🎨 部分代码逻辑简化

Author: wling-art

src/nonebot_plugin_liteperm/API/rules.py

@@ -48,7 +48,7 @@ def checker(self) -> Callable[[Event, str], Awaitable[bool]]:
         """
 
         # 捕获当前权限值到闭包中
-        current_perm = self.permission if self.permission else ""
+        current_perm = self.permission or ""
 
         async def _checker(event: Event, current_perm=current_perm) -> bool:
             """实际执行检查的协程函数"""
@@ -100,9 +100,9 @@ class GroupPermissionChecker(PermissionChecker):
     async def _check_permission(self, event: Event, perm: str) -> bool:
         if not isinstance(event, GroupEvent) and not self.only_group:
             return True
-        elif not isinstance(event, GroupEvent) and self.only_group:
+        elif not isinstance(event, GroupEvent):
             return False
-        elif isinstance(event, GroupEvent):
+        else:
             g_event: GroupEvent = event
         group_id: str = str(g_event.group_id)
         group_data = data_manager.get_group_data(group_id)

src/nonebot_plugin_liteperm/__init__.py

@@ -17,7 +17,7 @@
 ]
 
 __plugin_meta__ = PluginMetadata(
-    name="LitePerm 权限管理插件",  # type: ignore
+    name="LitePerm 权限管理插件",
     description="基于权限节点/权限组/特殊权限的权限管理插件。",
     usage="https://github.com/LiteSuggarDEV/plugin-liteperm/blob/main/README.md",
     homepage="https://github.com/LiteSuggarDEV/plugin-liteperm/",

src/nonebot_plugin_liteperm/commands/lp_chat_group.py

@@ -113,7 +113,7 @@ def get_handler(
         "parent": ParentGroupHandler(),
         "perm_group": PermissionGroupHandler(),
     }
-    return handlers[action_type] if action_type in handlers else None
+    return handlers.get(action_type)
 
 
 # 运行进入点

src/nonebot_plugin_liteperm/commands/lp_command.py

@@ -39,10 +39,9 @@ async def execute(
     ) -> tuple[str, dict[str, Any]]:
         result = "❌ 操作失败"
         command_data = data_manager.get_command_settings()
-        if operation == "del":
-            if command in command_data.commands:
-                del command_data.commands[command]
-                result = "✅ 操作成功"
+        if operation == "del" and command in command_data.commands:
+            del command_data.commands[command]
+            result = "✅ 操作成功"
         return result, command_data.model_dump()
 
 
@@ -67,7 +66,7 @@ def get_handler(
         "command": DelPermissionSetting(),
         "list": ListHandler(),
     }
-    return handlers[action_type] if action_type in handlers else None
+    return handlers.get(action_type)
 
 
 @command.command("command", permission=is_lp_admin).handle()

src/nonebot_plugin_liteperm/commands/lp_perm_group.py

@@ -92,15 +92,13 @@ async def execute(
         if operation == "create":
             if data_manager.get_permission_group_data(group) is not None:
                 return "❌ 权限组已存在", {}
-            else:
-                data_manager.get_permission_group_data(group, True)
-                return "✅ 权限组创建成功", {}
+            data_manager.get_permission_group_data(group, True)
+            return "✅ 权限组创建成功", {}
         elif operation == "remove":
             if data_manager.get_permission_group_data(group) is None:
                 return "❌ 权限组不存在", {}
-            else:
-                data_manager.remove_permission_group(group)
-                return "✅ 权限组删除成功", {}
+            data_manager.remove_permission_group(group)
+            return "✅ 权限组删除成功", {}
         return "❌ 操作错误", {}
 
 def get_handler(
@@ -111,7 +109,7 @@ def get_handler(
         "parent": ParentGroupHandler(),
         "to":PermissionGroupHandler(),
     }
-    return handlers[action_type] if action_type in handlers else None
+    return handlers.get(action_type)
 
 
 # 运行进入点

src/nonebot_plugin_liteperm/commands/lp_user.py

@@ -112,7 +112,7 @@ def get_handler(
         "parent": ParentGroupHandler(),
         "perm_group": PermissionGroupHandler(),
     }
-    return handlers[action_type] if action_type in handlers else None
+    return handlers.get(action_type)
 
 
 # 运行进入点

src/nonebot_plugin_liteperm/commands/main.py

@@ -18,9 +18,9 @@ async def execute(
 @command.command("", rule=to_me()).handle()
 async def lp(event: MessageEvent, matcher: Matcher, args: Message = CommandArg()):
     args_list = args.extract_plain_text().strip().split()
-    lp_0_help = (
-        "LP LitePerms\n请输入参数\nlp user\nlp chat_group\nlp perm_group\nlp command\n"
-    )
-
     if not args_list:
+        lp_0_help = (
+            "LP LitePerms\n请输入参数\nlp user\nlp chat_group\nlp perm_group\nlp command\n"
+        )
+
         await matcher.finish(lp_0_help)

src/nonebot_plugin_liteperm/config.py

@@ -130,13 +130,14 @@ def get_permission_group_data(
         self, group_name: str, new: bool = False
     ) -> PermissionGroupData | None:
         data_path = self.permission_groups_path / f"{group_name}.json"
-        if not data_path.exists() and new:
-            data = PermissionGroupData()
-            with open(data_path, "w") as f:
-                json.dump(data.model_dump(), f)
-            return data
-        elif not data_path.exists():
-            return None
+        if not data_path.exists():
+            if not new:
+                return None
+            else:
+                data = PermissionGroupData()
+                with open(data_path, "w") as f:
+                    json.dump(data.model_dump(), f)
+                return data
         with open(data_path) as f:
             return PermissionGroupData(**json.load(f))
 

src/nonebot_plugin_liteperm/hooks.py

@@ -109,10 +109,9 @@ async def check_on_command(matcher: Matcher, event: Event):
                                                 ).permissions  # type: ignore
                                             ).check_permission(permission):
                                                 return
-                                        else:
-                                            raise IgnoredException(
-                                                f"Permission {permission} denied"
-                                            )
+                                        raise IgnoredException(
+                                            f"Permission {permission} denied"
+                                        )
                                     else:
                                         raise IgnoredException(
                                             f"Permission {permission} denied"

src/nonebot_plugin_liteperm/nodelib.py

@@ -6,7 +6,9 @@
 class Permissions:
     permissions_data: dict[str, str | dict | bool]
 
-    def __init__(self, permissions_data: dict[str, str | dict | bool] = {}) -> None:
+    def __init__(self, permissions_data: dict[str, str | dict | bool] | None = None) -> None:
+        if permissions_data is None:
+            permissions_data = {}
         self.permissions_data = permissions_data
 
     __permissions_str: str = ""