From 7509d542bce08b16e6e5817d5b29aeed522e4815 Mon Sep 17 00:00:00 2001 From: liuwei Date: Mon, 26 May 2025 11:11:02 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=A9=E6=B0=94=E6=94=AF=E6=8C=81=E7=A7=81?= =?UTF-8?q?=E8=81=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugins/weather/main.py | 3 +-- utils/decorator/points_decorator.py | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/plugins/weather/main.py b/plugins/weather/main.py index 7a8dc88..2e2d8b9 100644 --- a/plugins/weather/main.py +++ b/plugins/weather/main.py @@ -95,11 +95,10 @@ class WeatherPlugin(MessagePluginInterface): self.LOG.debug(f"插件执行： {self.name}：{content}") sender = message.get("sender") roomid = message.get("roomid", "") - gbm: GroupBotManager = message.get("gbm") bot: WechatAPIClient = message.get("bot") # 检查权限 - if gbm.get_group_permission(roomid, Feature.WEATHER) == PermissionStatus.DISABLED: + if GroupBotManager.get_group_permission(roomid, Feature.WEATHER) == PermissionStatus.DISABLED: return False, "没有权限" # 处理消息内容 - 不再使用jieba分词 diff --git a/utils/decorator/points_decorator.py b/utils/decorator/points_decorator.py index 55422b3..1b426fe 100644 --- a/utils/decorator/points_decorator.py +++ b/utils/decorator/points_decorator.py @@ -189,14 +189,14 @@ def plugin_points_cost(points: int, description: str = None, feature: Feature = # 检查权限 roomid = message.get("roomid", "") if feature and roomid: - gbm = message.get("gbm") - if gbm and gbm.get_group_permission(roomid, feature) == PermissionStatus.DISABLED: + if GroupBotManager.get_group_permission(roomid, feature) == PermissionStatus.DISABLED: return False, "没有权限" # 检查是否开启了积分获取功能 - if gbm and gbm.get_group_permission(roomid, - Feature.SIGNIN) == PermissionStatus.DISABLED and gbm.get_group_permission( - roomid, Feature.TASK_GAME) == PermissionStatus.DISABLED: + if (GroupBotManager.get_group_permission(roomid, + Feature.SIGNIN) == PermissionStatus.DISABLED + and GroupBotManager.get_group_permission( + roomid, Feature.TASK_GAME) == PermissionStatus.DISABLED): return await func(self, message) # 获取消息信息 @@ -265,14 +265,14 @@ def plugin_points_cost(points: int, description: str = None, feature: Feature = # 检查权限 roomid = message.get("roomid", "") if feature and roomid: - gbm = message.get("gbm") - if gbm and gbm.get_group_permission(roomid, feature) == PermissionStatus.DISABLED: + if GroupBotManager.get_group_permission(roomid, feature) == PermissionStatus.DISABLED: return False, "没有权限" # 检查是否开启了积分获取功能 - if gbm and gbm.get_group_permission(roomid, - Feature.SIGNIN) == PermissionStatus.DISABLED and gbm.get_group_permission( - roomid, Feature.TASK_GAME) == PermissionStatus.DISABLED: + if (GroupBotManager.get_group_permission(roomid, + Feature.SIGNIN) == PermissionStatus.DISABLED + and GroupBotManager.get_group_permission( + roomid, Feature.TASK_GAME) == PermissionStatus.DISABLED): return func(self, message) # 获取消息信息