gardel/Mofox-Core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Main fix
This commit is contained in:
SengokuCola
2025-03-23 20:54:57 +08:00
committed by GitHub
parent 9f87cab148 695584fea0
commit 9860ea085e
3 changed files with 396 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/plugins/chat/emoji_manager.py
View File

@@ -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