fix bug

README.md

@@ -243,6 +243,12 @@ __Docker 最新版本由 [Sakuracio](https://github.com/Sakuracio) 提供__
 
 ## 更新
 
+### 2022/5/28
+
+* 修复私聊无法添加昵称
+* 修复原神玩家查询层岩巨渊地下矿区没开时报错
+* 修复 ```休息吧``` 无法阻断戳一戳
+
 ### 2022/5/26
 
 * 修复\[滴滴滴]会被转义成[滴滴滴]导致无法触发的问题

basic_plugins/hooks/auth_hook.py

@@ -91,7 +91,7 @@ async def _(matcher: Matcher, bot: Bot, event: Event, state: T_State):
     except AttributeError:
         pass
     # 群黑名单检测 群总开关检测
-    if isinstance(event, GroupMessageEvent) or matcher.plugin_name == other_limit_plugins:
+    if isinstance(event, GroupMessageEvent) or matcher.plugin_name in other_limit_plugins:
         try:
             if (
                 group_manager.get_group_level(event.group_id) < 0

basic_plugins/init_plugin_config/init_plugins_config.py

@@ -3,6 +3,7 @@ from ruamel.yaml import round_trip_load, round_trip_dump, YAML
 from utils.manager import admin_manager, plugins_manager
 from configs.config import Config
 from services.log import logger
+from utils.text_utils import prompt2cn
 from utils.utils import get_matchers
 from ruamel import yaml
 import nonebot
@@ -113,9 +114,7 @@ def init_plugins_config(data_path):
                     _tmp_data[plugin][k] = Config.get_config(plugin, k)
                 except AttributeError as e:
                     raise AttributeError(
-                        f"{e}\n**********************************************\n"
-                        f"****** 可能为config.yaml配置文件填写不规范 ******\n"
-                        f"**********************************************"
+                        f"{e}\n" + prompt2cn("可能为config.yaml配置文件填写不规范", 46)
                     )
         Config.save()
         temp_file = Path() / "configs" / "temp_config.yaml"

basic_plugins/nickname.py

@@ -1,4 +1,4 @@
-from nonebot.adapters.onebot.v11 import Bot, GroupMessageEvent, PrivateMessageEvent, Message
+from nonebot.adapters.onebot.v11 import Bot, GroupMessageEvent, PrivateMessageEvent, Message, MessageEvent
 from nonebot import on_command
 from nonebot.typing import T_State
 from nonebot.rule import to_me
@@ -47,7 +47,7 @@ cancel_nickname = on_command("取消昵称", rule=to_me(), priority=5, block=Tru
 
 
 @nickname.handle()
-async def _(bot: Bot, event: GroupMessageEvent, arg: Message = CommandArg()):
+async def _(bot: Bot, event: MessageEvent, arg: Message = CommandArg()):
     msg = arg.extract_plain_text().strip()
     if not msg:
         await nickname.finish("叫你空白？叫你虚空？叫你无名？？", at_sender=True)

plugins/bt/data_source.py

@@ -19,7 +19,7 @@ async def get_bt_info(keyword: str, page: int):
     :param page: 页数
     """
     text = (await AsyncHttpx.get(f"{url}/s/{keyword}_rel_{page}.html", timeout=5)).text
-    if text.find("大约0条结果") != -1:
+    if "大约0条结果" in text:
         return
     soup = BeautifulSoup(text, "lxml")
     item_lst = soup.find_all("div", {"class": "search-item"})

plugins/genshin/query_user/query_role/draw_image.py

@@ -330,18 +330,19 @@ def get_country_data_image(world_data_dict: Dict) -> BuildImage:
                 f"{world_data_dict['层岩巨渊']['exploration_percentage'] / 10}%",
                 fill=(255, 255, 255),
             )
-            content_bk.text((300, 85), "地下矿区探索", fill=(239, 211, 114))
-            content_bk.text(
-                (570, 85),
-                f"{world_data_dict['层岩巨渊·地下矿区']['exploration_percentage'] / 10}%",
-                fill=(255, 255, 255),
-            )
-            content_bk.text((300, 150), "流明石触媒", fill=(239, 211, 114))
-            content_bk.text(
-                (570, 150),
-                f"LV.{world_data_dict['层岩巨渊·地下矿区']['offerings'][0]['level']}",
-                fill=(255, 255, 255),
-            )
+            if world_data_dict.get('层岩巨渊·地下矿区'):
+                content_bk.text((300, 85), "地下矿区探索", fill=(239, 211, 114))
+                content_bk.text(
+                    (570, 85),
+                    f"{world_data_dict['层岩巨渊·地下矿区']['exploration_percentage'] / 10}%",
+                    fill=(255, 255, 255),
+                )
+                content_bk.text((300, 150), "流明石触媒", fill=(239, 211, 114))
+                content_bk.text(
+                    (570, 150),
+                    f"LV.{world_data_dict['层岩巨渊·地下矿区']['offerings'][0]['level']}",
+                    fill=(255, 255, 255),
+                )
         elif country in ["龙脊雪山"]:
             content_bk.text((300, 40), "探索", fill=(239, 211, 114))
             content_bk.text(

plugins/open_cases/__init__.py

@@ -212,7 +212,7 @@ update_price = on_command("更新开箱价格", priority=1, permission=SUPERUSER
 
 @update_price.handle()
 async def _(event: MessageEvent, arg: Message = CommandArg()):
-    await update_price.send(await util_get_buff_price(arg.extract_plain_text().strip()))
+    await update_price.send(await util_get_buff_price(arg.extract_plain_text().strip() or "狂牙大行动"))
 
 
 update_img = on_command("更新开箱图片", priority=1, permission=SUPERUSER, block=True)
@@ -220,7 +220,7 @@ update_img = on_command("更新开箱图片", priority=1, permission=SUPERUSER,
 
 @update_img.handle()
 async def _(event: MessageEvent, arg: Message = CommandArg()):
-    await update_img.send(await util_get_buff_img(str(arg.extract_plain_text().strip())))
+    await update_img.send(await util_get_buff_img(arg.extract_plain_text().strip() or "狂牙大行动"))
 
 
 # 重置开箱

utils/text_utils.py

@@ -0,0 +1,12 @@
+
+
+def prompt2cn(text: str, count: int, s: str = "#") -> str:
+    """
+    格式化中文提示
+    :param text: 文本
+    :param count: 个数
+    :param s: #
+    """
+    return s * count + "\n" + s * 6 + " " + text + " " + s * 6 + "\n" + s * count
+
+