fix: new timeline value (#143)

bangumi · Dec 17, 2023 · 2d562e9 · 2d562e9
1 parent 57d7b16
commit 2d562e9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 20 deletions.
diff --git a/chii/timeline/__init__.py b/chii/timeline/__init__.py
@@ -12,10 +12,6 @@ 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
@@ -1,6 +1,6 @@
 import html
 import time
-from typing import Optional
+from typing import Any, Optional
 
 import phpserialize as php
 import pydantic
@@ -31,12 +31,10 @@
     TimelineCat,
 )
 
-BatchMeme: pydantic.TypeAdapter[dict[int, SubjectMemo]] = pydantic.TypeAdapter(
-    dict[int, SubjectMemo]
-)
+BatchMeme: pydantic.TypeAdapter[dict[int, Any]] = pydantic.TypeAdapter(dict[int, Any])
 
-BatchSubjectImage: pydantic.TypeAdapter[dict[int, SubjectImage]] = pydantic.TypeAdapter(
-    dict[int, SubjectImage]
+BatchSubjectImage: pydantic.TypeAdapter[dict[int, Any]] = pydantic.TypeAdapter(
+    dict[int, Any]
 )
 
 
@@ -77,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:
@@ -105,10 +104,6 @@ def merge_previous_timeline(
 
         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,
         )
@@ -131,15 +126,12 @@ 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,
         )