emoji_api_doc

src/plugin_system/apis/emoji_api.py

@@ -65,14 +65,14 @@ async def get_by_description(description: str) -> Optional[Tuple[str, str, str]]
         return None
 
 
-async def get_random(count: Optional[int] = 1) -> Optional[List[Tuple[str, str, str]]]:
+async def get_random(count: Optional[int] = 1) -> List[Tuple[str, str, str]]:
     """随机获取指定数量的表情包
 
     Args:
         count: 要获取的表情包数量，默认为1
 
     Returns:
-        Optional[List[Tuple[str, str, str]]]: 包含(base64编码, 表情包描述, 随机情感标签)的元组列表，如果失败则为None
+        List[Tuple[str, str, str]]: 包含(base64编码, 表情包描述, 随机情感标签)的元组列表，失败则返回空列表
 
     Raises:
         TypeError: 如果count不是整数类型
@@ -94,13 +94,13 @@ async def get_random(count: Optional[int] = 1) -> Optional[List[Tuple[str, str,
 
         if not all_emojis:
             logger.warning("[EmojiAPI] 没有可用的表情包")
-            return None
+            return []
 
         # 过滤有效表情包
         valid_emojis = [emoji for emoji in all_emojis if not emoji.is_deleted]
         if not valid_emojis:
             logger.warning("[EmojiAPI] 没有有效的表情包")
-            return None
+            return []
 
         if len(valid_emojis) < count:
             logger.warning(
@@ -127,14 +127,14 @@ async def get_random(count: Optional[int] = 1) -> Optional[List[Tuple[str, str,
 
         if not results and count > 0:
             logger.warning("[EmojiAPI] 随机获取表情包失败，没有一个可以成功处理")
-            return None
+            return []
 
         logger.info(f"[EmojiAPI] 成功获取 {len(results)} 个随机表情包")
         return results
 
     except Exception as e:
         logger.error(f"[EmojiAPI] 获取随机表情包失败: {e}")
-        return None
+        return []
 
 
 async def get_by_emotion(emotion: str) -> Optional[Tuple[str, str, str]]:
@@ -162,10 +162,11 @@ async def get_by_emotion(emotion: str) -> Optional[Tuple[str, str, str]]:
 
         # 筛选匹配情感的表情包
         matching_emojis = []
-        for emoji_obj in all_emojis:
-            if not emoji_obj.is_deleted and emotion.lower() in [e.lower() for e in emoji_obj.emotion]:
-                matching_emojis.append(emoji_obj)
-
+        matching_emojis.extend(
+            emoji_obj
+            for emoji_obj in all_emojis
+            if not emoji_obj.is_deleted and emotion.lower() in [e.lower() for e in emoji_obj.emotion]
+        )
         if not matching_emojis:
             logger.warning(f"[EmojiAPI] 未找到匹配情感 '{emotion}' 的表情包")
             return None
@@ -256,10 +257,11 @@ def get_descriptions() -> List[str]:
         emoji_manager = get_emoji_manager()
         descriptions = []
 
-        for emoji_obj in emoji_manager.emoji_objects:
-            if not emoji_obj.is_deleted and emoji_obj.description:
-                descriptions.append(emoji_obj.description)
-
+        descriptions.extend(
+            emoji_obj.description
+            for emoji_obj in emoji_manager.emoji_objects
+            if not emoji_obj.is_deleted and emoji_obj.description
+        )
         return descriptions
     except Exception as e:
         logger.error(f"[EmojiAPI] 获取表情包描述失败: {e}")