update 0.0.6.5

.gitignore

@@ -0,0 +1,145 @@
+### Python template
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.nox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+*.py,cover
+.hypothesis/
+.pytest_cache/
+cover/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+db.sqlite3-journal
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+.pybuilder/
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# IPython
+profile_default/
+ipython_config.py
+
+# pyenv
+#   For a library or package, you might want to ignore these files since the code is
+#   intended to run in multiple environments; otherwise, check them in:
+# .python-version
+
+# pipenv
+#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
+#   However, in case of collaboration, if having platform-specific dependencies or dependencies
+#   having no cross-platform support, pipenv may install dependencies that don't work, or not
+#   install all needed dependencies.
+#Pipfile.lock
+
+# PEP 582; used by e.g. github.com/David-OConnor/pyflow
+__pypackages__/
+
+# Celery stuff
+celerybeat-schedule
+celerybeat.pid
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+.dmypy.json
+dmypy.json
+
+# Pyre type checker
+.pyre/
+
+# pytype static type analyzer
+.pytype/
+
+# Cython debug symbols
+cython_debug/
+
+test.py
+server.py
+member_activity_handle.py
+Yu-Gi-Oh/
+

README.md

@@ -321,6 +321,15 @@ python bot.py
 
 ## 更新
 
+### 2021/12/1 \[v0.0.6.5]
+
+* 群权限-1时超级用户命令依旧生效
+* 修复以真寻为开头的词条不会被回复
+* 修复购买道具可以为负数
+* P站排行/搜图提供配置项，将略过大于指定张数的作品
+* 昵称提供关键词屏蔽配置项，会将指定关键词替换为“*”
+* 取消了自动更新，改为自动检测版本
+
 ### 2021/11/29 \[v0.0.6.4]
 
 * 新增cos图撤回配置项

__version__

@@ -1 +1 @@
-__version__: v0.0.6.4
+__version__: v0.0.6.5

basic_plugins/hooks/auth_hook.py

@@ -20,6 +20,7 @@ from models.ban_user import BanUser
 from utils.utils import FreqLimiter
 from utils.message_builder import at
 from models.level_user import LevelUser
+import nonebot
 
 
 _flmt = FreqLimiter(Config.get_config("hook", "CHECK_NOTICE_INFO_CD"))
@@ -46,6 +47,18 @@ async def _(matcher: Matcher, bot: Bot, event: MessageEvent, state: T_State):
         and not plugins2info_dict[module]["limit_superuser"]
     ):
         return
+    # 超级用户命令
+    try:
+        _plugin = nonebot.plugin.get_plugin(module)
+        _module = _plugin.module
+        plugin_name = _module.__getattribute__("__zx_plugin_name__")
+        if (
+            "[superuser]" in plugin_name.lower()
+            and str(event.user_id) in bot.config.superusers
+        ):
+            return
+    except AttributeError:
+        pass
     # 群黑名单检测
     if isinstance(event, GroupMessageEvent):
         if group_manager.get_group_level(event.group_id) < 0:

basic_plugins/init_plugin_config/__init__.py

@@ -11,6 +11,7 @@ from .init_plugins_limit import (
 )
 from .init import init
 from .check_plugin_status import check_plugin_status
+from utils.manager import admin_manager
 from nonebot.adapters.cqhttp import Bot
 from configs.path_config import DATA_PATH
 from services.log import logger

basic_plugins/init_plugin_config/init_plugins_config.py

@@ -148,4 +148,3 @@ def init_plugins_config(data_path):
             logger.error(f"生成简易配置注释错误 {type(e)}：{e}")
         if temp_file.exists():
             temp_file.unlink()
-

basic_plugins/init_plugin_config/init_plugins_settings.py

@@ -26,7 +26,7 @@ def init_plugins_settings(data_path: str):
             plugin_name = _module.__getattribute__("__zx_plugin_name__")
             _tmp_module[x] = plugin_name
         except (KeyError, AttributeError) as e:
