🎨 代码优化

zhenxun/builtin_plugins/superuser/set_admin.py

@@ -1,35 +1,36 @@
 from nonebot.permission import SUPERUSER
 from nonebot.plugin import PluginMetadata
+from nonebot_plugin_session import EventSession, SessionLevel
 from nonebot_plugin_alconna import (
-    Alconna,
-    Args,
-    Arparma,
     At,
+    Args,
     Match,
+    Option,
+    Alconna,
+    Arparma,
     Subcommand,
     on_alconna,
 )
-from nonebot_plugin_session import EventSession, SessionLevel
 
-from zhenxun.configs.utils import PluginExtraData
-from zhenxun.models.level_user import LevelUser
 from zhenxun.services.log import logger
 from zhenxun.utils.enum import PluginType
 from zhenxun.utils.message import MessageUtils
+from zhenxun.models.level_user import LevelUser
+from zhenxun.configs.utils import PluginExtraData
 
 __plugin_meta__ = PluginMetadata(
     name="用户权限管理",
     description="设置用户权限",
     usage="""
-    权限设置 add [level: 权限等级] [at: at对象或用户id] [gid: 群组]
-    权限设置 delete [at: at对象或用户id]
-    
-    权限设置 add 5 @user
-    权限设置 add 5 422 352352
+    权限设置 add [level: 权限等级] [at: at对象或用户id] ?[-g gid: 群组]
+    权限设置 delete [at: at对象或用户id]  ?[-g gid: 群组]
+
+    添加权限 5 @user
+    权限设置 add 5 422 -g 352352
+
+    删除权限 @user
+    删除权限 1234123 -g 123123
 
-    权限设置 delete @user
-    权限设置 delete 123456
-    
     """.strip(),
     extra=PluginExtraData(
         author="HibiKier",
@@ -44,16 +45,31 @@ _matcher = on_alconna(
         "权限设置",
         Subcommand(
             "add",
-            Args["level", int]["uid", [str, At]]["gid?", str],
+            Args["level", int]["uid", [str, At]],
             help_text="添加权限",
         ),
-        Subcommand("delete", Args["uid", [str, At]]["gid?", str], help_text="删除权限"),
+        Subcommand("delete", Args["uid", [str, At]], help_text="删除权限"),
+        Option("-g|--group", Args["gid", str], help_text="指定群组"),
     ),
     permission=SUPERUSER,
     priority=5,
     block=True,
 )
 
+_matcher.shortcut(
+    "添加权限",
+    command="权限设置",
+    arguments=["add", "{%0}"],
+    prefix=True,
+)
+
+_matcher.shortcut(
+    "删除权限",
+    command="权限设置",
+    arguments=["delete", "{%0}"],
+    prefix=True,
+)
+
 
 @_matcher.assign("add")
 async def _(
@@ -82,9 +98,10 @@ async def _(
                 ]
             ).finish(reply_to=True)
         await MessageUtils.build_message(
-            f"成功为 \n群组：{group_id}\n用户：{uid} \n设置权限!\n权限：{old_level} -> {level}"
+            f"成功为 \n群组：{group_id}\n用户：{uid} \n"
+            f"设置权限!\n权限：{old_level} -> {level}"
         ).finish()
-    await MessageUtils.build_message(f"设置权限时群组不能为空...").finish()
+    await MessageUtils.build_message("设置权限时群组不能为空...").finish()
 
 
 @_matcher.assign("delete")
@@ -107,7 +124,7 @@ async def _(
                     session=session,
                 )
                 await MessageUtils.build_message(
-                    ["成功删除 ", At(flag="user", target=uid), f" 的权限等级!"]
+                    ["成功删除 ", At(flag="user", target=uid), " 的权限等级!"]
                 ).finish(reply_to=True)
             logger.info(
                 f"删除群组用户权限: {user.user_level} -> 0",
@@ -115,7 +132,8 @@ async def _(
                 session=session,
             )
             await MessageUtils.build_message(
-                f"成功删除 \n群组：{group_id}\n用户：{uid} \n的权限等级!\n权限：{user.user_level} -> 0"
+                f"成功删除 \n群组：{group_id}\n用户：{uid} \n"
+                f"的权限等级!\n权限：{user.user_level} -> 0"
             ).finish()
-        await MessageUtils.build_message(f"对方目前暂无权限喔...").finish()
-    await MessageUtils.build_message(f"设置权限时群组不能为空...").finish()
+        await MessageUtils.build_message("对方目前暂无权限喔...").finish()
+    await MessageUtils.build_message("设置权限时群组不能为空...").finish()