update

plugins/admin_bot_manage/__init__.py

@@ -1,12 +1,12 @@
 from nonebot import on_command
-from util.utils import get_message_text, get_message_imgs, scheduler, get_bot
+from utils.utils import get_message_text, get_message_imgs, scheduler, get_bot
 from nonebot.typing import T_State
 from nonebot.adapters.cqhttp import Bot, GroupMessageEvent
 from .data_source import set_group_status, custom_group_welcome, change_group_switch, \
     update_member_info, group_current_status
 from nonebot.adapters.cqhttp.permission import GROUP
 from services.log import logger
-from configs.config import plugins2name_dict
+from configs.config import plugins2info_dict
 from nonebot.plugin import export
 
 __plugin_name__ = '自定义进群欢迎消息'
@@ -18,8 +18,8 @@ export = export()
 export.update_member_info = update_member_info
 
 cmds = []
-for cmd_list in plugins2name_dict.values():
-    for cmd in cmd_list:
+for cmd_list in plugins2info_dict.values():
+    for cmd in cmd_list['cmd']:
         cmds.append(f'开启{cmd}')
         cmds.append(f'关闭{cmd}')
 cmds = set(cmds)
@@ -35,7 +35,7 @@ group_status = on_command('oc_reminds', aliases={'开启早晚安', '关闭早
                                                  '群通知状态'}, permission=GROUP, priority=1, block=True)
 
 switch_rule = on_command('switch_rule', aliases=cmds, permission=GROUP, priority=4, block=True)
-custom_welcome = on_command('自定义进群欢迎消息', aliases={'自定义欢迎消息', '自定义群欢迎消息'}, permission=GROUP, priority=5, block=True)
+custom_welcome = on_command('自定义进群欢迎消息', aliases={'自定义欢迎消息', '自定义群欢迎消息', '设置群欢迎消息'}, permission=GROUP, priority=5, block=True)
 refresh_member_group = on_command("更新群组成员列表", aliases={"更新群组成员信息"}, permission=GROUP, priority=5, block=True)
 
 

plugins/admin_bot_manage/data_source.py

@@ -4,11 +4,11 @@ from configs.path_config import DATA_PATH
 import os
 import aiofiles
 import aiohttp
-from util.init_result import image
-from util.utils import get_local_proxy, get_bot
+from utils.init_result import image
+from utils.utils import get_local_proxy, get_bot
 from pathlib import Path
 from nonebot import require
-from configs.config import plugins2name_dict
+from configs.config import plugins2info_dict
 from models.group_member_info import GroupInfoUser
 import time
 from datetime import datetime
@@ -136,8 +136,8 @@ async def change_group_switch(cmd: str, group_id: int):
         pass
     except FileNotFoundError:
         pass
-    for plugin_cmd in plugins2name_dict.keys():
-        if cmd in plugins2name_dict[plugin_cmd]:
+    for plugin_cmd in plugins2info_dict.keys():
+        if cmd in plugins2info_dict[plugin_cmd]['cmd']:
             # print(plugin_list[plugin_cmd])
             if status == '开启':
                 # if group_id in plugin_list[plugin_cmd]: