nonebot-plugin-dialectlist 2.5.1__tar.gz → 2.6.0__tar.gz

{nonebot_plugin_dialectlist-2.5.1/nonebot_plugin_dialectlist.egg-info → nonebot_plugin_dialectlist-2.6.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nonebot-plugin-dialectlist
-Version: 2.5.1
+Version: 2.6.0
 Summary: 看看你群群友有多能说
 Author-email: Chen_Xu233 <woyerpa@outlook.com>
 License: MIT

{nonebot_plugin_dialectlist-2.5.1 → nonebot_plugin_dialectlist-2.6.0}/nonebot_plugin_dialectlist/__init__.py

@@ -5,6 +5,7 @@ require("nonebot_plugin_apscheduler")
 require("nonebot_plugin_htmlrender")
 require("nonebot_plugin_userinfo")
 require("nonebot_plugin_alconna")
+require("nonebot_plugin_uninfo")
 require("nonebot_plugin_cesaa")
 
 import re
@@ -33,6 +34,7 @@ from nonebot_plugin_alconna import (
 )
 from nonebot_plugin_chatrecorder import get_message_records
 from nonebot_plugin_session import Session, SessionIdType, extract_session
+from nonebot_plugin_uninfo import Uninfo
 
 from .storage import get_cache, build_cache
 from .config import Config, plugin_config
@@ -93,17 +95,19 @@ b_cmd = on_alconna(
         "看看B话",
         Args["at", [str, At], Field(completion=lambda: "请想要查询的人的QQ号")],
         Option("-g|--group_id", Args["group_id?", str]),
-        Option("-k|--keyword", Args["keyword?", str])
+        Option("-k|--keyword", Args["keyword?", str]),
     ),
     aliases={"kkb"},
     use_cmd_start=True,
 )
 
+
 @b_cmd.handle()
 async def handle_b_cmd(
-    at:Match[str|At],
+    at: Match[str | At],
     group_id: Match[str],
     keyword: Match[str],
+    uninfo: Uninfo,
     session: Session = Depends(extract_session),
 ):
     id = at.result
@@ -113,10 +117,10 @@ async def handle_b_cmd(
         gid = group_id.result
     else:
         gid = session.id2
-    
+
     if not gid:
         await b_cmd.finish("请指定群号。")
-        
+
     if keyword.available:
         keywords = keyword.result
     else:
@@ -133,8 +137,14 @@ async def handle_b_cmd(
     )
     d = msg_counter(messages, keywords)
     rank = got_rank(d)
-    
-    await saa.Text(f"该用户在群{gid}的B话数量为{rank[0][1]}。").send(reply=True)
+    if not rank:
+        await b_cmd.finish(
+            f"该用户在群“{uninfo.scene.name}”关于“{keyword}”的B话数量为0。"
+        )
+
+    await saa.Text(
+        f"该用户在群“{uninfo.scene.name}”关于“{keyword}”的B话数量为{rank[0][1]}。"
+    ).send(reply=True)
 
 
 rank_cmd = on_alconna(
@@ -352,8 +362,8 @@ async def handle_rank(
         msg += suffix
     if not msg:
         await saa.Text("你把可视化都关了哪来的排行榜？").finish()
-        
+
     if plugin_config.aggregate_transmission:
-        await saa.AggregatedMessageFactory([msg]).finish(reply=True)
+        await saa.AggregatedMessageFactory([msg]).finish()
     else:
         await msg.finish(reply=True)

{nonebot_plugin_dialectlist-2.5.1 → nonebot_plugin_dialectlist-2.6.0}/nonebot_plugin_dialectlist/config.py

@@ -13,7 +13,7 @@ class ScopedConfig(BaseModel):
     counting_cache: bool = False  # 计数缓存(能够提高回复速度)
     excluded_people: List[str] = []  # 排除的人的QQ号
     use_user_info_cache: bool = False  # 是否使用用户信息缓存
-    aggregate_transmission:bool = False # 是否聚合转发消息
+    aggregate_transmission: bool = False  # 是否聚合转发消息
     timezone: Optional[str] = "Asia/Shanghai"  # 时区，影响统计时间
     string_suffix: str = "统计花费时间:{timecost}秒"  # 消息格式后缀
     template_path: str = "./template/rank_template.j2"  # 模板路径

{nonebot_plugin_dialectlist-2.5.1 → nonebot_plugin_dialectlist-2.6.0}/nonebot_plugin_dialectlist/utils.py

@@ -1,4 +1,5 @@
 import os
+import re
 import httpx
 import asyncio
 import unicodedata
@@ -96,7 +97,8 @@ def msg_counter(
     for i in msg_list:
         # logger.debug(f"processing msg {i.plain_text}")
         if keyword:
-            if keyword not in i.plain_text:
+            match = re.search(keyword, i.plain_text)
+            if not match:
                 continue
         try:
             lst[str(i.session_persist_id)] += 1

{nonebot_plugin_dialectlist-2.5.1 → nonebot_plugin_dialectlist-2.6.0/nonebot_plugin_dialectlist.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nonebot-plugin-dialectlist
-Version: 2.5.1
+Version: 2.6.0
 Summary: 看看你群群友有多能说
 Author-email: Chen_Xu233 <woyerpa@outlook.com>
 License: MIT

{nonebot_plugin_dialectlist-2.5.1 → nonebot_plugin_dialectlist-2.6.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "nonebot-plugin-dialectlist"
-version = "2.5.1"
+version = "2.6.0"
 description = "看看你群群友有多能说"
 authors = [
     {name = "Chen_Xu233", email = "woyerpa@outlook.com"},