Merge pull request #4 from CMHopeSunshine/plugin-blacklist

Author: CMHopeSunshine

README.md

@@ -60,5 +60,6 @@ nb plugin install nonebot-plugin-follow-withdraw
 | follow_withdraw_interval        | 0.5                                                          | 多条消息时的撤回间隔(单位秒)，以防止一瞬间撤回过多消息导致风控( |
 | follow_withdraw_enable_adapters | ["OneBot V11", "OneBot V12", "QQ Guild", "Discord", "Kaiheila"] | 启用的适配器类型列表，默认为所有已支持的适配器，可选值请看默认值 |
 | follow_withdraw_bot_blacklist   | []                                                           | 不启用跟随撤回的Bot列表，填写Bot的bot_id                     |
+| follow_withdraw_plugin_blacklist | [] | 不启用跟随撤回的插件列表 |
 
 此外，本插件还提供了一个仅超级用户可使用的命令`清除消息记录`，来清除本插件记录的消息ID数据。

nonebot_plugin_follow_withdraw/__init__.py

@@ -6,7 +6,7 @@
 from nonebot.permission import SUPERUSER
 from nonebot import on_notice, on_command
 from nonebot.plugin import PluginMetadata
-from nonebot.internal.matcher import current_event
+from nonebot.internal.matcher import current_event, current_matcher
 
 from . import adapters as adapters_module
 from .config import Config, withdraw_config
@@ -64,14 +64,23 @@ async def handle_save_message(
     if exception:
         return
     if bot.self_id in withdraw_config.follow_withdraw_bot_blacklist:
-        return False
+        return
+    try:
+        matcher = current_matcher.get()
+        if matcher.plugin_name in withdraw_config.follow_withdraw_plugin_blacklist:
+            return
+    except LookupError:
+        pass
+
     adapter_name = bot.adapter.get_name()
     if adapter_name not in withdraw_config.follow_withdraw_enable_adapters:
         return
     if not check_allow_api(adapter_name, api):
         return
-
-    event = current_event.get()
+    try:
+        event = current_event.get()
+    except LookupError:
+        return
     if (message := get_message(result, adapter_name)) and (
         origin_message := get_origin_message(event, adapter_name)
     ):

nonebot_plugin_follow_withdraw/config.py

@@ -17,6 +17,7 @@ class Config(BaseModel):
         "Kaiheila",
     ]
     follow_withdraw_bot_blacklist: List[str] = []
+    follow_withdraw_plugin_blacklist: List[str] = []
 
 
 driver = get_driver()

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "nonebot-plugin-follow-withdraw"
-version = "0.1.2"
+version = "0.2.0"
 description = "A plugin for nonebot2 that follows the user's withdraw of a command."
 authors = ["CMHopeSunshine <[email protected]>"]
 license = "MIT"