Merge pull request #559 from MaiM-with-u/main-fix

Main fix

src/plugins/chat/emoji_manager.py

@@ -118,7 +118,9 @@ class EmojiManager:
 
             try:
                 # 获取所有表情包
-                all_emojis = list(db.emoji.find({}, {"_id": 1, "path": 1, "embedding": 1, "description": 1}))
+                all_emojis = [e for e in
+                              db.emoji.find({}, {"_id": 1, "path": 1, "embedding": 1, "description": 1, "blacklist": 1})
+                              if 'blacklist' not in e]
 
                 if not all_emojis:
                     logger.warning("数据库中没有任何表情包")
@@ -173,7 +175,7 @@ class EmojiManager:
             logger.error(f"[错误] 获取表情包失败: {str(e)}")
             return None
 
-    async def _get_emoji_discription(self, image_base64: str) -> str:
+    async def _get_emoji_description(self, image_base64: str) -> str:
         """获取表情包的标签，使用image_manager的描述生成功能"""
 
         try:
@@ -248,20 +250,14 @@ class EmojiManager:
                     if existing_emoji_by_path["_id"] != existing_emoji_by_hash["_id"]:
                         logger.error(f"[错误] 表情包已存在但记录不一致: {filename}")
                         db.emoji.delete_one({"_id": existing_emoji_by_path["_id"]})
-                        db.emoji.update_one(
-                            {"_id": existing_emoji_by_hash["_id"]}, {"$set": {"path": image_path, "filename": filename}}
-                        )
-                        existing_emoji_by_hash["path"] = image_path
-                        existing_emoji_by_hash["filename"] = filename
-                    existing_emoji = existing_emoji_by_hash
+                        db.emoji.delete_one({"_id": existing_emoji_by_hash["_id"]})
+                        existing_emoji = None
+                    else:
+                        existing_emoji = existing_emoji_by_hash
                 elif existing_emoji_by_hash:
                     logger.error(f"[错误] 表情包hash已存在但path不存在: {filename}")
-                    db.emoji.update_one(
-                        {"_id": existing_emoji_by_hash["_id"]}, {"$set": {"path": image_path, "filename": filename}}
-                    )
-                    existing_emoji_by_hash["path"] = image_path
-                    existing_emoji_by_hash["filename"] = filename
-                    existing_emoji = existing_emoji_by_hash
+                    db.emoji.delete_one({"_id": existing_emoji_by_hash["_id"]})
+                    existing_emoji = None
                 elif existing_emoji_by_path:
                     logger.error(f"[错误] 表情包path已存在但hash不存在: {filename}")
                     db.emoji.delete_one({"_id": existing_emoji_by_path["_id"]})
@@ -273,7 +269,7 @@ class EmojiManager:
 
                 if existing_emoji:
                     # 即使表情包已存在，也检查是否需要同步到images集合
-                    description = existing_emoji.get("discription")
+                    description = existing_emoji.get("description")
                     # 检查是否在images集合中存在
                     existing_image = db.images.find_one({"hash": image_hash})
                     if not existing_image:
@@ -298,7 +294,7 @@ class EmojiManager:
                     description = existing_description
                 else:
                     # 获取表情包的描述
-                    description = await self._get_emoji_discription(image_base64)
+                    description = await self._get_emoji_description(image_base64)
 
                 if global_config.EMOJI_CHECK:
                     check = await self._check_emoji(image_base64, image_format)
@@ -316,7 +312,7 @@ class EmojiManager:
                         "filename": filename,
                         "path": image_path,
                         "embedding": embedding,
-                        "discription": description,
+                        "description": description,
                         "hash": image_hash,
                         "timestamp": int(time.time()),
                     }
@@ -399,6 +395,11 @@ class EmojiManager:
                             db.emoji.delete_one({"_id": emoji["_id"]})
                             removed_count += 1
 
+                    # 修复拼写错误
+                    if "discription" in emoji:
+                        desc = emoji["discription"]
+                        db.emoji.update_one({"_id": emoji["_id"]}, {"$unset": {"discription": ""}, "$set": {"description": desc}})
+
                 except Exception as item_error:
                     logger.error(f"[错误] 处理表情包记录时出错: {str(item_error)}")
                     continue

src/plugins/schedule/schedule_generator.py

@@ -97,14 +97,28 @@ class ScheduleGenerator:
             reg = r"\{(.|\r|\n)+\}"
             matched = re.search(reg, schedule_text)[0]
             schedule_dict = json.loads(matched)
+            self._check_schedule_validity(schedule_dict)
             return schedule_dict
         except json.JSONDecodeError:
             logger.exception("解析日程失败: {}".format(schedule_text))
             return False
+        except ValueError as e:
+            logger.exception(f"解析日程失败: {str(e)}")
+            return False
         except Exception as e:
             logger.exception(f"解析日程发生错误:{str(e)}")
             return False
 
+    def _check_schedule_validity(self, schedule_dict: Dict[str, str]):
+        """检查日程是否合法"""
+        if not schedule_dict:
+            return
+        for time_str in schedule_dict.keys():
+            try:
+                self._parse_time(time_str)
+            except ValueError:
+                raise ValueError("日程时间格式不正确") from None
+
     def _parse_time(self, time_str: str) -> str:
         """解析时间字符串，转换为时间"""
         return datetime.datetime.strptime(time_str, "%H:%M")