try fix

bangumi · Dec 17, 2023 · f76429c · f76429c
1 parent 28cba84
commit f76429c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 12 deletions.
diff --git a/chii/timeline/__init__.py b/chii/timeline/__init__.py
@@ -12,10 +12,7 @@ class SubjectMemo(BaseModel):
     collect_comment: str
     collect_rate: int
     subject_id: str
-    subject_name: str
-    subject_name_cn: str
     subject_series: bool = False
-    subject_type_id: str
 
 
 class SubjectImage(BaseModel):

diff --git a/rpc/timeline_service.py b/rpc/timeline_service.py
@@ -75,8 +75,9 @@ def SubjectCollect(
 
         return SubjectCollectResponse(ok=True)
 
+    @staticmethod
     def merge_previous_timeline(
-        self, session: Session, tl: ChiiTimeline, req: SubjectCollectRequest
+        session: Session, tl: ChiiTimeline, req: SubjectCollectRequest
     ):
         escaped = html.escape(req.comment)
         if tl.batch:
@@ -95,18 +96,15 @@ def merge_previous_timeline(
                     m.collect_rate = req.rate
 
                 if should_update:
-                    tl.memo = php.serialize(m.dict())
+                    tl.memo = php.serialize(m.model_dump())
                     session.add(tl)
                 return
 
             memo = {int(m.subject_id): m}
 
         memo[req.subject.id] = SubjectMemo(
             subject_id=str(req.subject.id),
-            subject_type_id=str(req.subject.type),
-            subject_name_cn=req.subject.name_cn,
             subject_series=req.subject.series,
-            subject_name=req.subject.name,
             collect_comment=escaped,
             collect_rate=req.rate,
         )
@@ -129,15 +127,13 @@ def merge_previous_timeline(
 
         session.add(tl)
 
+    @staticmethod
     def create_subject_collection_timeline(
-        self, session: Session, req: SubjectCollectRequest, type: int
+        session: Session, req: SubjectCollectRequest, type: int
     ):
         memo = SubjectMemo(
             subject_id=str(req.subject.id),
-            subject_type_id=str(req.subject.type),
-            subject_name_cn=req.subject.name_cn,
             subject_series=req.subject.series,
-            subject_name=req.subject.name,
             collect_comment=html.escape(req.comment),
             collect_rate=req.rate,
         )