-            logger.error(f"配置文件 模块：{x} 获取 plugin_name 失败...{e}")
+            logger.warning(f"配置文件 模块：{x} 获取 plugin_name 失败...{e}")
             _tmp_module[x] = ""
     for matcher in _matchers:
         if matcher.module not in plugins2settings_manager.keys():

basic_plugins/nickname.py

@@ -8,7 +8,7 @@ from models.friend_user import FriendUser
 import random
 from models.ban_user import BanUser
 from services.log import logger
-from configs.config import NICKNAME
+from configs.config import NICKNAME, Config
 
 
 __zx_plugin_name__ = "昵称系统"
@@ -23,6 +23,13 @@ __plugin_des__ = "区区昵称，才不想叫呢！"
 __plugin_cmd__ = ["以后叫我 [昵称]", f"{NICKNAME}我是谁"]
 __plugin_version__ = 0.1
 __plugin_author__ = "HibiKier"
+__plugin_configs__ = {
+    "BLACK_WORD": {
+        "value": ["爸", "妈", "爹", "爷"],
+        "help": "昵称所屏蔽的关键词，会被替换为 *",
+        "default_value": None
+    }
+}
 
 nickname = on_command(
     "nickname",
@@ -47,11 +54,19 @@ async def _(bot: Bot, event: GroupMessageEvent, state: T_State):
         await nickname.finish("叫你空白？叫你虚空？叫你无名？？", at_sender=True)
     if len(msg) > 10:
         await nickname.finish("昵称可不能超过10个字！", at_sender=True)
+    if msg in bot.config.superusers:
+        await nickname.finish("笨蛋！休想占用我的名字！#", at_sender=True)
+    _tmp = ""
+    black_word = Config.get_config("nickname", "BLACK_WORD")
+    for x in msg:
+        _tmp += "*" if x in black_word else x
+    msg = _tmp
+    if isinstance(event, GroupMessageEvent):
         if await GroupInfoUser.set_group_member_nickname(
             event.user_id, event.group_id, msg
         ):
             if len(msg) < 5:
-            if random.random() < 0.5:
+                if random.random() < 0.3:
                     msg = "~".join(msg)
             await nickname.send(
                 random.choice(
@@ -68,15 +83,7 @@ async def _(bot: Bot, event: GroupMessageEvent, state: T_State):
         else:
             await nickname.send("设置昵称失败，请更新群组成员信息！", at_sender=True)
             logger.warning(f"USER {event.user_id} GROUP {event.group_id} 设置群昵称 {msg} 失败")
-
+    else:
-
-@nickname.handle()
-async def _(bot: Bot, event: PrivateMessageEvent, state: T_State):
-    msg = get_message_text(event.json())
-    if not msg:
-        await nickname.finish("叫你空白？叫你虚空？叫你无名？？", at_sender=True)
-    if len(msg) > 10:
-        await nickname.finish("不要超过10个字！", at_sender=True)
         if await FriendUser.set_friend_nickname(event.user_id, msg):
             await nickname.send(
                 random.choice(

basic_plugins/super_cmd/reload_setting.py

@@ -15,6 +15,10 @@ __zx_plugin_name__ = "重载插件配置 [Superuser]"
 __plugin_usage__ = """
 usage：
     重载插件配置
+    plugins2settings,
+    plugins2cd
+    plugins2block
+    group_manager
     指令：
         重载插件配置
 """.strip()
@@ -27,7 +31,7 @@ __plugin_author__ = "HibiKier"
 
 
 reload_plugins_manager = on_command(
-    "重载插件限制", rule=to_me(), permission=SUPERUSER, priority=1, block=True
+    "重载配置", rule=to_me(), permission=SUPERUSER, priority=1, block=True
 )
 
 

models/friend_user.py

@@ -1,4 +1,5 @@
 from services.db_context import db
+from configs.config import Config
 
 
 class FriendUser(db.Model):
@@ -80,7 +81,11 @@ class FriendUser(db.Model):
         user = await query.gino.first()
         if user:
             if user.nickname:
-                return user.nickname
+                _tmp = ""
+                black_word = Config.get_config("nickname", "BLACK_WORD")
+                for x in user.nickname:
+                    _tmp += "*" if x in black_word else x
+                return _tmp
         return ""
 
     @classmethod

models/group_member_info.py

@@ -1,5 +1,5 @@
 from datetime import datetime
-
+from configs.config import Config
 from services.db_context import db
 from typing import List, Optional
 
@@ -128,6 +128,17 @@ class GroupInfoUser(db.Model):
             return True
         return False
 
+    @classmethod
+    async def get_user_all_group(cls, user_qq: int) -> List[int]:
+        """
+        获取该用户所在的所有群聊
+        :param user_qq: 用户qq
+        """
+        query = await cls.query.where(cls.user_qq == user_qq).gino.all()
+        if query:
+            query = [x.belonging_group for x in query]
+        return query
+
     @classmethod
     async def get_group_member_nickname(cls, user_qq: int, belonging_group: int) -> str:
         """
@@ -143,7 +154,11 @@ class GroupInfoUser(db.Model):
         user = await query.gino.first()
         if user:
             if user.nickname:
-                return user.nickname
+                _tmp = ""
+                black_word = Config.get_config("nickname", "BLACK_WORD")
+                for x in user.nickname:
+                    _tmp += "*" if x in black_word else x
+                return _tmp
         return ""
 
     @classmethod

plugins/ai/data_source.py

@@ -59,7 +59,6 @@ async def get_chat_result(text: str, img_url: str, user_id: int, nickname: str)
                         nickname += "大~人~"
         rst = rst.replace("小主人", nickname).replace("小朋友", nickname)
     ai_message_manager.add_result(user_id, rst)
-    print(ai_message_manager)
     return rst
 
 

plugins/alapi/__init__.py

@@ -1,7 +1,6 @@
 from configs.config import Config
 import nonebot
 
-nonebot.load_plugins("plugins/alapi")
 
 Config.add_plugin_config(
     "alapi",
@@ -9,3 +8,7 @@ Config.add_plugin_config(
     None,
     help_="在https://admin.alapi.cn/user/login登录后获取token"
 )
+
+
+nonebot.load_plugins("plugins/alapi")
+

plugins/check_zhenxun_update/__init__.py

@@ -110,17 +110,17 @@ async def _():
                     f"当前版本：{_version}，最新版本：{latest_version}\n"
                     f"尝试自动更新...",
                 )
-                try:
+                # try:
-                    code = await check_update(bot)
+                #     code = await check_update(bot)
-                except Exception as e:
+                # except Exception as e:
-                    logger.error(f"更新真寻未知错误 {type(e)}：{e}")
+                #     logger.error(f"更新真寻未知错误 {type(e)}：{e}")
-                    await bot.send_private_msg(
+                #     await bot.send_private_msg(
-                        user_id=int(list(bot.config.superusers)[0]),
+                #         user_id=int(list(bot.config.superusers)[0]),
-                        message=f"更新真寻未知错误 {type(e)}：{e}\n",
+                #         message=f"更新真寻未知错误 {type(e)}：{e}\n",
-                    )
+                #     )
-                else:
+                # else:
-                    if code == 200:
+                #     if code == 200:
-                        await bot.send_private_msg(
+                #         await bot.send_private_msg(
-                            user_id=int(list(bot.config.superusers)[0]),
+                #             user_id=int(list(bot.config.superusers)[0]),
-                            message=f"更新完毕，请重启真寻....",
+                #             message=f"更新完毕，请重启真寻....",
-                        )
+                #         )

plugins/coser/__init__.py

@@ -51,4 +51,3 @@ async def _(bot: Bot, event: MessageEvent, state: T_State):
     except Exception as e:
         await coser.send("你cos给我看！")
         logger.error(f"coser 发送了未知错误 {type(e)}：{e}")
-

plugins/draw_card/genshin_handle.py

@@ -1,6 +1,5 @@
 import os
 from nonebot.adapters.cqhttp import MessageSegment, Message
-import nonebot
 import random
 from .update_game_info import update_info
 from .util import generate_img, init_star_rst, BaseData, set_list, get_star, init_up_char
@@ -15,7 +14,6 @@ try:
 except ModuleNotFoundError:
     import json
 
-driver: nonebot.Driver = nonebot.get_driver()
 
 announcement = GenshinAnnouncement()
 

plugins/draw_card/guardian_handle.py

@@ -1,6 +1,5 @@
 
 import os
-import nonebot
 from nonebot.adapters.cqhttp import MessageSegment, Message
 from .update_game_info import update_info
 from .announcement import GuardianAnnouncement
@@ -18,7 +17,6 @@ try:
 except ModuleNotFoundError:
     import json
 
-driver: nonebot.Driver = nonebot.get_driver()
 
 announcement = GuardianAnnouncement()
 

plugins/draw_card/pretty_handle.py

@@ -1,5 +1,4 @@
 
-import nonebot
 from .update_game_info import update_info
 from .announcement import PrettyAnnouncement
 from .util import init_star_rst, generate_img, max_card, BaseData, \
@@ -15,7 +14,6 @@ try:
 except ModuleNotFoundError:
     import json
 
-driver: nonebot.Driver = nonebot.get_driver()
 
 announcement = PrettyAnnouncement()
 

plugins/draw_card/prts_handle.py

@@ -1,6 +1,5 @@
 
 from nonebot.adapters.cqhttp import MessageSegment, Message
-import nonebot
 import random
 from .config import PRTS_FIVE_P, PRTS_FOUR_P, PRTS_SIX_P, PRTS_THREE_P, DRAW_PATH, PRTS_FLAG
 from .update_game_info import update_info
@@ -15,7 +14,6 @@ try:
 except ModuleNotFoundError:
     import json
 
-driver: nonebot.Driver = nonebot.get_driver()
 
 announcement = PrtsAnnouncement()
 

plugins/genshin/almanac/__init__.py

@@ -65,4 +65,4 @@ async def _():
             mes = alc_img + "\n ※ 黄历数据来源于 genshin.pub"
             for gid in gl:
                 if await group_manager.check_group_task_status(gid, "genshin_alc"):
-                    await bot.send_group_msg(group_id=int(gid), message=mes)
+                    await bot.send_group_msg(group_id=int(gid), message="" + mes)

plugins/genshin/query_resource_points/query_resource.py

@@ -8,6 +8,7 @@ from asyncio.exceptions import TimeoutError
 from asyncio import Semaphore
 from utils.image_utils import is_valid
 from utils.http_utils import AsyncHttpx
+from httpx import ConnectTimeout
 from pathlib import Path
 from .map import Map
 import asyncio
@@ -150,9 +151,11 @@ async def download_resource_data(semaphore: Semaphore):
                 logger.warning(f'获取原神资源失败 msg: {data["message"]}')
         else:
             logger.warning(f"获取原神资源失败 code：{response.status_code}")
-    except TimeoutError:
+    except (TimeoutError, ConnectTimeout):
         logger.warning("获取原神资源数据超时...已再次尝试...")
         await download_resource_data(semaphore)
+    except Exception as e:
+        logger.error(f"获取原神资源数据未知错误 {type(e)}：{e}")
 
 
 # 下载原神地图并拼图
@@ -164,6 +167,7 @@ async def download_map_init(
     _map = map_path / "map.png"
     if _map.exists() and os.path.getsize(_map) > 1024 * 1024 * 30:
         _map.unlink()
+    try:
         response = await AsyncHttpx.get(MAP_URL)
         if response.status_code == 200:
             data = response.json()
@@ -191,12 +195,17 @@ async def download_map_init(
             else:
                 logger.warning(f'获取原神地图失败 msg: {data["message"]}')
         else:
-        logger.warning(f"获取原神地图失败 code：{response.status}")
+            logger.warning(f"获取原神地图失败 code：{response.status_code}")
+    except (TimeoutError, ConnectTimeout):
+        logger.warning("下载原神地图数据超时....")
+    except Exception as e:
+        logger.error(f"下载原神地图数据超时 {type(e)}：{e}")
 
 
 # 下载资源类型数据
 async def download_resource_type():
     resource_type_file.parent.mkdir(parents=True, exist_ok=True)
+    try:
         response = await AsyncHttpx.get(LABEL_URL)
         if response.status_code == 200:
             data = response.json()
@@ -213,6 +222,10 @@ async def download_resource_type():
                 logger.warning(f'获取原神资源类型失败 msg: {data["message"]}')
         else:
             logger.warning(f"获取原神资源类型失败 code：{response.status_code}")
+    except (TimeoutError, ConnectTimeout):
+        logger.warning("下载原神资源类型数据超时....")
+    except Exception as e:
+        logger.error(f"载原神资源类型数据超时 {type(e)}：{e}")
 
 
 # 初始化资源图标

plugins/gold_redbag/data_source.py

@@ -1,7 +1,6 @@
 from models.bag_user import BagUser
-from utils.utils import is_number, get_local_proxy, get_user_avatar
+from utils.utils import is_number, get_user_avatar
 from utils.image_utils import CreateImg
-from utils.user_agent import get_user_agent
 from configs.path_config import IMAGE_PATH
 from .model import RedbagUser
 import random

plugins/image_management/upload_image/__init__.py

@@ -22,7 +22,7 @@ __plugin_des__ = "指定图库图片上传"
 __plugin_cmd__ = ["上传图片 [图库] [图片]", "连续上传图片 [图库]", "查看公开图库"]
 __plugin_version__ = 0.1
 __plugin_author__ = "HibiKier"
-__plugin_settings__ = {"admin_level": Config.get_config("image_management", "DELETE_IMAGE_LEVEL")}
+__plugin_settings__ = {"admin_level": Config.get_config("image_management", "UPLOAD_IMAGE_LEVEL")}
 
 upload_img = on_command("上传图片", rule=to_me(), priority=5, block=True)
 

plugins/my_info/data_source.py

@@ -0,0 +1,6 @@
+
+
+
+
+
+

plugins/pix_gallery/model/__init__.py

@@ -1,3 +1 @@
-from .pixiv_keyword_user import *
+
-from .omega_pixiv_illusts import *
-from .pixiv import *

plugins/pix_gallery/model/omega_pixiv_illusts.py

@@ -139,3 +139,15 @@ class OmegaPixivIllusts(db.Model):
         data = await cls.select('pid').gino.all()
         return [x[0] for x in data]
 
+    @classmethod
+    async def test(cls, nsfw_tag: int = 1):
+        if nsfw_tag is not None:
+            query = cls.query.where(cls.nsfw_tag == nsfw_tag)
+        else:
+            query = cls.query
+        query = query.where((cls.width - cls.height) < 50)
+        for x in await query.gino.all():
+            print(x.pid)
+
+
+

plugins/pixiv_rank_search/__init__.py

@@ -64,6 +64,11 @@ __plugin_configs__ = {
         "value": 10,
         "help": "图片下载超时限制",
         "default_value": 10
+    },
+    "MAX_PAGE_LIMIT": {
+        "value": 20,
+        "help": "作品最大页数限制，超过的作品会被略过",
+        "default_value": 20
     }
 }
 Config.add_plugin_config(

plugins/pixiv_rank_search/data_source.py

@@ -89,8 +89,13 @@ async def parser_data(
     else:
         return ["网络不太好？没有该页数？也许过一会就好了..."], 998
     num = num if num < 30 else 30
-    data = data[:num]
+    _data = []
     for x in data:
+        if x["page_count"] < Config.get_config("pixiv_rank_search", "MAX_PAGE_LIMIT"):
+            _data.append(x)
+        if len(_data) == num:
+            break
+    for x in _data:
         if type_ == "search" and r18 == 1:
             if "R-18" in str(x["tags"]):
                 continue

plugins/send_setu_/update_setu/data_source.py

@@ -37,8 +37,8 @@ async def update_old_setu_data():
                 for x in data:
                     if file == setu_data_file:
                         idx = index
-                        if 'R-18' in data[x]["tags"]:
+                        if "R-18" in data[x]["tags"]:
-                            data[x]["tags"].remove('R-18')
+                            data[x]["tags"].remove("R-18")
                     else:
                         idx = r18_index
                     img_url = (
@@ -58,14 +58,16 @@ async def update_old_setu_data():
                             ",".join(data[x]["tags"]),
                         )
                         count += 1
-                        if 'R-18' in data[x]["tags"]:
+                        if "R-18" in data[x]["tags"]:
                             r18_index += 1
                         else:
                             index += 1
                         logger.info(f'添加旧色图数据成功 PID：{data[x]["pid"]} index：{idx}....')
                     except UniqueViolationError:
                         fail_count += 1
-                        logger.info(f'添加旧色图数据失败，色图重复 PID：{data[x]["pid"]} index：{idx}....')
+                        logger.info(
+                            f'添加旧色图数据失败，色图重复 PID：{data[x]["pid"]} index：{idx}....'
+                        )
                 file.unlink()
         setu_url_path = path / "setu_url.json"
         setu_r18_url_path = path / "setu_r18_url.json"
@@ -106,21 +108,25 @@ async def update_setu_img():
             url_ = image.img_url
             ws_url = Config.get_config("pixiv", "PIXIV_NGINX_URL")
             if ws_url:
-                url_ = url_.replace("i.pximg.net", ws_url).replace("i.pixiv.cat", ws_url)
+                url_ = url_.replace("i.pximg.net", ws_url).replace(
+                    "i.pixiv.cat", ws_url
+                )
             try:
-                if not await AsyncHttpx.download_file(url_, rar_path / f'{image.local_id}.jpg'):
+                if not await AsyncHttpx.download_file(
+                    url_, rar_path / f"{image.local_id}.jpg"
+                ):
                     continue
                 _success += 1
                 try:
                     if (
                         os.path.getsize(
-                            rar_path / f'{image.local_id}.jpg',
+                            rar_path / f"{image.local_id}.jpg",
                         )
                         > 1024 * 1024 * 1.5
                     ):
                         compressed_image(
                             rar_path / f"{image.local_id}.jpg",
-                            path / f"{image.local_id}.jpg"
+                            path / f"{image.local_id}.jpg",
                         )
                     else:
                         logger.info(
@@ -134,30 +140,20 @@ async def update_setu_img():
                 except FileNotFoundError:
                     logger.warning(f"文件 {image.local_id}.jpg 不存在，跳过...")
                     continue
-                img_hash = str(
+                img_hash = str(get_img_hash(f"{path}/{image.local_id}.jpg"))
-                    get_img_hash(
+                await Setu.update_setu_data(image.pid, img_hash=img_hash)
-                        f"{path}/{image.local_id}.jpg"
-                    )
-                )
-                await Setu.update_setu_data(
-                    image.pid, img_hash=img_hash
-                )
             except Exception as e:
                 _success -= 1
                 logger.error(f"更新色图 {image.local_id}.jpg 错误 {type(e)}: {e}")
                 if type(e) not in error_type:
                     error_type.append(type(e))
-                    error_info.append(
+                    error_info.append(f"更新色图 {image.local_id}.jpg 错误 {type(e)}: {e}")
-                        f"更新色图 {image.local_id}.jpg 错误 {type(e)}: {e}"
-                    )
         else:
-            logger.info(f'更新色图 {image.local_id}.jpg 已存在')
+            logger.info(f"更新色图 {image.local_id}.jpg 已存在")
-    error_info = ['无报错..'] if not error_info else error_info
+    error_info = ["无报错.."] if not error_info else error_info
-    if count or _success or (error_info and "无报错.." not in error_info):
+    if count or _success or error_info:
         await get_bot().send_private_msg(
             user_id=int(list(get_bot().config.superusers)[0]),
-            message=f'{str(datetime.now()).split(".")[0]} 更新 色图 完成，本地存在 {count} 张，实际更新 {_success} 张，以下为更新时未知错误：\n'
+            message=f'{str(datetime.now()).split(".")[0]} 更新 色图 完成，本地存在 {count} 张，实际更新 {_success} 张，'
-            + "\n".join(error_info),
+            f"以下为更新时未知错误：\n" + "\n".join(error_info),
         )
-
-

plugins/shop/buy.py

@@ -43,10 +43,10 @@ async def _(bot: Bot, event: GroupMessageEvent, state: T_State):
     msg = get_message_text(event.json()).strip().split(" ")
     num = 1
     if len(msg) > 1:
-        if is_number(msg[1]):
+        if is_number(msg[1]) and int(msg[1]) > 0:
             num = int(msg[1])
         else:
-            await buy.finish("购买的数量要是数字！", at_sender=True)
+            await buy.finish("购买的数量要是数字且大于0！", at_sender=True)
     # print(msg, num)
     if is_number(msg[0]):
         msg = int(msg[0])

plugins/word_bank/message_handle.py

@@ -19,17 +19,23 @@ data_dir = Path(DATA_PATH) / "word_bank"
 data_dir.mkdir(parents=True, exist_ok=True)
 
 
-message_handle = on_message(priority=7, block=True, rule=check)
+message_handle = on_message(priority=5, block=True, rule=check)
 
 
 @message_handle.handle()
 async def _(bot: Bot, event: GroupMessageEvent, state: T_State):
     path = data_dir / f"{event.group_id}"
-    q = await WordBank.check(event.group_id, get_message_text(event.json()))
+    q = await WordBank.check(
-    placeholder_list = [
+        event.group_id, get_message_text(event.json()), event.is_tome()
+    )
+    placeholder_list = (
+        [
             (x.split("<_s>")[0], x.split("<_s>")[1])
             for x in q.format.split("<format>")[:-1]
-    ] if q.format else []
+        ]
+        if q.format
+        else []
+    )
     answer = ""
     _a = q.answer
     if not placeholder_list:
@@ -37,7 +43,9 @@ async def _(bot: Bot, event: GroupMessageEvent, state: T_State):
     else:
         for idx, placeholder in placeholder_list:
             if placeholder.endswith("jpg"):
-                answer += _a[:_a.find(f"[__placeholder_{idx}]")] + image(path / placeholder)
+                answer += _a[: _a.find(f"[__placeholder_{idx}]")] + image(
+                    path / placeholder
+                )
             else:
                 answer += _a[: _a.find(f"[__placeholder_{idx}]")] + at(placeholder)
             _a = _a[_a.find(f"[__placeholder_{idx}]") + len(f"[__placeholder_{idx}]") :]

plugins/word_bank/model.py

@@ -3,6 +3,7 @@ from typing import Optional, List, Union, Tuple
 from datetime import datetime
 from pathlib import Path
 from configs.path_config import DATA_PATH
+import re
 import random
 
 
@@ -97,15 +98,36 @@ class WordBank(db.Model):
         q = await cls.query.where(cls.group_id == group_id).gino.all()
         q = [x.problem for x in q]
         q.sort()
-        return list(set(q))
+        _tmp = []
+        for problem in q:
+            if "[_to_me" in problem:
+                r = re.search(r"\[_to_me\|(.*?)](.*)", problem)
+                if r:
+                    bot_name = r.group(1)
+                    problem = problem.replace(f"[_to_me|{bot_name}]", bot_name)
+            _tmp.append(problem)
+        return list(set(_tmp))
 
     @classmethod
-    async def check(cls, group_id: int, problem: str) -> Optional["WordBank"]:
+    async def check(cls, group_id: int, problem: str, is_tome: bool = False) -> Optional["WordBank"]:
         """
         检测词条并随机返回
         :param group_id: 群号
         :param problem: 问题
+        :param is_tome：是否at真寻
         """
+        if is_tome:
+            q = await cls.query.where(
+                (cls.group_id == group_id)
+            ).gino.all()
+            q = [x for x in q if "[_to_me" in x.problem]
+            if q:
+                for x in q:
+                    r = re.search(r"\[_to_me\|(.*?)](.*)", x.problem)
+                    if r and r.group(2) == problem:
+                        return x
+            return None
+        else:
             q = await cls.query.where(
                 (cls.group_id == group_id) & (cls.problem == problem)
             ).gino.all()

plugins/word_bank/rule.py

@@ -7,6 +7,6 @@ from .model import WordBank
 async def check(bot: Bot, event: Event, state: T_State) -> bool:
     if isinstance(event, GroupMessageEvent):
         return bool(
-            await WordBank.check(event.group_id, get_message_text(event.json()))
+            await WordBank.check(event.group_id, get_message_text(event.json()), event.is_tome())
         )
     return False

plugins/word_bank/word_hanlde.py

@@ -67,7 +67,13 @@ async def _(bot: Bot, event: GroupMessageEvent, state: T_State):
     if not answer:
         await add_word.finish("未检测到词条回答...")
     idx = 0
-    _builder = WordBankBuilder(event.user_id, event.group_id, problem)
+    for n in bot.config.nickname:
+        if problem.startswith(n):
+            _problem = f"[_to_me|{n}]" + problem[len(n):]
+            break
+    else:
+        _problem = problem
+    _builder = WordBankBuilder(event.user_id, event.group_id, _problem)
     for at_ in get_message_at(event.json()):
         r = re.search(rf"\[CQ:at,qq={at_}]", answer)
         if r:

update_info.json

@@ -4,7 +4,8 @@
       "models",
       "basic_plugins",
       "utils",
-      "services"
+      "services",
+      "configs"
     ],
     "add_file": [],
     "delete_file": []

utils/http_utils.py

@@ -8,7 +8,9 @@ from asyncio.exceptions import TimeoutError
 from nonebot.adapters.cqhttp import MessageSegment
 from playwright.async_api import Page
 from .message_builder import image
+from httpx import ConnectTimeout
 from .browser import get_browser
+from retrying import retry
 import asyncio
 import aiofiles
 import httpx
@@ -19,6 +21,7 @@ class AsyncHttpx:
     proxy = {"http://": get_local_proxy()}
 
     @classmethod
+    @retry(stop_max_attempt_number=3)
     async def get(
         cls,
         url: str,
@@ -149,7 +152,7 @@ class AsyncHttpx:
                         await wf.write(content)
                         logger.info(f"下载图片 {url} 成功.. Path：{path.absolute()}")
                     return True
-                except TimeoutError:
+                except (TimeoutError, ConnectTimeout):
                     pass
             else:
                 logger.error(f"下载图片 {url} 下载超时.. Path：{path.absolute()}")
@@ -312,6 +315,7 @@ class AsyncPlaywright:
             return image(path)
         except Exception as e:
             logger.warning(f"Playwright 截图 url：{url} element：{element} 发生错误 {type(e)}：{e}")
+        finally:
             if page:
                 await page.close()
         return None

utils/manager/__init__.py

@@ -13,10 +13,7 @@ from .admin_manager import AdminManager
 from .none_plugin_count_manager import NonePluginCountManager
 from .requests_manager import RequestManager
 from configs.path_config import DATA_PATH
-from nonebot import Driver
-import nonebot
 
-driver: Driver = nonebot.get_driver()
 
 # 群功能开关 | 群被动技能 | 群权限  管理
 group_manager: Optional[GroupManager] = GroupManager(
@@ -69,4 +66,3 @@ requests_manager: Optional[RequestManager] = RequestManager(
 
 # 管理员命令管理器
 admin_manager = AdminManager()
-

utils/manager/group_manager.py

@@ -299,4 +299,3 @@ class GroupManager(StaticData):
             del self._data["super"]["close_plugins"]
             return _x
         return None
-