diff --git a/src/chat/emoji_system/emoji_manager.py b/src/chat/emoji_system/emoji_manager.py index 00f93421a..10669b140 100644 --- a/src/chat/emoji_system/emoji_manager.py +++ b/src/chat/emoji_system/emoji_manager.py @@ -723,7 +723,7 @@ class EmojiManager: emoji = await self.get_emoji_from_manager(emoji_hash) if emoji and emoji.emotion: logger.info(f"[缓存命中] 从内存获取表情包描述: {emoji.emotion}...") - return emoji.emotion + return ",".join(emoji.emotion) # 如果内存中没有,从数据库查找 self._ensure_db() diff --git a/src/chat/utils/utils_image.py b/src/chat/utils/utils_image.py index 58df290d4..7aaa207bf 100644 --- a/src/chat/utils/utils_image.py +++ b/src/chat/utils/utils_image.py @@ -101,6 +101,8 @@ class ImageManager: image_bytes = base64.b64decode(image_base64) image_hash = hashlib.md5(image_bytes).hexdigest() emoji = await emoji_manager.get_emoji_from_manager(image_hash) + if not emoji: + return "[表情包:未知]" emotion_list = emoji.emotion tag_str = ",".join(emotion_list) return f"[表情包:{tag_str}]"