nonebot-plugin-parser 2.6.6__tar.gz → 2.6.7__tar.gz

{nonebot_plugin_parser-2.6.6 → nonebot_plugin_parser-2.6.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: nonebot-plugin-parser
-Version: 2.6.6
+Version: 2.6.7
 Summary: NoneBot2 链接分享解析 Alconna 版, 现支持B站|抖音|快手|微博|小红书|YouTube|TikTok|Twitter|AcFun|NGA
 Keywords: acfun,bilibili,douyin,kuaishou,nga,nonebot,nonebot2,tiktok,twitter,video,weibo,xiaohongshu,youtube
 Author: fllesser
@@ -315,6 +315,10 @@ parser_emoji_cdn="https://emojicdn.elk.sh"
 
 # [可选] emoji 渲染样式 "apple", "google", "twitter", "facebook"(默认)
 parser_emoji_style="facebook"
+
+# [可选] 是否启用群组黑名单模式(默认启用，即所有群聊的解析都是开启的)
+parser_group_blacklist_enabled=True
+
 ```
 
 </details>

{nonebot_plugin_parser-2.6.6 → nonebot_plugin_parser-2.6.7}/README.md

@@ -262,6 +262,10 @@ parser_emoji_cdn="https://emojicdn.elk.sh"
 
 # [可选] emoji 渲染样式 "apple", "google", "twitter", "facebook"(默认)
 parser_emoji_style="facebook"
+
+# [可选] 是否启用群组黑名单模式(默认启用，即所有群聊的解析都是开启的)
+parser_group_blacklist_enabled=True
+
 ```
 
 </details>

{nonebot_plugin_parser-2.6.6 → nonebot_plugin_parser-2.6.7}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "nonebot-plugin-parser"
-version = "2.6.6"
+version = "2.6.7"
 description = "NoneBot2 链接分享解析 Alconna 版, 现支持B站|抖音|快手|微博|小红书|YouTube|TikTok|Twitter|AcFun|NGA"
 readme = "README.md"
 requires-python = ">=3.10"
@@ -115,7 +115,7 @@ conflicts = [
 [tool.bumpversion]
 tag = true
 commit = true
-current_version = "2.6.6"
+current_version = "2.6.7"
 message = "release: bump vesion from {current_version} to {new_version}"
 
 [[tool.bumpversion.files]]

{nonebot_plugin_parser-2.6.6 → nonebot_plugin_parser-2.6.7}/src/nonebot_plugin_parser/config.py

@@ -56,6 +56,8 @@ class Config(BaseModel):
     """Pilmoji 表情 CDN"""
     parser_emoji_style: EmojiStyle = EmojiStyle.FACEBOOK
     """Pilmoji 表情样式"""
+    parser_group_blacklist_enabled: bool = True
+    """是否启用群组黑名单模式(默认启用，即所有群聊的解析都是开启的)"""
 
     @property
     def nickname(self) -> str:
@@ -182,6 +184,11 @@ class Config(BaseModel):
         """Pilmoji 表情样式"""
         return self.parser_emoji_style
 
+    @property
+    def group_blacklist_enabled(self) -> bool:
+        """是否启用群组黑名单模式"""
+        return self.parser_group_blacklist_enabled
+
 
 pconfig: Config = get_plugin_config(Config)
 """插件配置"""

nonebot_plugin_parser-2.6.7/src/nonebot_plugin_parser/matchers/filter.py

@@ -0,0 +1,82 @@
+import json
+from pathlib import Path
+
+from nonebot import on_command
+from nonebot.rule import to_me
+from nonebot.matcher import Matcher
+from nonebot.permission import SUPERUSER
+from nonebot_plugin_uninfo import ADMIN, Session, UniSession
+
+from ..config import pconfig
+
+_DISABLED_GROUPS_PATH: Path = pconfig.data_dir / "disabled_groups.json"
+_GROUP_SET_PATH: Path = pconfig.data_dir / "group_set.json"
+
+
+def _load_or_initialize_set() -> set[str]:
+    """加载群配置"""
+    # 判断是否存在
+    if not _GROUP_SET_PATH.exists():
+        if _DISABLED_GROUPS_PATH.exists():
+            # 迁移旧的关闭解析名单
+            _DISABLED_GROUPS_PATH.rename(_GROUP_SET_PATH)
+        else:
+            _GROUP_SET_PATH.write_text(json.dumps([]))
+
+    return set(json.loads(_GROUP_SET_PATH.read_text()))
+
+
+_GROUP_SET: set[str] = _load_or_initialize_set()
+
+
+def _save_group_set():
+    _GROUP_SET_PATH.write_text(json.dumps(list(_GROUP_SET)))
+
+
+def _add_group(group_key: str):
+    _GROUP_SET.add(group_key)
+    _save_group_set()
+
+
+def _remove_group(group_key: str):
+    _GROUP_SET.discard(group_key)
+    _save_group_set()
+
+
+def _get_group_key(session: Session) -> str:
+    """获取群组的唯一标识符 由平台名称和会话场景 ID 组成，例如 `QQClient_123456789`"""
+    return f"{session.scope}_{session.scene_path}"
+
+
+def is_enabled(session: Session = UniSession()) -> bool:
+    """判断当前会话是否在关闭解析的名单中"""
+    if session.scene.is_private:
+        return True
+
+    group_key = _get_group_key(session)
+    if pconfig.group_blacklist_enabled:
+        return group_key not in _GROUP_SET
+    else:
+        return group_key in _GROUP_SET
+
+
+@on_command("开启解析", rule=to_me(), permission=SUPERUSER | ADMIN(), block=True).handle()
+async def _(matcher: Matcher, session: Session = UniSession()):
+    """开启解析"""
+    group_key = _get_group_key(session)
+    if pconfig.group_blacklist_enabled:
+        _remove_group(group_key)
+    else:
+        _add_group(group_key)
+    await matcher.finish("解析已开启")
+
+
+@on_command("关闭解析", rule=to_me(), permission=SUPERUSER | ADMIN(), block=True).handle()
+async def _(matcher: Matcher, session: Session = UniSession()):
+    """关闭解析"""
+    group_key = _get_group_key(session)
+    if pconfig.group_blacklist_enabled:
+        _add_group(group_key)
+    else:
+        _remove_group(group_key)
+    await matcher.finish("解析已关闭")

{nonebot_plugin_parser-2.6.6 → nonebot_plugin_parser-2.6.7}/src/nonebot_plugin_parser/parsers/xiaohongshu/__init__.py

@@ -33,7 +33,7 @@ class XiaoHongShuParser(BaseParser):
             self.headers["cookie"] = pconfig.xhs_ck
             self.ios_headers["cookie"] = pconfig.xhs_ck
 
-    @handle("xhslink.com", r"xhslink\.com/[A-Za-z0-9._?%&+=/#@-]+")
+    @handle("xhslink", r"xhslink\.(com|cn)/[A-Za-z0-9._?%&+=/#@-]+")
     async def _parse_short_link(self, searched: re.Match[str]):
         url = f"https://{searched.group(0)}"
         return await self.parse_with_redirect(url, self.ios_headers)

nonebot_plugin_parser-2.6.6/src/nonebot_plugin_parser/matchers/filter.py

@@ -1,72 +0,0 @@
-import json
-from pathlib import Path
-
-from nonebot import on_command
-from nonebot.rule import to_me
-from nonebot.matcher import Matcher
-from nonebot.permission import SUPERUSER
-from nonebot_plugin_uninfo import ADMIN, Session, UniSession
-
-from ..config import pconfig
-
-_DISABLED_GROUPS_PATH: Path = pconfig.data_dir / "disabled_groups.json"
-
-
-def load_or_initialize_set() -> set[str]:
-    """加载或初始化关闭解析的名单"""
-    # 判断是否存在
-    if not _DISABLED_GROUPS_PATH.exists():
-        _DISABLED_GROUPS_PATH.write_text(json.dumps([]))
-    return set(json.loads(_DISABLED_GROUPS_PATH.read_text()))
-
-
-def save_disabled_groups():
-    """保存关闭解析的名单"""
-    _DISABLED_GROUPS_PATH.write_text(json.dumps(list(_DISABLED_GROUPS_SET)))
-
-
-# 内存中关闭解析的名单，第一次先进行初始化
-_DISABLED_GROUPS_SET: set[str] = load_or_initialize_set()
-
-
-def get_group_key(session: Session) -> str:
-    """获取群组的唯一标识符
-
-    由平台名称和会话场景 ID 组成，例如 `QQClient_123456789`。
-    """
-    return f"{session.scope}_{session.scene_path}"
-
-
-def is_enabled(session: Session = UniSession()) -> bool:
-    """判断当前会话是否在关闭解析的名单中"""
-    if session.scene.is_private:
-        return True
-
-    group_key = get_group_key(session)
-    if group_key in _DISABLED_GROUPS_SET:
-        return False
-    return True
-
-
-@on_command("开启解析", rule=to_me(), permission=SUPERUSER | ADMIN(), block=True).handle()
-async def _(matcher: Matcher, session: Session = UniSession()):
-    """开启解析"""
-    group_key = get_group_key(session)
-    if group_key in _DISABLED_GROUPS_SET:
-        _DISABLED_GROUPS_SET.remove(group_key)
-        save_disabled_groups()
-        await matcher.finish("解析已开启")
-    else:
-        await matcher.finish("解析已开启，无需重复开启")
-
-
-@on_command("关闭解析", rule=to_me(), permission=SUPERUSER | ADMIN(), block=True).handle()
-async def _(matcher: Matcher, session: Session = UniSession()):
-    """关闭解析"""
-    group_key = get_group_key(session)
-    if group_key not in _DISABLED_GROUPS_SET:
-        _DISABLED_GROUPS_SET.add(group_key)
-        save_disabled_groups()
-        await matcher.finish("解析已关闭")
-    else:
-        await matcher.finish("解析已关闭，无需重复关闭")