Merge branch 'dev' into plugin

src/common/database/database_model.py

@@ -130,6 +130,7 @@ class Messages(BaseModel):
     reply_to = TextField(null=True)
 
     interest_value = DoubleField(null=True)
+    is_mentioned = BooleanField(null=True)
 
     # 从 chat_info 扁平化而来的字段
     chat_info_stream_id = TextField()
@@ -155,6 +156,13 @@ class Messages(BaseModel):
     detailed_plain_text = TextField(null=True)  # 详细的纯文本消息
     memorized_times = IntegerField(default=0)  # 被记忆的次数
 
+    priority_mode = TextField(null=True)
+    priority_info = TextField(null=True)
+
+    additional_config = TextField(null=True)
+    is_emoji = BooleanField(default=False)
+    is_picid = BooleanField(default=False)
+
     class Meta:
         # database = db # 继承自 BaseModel
         table_name = "messages"

src/common/message_repository.py

@@ -2,6 +2,7 @@ import traceback
 
 from typing import List, Any, Optional
 from peewee import Model  # 添加 Peewee Model 导入
+from src.config.config import global_config
 
 from src.common.database.database_model import Messages
 from src.common.logger import get_logger
@@ -21,6 +22,7 @@ def find_messages(
     sort: Optional[List[tuple[str, int]]] = None,
     limit: int = 0,
     limit_mode: str = "latest",
+    fliter_bot=False,
 ) -> List[dict[str, Any]]:
     """
     根据提供的过滤器、排序和限制条件查找消息。
@@ -70,6 +72,9 @@ def find_messages(
             if conditions:
                 query = query.where(*conditions)
 
+        if fliter_bot:
+            query = query.where(Messages.user_id != global_config.bot.qq_account)
+
         if limit > 0:
             if limit_mode == "earliest":
                 # 获取时间最早的 limit 条记录，已经是正序