✨ 更新菜单插件，增加新功能项；优化好友添加提示信息；重构回声洞投稿条件判断逻辑

src/plugins/Menu/plugin.json

@@ -1,18 +1,18 @@
 {
-  "1": "娶群友",
-  "2": "成分姬",
-  "3": "答案之书",
-  "4": "疯狂星期四",
-  "5": "回声洞",
-  "6": "今日运势",
-  "7": "今天吃什么",
-  "8": "历史上的今天",
-  "9": "天气",
-  "10": "网易云点歌",
-  "11": "网抑云",
-  "12": "钓鱼",
-  "13": "表情包制作",
-  "14": "塔罗牌",
-  "15": "水群记录",
-  "16": "运行状态"
-}
+    "1": "娶群友",
+    "2": "成分姬",
+    "3": "答案之书",
+    "4": "疯狂星期四",
+    "5": "回声洞",
+    "6": "今日运势",
+    "7": "今天吃什么",
+    "8": "历史上的今天",
+    "9": "天气",
+    "10": "网易云点歌",
+    "11": "网抑云",
+    "13": "钓鱼",
+    "14": "表情包制作",
+    "15": "塔罗牌",
+    "16": "水群记录",
+    "17": "运行状态"
+}

src/plugins/addfirend/__init__.py

@@ -35,6 +35,7 @@ async def _(bot: Bot, event: RequestEvent):
         # 获取好友列表对比
         friend_list = await bot.get_friend_list()
         if event.user_id not in [friend["user_id"] for friend in friend_list]:
+            await addfriend.finish("我们还是先成为好友再带我去别的地方吧~")
             return
         nickname = (await bot.get_stranger_info(user_id=event.user_id, no_cache=True))[
             "nickname"

src/plugins/aichat/__init__.py

@@ -8,7 +8,6 @@
 import aiofiles
 import nonebot
 import ujson
-from cnocr import CnOcr
 from nonebot import get_plugin_config, logger, on_command, on_message
 from nonebot.adapters.onebot.v11 import Bot
 from nonebot.adapters.onebot.v11.event import GroupMessageEvent, MessageEvent, Reply

src/plugins/cave/__init__.py

@@ -84,17 +84,26 @@ async def _():
     await cave_update.finish("更新成功！")
 
 
-@cave_add.handle()
-async def _(bot: Bot, event: MessageEvent):
-    key = str(event.get_message()).strip().replace("投稿", "", 1)
-    # 仅私聊
+async def condition(event: MessageEvent, key: str) -> tuple[bool, str | None]:
+    "判断是否符合投稿条件"
     urllist = extract_image_urls(event.get_message())
     if len(urllist) > 1:
-        await cave_add.finish("只能投一张图哦")
+        return False, "只能投一张图哦"
     if not isinstance(event, PrivateMessageEvent):
-        await cave_add.finish("别搞啊，只能私聊我才能投稿啊！")
+        return False, "别搞啊，只能私聊我才能投稿啊！"
     if not key:
-        await cave_add.finish("不输入内容，小子你是想让我投稿什么？空气咩？")
+        return False, "不输入内容，小子你是想让我投稿什么？空气咩？"
+    if len(key) < 6:
+        return False, "字数太少了！"
+    return True, None
+
+
+@cave_add.handle()
+async def _(bot: Bot, event: MessageEvent):
+    key = str(event.get_message()).strip().replace("投稿", "", 1)
+    result = await condition(event, key)
+    if result[0] is False:  # 审核
+        await cave_add.finish(result[1])
     is_image = await is_image_message(event)
     details = is_image[1] if is_image[0] else key
     caves = await cave_models.create(details=details, user_id=event.user_id)
@@ -115,16 +124,10 @@ async def _(bot: Bot, event: MessageEvent):
 @cave_am_add.handle()
 async def _(bot: Bot, event: MessageEvent):
     "匿名发布回声洞"
-    key = str(event.get_message()).strip().replace("投稿", "", 1)
-
-    # 仅私聊
-    urllist = extract_image_urls(event.get_message())
-    if len(urllist) > 1:
-        await cave_add.finish("只能投一张图哦")
-    if not isinstance(event, PrivateMessageEvent):
-        await cave_add.finish("别搞啊，只能私聊我才能投稿啊！")
-    if not key:
-        await cave_add.finish("不输入内容，小子你是想让我投稿什么？空气咩？")
+    key = str(event.get_message()).strip().replace("匿名投稿", "", 1)
+    result = await condition(event, key)
+    if result[0] is False:  # 审核
+        await cave_add.finish(result[1])
     is_image = await is_image_message(event)
     details = is_image[1] if is_image[0] else key
     caves = await cave_models.create(

src/plugins/removegroup/__init__.py

@@ -3,7 +3,6 @@
 
 from nonebot import logger, on_command
 from nonebot.adapters.onebot.v11 import Bot
-from sympy import loggamma
 
 # 事件响应函数
 rlist = on_command("removegrouplist")