バグ直し

config.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 import os
 from typing import TypedDict
 
-from eloquent import DatabaseManager, Model
+from eloquent import DatabaseManager, Model  # type: ignore
 
 CONFIG: dict[str, DbConfig] = { 'mysql': { 'driver':    'mysql',
                                            'host':      'localhost',

consts.py

@@ -1,13 +1,6 @@
 from enum import Enum
 
 
-class AnswerType (Enum):
-    YOUTUBE_REPLY   = 1
-    BLUESKY_REPLY   = 2
-    YOUTUBE_SYSTEM  = 3
-    BLUESKY_SYSTEM  = 4
-
-
 class Character (Enum):
     DEERJIKA    = 1
     GOATOH      = 2
@@ -27,4 +20,8 @@ class QueryType (Enum):
     YOUTUBE_COMMENT = 1
     BLUESKY_COMMENT = 2
     YOUTUBE_SYSTEM  = 3
-    BLUESKY_SYSTEM  = 3
+    BLUESKY_SYSTEM  = 4
+    KIRIBAN         = 5
+    NICO_REPORT     = 6
+    SNACK_TIME      = 7
+    HOT_SPRING      = 8

models.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 from datetime import datetime
 
-from eloquent import Model
+from eloquent import Model, QueryBuilder  # type: ignore
 
 from .config import DB
 
@@ -27,17 +27,22 @@ class Answer (Model):
     query_id:       int
     character:      int
     content:        str
-    answer_type:    int
     sent_at:        datetime
 
     __timestamps__ = False
 
     @property
-    def query (
+    def query_rel (
             self,
     ) -> Query:
         return self.belongs_to (Query)
 
+    @property
+    def answered_flags (
+            self,
+    ) -> list[AnsweredFlag]:
+        return self.has_many (AnsweredFlag)
+
     def answered (
             self,
             platform:   int,
@@ -60,7 +65,9 @@ class Query (Model):
     model:              int
     sent_at:            datetime
     answered:           bool
+    transfer_data:      dict[str, str] | None
 
+    __casts__ = { 'transfer_data': 'json' }
     __timestamps__ = False
 
     @property
@@ -73,7 +80,7 @@ class Query (Model):
     def answer_histories (
             self,
     ) -> list[Answer]:
-        return [x.answer for x in self.has_many (QueryAnswerHistory).get ()]
+        return [x.answer for x in self.has_many (QueryAnswerHistory)]
 
 
 class QueryAnswerHistory (Model):
@@ -84,7 +91,7 @@ class QueryAnswerHistory (Model):
     __timestamps__ = False
 
     @property
-    def query (
+    def query_rel (
             self,
     ) -> Query:
         return self.belongs_to (Query)