update bilibili_sub

fix shop update goods
update send_setu
2026-09-30 01:00:02 +08:00 · 2022-07-03 22:00:49 +08:00 · 2022-07-03 16:47:19 +08:00 · 2022-07-03 16:33:14 +08:00 · 2022-07-03 13:55:26 +08:00 · 2022-07-03 13:53:49 +08:00
147 changed files with 2351 additions and 1423 deletions
@@ -0,0 +1,23 @@
+---
+name: Issue template
+about: " issue template's purpose here."
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+### 系统版本：Ubuntu 20.04
+### 真寻版本：0.1.5.3
+
+### 错误截图
+
+[img]
+
+### 日志截图
+
+[img]
+
+### 错误说明
+
+发生了xx错误...
@@ -0,0 +1,38 @@
+name: Generate poetry.lock
+
+on:
+  push:
+    branches:
+      - "main"
+    paths:
+      - 'pyproject.toml'
+
+jobs:
+  poetry_lock:
+    name: Generate
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Set up Python
+        uses: he0119/setup-python@main
+        with:
+          python-version: "3.9"
+      - name: poetry lock
+        run: |
+          rm -f poetry.lock
+          sed -i.bak "8,11d" pyproject.toml
+          poetry lock
+          mv pyproject.toml.bak pyproject.toml
+      # commit
+      - name: commit file
+        run: |
+          git config --local user.email "github-actions[bot]@users.noreply.github.com"
+          git config --local user.name "github-actions[bot]"
+          git add poetry.lock
+          git commit -m "Auto generate poetry.lock" -a
+      # push 
+      - name: push changes
+        uses: ad-m/github-push-action@master
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
@@ -0,0 +1,9 @@
+### 系统版本：Ubuntu 20.04
+### 真寻版本：0.1.5.3
+
+### 错误截图
+
+[img]
+
+### 错误说明
+发生了xx错误...
@@ -140,6 +140,7 @@ cython_debug/

 test.py
 server_ip.py
+game_utils.py
 member_activity_handle.py
 Yu-Gi-Oh/
 csgo/
@@ -18,6 +18,11 @@
 ## 声明
 此项目仅用于学习交流，请勿用于非法用途

+# Nonebot2
+<img style="height: 200px;width: 200px;" src="https://camo.githubusercontent.com/0ef71e86056da694c540790aa4a4e314396884d6c4fdb95362a7538b27a1b034/68747470733a2f2f76322e6e6f6e65626f742e6465762f6c6f676f2e706e67">
+
+非常 [ **[NICE](https://github.com/nonebot/nonebot2)** ] 的OneBot框架
+
 ## 未完成的文档

 # [传送门](https://hibikier.github.io/zhenxun_bot/)
@@ -109,7 +114,7 @@
 - [x] 获取b站视频封面
 - [x] 通过PID获取图片
 - [x] 功能统计可视化
-
+- [x] 词云
 - [x] 关于

 ### 已实现的管理员功能
@@ -231,23 +236,161 @@ python bot.py

 ## 使用Docker
 __Docker 最新版本由 [Sakuracio](https://github.com/Sakuracio) 提供__
-#### GitHub：[Sakuracio/zxenv](https://github.com/Sakuracio/zxenv)
+#### GitHub：[Sakuracio/zhenxun_bot_docker](https://github.com/Sakuracio/zhenxun_bot_docker)
 #### DockerHub：[hibikier/zhenxun_bot](https://hub.docker.com/r/hibikier/zhenxun_bot)



 ## 更新

-### 2022/5/23 \[v1.5.6]
+### 2022/7/3
+
+* BagUser提供方法`check_props`方法，用于判断用户是否含有该道具并是否使用
+* 优化商品显示图片，提供限制，限购，折扣提示
+* 修复图库内图片无法被连续删除的问题 [@pull/879](https://github.com/HibiKier/zhenxun_bot/pull/879)
+* 色图提供配置项`MAX_ONCE_NUM2FORWARD`：群聊中单次发送图片数量达到指定时使用合并转发
+* 优化修复了商品修改命令
+* B站订阅UP动态改为详情页截图
+
+### 2022/6/28
+
+* 修复色图插件api修改无法搜索图片 [@pull/866](https://github.com/HibiKier/zhenxun_bot/pull/866)
+
+### 2022/6/26
+
+* 替换了bt URL
+* PIX当使用pid查询图片时，会发送该pid下所有图片
+* 商店提供了每日购买次数限制
+
+### 2022/6/24
+
+* 对WSL虚拟机 代理 添加写法 [@pull/847](https://github.com/HibiKier/zhenxun_bot/pull/847)
+
+### 2022/6/21
+
+* update parse_bilibili [@pull/840](https://github.com/HibiKier/zhenxun_bot/pull/840)
+
+### 2022/6/19 \[v0.1.6.0]
+
+* 暂时使用hook修复webui中plugins2setting修改时会改变plugins2setting.cmd为字符串
+* 修复原神树脂重复提醒的bug [@pull/828](https://github.com/HibiKier/zhenxun_bot/pull/828)
+* 词条优化问题展示,修改含机器人昵称和@逻辑 [@pull/835](https://github.com/HibiKier/zhenxun_bot/pull/835)
+
+### 2022/6/18
+
+* 修复昵称系统`BLACK_WORD`为空时造成报错
+* 修复特殊头像时背景透明化出错
+* 修复text2image纯文本时换行时颜色不统一
+* 优化webUI，当有插件出错时不会影响其他插件显示
+* 优化Config类型注释 [@pull/830](https://github.com/HibiKier/zhenxun_bot/pull/830)
+* 优化browser
+
+### 2022/6/17
+
+* 修复wordbank的一些小问题 @pull/820
+
+### 2022/6/14
+
+* AsyncHttpx提供可关闭 ssl 验证参数 [@pull/812](https://github.com/HibiKier/zhenxun_bot/pull/812)
+* fix: 自动更新群组 [@pull/810](https://github.com/HibiKier/zhenxun_bot/pull/810)
+* fix: 修复添加词条时对answer中图片的处理 [@pull/806](https://github.com/HibiKier/zhenxun_bot/pull/806)
+* 修复pix中指定num无法生效
+* 替换了bt URL
+
+### 2022/6/13
+
+* Windows 重启适配 [@pull/804](https://github.com/HibiKier/zhenxun_bot/pull/804)
+* 色图等提供修改md5方法 [@pull/800](https://github.com/HibiKier/zhenxun_bot/pull/800)
+* webui中token.json文件写入补充 [@pull/798](https://github.com/HibiKier/zhenxun_bot/pull/798)
+* 修复识图某些图片可能会出错
+
+### 2022/6/11
+
+* pix当只有一个tag时且为数字时可以通过添加'#'防止判定为数量
+
+### 2022/6/9
+
+* 修复b站订阅同群二人以上相同订阅时发送多次信息
+* 修复超级用户帮助中缺少了 ‘插件商店’ 相关帮助
+* 昵称系统提供了详细帮助
+
+### 2022/6/5 \[v0.1.5.9]
+
+* webui修复plugin2setting中cmd从list转变为str
+* 当命令`我的金币`被风控时将以图片形式发送
+* fix gold_redbag [@pull/763](https://github.com/HibiKier/zhenxun_bot/pull/763)
+* 金币红包功能增加更多封面 [@pull/764](https://github.com/HibiKier/zhenxun_bot/pull/764)
+
+### 2022/6/3
+
+* 插件仓库在已安装插件边上会提示\[已安装]
+* 修复ShopRegister kwargs某些字段无效
+* 调整了一下查看所有请求中的年龄绘制 [@pull/745](https://github.com/HibiKier/zhenxun_bot/pull/745)
+* 修复原神树脂提醒bug [@pull/756](https://github.com/HibiKier/zhenxun_bot/pull/756)
+
+### 2022/5/31
+
+* 修复开启/关闭全部功能时帮助图片未重绘 [@pull/721](https://github.com/HibiKier/zhenxun_bot/pull/721)
+* bot_friend_group将group_handle.修改为friend_handle. [@pull/711](https://github.com/HibiKier/zhenxun_bot/pull/711)
+* 修复发红包图片背景未透明化;修复原神树脂提醒参数错误 [@pull/712](https://github.com/HibiKier/zhenxun_bot/pull/712)
+* 修复抽卡插件：方舟更新UP池信息时，若公告的第一个池子过期会导致无法更新UP池信息 [@pull/707](https://github.com/HibiKier/zhenxun_bot/pull/707)
+* 商店插件判断是否有requirements.txt文件 [@pull/705](https://github.com/HibiKier/zhenxun_bot/pull/705)
+* 删除原神玩家查询api返回变更的多余键值
+* 优化了text2image方法
+
+### 2022/5/29 \[v0.1.5.8]
+
+* 提供了真寻适配仓库的插件 安装/卸载 操作
+* 暂时关闭了插件资源清空
+* 通过指令安装插件时会在插件目录下生成plugin_info.json记录当前插件信息
+
+### 2022/5/28
+
+* 修复私聊无法添加昵称
+* 修复原神玩家查询层岩巨渊地下矿区没开时报错
+* 修复 ```休息吧``` 无法阻断戳一戳
+* 当图库无图片时，戳一戳将略过发送图片
+* 新增搜图提供配置项```ALLOW_GROUP_R18```：允许在群聊中使用r18参数
+* 新增自动更新插件```UPDATE_REMIND```：新版本提醒，原配置项```AUTO_UPDATE_ZHENXUN```改为自动更新升级
+* black_word新增当群权限为-1时不再检测该群
+* 修复非超级用户绑定原神cookie会被black_word阻拦
+* 修复微博热搜报错,发红包小bug [@pull/688](https://github.com/HibiKier/zhenxun_bot/pull/688)
+* 更多的中文提示
+
+### 2022/5/26
+
+* 修复\[滴滴滴]会被转义成&#91;滴滴滴&#93;导致无法触发的问题
+* 将一些错误以中文提示输出
+* 更新BT搜索源地址 [@pull/668](https://github.com/HibiKier/zhenxun_bot/pull/668)
+* 更新抽卡插件 [@pull/667](https://github.com/HibiKier/zhenxun_bot/pull/667)
+
+### 2022/5/25
+
+* 修复webui中CountLimit字段limit_type类型错误
+* 修改nickname插件：一处文案错误，添加敏感词 [@pull/624](https://github.com/HibiKier/zhenxun_bot/pull/624)
+* gamedraw的ba卡池搬运了过来并且进行了真寻的适配 [@pull/617](https://github.com/HibiKier/zhenxun_bot/pull/617)
+* feat: stream downloading and progress [@pull/607](https://github.com/HibiKier/zhenxun_bot/pull/607)
+* 修改翻译插件，添加缺失的冒号 [@pull/602](https://github.com/HibiKier/zhenxun_bot/pull/602)
+* 修复碧蓝航线/明日方舟up池解析出错的问题 [@pull/610](https://github.com/HibiKier/zhenxun_bot/pull/602)
+
+### 2022/5/24
+
+* fix: 修正了签到时日期时间的显示不补齐零的bug （符合日期时间表示法 ISO 8601）[@pull/600](https://github.com/HibiKier/zhenxun_bot/pull/600)
+* 更新"微博热搜"接口 [@pull/579](https://github.com/HibiKier/zhenxun_bot/pull/579)
+* refactor&fix(manager): modify argument [@pull/576](https://github.com/HibiKier/zhenxun_bot/pull/576)
+* 修复复读不能复读图片的问题 [@pull/573](https://github.com/HibiKier/zhenxun_bot/pull/573)
+* 修复抽卡插件：方舟抽卡的抽取和显示问题 [@pull/581](https://github.com/HibiKier/zhenxun_bot/pull/581)
+
+### 2022/5/23 \[v0.1.5.6]

 * 修复"清除已删除插件数据" [@pull/545](https://github.com/HibiKier/zhenxun_bot/pull/545)
 * 修复有置顶的up主B站动态获取失败 [@pull/552](https://github.com/HibiKier/zhenxun_bot/pull/552)
 * 添加pixiv搜图多关键词支持;修复p站搜图数量参数问题 [@pull/441](https://github.com/HibiKier/zhenxun_bot/pull/441)
 * 修复开箱更新价格错误传参
 * 修复pix无法正确查询uid
-* 新增色图插件添加配置项ALLOW_GROUP_R18：允许群聊中使用色图r
-* 新增PIX插件添加配置项ALLOW_GROUP_SETU：允许非超级用户使用-s参数
-* 新增PIX插件添加配置项ALLOW_GROUP_R18：允许非超级用户使用-r参数
+* 新增色图插件添加配置项```ALLOW_GROUP_R18```：允许群聊中使用色图r
+* 新增PIX插件添加配置项```ALLOW_GROUP_SETU```：允许非超级用户使用-s参数
+* 新增PIX插件添加配置项```ALLOW_GROUP_R18```：允许非超级用户使用-r参数

 ### 2022/5/22 \[v0.1.5.4]

@@ -538,10 +681,13 @@ __Docker 最新版本由 [Sakuracio](https://github.com/Sakuracio) 提供__

 __..... 更多更新信息请查看文档__

-
 ## Todo
 - [ ] web管理

+## 爱发电
+
+<img width="365px" height="450px" src="https://user-images.githubusercontent.com/45528451/175059389-cfeb8174-fa07-4939-80ab-a039087a50f6.png">
+
 ## 感谢
 [botuniverse / onebot](https://github.com/botuniverse/onebot) ：超棒的机器人协议  
 [Mrs4s / go-cqhttp](https://github.com/Mrs4s/go-cqhttp) ：cqhttp的golang实现，轻量、原生跨平台.  
@@ -1 +1 @@
-__version__: v0.1.5.6
+__version__: v0.1.6.0
@@ -118,6 +118,8 @@ async def change_group_switch(cmd: str, group_id: int, is_super: bool = False):
                group_manager.unblock_plugin(f, group_id)
            else:
                group_manager.block_plugin(f, group_id)
+        if group_help_file.exists():
+            group_help_file.unlink()
        return f"已 {status} 全部功能！"
    if cmd in [task_data[x] for x in task_data.keys()]:
        type_ = "task"
@@ -4,9 +4,8 @@ from nonebot import on_message
 from services.log import logger
 from models.group_info import GroupInfo
 from models.friend_user import FriendUser
-from nonebot.adapters.onebot.v11.exception import ActionFailed
+from nonebot.adapters.onebot.v11 import ActionFailed
 from configs.config import NICKNAME, Config
-from utils.manager import group_manager
 from pathlib import Path
 import shutil

@@ -107,6 +106,7 @@ async def _():
                group_info["group_name"],
                group_info["max_member_count"],
                group_info["member_count"],
+                1
            )
            logger.info(f"自动更新群组 {g} 信息成功")
    except Exception as e:
@@ -7,10 +7,10 @@ from datetime import datetime
 from services.log import logger
 from nonebot.adapters.onebot.v11 import (
    Bot,
+    ActionFailed,
    GroupIncreaseNoticeEvent,
    GroupDecreaseNoticeEvent,
 )
-from nonebot.adapters.onebot.v11.exception import ActionFailed
 from utils.manager import group_manager, plugins2settings_manager, requests_manager
 from configs.config import NICKNAME
 from models.group_info import GroupInfo
@@ -1,6 +1,5 @@
 from nonebot.matcher import Matcher
 from nonebot.message import run_preprocessor, run_postprocessor, IgnoredException
-from nonebot.adapters.onebot.v11.exception import ActionFailed
 from models.friend_user import FriendUser
 from models.group_member_info import GroupInfoUser
 from models.bag_user import BagUser
@@ -23,6 +22,7 @@ from nonebot.typing import T_State
 from typing import Optional
 from nonebot.adapters.onebot.v11 import (
    Bot,
+    ActionFailed,
    MessageEvent,
    GroupMessageEvent,
    PokeNotifyEvent,
@@ -91,7 +91,10 @@ 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
@@ -148,7 +151,11 @@ async def _(matcher: Matcher, bot: Bot, event: Event, state: T_State):
                raise IgnoredException("权限不足")
    if module in plugins2info_dict.keys() and matcher.priority not in [1, 999]:
        # 戳一戳单独判断
-        if isinstance(event, GroupMessageEvent) or isinstance(event, PokeNotifyEvent) or matcher.plugin_name in other_limit_plugins:
+        if (
+            isinstance(event, GroupMessageEvent)
+            or isinstance(event, PokeNotifyEvent)
+            or matcher.plugin_name in other_limit_plugins
+        ):
            if status_message_manager.get(event.group_id) is None:
                status_message_manager.delete(event.group_id)
            if plugins2info_dict[module]["level"] > group_manager.get_group_level(
@@ -1,11 +1,11 @@
 from nonebot.matcher import Matcher
 from nonebot.message import run_preprocessor, IgnoredException
-from nonebot.adapters.onebot.v11.exception import ActionFailed
 from nonebot.typing import T_State
 from nonebot.adapters.onebot.v11 import (
    Bot,
    Event,
    MessageEvent,
+    ActionFailed,
    PokeNotifyEvent,
    GroupMessageEvent,
 )
@@ -1,9 +1,9 @@
 from nonebot.matcher import Matcher
 from nonebot.message import run_preprocessor, IgnoredException
-from nonebot.adapters.onebot.v11.exception import ActionFailed
 from nonebot.typing import T_State
 from nonebot.adapters.onebot.v11 import (
    Bot,
+    ActionFailed,
    MessageEvent,
    GroupMessageEvent,
 )
@@ -40,7 +40,7 @@ def init_none_plugin_count_manager():
                    plugins2block_manager.save()
                    plugins_manager.delete(module)
                    plugins_manager.save()
-                    resources_manager.remove_resource(module)
+                    # resources_manager.remove_resource(module)
                    none_plugin_count_manager.delete(module)
                    logger.info(f"{module}:{plugin_name} 插件疑似已删除，清除对应插件数据...")
                except Exception as e:
@@ -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
@@ -56,7 +57,9 @@ def init_plugins_config(data_path):
                        _override=True,
                    )
                else:
-                    Config.add_plugin_config(matcher.plugin_name, key, plugin_configs[key])
+                    Config.add_plugin_config(
+                        matcher.plugin_name, key, plugin_configs[key]
+                    )
        else:
            plugin_configs = _data[matcher.plugin_name]
            for key in plugin_configs:
@@ -79,7 +82,10 @@ def init_plugins_config(data_path):
            _data[plugin].yaml_set_start_comment(plugin_name, indent=2)
        # 初始化未设置的管理员权限等级
        for k, v in Config.get_admin_level_data():
-            admin_manager.set_admin_level(k, v)
+            try:
+                admin_manager.set_admin_level(k, v)
+            except KeyError as e:
+                raise KeyError(f"{e} ****** 请检查是否有插件加载失败 ******")
        # 存完插件基本设置
        with open(plugins2config_file, "w", encoding="utf8") as wf:
            round_trip_dump(
@@ -96,14 +102,23 @@ def init_plugins_config(data_path):
        for plugin in Config.keys():
            _tmp_data[plugin] = {}
            for k in Config[plugin].keys():
-                if _data.get(plugin) and k in _data[plugin].keys():
-                    Config.set_config(plugin, k, _data[plugin][k])
-                    if level2module := Config.get_level2module(plugin, k):
-                        try:
-                            admin_manager.set_admin_level(level2module, _data[plugin][k])
-                        except KeyError:
-                            logger.warning(f"{level2module} 设置权限等级失败：{_data[plugin][k]}")
-                _tmp_data[plugin][k] = Config.get_config(plugin, k)
+                try:
+                    if _data.get(plugin) and k in _data[plugin].keys():
+                        Config.set_config(plugin, k, _data[plugin][k])
+                        if level2module := Config.get_level2module(plugin, k):
+                            try:
+                                admin_manager.set_admin_level(
+                                    level2module, _data[plugin][k]
+                                )
+                            except KeyError:
+                                logger.warning(
+                                    f"{level2module} 设置权限等级失败：{_data[plugin][k]}"
+                                )
+                    _tmp_data[plugin][k] = Config.get_config(plugin, k)
+                except AttributeError as e:
+                    raise AttributeError(
+                        f"{e}\n" + prompt2cn("可能为config.yaml配置文件填写不规范", 46)
+                    )
        Config.save()
        temp_file = Path() / "configs" / "temp_config.yaml"
        try:
@@ -28,7 +28,7 @@ def init_plugins_cd_limit(data_path):
                _module = _plugin.module
                plugin_cd_limit = _module.__getattribute__("__plugin_cd_limit__")
                plugins2cd_manager.add_cd_limit(
-                    matcher.plugin_name, data_dict=plugin_cd_limit
+                    matcher.plugin_name, **plugin_cd_limit
                )
            except AttributeError:
                pass
@@ -76,7 +76,7 @@ def init_plugins_block_limit(data_path):
                _module = _plugin.module
                plugin_block_limit = _module.__getattribute__("__plugin_block_limit__")
                plugins2block_manager.add_block_limit(
-                    matcher.plugin_name, data_dict=plugin_block_limit
+                    matcher.plugin_name, **plugin_block_limit
                )
            except AttributeError:
                pass
@@ -124,7 +124,7 @@ def init_plugins_count_limit(data_path):
                _module = _plugin.module
                plugin_count_limit = _module.__getattribute__("__plugin_count_limit__")
                plugins2count_manager.add_count_limit(
-                    matcher.plugin_name, data_dict=plugin_count_limit
+                    matcher.plugin_name, **plugin_count_limit
                )
            except AttributeError:
                pass
@@ -1,6 +1,7 @@
 from nonebot import on_request, on_message
 from nonebot.adapters.onebot.v11 import (
    Bot,
+    ActionFailed,
    FriendRequestEvent,
    GroupRequestEvent,
    MessageEvent,
@@ -8,7 +9,6 @@ from nonebot.adapters.onebot.v11 import (
 from models.friend_user import FriendUser
 from datetime import datetime
 from configs.config import NICKNAME, Config
-from nonebot.adapters.onebot.v11.exception import ActionFailed
 from utils.manager import requests_manager
 from models.group_info import GroupInfo
 from utils.utils import scheduler
@@ -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
@@ -22,9 +22,15 @@ __plugin_des__ = "区区昵称，才不想叫呢！"
 __plugin_cmd__ = ["以后叫我 [昵称]", f"{NICKNAME}我是谁"]
 __plugin_version__ = 0.1
 __plugin_author__ = "HibiKier"
+__plugin_settings__ = {
+    "level": 5,
+    "default_status": True,
+    "limit_superuser": False,
+    "cmd": ["昵称", "昵称系统"],
+}
 __plugin_configs__ = {
    "BLACK_WORD": {
-        "value": ["爸", "爹", "爷"],
+        "value": ["爸", "爹", "爷", "父亲"],
        "help": "昵称所屏蔽的关键词，会被替换为 *",
        "default_value": None
    }
@@ -47,7 +53,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)
@@ -57,8 +63,9 @@ async def _(bot: Bot, event: GroupMessageEvent, arg: Message = CommandArg()):
        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
+    if 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(
@@ -73,7 +80,7 @@ async def _(bot: Bot, event: GroupMessageEvent, arg: Message = CommandArg()):
                        f"好啦好啦，我知道啦，{msg}，以后就这么叫你吧",
                        f"嗯嗯，{NICKNAME}记住你的昵称了哦，{msg}",
                        f"好突然，突然要叫你昵称什么的...{msg}..",
-                        f"{NICKNAME}会好好记住的{msg}的，放心吧",
+                        f"{NICKNAME}会好好记住{msg}的，放心吧",
                        f"好..好.，那窝以后就叫你{msg}了.",
                    ]
                )
@@ -90,7 +97,7 @@ async def _(bot: Bot, event: GroupMessageEvent, arg: Message = CommandArg()):
                        f"好啦好啦，我知道啦，{msg}，以后就这么叫你吧",
                        f"嗯嗯，{NICKNAME}记住你的昵称了哦，{msg}",
                        f"好突然，突然要叫你昵称什么的...{msg}..",
-                        f"{NICKNAME}会好好记住的{msg}的，放心吧",
+                        f"{NICKNAME}会好好记住{msg}的，放心吧",
                        f"好..好.，那窝以后就叫你{msg}了.",
                    ]
                )
@@ -0,0 +1,68 @@
+from nonebot import on_command, on_regex
+
+from .data_source import show_plugin_repo, install_plugin, uninstall_plugin, download_json
+from services.log import logger
+from nonebot.adapters.onebot.v11 import Bot, GroupMessageEvent, Message, MessageEvent
+from nonebot.params import CommandArg
+
+from utils.message_builder import image
+from nonebot.permission import SUPERUSER
+
+
+__zx_plugin_name__ = "插件商店 [Superuser]"
+__plugin_usage__ = """
+usage：
+    下载安装插件
+    指令：
+        查看插件仓库
+        更新插件仓库
+        安装插件 [name/id] （重新安装等同于更新）
+        卸载插件 [name/id]
+""".strip()
+__plugin_des__ = "从真寻适配仓库中下载插件"
+__plugin_cmd__ = ["查看插件仓库", "更新插件仓库", "安装插件 [name/id]", "卸载插件 [name/id]"]
+__plugin_version__ = 0.1
+__plugin_author__ = "HibiKier"
+
+show_repo = on_regex("^查看插件仓库$", priority=1, block=True, permission=SUPERUSER)
+
+update_repo = on_regex("^更新插件仓库$", priority=1, block=True, permission=SUPERUSER)
+
+install_plugin_matcher = on_command("安装插件", priority=1, block=True, permission=SUPERUSER)
+
+uninstall_plugin_matcher = on_command("卸载插件", priority=1, block=True, permission=SUPERUSER)
+
+
+@install_plugin_matcher.handle()
+async def _(bot: Bot, event: MessageEvent, arg: Message = CommandArg()):
+    arg = arg.extract_plain_text().strip()
+    msg = await install_plugin(arg)
+    await install_plugin_matcher.send(msg)
+
+
+@uninstall_plugin_matcher.handle()
+async def _(bot: Bot, event: MessageEvent, arg: Message = CommandArg()):
+    arg = arg.extract_plain_text().strip()
+    msg = await uninstall_plugin(arg)
+    await install_plugin_matcher.send(msg)
+
+
+@update_repo.handle()
+async def _(bot: Bot, event: MessageEvent):
+    code = await download_json()
+    if code == 200:
+        await update_repo.finish("更新插件仓库信息成功！")
+    await update_repo.send("更新插件仓库信息失败！")
+    
+
+@show_repo.handle()
+async def _(bot: Bot, event: MessageEvent):
+    msg = await show_plugin_repo()
+    if isinstance(msg, int):
+        await show_repo.finish("文件下载失败或解压失败..")
+    await show_repo.send(image(b64=msg))
+    logger.info(
+        f"(USER {event.user_id}, GROUP {event.group_id if isinstance(event, GroupMessageEvent) else 'private'})"
+        f" 查看插件仓库"
+    )
+
@@ -0,0 +1,198 @@
+import os
+import shutil
+import zipfile
+from pathlib import Path
+from typing import Union, Tuple
+from utils.manager import plugins_manager
+
+import ujson as json
+
+from services import logger
+from utils.http_utils import AsyncHttpx
+from configs.path_config import TEMP_PATH, DATA_PATH
+from utils.image_utils import text2image, BuildImage
+from utils.utils import is_number
+
+path = DATA_PATH / "plugin_shop"
+if not path.exists():
+    path.mkdir(parents=True, exist_ok=True)
+
+repo_json_url = "https://github.com/zhenxun-org/nonebot_plugins_zhenxun_bot/archive/refs/heads/index.zip"
+repo_zip_path = TEMP_PATH / "plugin_repo_json.zip"
+plugin_json = path / "zhenxun_plugins.json"
+
+extensive_plugin_path = Path() / "extensive_plugin"
+
+path = DATA_PATH / "plugin_shop"
+if not path.exists():
+    path.mkdir(parents=True, exist_ok=True)
+if not extensive_plugin_path.exists():
+    extensive_plugin_path.mkdir(parents=True, exist_ok=True)
+
+data = {}
+
+
+async def install_plugin(name: str) -> str:
+    """
+    安装插件
+    :param name: 插件名或下标
+    """
+    try:
+        if is_number(name):
+            name, code = await get_plugin_name(int(name))
+            if code != 200:
+                return name
+        plugin_url = data[name]["download_url"]
+        url = (await AsyncHttpx.get(plugin_url)).headers.get("Location")
+        zip_file = TEMP_PATH / f"{name}.zip"
+        if zip_file.exists():
+            zip_file.unlink()
+        if await AsyncHttpx.download_file(url, zip_file):
+            logger.debug("开始解压插件压缩包...")
+            # 解压
+            zf = zipfile.ZipFile(zip_file, "r")
+            extract_path = TEMP_PATH / f"{name}"
+            if extract_path.exists():
+                shutil.rmtree(extract_path.absolute(), ignore_errors=True)
+            extract_path.mkdir(exist_ok=True, parents=True)
+            for file in zf.namelist():
+                zf.extract(file, extract_path)
+            zf.close()
+            logger.debug("解压插件压缩包完成...")
+            logger.debug("开始移动插件文件夹...")
+            if (extensive_plugin_path / f"{name}").exists():
+                logger.debug("extensive_plugin目录下文件夹已存在，删除该目录插件文件夹...")
+                shutil.rmtree(
+                    (extensive_plugin_path / f"{name}").absolute(), ignore_errors=True
+                )
+            extract_path.rename(extensive_plugin_path / f"{name}")
+            tmp = ""
+            if "pyproject.toml" in os.listdir(extensive_plugin_path / f"{name}"):
+                tmp = "检测到该插件含有额外依赖，当前安装无法保证依赖完全安装成功。"
+                os.system(
+                    f"poetry run pip install -r {(extensive_plugin_path / f'{name}' / 'pyproject.toml').absolute()}"
+                )
+            elif "requirements.txt" in os.listdir(extensive_plugin_path / f"{name}"):
+                tmp = "检测到该插件含有额外依赖，当前安装无法保证依赖完全安装成功。"
+                os.system(
+                    f"poetry run pip install -r {(extensive_plugin_path / f'{name}' / 'requirements.txt').absolute()}"
+                )
+            with open(extensive_plugin_path / f"{name}" / "plugin_info.json", "w") as f:
+                json.dump(data[name], f, ensure_ascii=False, indent=4)
+            logger.debug("移动插件文件夹完成...")
+            logger.info(f"成功安装插件 {name} 成功！\n{tmp}")
+        return f"成功安装插件 {name}，请重启真寻！"
+    except Exception as e:
+        logger.error(f"安装插件 {name} 失败 {type(e)}：{e}")
+        return f"安装插件 {name} 失败 {type(e)}：{e}"
+
+
+async def uninstall_plugin(name: str) -> str:
+    """
+    删除插件
+    :param name: 插件名或下标
+    """
+    try:
+        if is_number(name):
+            name, code = await get_plugin_name(int(name))
+            if code != 200:
+                return name
+        if name not in os.listdir(extensive_plugin_path):
+            return f"未安装 {name} 插件！"
+        shutil.rmtree((extensive_plugin_path / name).absolute(), ignore_errors=True)
+        logger.info(f"插件 {name} 删除成功！")
+        return f"插件 {name} 删除成功！"
+    except Exception as e:
+        logger.error(f"删除插件 {name} 失败 {type(e)}：{e}")
+        return f"删除插件 {name} 失败 {type(e)}：{e}"
+
+
+async def show_plugin_repo() -> Union[int, str]:
+    """
+    获取插件仓库数据并格式化
+    """
+    if not plugin_json.exists():
+        code = await download_json()
+        if code != 200:
+            return code
+    plugin_info = json.load(open(plugin_json, "r", encoding="utf8"))
+    load_plugin_list = plugins_manager.get_data().keys()
+    image_list = []
+    w, h = 0, 0
+    line_height = 10
+    for i, key in enumerate(plugin_info.keys()):
+        data[key] = {
+            "名称": plugin_info[key]["plugin_name"],
+            "模块": key,
+            "作者": plugin_info[key]["author"],
+            "版本": plugin_info[key]["version"],
+            "简介": plugin_info[key]["introduction"],
+            "download_url": plugin_info[key]["download_url"],
+            "github_url": plugin_info[key]["github_url"],
+        }
+        status = ""
+        version = ""
+        if key in load_plugin_list:
+            status = "<f font_color=#1a7e30>[已安装]</f>"
+            version = f"<f font_color=#1a7e30>[{plugins_manager.get_data()[key]['version']}]</f>"
+        s = (
+            f'id：{i+1}\n名称：{plugin_info[key]["plugin_name"]}'
+            f' \t\t{status}\n'
+            f"模块：{key}\n"
+            f'作者：{plugin_info[key]["author"]}\n'
+            f'版本：{plugin_info[key]["version"]} \t\t{version}\n'
+            f'简介：{plugin_info[key]["introduction"]}\n'
+            f"-------------------"
+        )
+        img = await text2image(s, font_size=20, color="#f9f6f2")
+        w = w if w > img.w else img.w
+        h += img.h + line_height
+        image_list.append(img)
+    A = BuildImage(w + 50, h + 50, color="#f9f6f2")
+    cur_h = 25
+    for img in image_list:
+        await A.apaste(img, (25, cur_h))
+        cur_h += img.h + line_height
+    return A.pic2bs4()
+
+
+async def download_json() -> int:
+    """
+    下载插件库json文件
+    """
+    try:
+        url = (await AsyncHttpx.get(repo_json_url)).headers.get("Location")
+        if repo_zip_path.exists():
+            repo_zip_path.unlink()
+        if await AsyncHttpx.download_file(url, repo_zip_path):
+            zf = zipfile.ZipFile(repo_zip_path, "r")
+            extract_path = path / "temp"
+            for file in zf.namelist():
+                zf.extract(file, extract_path)
+            zf.close()
+            if plugin_json.exists():
+                plugin_json.unlink()
+            (
+                extract_path
+                / "nonebot_plugins_zhenxun_bot-index"
+                / "zhenxun_plugins.json"
+            ).rename(plugin_json)
+            shutil.rmtree(extract_path.absolute(), ignore_errors=True)
+            return 200
+    except Exception as e:
+        logger.error(f"下载插件库压缩包失败或解压失败 {type(e)}：{e}")
+    return 999
+
+
+async def get_plugin_name(name: int) -> Tuple[str, int]:
+    """
+    通过下标获取插件名
+    :param name: 下标
+    """
+    name = int(name)
+    if not data:
+        await show_plugin_repo()
+    if name < 1 or name > len(data.keys()):
+        return "下标超过上下限！", 999
+    name = list(data.keys())[name - 1]
+    return name, 200
@@ -112,6 +112,14 @@ async def _():
            "ALTER TABLE chat_history ADD plain_text Text;",
            "chat_history"
        ),  # 新增纯文本
+        (
+            "ALTER TABLE goods_info ADD daily_limit Integer DEFAULT 0;",
+            "goods_info"
+        ),  # 新增纯文本
+        (
+            "ALTER TABLE goods_info ADD daily_purchase_limit Json DEFAULT '{}';",
+            "goods_info"
+        ),  # 新增纯文本
    ]
    for sql in sql_str:
        try:
@@ -77,7 +77,11 @@ async def _(event: GroupMessageEvent, arg: Message = CommandArg()):
            await BagUser.get_gold(event.user_id, event.group_id)
        ) < goods.goods_price * num * goods.goods_discount:
            await buy.finish("您的金币好像不太够哦", at_sender=True)
+        flag, n = await GoodsInfo.check_user_daily_purchase(goods, event.user_id, event.group_id, num)
+        if flag:
+            await buy.finish(f"该次购买将超过每日次数限制，目前该道具还可以购买{n}次哦", at_sender=True)
        if await BagUser.buy_property(event.user_id, event.group_id, goods, num):
+            await GoodsInfo.add_user_daily_purchase(goods, event.user_id, event.group_id, num)
            await buy.send(
                f"花费 {goods.goods_price * num * goods.goods_discount} 金币购买 {goods.goods_name} ×{num} 成功！",
                at_sender=True,
@@ -1,9 +1,10 @@
 from nonebot import on_command
-from nonebot.adapters.onebot.v11 import GroupMessageEvent, Message
+from nonebot.adapters.onebot.v11 import GroupMessageEvent, Message, ActionFailed
 from nonebot.params import CommandArg
 from nonebot.adapters.onebot.v11.permission import GROUP
 from utils.data_utils import init_rank
 from models.bag_user import BagUser
+from utils.image_utils import text2image
 from utils.message_builder import image
 from utils.utils import is_number

@@ -34,7 +35,11 @@ gold_rank = on_command("金币排行", priority=5, block=True, permission=GROUP)

@my_gold.handle()
 async def _(event: GroupMessageEvent):
-    await my_gold.finish(await BagUser.get_user_total_gold(event.user_id, event.group_id))
+    msg = await BagUser.get_user_total_gold(event.user_id, event.group_id)
+    try:
+        await my_gold.send(msg)
+    except ActionFailed:
+        await my_gold.send(image(b64=(await text2image(msg, color="#f9f6f2", padding=10)).pic2bs4()))


@gold_rank.handle()
@@ -1,10 +1,10 @@
-from .data_source import create_shop_help, delete_goods, update_goods, register_goods, parse_goods_info
+from .data_source import create_shop_help, delete_goods, update_goods, register_goods, parse_goods_info, GoodsInfo
 from nonebot.adapters.onebot.v11 import MessageEvent, Message
 from nonebot import on_command
 from configs.path_config import IMAGE_PATH
 from utils.message_builder import image
 from nonebot.permission import SUPERUSER
-from utils.utils import is_number
+from utils.utils import is_number, scheduler
 from nonebot.params import CommandArg
 from nonebot.plugin import export
 from services.log import logger
@@ -128,6 +128,18 @@ async def _(event: MessageEvent, arg: Message = CommandArg()):
            await shop_update_goods.send(f"修改商品 {name} 成功了...\n{text}", at_sender=True)
            logger.info(f"USER {event.user_id} 修改商品 {name} 数据 {text} 成功")
        else:
-            await shop_update_goods.send(f"修改商品 {name} 失败了...", at_sender=True)
+            await shop_update_goods.send(name, at_sender=True)
            logger.info(f"USER {event.user_id} 修改商品 {name} 数据 {text} 失败")

+
+@scheduler.scheduled_job(
+    "cron",
+    hour=0,
+    minute=0,
+)
+async def _():
+    try:
+        await GoodsInfo.reset_daily_purchase()
+        logger.info("商品每日限购次数重置成功...")
+    except Exception as e:
+        logger.error(f"商品每日限购次数重置发生错误 {type(e)}：{e}")
@@ -1,9 +1,11 @@
+from PIL import Image
+
 from models.goods_info import GoodsInfo
 from utils.image_utils import BuildImage
 from models.sign_group_user import SignGroupUser
 from utils.utils import is_number
 from configs.path_config import IMAGE_PATH
-from typing import Optional, Union
+from typing import Optional, Union, Tuple
 from configs.config import Config
 from nonebot import Driver
 from nonebot.plugin import require
@@ -32,6 +34,7 @@ async def init_default_shop_goods():
            "下次签到双倍好感度概率 + 30%（金币才是真命天子！）（同类商品将覆盖）",
        ),
        load_status=Config.get_config("shop", "IMPORT_DEFAULT_SHOP_GOODS"),
+        daily_limit=(10, 20, 30),
        ** {"好感度双倍加持卡Ⅰ_prob": 0.1, "好感度双倍加持卡Ⅱ_prob": 0.2, "好感度双倍加持卡Ⅲ_prob": 0.3},
    )
    async def sign_card(user_id: int, group_id: int, prob: float):
@@ -62,8 +65,9 @@ async def create_shop_help() -> str:
            _list.append(goods)
    A = BuildImage(1000, h, color="#f9f6f2")
    current_h = 0
+    total_n = 0
    for goods in _list:
-        bk = BuildImage(700, 80, font_size=15, color="#f9f6f2", font="CJGaoDeGuo.otf")
+        bk = BuildImage(1180, 80, font_size=15, color="#f9f6f2", font="CJGaoDeGuo.otf")
        goods_image = BuildImage(
            600, 80, font_size=20, color="#a29ad6", font="CJGaoDeGuo.otf"
        )
@@ -75,16 +79,27 @@ async def create_shop_help() -> str:
        )
        await name_image.aline((380, -5, 280, 45), "#a29ad6", 5)
        await name_image.atext((390, 0), "售价：", center_type="by_height")
-        await name_image.atext(
-            (440, 0), str(goods.goods_price), (255, 255, 255), center_type="by_height"
-        )
+        if goods.goods_discount != 1:
+            discount_price = int(goods.goods_discount * goods.goods_price)
+            old_price_image = BuildImage(0, 0, plain_text=str(goods.goods_price), font_color=(194, 194, 194), font="CJGaoDeGuo.otf", font_size=15)
+            await old_price_image.aline((0, int(old_price_image.h / 2), old_price_image.w + 1, int(old_price_image.h / 2)), (0, 0, 0))
+            await name_image.apaste(
+                old_price_image, (440, 0), True
+            )
+            await name_image.atext(
+                (440, 15), str(discount_price), (255, 255, 255)
+            )
+        else:
+            await name_image.atext(
+                (440, 0), str(goods.goods_price), (255, 255, 255), center_type="by_height"
+            )
        await name_image.atext(
            (
                440
                + BuildImage(0, 0, plain_text=str(goods.goods_price), font_size=25).w,
                0,
            ),
-            " 金币",
+            f" 金币",
            center_type="by_height",
        )
        await name_image.acircle_corner(5)
@@ -92,15 +107,18 @@ async def create_shop_help() -> str:
        await goods_image.atext((15, 50), f"简介：{goods.goods_description}")
        await goods_image.acircle_corner(20)
        await bk.apaste(goods_image, alpha=True)
+        n = 0
+        _w = 550
        # 添加限时图标和时间
        if goods.goods_limit_time > 0:
+            n += 140
            _limit_time_logo = BuildImage(
                40, 40, background=f"{IMAGE_PATH}/other/time.png"
            )
-            await bk.apaste(_limit_time_logo, (600, 0), True)
+            await bk.apaste(_limit_time_logo, (_w + 50, 0), True)
            await bk.apaste(
                BuildImage(0, 0, plain_text="限时！", font_size=23, font="CJGaoDeGuo.otf"),
-                (640, 10),
+                (_w + 90, 10),
                True,
            )
            limit_time = time.strftime(
@@ -109,28 +127,66 @@ async def create_shop_help() -> str:
            y_m_d = limit_time[0]
            _h_m = limit_time[1].split(":")
            h_m = _h_m[0] + "时 " + _h_m[1] + "分"
-            await bk.atext((605, 38), str(y_m_d))
-            await bk.atext((615, 57), str(h_m))
-            await bk.aline((550, -1, 710, -1), "#a29ad6", 5)
-            await bk.aline((550, 80, 710, 80), "#a29ad6", 5)
+            await bk.atext((_w + 55, 38), str(y_m_d))
+            await bk.atext((_w + 65, 57), str(h_m))
+            _w += 140
+        if goods.goods_discount != 1:
+            n += 140
+            _discount_logo = BuildImage(30, 30, background=f"{IMAGE_PATH}/other/discount.png")
+            await bk.apaste(_discount_logo, (_w + 50, 10), True)
+            await bk.apaste(
+                BuildImage(0, 0, plain_text="折扣！", font_size=23, font="CJGaoDeGuo.otf"),
+                (_w + 90, 15),
+                True,
+            )
+            await bk.apaste(
+                BuildImage(0, 0, plain_text=f"{10 * goods.goods_discount:.1f} 折", font_size=30, font="CJGaoDeGuo.otf", font_color=(85, 156, 75)),
+                (_w + 50, 44),
+                True,
+            )
+            _w += 140
+        if goods.daily_limit != 0:
+            n += 140
+            _daily_limit_logo = BuildImage(35, 35, background=f"{IMAGE_PATH}/other/daily_limit.png")
+            await bk.apaste(_daily_limit_logo, (_w + 50, 10), True)
+            await bk.apaste(
+                BuildImage(0, 0, plain_text="限购！", font_size=23, font="CJGaoDeGuo.otf"),
+                (_w + 90, 20),
+                True,
+            )
+            await bk.apaste(
+                BuildImage(0, 0, plain_text=f"{goods.daily_limit}", font_size=30, font="CJGaoDeGuo.otf"),
+                (_w + 72, 45),
+                True,
+            )
+        if total_n < n:
+            total_n = n
+        if n:
+            await bk.aline((550, -1, 550 + n, -1), "#a29ad6", 5)
+            await bk.aline((550, 80, 550 + n, 80), "#a29ad6", 5)
+
+        # 添加限时图标和时间
        idx += 1
        await A.apaste(bk, (0, current_h), True)
        current_h += 90
-    w = 1000
+    w = 850
+    if total_n:
+        w += total_n
    h = A.h + 230 + 100
    h = 1000 if h < 1000 else h
    shop_logo = BuildImage(100, 100, background=f"{IMAGE_PATH}/other/shop_text.png")
    shop = BuildImage(w, h, font_size=20, color="#f9f6f2")
-    shop.paste(A, (20, 230))
-    zx_img = BuildImage(0, 0, background=f"{IMAGE_PATH}/zhenxun/toukan.png")
+    zx_img = BuildImage(0, 0, background=f"{IMAGE_PATH}/zhenxun/toukan_3.png")
+    zx_img.transpose(Image.FLIP_LEFT_RIGHT)
    zx_img.replace_color_tran(((240, 240, 240), (255, 255, 255)), (249, 246, 242))
-    await shop.apaste(zx_img, (780, 100))
+    await shop.apaste(zx_img, (0, 100))
+    shop.paste(A, (20 + zx_img.w, 230))
    await shop.apaste(shop_logo, (450, 30), True)
    shop.text(
        (int((1000 - shop.getsize("注【通过 序号 或者 商品名称 购买】")[0]) / 2), 170),
        "注【通过 序号 或者 商品名称 购买】",
    )
-    shop.text((20, h - 100), "神秘药水\t\t售价：9999999金币\n\t\t鬼知道会有什么效果~")
+    shop.text((20 + zx_img.w, h - 100), "神秘药水\t\t售价：9999999金币\n\t\t鬼知道会有什么效果~")
    return shop.pic2bs4()


@@ -140,6 +196,7 @@ async def register_goods(
    des: str,
    discount: Optional[float] = 1,
    limit_time: Optional[int] = 0,
+    daily_limit: Optional[int] = 0,
 ) -> bool:
    """
    添加商品
@@ -151,6 +208,7 @@ async def register_goods(
    :param des: 商品简介
    :param discount: 商品折扣
    :param limit_time: 商品限时销售时间，单位为小时
+    :param daily_limit: 每日购买次数限制
    :return: 是否添加成功
    """
    if not await GoodsInfo.get_goods_info(name):
@@ -162,7 +220,7 @@ async def register_goods(
            else 0
        )
        return await GoodsInfo.add_goods(
-            name, int(price), des, float(discount), limit_time
+            name, int(price), des, float(discount), limit_time, daily_limit
        )
    return False

@@ -192,7 +250,7 @@ async def delete_goods(name: str, id_: int) -> "str, str, int":


 # 更新商品信息
-async def update_goods(**kwargs) -> "str, str, int":
+async def update_goods(**kwargs) -> Tuple[bool, str, str]:
    """
    更新商品信息
    :param kwargs: kwargs
@@ -202,17 +260,18 @@ async def update_goods(**kwargs) -> "str, str, int":
        goods_lst = await GoodsInfo.get_all_goods()
        if is_number(kwargs["name"]):
            if int(kwargs["name"]) < 1 or int(kwargs["name"]) > len(goods_lst):
-                return "序号错误，没有该序号的商品...", "", 999
+                return False, "序号错误，没有该序号的商品...", ""
            goods = goods_lst[int(kwargs["name"]) - 1]
        else:
            goods = await GoodsInfo.get_goods_info(kwargs["name"])
            if not goods:
-                return "名称错误，没有该名称的商品...", "", 999
-        name = goods.goods_name
+                return False, "名称错误，没有该名称的商品...", ""
+        name: str = goods.goods_name
        price = goods.goods_price
        des = goods.goods_description
        discount = goods.goods_discount
        limit_time = goods.goods_limit_time
+        daily_limit = goods.daily_limit
        new_time = 0
        tmp = ""
        if kwargs.get("price"):
@@ -229,24 +288,25 @@ async def update_goods(**kwargs) -> "str, str, int":
            new_time = time.strftime(
                "%Y-%m-%d %H:%M:%S",
                time.localtime(time.time() + kwargs["limit_time"] * 60 * 60),
-            )
-            tmp += f"限时至： {new_time}\n"
+            ) if kwargs["limit_time"] != 0 else 0
+            tmp += f"限时至： {new_time}\n" if new_time else "取消了限时\n"
            limit_time = kwargs["limit_time"]
-        return (
-            await GoodsInfo.update_goods(
-                name,
-                int(price),
-                des,
-                float(discount),
-                int(
-                    time.time() + limit_time * 60 * 60
-                    if limit_time != 0 and new_time
-                    else 0
-                ),
-            ),
+        if kwargs.get("daily_limit"):
+            tmp += f'每日购买限制：{daily_limit} --> {kwargs["daily_limit"]}\n' if daily_limit else "取消了购买限制\n"
+            daily_limit = int(kwargs["daily_limit"])
+        await GoodsInfo.update_goods(
            name,
-            tmp[:-1],
+            int(price),
+            des,
+            float(discount),
+            int(
+                time.time() + limit_time * 60 * 60
+                if limit_time != 0 and new_time
+                else 0
+            ),
+            daily_limit
        )
+        return True, name, tmp[:-1],


 def parse_goods_info(msg: str) -> Union[dict, str]:
@@ -276,6 +336,10 @@ def parse_goods_info(msg: str) -> Union[dict, str]:
                data["discount"] = sp[1]
            elif sp[0] == "limit_time":
                if not is_number(sp[1]) or float(sp[1]) < 0:
-                    return "limit_time参数不合法，必须大于0！"
+                    return "limit_time参数不合法，必须为数字且大于0！"
                data["limit_time"] = sp[1]
+            elif sp[0] == "daily_limit":
+                if not is_number(sp[1]) or float(sp[1]) < 0:
+                    return "daily_limit参数不合法，必须为数字且大于0！"
+                data["daily_limit"] = sp[1]
    return data
@@ -26,7 +26,7 @@ class GoodsUseFuncManager:
        判断商品使用方法是否被注册
        :param goods_name: 商品名称
        """
-        return bool(self._data.get(goods_name))
+        return bool(self ._data.get(goods_name))

    def get_max_num_limit(self, goods_name: str) -> int:
        """
@@ -119,18 +119,18 @@ async def _(bot: Bot, cmd: Tuple[str, ...] = Command(), arg: Message = CommandAr
                    )
                flag = await requests_manager.approve(bot, id_, "group")
            else:
-                await friend_handle.send("同意群聊请求失败，未找到此id的请求..")
+                await group_handle.send("同意群聊请求失败，未找到此id的请求..")
        else:
            flag = await requests_manager.refused(bot, id_, "group")
        if flag == 1:
-            await friend_handle.send(f"{cmd[:2]}群聊请求失败，该请求已失效..")
+            await group_handle.send(f"{cmd[:2]}群聊请求失败，该请求已失效..")
            requests_manager.delete_request(id_, "group")
        elif flag == 2:
-            await friend_handle.send(f"{cmd[:2]}群聊请求失败，未找到此id的请求..")
+            await group_handle.send(f"{cmd[:2]}群聊请求失败，未找到此id的请求..")
        else:
-            await friend_handle.send(f"{cmd[:2]}群聊请求成功！")
+            await group_handle.send(f"{cmd[:2]}群聊请求成功！")
    else:
-        await friend_handle.send("id必须为纯数字！")
+        await group_handle.send("id必须为纯数字！")


@cls_request.handle()
@@ -150,4 +150,4 @@ async def _():
@clear_request.handle()
 async def _():
    requests_manager.clear()
-    await cls_request.send("已清空所有好友/群聊请求..")
+    await clear_request.send("已清空所有好友/群聊请求..")
@@ -1,4 +1,11 @@
-from nonebot.adapters.onebot.v11 import Bot, MessageEvent, GROUP, GroupMessageEvent, Message
+from nonebot.adapters.onebot.v11 import (
+    Bot,
+    MessageEvent,
+    GROUP,
+    GroupMessageEvent,
+    Message,
+    ActionFailed,
+)
 from nonebot import on_command, on_regex
 from nonebot.permission import SUPERUSER
 from nonebot.typing import T_State
@@ -8,7 +15,6 @@ from utils.manager import group_manager, plugins2settings_manager
 from models.group_info import GroupInfo
 from services.log import logger
 from configs.config import NICKNAME
-from nonebot.adapters.onebot.v11.exception import ActionFailed
 from nonebot.params import Command, CommandArg
 from typing import Tuple

@@ -137,9 +143,7 @@ async def _():
 async def _(bot: Bot, cmd: Tuple[str, ...] = Command(), arg: Message = CommandArg()):
    cmd = cmd[0]
    msg = arg.extract_plain_text().strip().split()
-    all_group = [
-        g["group_id"] for g in await bot.get_group_list()
-    ]
+    all_group = [g["group_id"] for g in await bot.get_group_list()]
    group_list = []
    for group in msg:
        if is_number(group) and int(group) in all_group:
@@ -151,9 +155,7 @@ async def _(bot: Bot, cmd: Tuple[str, ...] = Command(), arg: Message = CommandAr
            else:
                group_manager.delete_group_white_list(group)
        group_list = [str(x) for x in group_list]
-        await manager_group_whitelist.send(
-            "已成功将 " + "\n".join(group_list) + " " + cmd
-        )
+        await manager_group_whitelist.send("已成功将 " + "\n".join(group_list) + " " + cmd)
    else:
        await manager_group_whitelist.send(f"添加失败，请检查{NICKNAME}是否已加入这些群聊或重复添加/删除群白单名")

@@ -199,6 +201,4 @@ async def _(bot: Bot, cmd: Tuple[str, ...] = Command(), arg: Message = CommandAr
        else:
            if await GroupInfo.get_group_info(group_id):
                await GroupInfo.set_group_flag(group_id, 0)
-        await group_auth.send(
-            f'已为 {group_id} {cmd[:2]}群认证..'
-        )
+        await group_auth.send(f"已为 {group_id} {cmd[:2]}群认证..")
@@ -12,6 +12,7 @@ driver.on_shutdown(disconnect)
 nonebot.load_plugin("nonebot_plugin_apscheduler")
 nonebot.load_plugins("basic_plugins")
 nonebot.load_plugins("plugins")
+nonebot.load_plugins("extensive_plugin")
 # 最后加载权限控制
 nonebot.load_plugins("basic_plugins/hooks")

@@ -2,6 +2,10 @@ from typing import Optional
 from pathlib import Path
 from .utils import ConfigsManager

+import platform
+if platform.system() == "Linux":
+    import os
+    hostip = os.popen("cat /etc/resolv.conf | grep nameserver | awk '{ print $2 }'").read().replace("\n","")

 # 回复消息名称
 NICKNAME: str = "小真寻"
@@ -18,6 +22,7 @@ port: str = ""  # 数据库端口
 database: str = ""  # 数据库名称

 # 代理，例如 "http://127.0.0.1:7890"
+# 如果是WLS 可以 f"http://{hostip}:7890" 使用寄主机的代理
 SYSTEM_PROXY: Optional[str] = None  # 全局代理


@@ -2,6 +2,7 @@ from typing import Optional, Any, Union
 from pathlib import Path
 from ruamel.yaml import YAML
 from ruamel import yaml
+from ruamel.yaml.scanner import ScannerError


 class ConfigsManager:
@@ -21,9 +22,24 @@ class ConfigsManager:
            if file.exists():
                with open(file, "r", encoding="utf8") as f:
                    self._data = _yaml.load(f)
+                if not self._data:
+                    self.file.unlink()
+                    raise ValueError(
+                        "配置文件为空！\n"
+                        "***********************************************************\n"
+                        "****** 配置文件 plugins2config.yaml 为空，已删除，请重启 ******\n"
+                        "***********************************************************"
+                    )
            if self._simple_file.exists():
-                with open(self._simple_file, "r", encoding="utf8") as f:
-                    self._simple_data = _yaml.load(f)
+                try:
+                    with open(self._simple_file, "r", encoding="utf8") as f:
+                        self._simple_data = _yaml.load(f)
+                except ScannerError as e:
+                    raise ScannerError(
+                        f"{e}\n**********************************************\n"
+                        f"****** 可能为config.yaml配置文件填写不规范 ******\n"
+                        f"**********************************************"
+                    )

    def add_plugin_config(
        self,
@@ -78,18 +94,22 @@ class ConfigsManager:
            del self._data[module]
        self.save()

-    def set_config(self, module: str, key: str, value: str):
+    def set_config(self, module: str, key: str, value:  Any , save_simple_data: bool = False):
        """
        设置配置值
        :param module: 模块名
        :param key: 配置名称
        :param value: 值
+        :param save_simple_data: 同时保存至config.yaml
        """
        if module in self._data.keys():
-            if self._data[module].get(key) is not None and self._data[module][key] != value:
+            if (
+                self._data[module].get(key) is not None
+                and self._data[module][key] != value
+            ):
                self._data[module][key]["value"] = value
                self._simple_data[module][key] = value
-                self.save()
+                self.save(save_simple_data = save_simple_data)

    def set_help(self, module: str, key: str, help_: str):
        """
@@ -103,7 +123,7 @@ class ConfigsManager:
                self._data[module][key]["help"] = help_
                self.save()

-    def set_default_value(self, module: str, key: str, value: str):
+    def set_default_value(self, module: str, key: str, value:  Any):
        """
        设置配置默认值
        :param module: 模块名
@@ -115,7 +135,9 @@ class ConfigsManager:
                self._data[module][key]["default_value"] = value
                self.save()

-    def get_config(self, module: str, key: str, default: Optional[Any] = None) -> Optional[Any]:
+    def get_config(
+        self, module: str, key: str, default: Optional[Any] = None
+    ) -> Optional[Any]:
        """
        获取指定配置值
        :param module: 模块名
@@ -161,7 +183,11 @@ class ConfigsManager:
        if save_simple_data:
            with open(self._simple_file, "w", encoding="utf8") as f:
                yaml.dump(
-                    self._simple_data, f, indent=2, Dumper=yaml.RoundTripDumper, allow_unicode=True
+                    self._simple_data,
+                    f,
+                    indent=2,
+                    Dumper=yaml.RoundTripDumper,
+                    allow_unicode=True,
                )
        path = path if path else self.file
        with open(path, "w", encoding="utf8") as f:
@@ -209,7 +209,7 @@ class BagUser(db.Model):
            return True
        except Exception as e:
            logger.error(f"buy_property 发生错误 {type(e)}：{e}")
-            return False
+        return False

    @classmethod
    async def get_all_users(cls, group_id: Optional[int] = None) -> List["BagUser"]:
@@ -1,5 +1,5 @@
 from services.db_context import db
-from typing import Optional, List
+from typing import Optional, List, Tuple
 from services.log import logger


@@ -12,17 +12,22 @@ class GoodsInfo(db.Model):
    goods_description = db.Column(db.TEXT(), nullable=False)  # 商品描述
    goods_discount = db.Column(db.Numeric(scale=3, asdecimal=False), default=1)  # 打折
    goods_limit_time = db.Column(db.BigInteger(), default=0)  # 限时
+    daily_limit = db.Column(db.Integer(), nullable=False, default=0)  # 每日购买限制
+    daily_purchase_limit = db.Column(
+        db.JSON(), nullable=False, default={}
+    )  # 每日购买限制数据存储

    _idx1 = db.Index("goods_group_users_idx1", "goods_name", unique=True)

    @classmethod
    async def add_goods(
-        cls,
-        goods_name: str,
-        goods_price: int,
-        goods_description: str,
-        goods_discount: float = 1,
-        goods_limit_time: int = 0,
+            cls,
+            goods_name: str,
+            goods_price: int,
+            goods_description: str,
+            goods_discount: float = 1,
+            goods_limit_time: int = 0,
+            daily_limit: int = 0,
    ) -> bool:
        """
        说明：
@@ -33,6 +38,7 @@ class GoodsInfo(db.Model):
            :param goods_description: 商品简介
            :param goods_discount: 商品折扣
            :param goods_limit_time: 商品限时
+            :param daily_limit: 每日购买限制
        """
        try:
            if not await cls.get_goods_info(goods_name):
@@ -42,6 +48,7 @@ class GoodsInfo(db.Model):
                    goods_description=goods_description,
                    goods_discount=goods_discount,
                    goods_limit_time=goods_limit_time,
+                    daily_limit=daily_limit,
                )
                return True
        except Exception as e:
@@ -58,8 +65,8 @@ class GoodsInfo(db.Model):
        """
        query = (
            await cls.query.where(cls.goods_name == goods_name)
-            .with_for_update()
-            .gino.first()
+                .with_for_update()
+                .gino.first()
        )
        if not query:
            return False
@@ -68,12 +75,13 @@ class GoodsInfo(db.Model):

    @classmethod
    async def update_goods(
-        cls,
-        goods_name: str,
-        goods_price: Optional[int] = None,
-        goods_description: Optional[str] = None,
-        goods_discount: Optional[float] = None,
-        goods_limit_time: Optional[int] = None,
+            cls,
+            goods_name: str,
+            goods_price: Optional[int] = None,
+            goods_description: Optional[str] = None,
+            goods_discount: Optional[float] = None,
+            goods_limit_time: Optional[int] = None,
+            daily_limit: Optional[int] = None
    ) -> bool:
        """
        说明：
@@ -84,27 +92,27 @@ class GoodsInfo(db.Model):
            :param goods_description: 商品简介
            :param goods_discount: 商品折扣
            :param goods_limit_time: 商品限时时间
+            :param daily_limit: 每日次数限制
        """
        try:
            query = (
                await cls.query.where(cls.goods_name == goods_name)
-                .with_for_update()
-                .gino.first()
+                    .with_for_update()
+                    .gino.first()
            )
            if not query:
                return False
-            if goods_price:
-                await query.update(goods_price=goods_price).apply()
-            if goods_description:
-                await query.update(goods_description=goods_description).apply()
-            if goods_discount:
-                await query.update(goods_discount=goods_discount).apply()
-            if goods_limit_time:
-                await query.update(goods_limit_time=goods_limit_time).apply()
+            await query.update(
+                goods_price=goods_price or query.goods_price,
+                goods_description=goods_description or query.goods_description,
+                goods_discount=goods_discount or query.goods_discount,
+                goods_limit_time=goods_limit_time if goods_limit_time is not None else query.goods_limit_time,
+                daily_limit=daily_limit if daily_limit is not None else query.daily_limit,
+            ).apply()
            return True
        except Exception as e:
            logger.error(f"GoodsInfo update_goods 发生错误 {type(e)}：{e}")
-            return False
+        return False

    @classmethod
    async def get_goods_info(cls, goods_name: str) -> "GoodsInfo":
@@ -130,3 +138,62 @@ class GoodsInfo(db.Model):
            goods_lst.append([x for x in query if x.id == min_id][0])
            id_lst.remove(min_id)
        return goods_lst
+
+    @classmethod
+    async def add_user_daily_purchase(
+            cls, goods: "GoodsInfo", user_id: int, group_id: int, num: int = 1
+    ):
+        """
+        说明：
+            添加用户明日购买限制
+        参数：
+            :param goods: 商品
+            :param user_id: 用户id
+            :param group_id: 群号
+            :param num: 数量
+        """
+        user_id = str(user_id)
+        group_id = str(group_id)
+        if goods and goods.daily_limit and goods.daily_limit > 0:
+            if not goods.daily_purchase_limit.get(group_id):
+                goods.daily_purchase_limit[group_id] = {}
+            if not goods.daily_purchase_limit[group_id].get(user_id):
+                goods.daily_purchase_limit[group_id][user_id] = 0
+            goods.daily_purchase_limit[group_id][user_id] += num
+            await goods.update(daily_purchase_limit=goods.daily_purchase_limit).apply()
+
+    @classmethod
+    async def check_user_daily_purchase(
+            cls, goods: "GoodsInfo", user_id: int, group_id: int, num: int = 1
+    ) -> Tuple[bool, int]:
+        """
+        说明：
+            检测用户每日购买上限
+        参数：
+            :param goods: 商品
+            :param user_id: 用户id
+            :param group_id: 群号
+            :param num: 数量
+        """
+        user_id = str(user_id)
+        group_id = str(group_id)
+        if goods:
+            if (
+                    not goods.daily_limit
+                    or not goods.daily_purchase_limit.get(group_id)
+                    or not goods.daily_purchase_limit[group_id].get(user_id)
+            ):
+                return goods.daily_limit - num < 0, goods.daily_limit
+            if goods.daily_purchase_limit[group_id][user_id] + num > goods.daily_limit:
+                return (
+                    True,
+                    goods.daily_limit - goods.daily_purchase_limit[group_id][user_id],
+                )
+        return False, 0
+
+    @classmethod
+    async def reset_daily_purchase(cls):
+        """
+        重置每次次数限制
+        """
+        await cls.update.values(daily_purchase_limit={}).gino.status()
@@ -1,7 +1,3 @@
-from nonebot.adapters.onebot.v11 import MessageSegment
-from utils.image_utils import BuildImage
-from utils.message_builder import image
-from configs.path_config import IMAGE_PATH
 from typing import Optional, Tuple, Union
 from configs.config import Config
 from utils.http_utils import AsyncHttpx
@@ -28,24 +24,3 @@ async def get_data(url: str, params: Optional[dict] = None) -> Tuple[Union[dict,
            return f'发生了错误...code：{data["code"]}', 999
    except TimeoutError:
        return "超时了....", 998
-
-
-def gen_wbtop_pic(data: dict) -> MessageSegment:
-    """
-    生成微博热搜图片
-    :param data: 微博热搜数据
-    """
-    bk = BuildImage(700, 32 * 50 + 280, 700, 32, color="#797979")
-    wbtop_bk = BuildImage(700, 280, background=f"{IMAGE_PATH}/other/webtop.png")
-    bk.paste(wbtop_bk)
-    text_bk = BuildImage(700, 32 * 50, 700, 32, color="#797979")
-    for i, data in enumerate(data):
-        title = f"{i+1}. {data['hot_word']}"
-        hot = data["hot_word_num"]
-        img = BuildImage(700, 30, font_size=20)
-        w, h = img.getsize(title)
-        img.text((10, int((30 - h) / 2)), title)
-        img.text((580, int((30 - h) / 2)), hot)
-        text_bk.paste(img)
-    bk.paste(text_bk, (0, 280))
-    return image(b64=bk.pic2bs4())
@@ -228,12 +228,14 @@ async def send_sub_msg(rst: str, sub: BilibiliSub, bot: Bot):
    :param sub: BilibiliSub
    :param bot: Bot
    """
+    temp_group = []
    if rst:
        for x in sub.sub_users.split(",")[:-1]:
            try:
-                if ":" in x:
+                if ":" in x and x.split(":")[1] not in temp_group:
+                    temp_group.append(x.split(":")[1])
                    await bot.send_group_msg(
-                        group_id=int(x.split(":")[1]), message=Message(rst)
+                            group_id=int(x.split(":")[1]), message=Message(rst)
                    )
                else:
                    await bot.send_private_msg(user_id=int(x), message=Message(rst))
@@ -1,4 +1,6 @@
 from bilireq.exceptions import ResponseCodeError
+from nonebot.adapters.onebot.v11 import MessageSegment
+
 from utils.manager import resources_manager
 from asyncio.exceptions import TimeoutError
 from .model import BilibiliSub
@@ -8,7 +10,7 @@ from utils.message_builder import image
 from bilireq.user import get_user_info
 from bilireq import dynamic
 from .utils import get_videos
-from typing import Optional
+from typing import Optional, Tuple
 from configs.path_config import IMAGE_PATH
 from datetime import datetime
 from utils.browser import get_browser
@@ -304,7 +306,7 @@ async def _get_season_status(id_) -> Optional[str]:

 async def get_user_dynamic(
    uid: int, local_user: BilibiliSub
-) -> "Optional[MessageSegment], int":
+) -> Tuple[Optional[MessageSegment], int]:
    """
    获取用户动态
    :param uid: 用户uid
@@ -317,14 +319,15 @@ async def get_user_dynamic(
    if dynamic_info.get("cards") and browser:
        dynamic_upload_time = dynamic_info["cards"][0]["desc"]["timestamp"]
        if local_user.dynamic_upload_time < dynamic_upload_time:
-            page = await browser.new_page()
+            context = await browser.new_context()
+            page = await context.new_page()
            try:
                await page.goto(
                    f"https://space.bilibili.com/{local_user.uid}/dynamic",
                    wait_until="networkidle",
                    timeout=10000,
                )
-                await page.set_viewport_size({"width": 2560, "height": 1080, "timeout": 10000*20}) # timeout: 200s
+                # await page.set_viewport_size({"width": 2560, "height": 1080, "timeout": 10000*20}) # timeout: 200s
                # 删除置顶
                await page.evaluate(
                    """
@@ -334,15 +337,30 @@ async def get_user_dynamic(
                    }
                """
                )
-                card = page.locator(".bili-dyn-list__item").first
+                async with page.expect_popup() as popup_info:
+                    await page.locator(".bili-rich-text__content").click()
+                details_page = await popup_info.value
+                await details_page.set_viewport_size(
+                    {"width": 2560, "height": 1080, "timeout": 10000 * 20}
+                )
+                await details_page.wait_for_selector(".panel-area")
+                await details_page.evaluate(
+                    """
+                    xs = document.getElementById('internationalHeader');
+                    xs.remove();
+                    xs = document.getElementsByClassName('panel-area')
+                    xs[0].remove();
+                """
+                )
+                card = details_page.locator(".detail-card")
                await card.wait_for()
-                # 截图并保存
                await card.screenshot(
                    path=dynamic_path / f"{local_user.sub_id}_{dynamic_upload_time}.jpg",
                )
            except Exception as e:
                logger.error(f"B站订阅：获取用户动态 发送错误 {type(e)}：{e}")
            finally:
+                await context.close()
                await page.close()
            return (
                image(
@@ -351,7 +369,7 @@ async def get_user_dynamic(
                ),
                dynamic_upload_time,
            )
-    return None, None
+    return None, 0


 class SubManager:
@@ -8,6 +8,7 @@ from nonebot.adapters.onebot.v11 import (
 from nonebot.matcher import Matcher
 from nonebot.message import run_preprocessor
 from utils.image_utils import BuildImage
+from utils.manager import group_manager
 from utils.utils import get_message_text, is_number
 from nonebot.params import RegexGroup, CommandArg
 from .utils import black_word_manager
@@ -155,7 +156,11 @@ async def _(
        and matcher.plugin_name == "black_word"
        and not await BanUser.is_ban(event.user_id)
        and str(event.user_id) not in bot.config.superusers
+        and not get_message_text(event.json()).startswith("原神绑定")
    ):
+        # 屏蔽群权限-1的群
+        if isinstance(event, GroupMessageEvent) and group_manager.get_group_level(event.group_id) < 0:
+            return
        user_id = event.user_id
        group_id = event.group_id if isinstance(event, GroupMessageEvent) else None
        msg = get_message_text(event.json())
@@ -6,7 +6,7 @@ from configs.config import Config
 from pathlib import Path
 from services.log import logger
 from models.ban_user import BanUser
-from nonebot.adapters.onebot.v11.exception import ActionFailed
+from nonebot.adapters.onebot.v11 import ActionFailed
 from models.group_member_info import GroupInfoUser
 from utils.http_utils import AsyncHttpx
 import random
@@ -80,8 +80,8 @@ async def _(
    except TimeoutError:
        await bt.finish(f"搜索 {keyword} 超时...")
    except Exception as e:
-        await bt.finish(f"bt 其他未知错误..")
        logger.error(f"bt 错误 {type(e)}：{e}")
+        await bt.finish(f"bt 其他未知错误..")
    if not send_flag:
        await bt.send(f"{keyword} 未搜索到...")
    logger.info(f"USER {event.user_id} BT搜索 {keyword} 第 {page} 页")
@@ -9,7 +9,7 @@ import platform
 #     asyncio.set_event_loop_policy(asyncio.WindowsSelectorEventLoopPolicy())


-url = "http://www.eclzz.mobi"
+url = "http://www.eclzz.zone/"


 async def get_bt_info(keyword: str, page: int):
@@ -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"})
@@ -5,7 +5,7 @@ from .data_source import check_update, get_latest_version_data
 from services.log import logger
 from utils.utils import scheduler, get_bot
 from pathlib import Path
-from configs.config import Config
+from configs.config import NICKNAME, Config
 from nonebot.rule import to_me
 from nonebot.params import ArgStr
 import platform
@@ -25,6 +25,11 @@ __plugin_cmd__ = ["检查更新真寻", "重启"]
 __plugin_version__ = 0.1
 __plugin_author__ = "HibiKier"
 __plugin_configs__ = {
+    "UPDATE_REMIND": {
+        "value": True,
+        "help": "真寻是否检测版本状态",
+        "default": True,
+    },
    "AUTO_UPDATE_ZHENXUN": {
        "value": False,
        "help": "真寻是否自动检查更新",
@@ -66,18 +71,18 @@ async def _(bot: Bot):
            )


-@restart.handle()
-async def _():
-    if str(platform.system()).lower() == "windows":
-        await restart.finish("暂无windows重启脚本...")

-
-@restart.got("flag", prompt="确定是否重启真寻？（重启失败咱们将失去联系，请谨慎！）")
+@restart.got("flag", prompt=f"确定是否重启{NICKNAME}？确定请回复[是|好|确定]（重启失败咱们将失去联系，请谨慎！）")
 async def _(flag: str = ArgStr("flag")):
    if flag.lower() in ["true", "是", "好", "确定", "确定是"]:
-        await restart.send("开始重启真寻..请稍等...")
+        await restart.send(f"开始重启{NICKNAME}..请稍等...")
        open("is_restart", "w")
-        os.system("./restart.sh")
+        if str(platform.system()).lower() == "windows":
+            import sys
+            python = sys.executable
+            os.execl(python, python, *sys.argv)
+        else:
+            os.system("./restart.sh")
    else:
        await restart.send("已取消操作...")

@@ -88,7 +93,7 @@ async def _(flag: str = ArgStr("flag")):
    minute=0,
 )
 async def _():
-    if Config.get_config("check_zhenxun_update", "AUTO_UPDATE_ZHENXUN"):
+    if Config.get_config("check_zhenxun_update", "UPDATE_REMIND"):
        _version = "v0.0.0"
        _version_file = Path() / "__version__"
        if _version_file.exists():
@@ -108,17 +113,18 @@ async def _():
                    message=f"检测到真寻版本更新\n"
                    f"当前版本：{_version}，最新版本：{latest_version}",
                )
-                # try:
-                #     code = await check_update(bot)
-                # except Exception as e:
-                #     logger.error(f"更新真寻未知错误 {type(e)}：{e}")
-                #     await bot.send_private_msg(
-                #         user_id=int(list(bot.config.superusers)[0]),
-                #         message=f"更新真寻未知错误 {type(e)}：{e}\n",
-                #     )
-                # else:
-                #     if code == 200:
-                #         await bot.send_private_msg(
-                #             user_id=int(list(bot.config.superusers)[0]),
-                #             message=f"更新完毕，请重启真寻....",
-                #         )
+                if Config.get_config("check_zhenxun_update", "AUTO_UPDATE_ZHENXUN"):
+                    try:
+                        code = await check_update(bot)
+                    except Exception as e:
+                        logger.error(f"更新真寻未知错误 {type(e)}：{e}")
+                        await bot.send_private_msg(
+                            user_id=int(list(bot.config.superusers)[0]),
+                            message=f"更新真寻未知错误 {type(e)}：{e}\n",
+                        )
+                    else:
+                        if code == 200:
+                            await bot.send_private_msg(
+                                user_id=int(list(bot.config.superusers)[0]),
+                                message=f"更新完毕，请重启{NICKNAME}....",
+                            )
@@ -162,7 +162,7 @@ def _file_handle(latest_version: str) -> str:
                if backup_file.exists():
                    backup_file.unlink()
                if file not in [config_file, config_path_file]:
-                    os.rename(file.absolute(), backup_file.absolute())
+                    shutil.move(file.absolute(), backup_file.absolute())
                else:
                    with open(file, "r", encoding="utf8") as rf:
                        data = rf.read()
@@ -174,7 +174,7 @@ def _file_handle(latest_version: str) -> str:
        old_file = Path() / file
        if old_file not in [config_file, config_path_file] and file != "configs":
            if not old_file.exists() and new_file.exists():
-                os.rename(new_file.absolute(), old_file.absolute())
+                shutil.move(new_file.absolute(), old_file.absolute())
                logger.info(f"已更新文件：{file}")
    # except Exception as e:
    #     error = f'{type(e)}：{e}'
@@ -189,6 +189,9 @@ def _file_handle(latest_version: str) -> str:
        local_update_info_file.unlink()
    with open(_version_file, "w", encoding="utf8") as f:
        f.write(f"__version__: {latest_version}")
+    os.system(
+        f"poetry run pip install -r {(Path() / 'pyproject.toml').absolute()}"
+    )
    return error


@@ -53,7 +53,7 @@ __plugin_settings__ = {
 dialogue_data = {}


-dialogue = on_command("[滴滴滴]", aliases={"滴滴滴-"}, priority=5, block=True)
+dialogue = on_command("&#91;滴滴滴&#93;", aliases={"滴滴滴-"}, priority=5, block=True)
 reply = on_command("/t", priority=1, permission=SUPERUSER, block=True)


@@ -23,6 +23,7 @@ from .handles.onmyoji_handle import OnmyojiHandle
 from .handles.pcr_handle import PcrHandle
 from .handles.pretty_handle import PrettyHandle
 from .handles.prts_handle import PrtsHandle
+from .handles.ba_handle import BaHandle

 from .config import draw_config

@@ -30,7 +31,7 @@ from .config import draw_config
 __zx_plugin_name__ = "游戏抽卡"
 __plugin_usage__ = """
 usage：
-    模拟赛马娘，原神，明日方舟，坎公骑冠剑，公主连结(国/台)，碧蓝航线，FGO，阴阳师进行抽卡
+    模拟赛马娘，原神，明日方舟，坎公骑冠剑，公主连结(国/台)，碧蓝航线，FGO，阴阳师，碧蓝档案进行抽卡
    指令：
        原神[1-180]抽: 原神常驻池
        原神角色[1-180]抽: 原神角色UP池子
@@ -43,6 +44,7 @@ usage：
        碧蓝航线/碧蓝[重型/轻型/特型/活动][1-300]抽: 碧蓝航线重型/轻型/特型/活动卡池
        fgo[1-300]抽: fgo卡池
        阴阳师[1-300]抽: 阴阳师卡池
+        ba/碧蓝档案[1-200]抽：碧蓝档案卡池
    * 以上指令可以通过 XX一井 来指定最大抽取数量 *
    * 示例：原神一井 *
 """.strip()
@@ -73,6 +75,7 @@ __plugin_cmd__ = [
    "pcr/公主连接[1-300]抽",
    "fgo[1-300]抽",
    "阴阳师[1-300]抽",
+    "碧蓝档案[1-200]抽",
    "更新方舟信息 [_superuser]",
    "重载方舟卡池 [_superuser]",
    "更新原神信息 [_superuser]",
@@ -83,6 +86,7 @@ __plugin_cmd__ = [
    "更新碧蓝航线信息 [_superuser]",
    "更新fgo信息 [_superuser]",
    "更新阴阳师信息 [_superuser]",
+    "更新碧蓝档案信息 [_superuser]",
 ]
 __plugin_type__ = ("抽卡相关", 1)
 __plugin_version__ = 0.1
@@ -105,7 +109,7 @@ class Game:


 games = (
-    Game({"azur", "碧蓝", "碧蓝航线"}, AzurHandle(), draw_config.AZUR_FLAG),
+    Game({"azur", "碧蓝航线"}, AzurHandle(), draw_config.AZUR_FLAG),
    Game({"fgo", "命运冠位指定"}, FgoHandle(), draw_config.FGO_FLAG),
    Game(
        {"genshin", "原神"},
@@ -130,6 +134,11 @@ games = (
        reload_time=4,
    ),
    Game({"prts", "方舟", "明日方舟"}, PrtsHandle(), draw_config.PRTS_FLAG, reload_time=4),
+    Game(
+        {"ba","碧蓝档案"},BaHandle(),
+        draw_config.BA_FLAG,
+        max_count=200,
+    ),
 )


@@ -87,6 +87,12 @@ class OnmyojiConfig(BaseModel, extra=Extra.ignore):
    ONMYOJI_SR: float = 0.2
    ONMYOJI_R: float = 0.7875

+#碧蓝档案
+class BaConfig(BaseModel, extra=Extra.ignore):
+    BA_THREE_P: float = 0.025
+    BA_TWO_P: float = 0.185
+    BA_ONE_P: float = 0.79
+    BA_G_TWO_P: float = 0.975

 class Config(BaseModel, extra=Extra.ignore):
    # 开关
@@ -98,6 +104,7 @@ class Config(BaseModel, extra=Extra.ignore):
    AZUR_FLAG: bool = AConfig.get_config("draw_card", "AZUR_FLAG")
    FGO_FLAG: bool = AConfig.get_config("draw_card", "FGO_FLAG")
    ONMYOJI_FLAG: bool = AConfig.get_config("draw_card", "ONMYOJI_FLAG")
+    BA_FLAG: bool = AConfig.get_config("draw_card", "BA_FLAG")

    # 其他配置
    PCR_TAI: bool = AConfig.get_config("draw_card", "PCR_TAI")
@@ -112,6 +119,7 @@ class Config(BaseModel, extra=Extra.ignore):
    azur: AzurConfig = AzurConfig()
    fgo: FgoConfig = FgoConfig()
    onmyoji: OnmyojiConfig = OnmyojiConfig()
+    ba: BaConfig = BaConfig()


 driver = nonebot.get_driver()
@@ -133,8 +141,9 @@ for game_flag, game_name in zip(
        "FGO_FLAG",
        "ONMYOJI_FLAG",
        "PCR_TAI",
+        "BA_FLAG"
    ],
-    ["明日方舟", "原神", "赛马娘", "坎公骑冠剑", "公主连结", "碧蓝航线", "命运-冠位指定（FGO）", "阴阳师", "pcr台服卡池"],
+    ["明日方舟", "原神", "赛马娘", "坎公骑冠剑", "公主连结", "碧蓝航线", "命运-冠位指定（FGO）", "阴阳师", "pcr台服卡池","碧蓝档案"],
 ):
    AConfig.add_plugin_config(
        "draw_card",
@@ -293,7 +293,7 @@ class AzurHandle(BaseHandle[AzurChar]):
                type_ = ship.xpath("./tbody/tr/td[2]/p/small/text()")[0]        # 舰船类型
                try:
                    p = float(str(ship.xpath(".//sup/text()")[0]).strip("%"))
-                except IndexError:
+                except (IndexError, ValueError):
                    p = 0
                star = self.parse_star(
                    ship.xpath("./tbody/tr/td[1]/div/div/div/a/img/@alt")[0]
@@ -0,0 +1,150 @@
+import random
+from lxml import etree
+from typing import List, Tuple
+from PIL import ImageDraw
+from urllib.parse import unquote
+from nonebot.log import logger
+
+from .base_handle import BaseHandle, BaseData
+from ..config import draw_config
+from ..util import remove_prohibited_str, cn2py, load_font
+from utils.image_utils import BuildImage
+
+
+class BaChar(BaseData):
+    pass
+
+
+class BaHandle(BaseHandle[BaChar]):
+    def __init__(self):
+        super().__init__("ba", "碧蓝档案")
+        self.max_star = 3
+        self.config = draw_config.ba
+        self.ALL_CHAR: List[BaChar] = []
+
+    def get_card(self, mode: int = 1) -> BaChar:
+        if mode == 2:
+            star = self.get_star(
+                [3, 2], [self.config.BA_THREE_P, self.config.BA_G_TWO_P]
+            )
+        else:
+            star = self.get_star(
+                [3, 2, 1],
+                [self.config.BA_THREE_P, self.config.BA_TWO_P, self.config.BA_ONE_P],
+            )
+        chars = [x for x in self.ALL_CHAR if x.star == star and not x.limited]
+        return random.choice(chars)
+
+    def get_cards(self, count: int, **kwargs) -> List[Tuple[BaChar, int]]:
+        card_list = []
+        card_count = 0  # 保底计算
+        for i in range(count):
+            card_count += 1
+            # 十连保底
+            if card_count == 10:
+                card = self.get_card(2)
+                card_count = 0
+            else:
+                card = self.get_card(1)
+                if card.star > self.max_star - 2:
+                    card_count = 0
+            card_list.append((card, i + 1))
+        return card_list
+
+    def generate_card_img(self, card: BaChar) -> BuildImage:
+        sep_w = 5
+        sep_h = 5
+        star_h = 15
+        img_w = 90
+        img_h = 100
+        font_h = 20
+        bar_h = 20
+        bar_w = 90
+        bg = BuildImage(img_w + sep_w * 2, img_h + font_h + sep_h * 2, color="#EFF2F5")
+        img_path = str(self.img_path / f"{cn2py(card.name)}.png")
+        img = BuildImage(img_w, img_h, background=img_path)
+        bar = BuildImage(bar_w, bar_h, color="#6495ED")
+        bg.paste(img, (sep_w, sep_h), alpha=True)
+        bg.paste(bar, (sep_w, img_h - bar_h + sep_h), alpha=True)
+        if (card.star == 1):
+            star_path = str(self.img_path / "star-1.png")
+            star_w = 15
+        elif (card.star == 2):
+            star_path = str(self.img_path / "star-2.png")
+            star_w = 30
+        else:
+            star_path = str(self.img_path / "star-3.png")
+            star_w = 45
+        star = BuildImage(star_w, star_h, background=star_path)
+        bg.paste(star, (img_w // 2 - 15 * (card.star - 1) // 2, img_h - star_h), alpha=True)
+        text = card.name[:5] + "..." if len(card.name) > 6 else card.name
+        font = load_font(fontsize=14)
+        text_w, text_h = font.getsize(text)
+        draw = ImageDraw.Draw(bg.markImg)
+        draw.text(
+            (sep_w + (img_w - text_w) / 2, sep_h + img_h + (font_h - text_h) / 2),
+            text,
+            font=font,
+            fill="gray",
+        )
+        return bg
+
+    def _init_data(self):
+        self.ALL_CHAR = [
+            BaChar(
+                name=value["名称"],
+                star=int(value["星级"]),
+                limited=True if "（" in key else False,
+            )
+            for key, value in self.load_data().items()
+        ]
+    
+    def title2star(self, title: int):
+        if title == 'Star-3.png':
+            return 3
+        elif title == 'Star-2.png':
+            return 2
+        else:
+            return 1
+
+    async def _update_info(self):
+        info = {}
+        url = "https://wiki.biligame.com/bluearchive/学生筛选"
+        result = await self.get_url(url)
+        if not result:
+            logger.warning(f"更新 {self.game_name_cn} 出错")
+            return
+        else:
+            dom = etree.HTML(result, etree.HTMLParser())
+            char_list = dom.xpath("//div[@class='filters']/table[2]/tbody/tr")
+            for char in char_list:
+                try:
+                    name = char.xpath("./td[2]/a/div/text()")[0]
+                    avatar = char.xpath("./td[1]/div/div/a/img/@data-src")[0]
+                    star_pic = char.xpath("./td[4]/img/@alt")[0]
+                except IndexError:
+                    continue
+                member_dict = {
+                    "头像": unquote(str(avatar)),
+                    "名称": remove_prohibited_str(name),
+                    "星级": self.title2star(star_pic),
+                }
+                info[member_dict["名称"]] = member_dict
+        self.dump_data(info)
+        logger.info(f"{self.game_name_cn} 更新成功")
+        # 下载头像
+        for value in info.values():
+            await self.download_img(value["头像"], value["名称"])
+        # 下载星星
+        await self.download_img(
+            "https://patchwiki.biligame.com/images/bluearchive/thumb/e/e0/82nj2x9sxko473g7782r14fztd4zyky.png/15px-Star-1.png",
+            "star-1",
+        )
+        await self.download_img(
+            "https://patchwiki.biligame.com/images/bluearchive/thumb/0/0b/msaff2g0zk6nlyl1rrn7n1ri4yobcqc.png/30px-Star-2.png",
+            "star-2",
+        )
+        await self.download_img(
+            "https://patchwiki.biligame.com/images/bluearchive/thumb/8/8a/577yv79x1rwxk8efdccpblo0lozl158.png/46px-Star-3.png",
+            "star-3"
+        )
@@ -3,7 +3,6 @@ import random
 import dateparser
 from lxml import etree
 from PIL import ImageDraw
-from bs4 import BeautifulSoup
 from datetime import datetime
 from urllib.parse import unquote
 from typing import List, Optional, Tuple
@@ -32,8 +31,9 @@ class Operator(BaseData):

 class PrtsHandle(BaseHandle[Operator]):
    def __init__(self):
-        super().__init__("prts", "明日方舟", "#eff2f5")
+        super().__init__(game_name="prts", game_name_cn="明日方舟")
        self.max_star = 6
+        self.game_card_color = "#eff2f5"
        self.config = draw_config.prts

        self.ALL_OPERATOR: List[Operator] = []
@@ -41,8 +41,8 @@ class PrtsHandle(BaseHandle[Operator]):

    def get_card(self, add: float) -> Operator:
        star = self.get_star(
-            [6, 5, 4, 3],
-            [
+            star_list=[6, 5, 4, 3],
+            probability_list=[
                self.config.PRTS_SIX_P + add,
                self.config.PRTS_FIVE_P,
                self.config.PRTS_FOUR_P,
@@ -53,7 +53,7 @@ class PrtsHandle(BaseHandle[Operator]):
        all_operators = [
            x
            for x in self.ALL_OPERATOR
-            if x.star == star and not any([x.limited, x.event_only, x.recruit_only])
+            if x.star == star and not any([x.limited, x.recruit_only, x.event_only])
        ]
        acquire_operator = None

@@ -74,7 +74,7 @@ class PrtsHandle(BaseHandle[Operator]):
            acquire_operator = random.choice(all_operators)
        return acquire_operator

-    def get_cards(self, count: int) -> List[Tuple[Operator, int]]:
+    def get_cards(self, count: int, **kwargs) -> List[Tuple[Operator, int]]:
        card_list = []  # 获取所有角色
        add = 0.0
        count_idx = 0
@@ -109,7 +109,8 @@ class PrtsHandle(BaseHandle[Operator]):

    def _draw(self, count: int, **kwargs) -> Message:
        index2card = self.get_cards(count)
-        cards = [card[0] for card in self.get_cards(count)]
+        """这里cards修复了抽卡图文不符的bug"""
+        cards = [card[0] for card in index2card]
        up_list = [x.name for x in self.UP_EVENT.up_char] if self.UP_EVENT else []
        result = self.format_result(index2card, up_list=up_list)
        pool_info = self.format_pool_info()
@@ -162,7 +163,11 @@ class PrtsHandle(BaseHandle[Operator]):
    def load_up_char(self):
        try:
            data = self.load_data(f"draw_card_up/{self.game_name}_up_char.json")
-            self.UP_EVENT = UpEvent.parse_obj(data.get("char", {}))
+            """这里的 waring 有点模糊，更新游戏信息时没有up池的情况下也会报错，所以细分了一下"""
+            if not data:
+                logger.warning(f"当前无UP池或 {self.game_name}_up_char.json 文件不存在")
+            else:
+                self.UP_EVENT = UpEvent.parse_obj(data.get("char", {}))
        except ValidationError:
            logger.warning(f"{self.game_name}_up_char 解析出错")

@@ -185,14 +190,15 @@ class PrtsHandle(BaseHandle[Operator]):
                avatar = char.xpath("./td[1]/div/div/div/a/img/@srcset")[0]
                name = char.xpath("./td[2]/a/text()")[0]
                star = char.xpath("./td[5]/text()")[0]
-                sources = str(char.xpath("./td[8]/text()")[0]).split("\n")
+                """这里sources修好了干员获取标签有问题的bug，如三星只能抽到卡缇就是这个原因"""
+                sources = [_.strip('\n') for _ in char.xpath("./td[8]/text()")]
            except IndexError:
                continue
            member_dict = {
                "头像": unquote(str(avatar).split(" ")[-2]),
                "名称": remove_prohibited_str(str(name).strip()),
                "星级": int(str(star).strip()),
-                "获取途径": [s for s in sources if s],
+                "获取途径": sources,
            }
            info[member_dict["名称"]] = member_dict
        self.dump_data(info)
@@ -208,6 +214,7 @@ class PrtsHandle(BaseHandle[Operator]):
        await self.update_up_char()

    async def update_up_char(self):
+        """重载卡池"""
        announcement_url = "https://ak.hypergryph.com/news.html"
        result = await self.get_url(announcement_url)
        if not result:
@@ -221,41 +228,53 @@ class PrtsHandle(BaseHandle[Operator]):
        end_time = None
        up_chars = []
        pool_img = ""
-        title = ""
-        for activity_url in activity_urls:
+        for activity_url in activity_urls[:10]:  # 减少响应时间, 10个就够了
            activity_url = f"https://ak.hypergryph.com{activity_url}"
            result = await self.get_url(activity_url)
            if not result:
                logger.warning(f"{self.game_name_cn}获取公告 {activity_url} 出错")
                continue
-            soup = BeautifulSoup(result, "lxml")
-            contents = soup.find_all("p")
+
+            """因为鹰角的前端太自由了，这里重写了匹配规则以尽可能避免因为前端乱七八糟而导致的重载失败"""
+            dom = etree.HTML(result, etree.HTMLParser())
+            contents = dom.xpath(
+                "//div[@class='article-content']/p/text() | //div[@class='article-content']/p/span/text() | //div[@class='article-content']/div[@class='media-wrap image-wrap']/img/@src"
+            )
+            title = ""
+            time = ""
+            chars: List[str] = []
            for index, content in enumerate(contents):
-                if re.search("(.*)(寻访|复刻).*?开启", content.text):
-                    title = content.text
-                    if "【" in title and "】" in title:
-                        title = re.split(r"[【】]", title)[1]
-                    lines = [str(contents[index + i + 1].text) for i in range(5)]
-                    time = ""
-                    chars: List[str] = []
-                    for line in lines:
+                if re.search("(.*)(寻访|复刻).*?开启", content):
+                    title = re.split(r"[【】]", content)
+                    title = "".join(title[1:-1]) if "-" in title else title[1]
+                    lines = [contents[index-2+_] for _ in range(8)]  # 从 -2 开始是因为xpath获取的时间有的会在寻访开启这一句之前
+                    lines.append("")  # 防止IndexError，加个空字符串
+                    for idx, line in enumerate(lines):
                        match = re.search(
                            r"(\d{1,2}月\d{1,2}日.*?-.*?\d{1,2}月\d{1,2}日.*?$)", line
                        )
                        if match:
                            time = match.group(1)
-                        if "★" in line:
-                            chars.append(line)
+                        """因为 <p> 的诡异排版，所以有了下面的一段"""
+                        if ("★★" in line and "%" in line) or ("★★" in line and "%" in lines[idx + 1]):
+                            chars.append(line) if ("★★" in line and "%" in line) else chars.append(line + lines[idx + 1])
                    if not time:
                        continue
-                    start, end = time.replace("月", "/").replace("日", "").split("-")[:2]
+                    start, end = time.replace("月", "/").replace("日", " ").split("-")[:2]  # 日替换为空格是因为有日后面不接空格的情况，导致 split 出问题
                    start_time = dateparser.parse(start)
                    end_time = dateparser.parse(end)
-                    pool_img = content.find_previous("img")["src"]
+                    pool_img = contents[index-2]
+                    r"""两类格式：用/分割，用\分割；★+(概率)+名字，★+名字+(概率)"""
                    for char in chars:
                        star = char.split("（")[0].count("★")
-                        name = re.split(r"[：（]", char)[1]
-                        names = name.split("/") if "/" in name else [name]
+                        name = re.split(r"[：（]", char)[1] if "★（" not in char else re.split("）：", char)[1]  # 有的括号在前面有的在后面
+                        if "\\" in name:
+                            names = name.split("\\")
+                        elif "/" in name:
+                            names = name.split("/")
+                        else:
+                            names = [name]  # 既有用/分割的，又有用\分割的
+
                        names = [name.replace("[限定]", "").strip() for name in names]
                        if "权值" in char:
                            match = re.search(r"（在.*?以.*?(\d+).*?倍权值.*?）", char)
@@ -269,7 +288,10 @@ class PrtsHandle(BaseHandle[Operator]):
                            up_chars.append(
                                UpChar(name=name, star=star, limited=False, zoom=zoom)
                            )
-                    break
+                    if start_time <= datetime.now() <= end_time: # 跳过过时的卡池
+                        break  # 这里break会导致个问题：如果一个公告里有两个池子，会漏掉下面的池子，比如 5.19 的定向寻访。但目前我也没啥好想法解决
+                    chars: List[str] = [] # 查找下一个卡池之前清空 chars
+                    up_chars = [] # 查找下一个卡池之前清空 up_chars
            if title and start_time and end_time:
                if start_time <= datetime.now() <= end_time:
                    self.UP_EVENT = UpEvent(
@@ -106,20 +106,21 @@ async def _(event: GroupMessageEvent):
            "fudu", "FUDU_PROBABILITY"
        ) and not _fudu_list.is_repeater(event.group_id):
            if random.random() < 0.2:
-                await fudu.finish("[[_task|fudu]]打断施法！")
+                if msg.endswith("打断施法！"):
+                    await fudu.finish("[[_task|fudu]]打断" + msg)        
+                else:
+                    await fudu.finish("[[_task|fudu]]打断施法！")
            _fudu_list.set_repeater(event.group_id)
            if img and msg:
-                rst = msg + image(f"compare_{event.group_id}_img.jpg", "temp")
+                rst = msg + image(TEMP_PATH / f"compare_{event.group_id}_img.jpg")
            elif img:
-                rst = image(f"compare_{event.group_id}_img.jpg", "temp")
+                rst = image(TEMP_PATH / f"compare_{event.group_id}_img.jpg")
            elif msg:
                rst = msg
            else:
                rst = ""
            if rst:
-                if rst.endswith("打断施法！"):
-                    rst = "打断" + rst
-                await fudu.send("[[_task|fudu]]" + rst)
+                await fudu.finish("[[_task|fudu]]" + rst)


 async def get_fudu_img_hash(url, group_id):
@@ -182,7 +182,7 @@ def parsed_data(
    role_data = {
        "active_day_number": data["stats"]["active_day_number"],  # 活跃天数
        "achievement_number": data["stats"]["achievement_number"],  # 达成成就数量
-        "win_rate": data["stats"]["win_rate"],
+        # "win_rate": data["stats"]["win_rate"],
        "anemoculus_number": data["stats"]["anemoculus_number"],  # 风神瞳已收集
        "geoculus_number": data["stats"]["geoculus_number"],  # 岩神瞳已收集
        "avatar_number": data["stats"]["avatar_number"],  # 获得角色数量
@@ -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(
@@ -86,30 +86,28 @@ async def _():
                if await Genshin.get_user_resin_recovery_time(u.uid) > datetime.now(
                    pytz.timezone("Asia/Shanghai")
                ):
-                    date = await Genshin.get_user_resin_recovery_time(u.uid)
-                    scheduler.add_job(
-                        _remind,
-                        "date",
-                        run_date=date.replace(microsecond=0),
-                        id=f"genshin_resin_remind_{u.uid}_{u.user_qq}",
-                        args=[u.user_qq, u.uid],
-                    )
+                    # date = await Genshin.get_user_resin_recovery_time(u.uid)  # 不能要,因为可能在这期间用户使用了树脂
+                    add_job(u.user_qq, u.uid)
+                    # scheduler.add_job(
+                    #     _remind,
+                    #     "date",
+                    #     run_date=date.replace(microsecond=0),
+                    #     id=f"genshin_resin_remind_{u.uid}_{u.user_qq}",
+                    #     args=[u.user_qq, u.uid],
+                    # )
                    logger.info(
-                        f"genshin_resin_remind add_job：USER：{u.user_qq} UID：{u.uid} "
-                        f"{date} 原神树脂提醒"
+                        f"genshin_resin_remind add_job：USER：{u.user_qq} UID：{u.uid}启动原神树脂提醒 "
                    )
                else:
                    await Genshin.clear_resin_remind_time(u.uid)
                    add_job(u.user_qq, u.uid)
                    logger.info(
-                        f"genshin_resin_remind add_job CHECK：USER：{u.user_qq} UID：{u.uid} "
-                        f"{date} 原神树脂提醒"
+                        f"genshin_resin_remind add_job CHECK：USER：{u.user_qq} UID：{u.uid}启动原神树脂提醒 "
                    )
            else:
                add_job(u.user_qq, u.uid)
                logger.info(
-                    f"genshin_resin_remind add_job CHECK：USER：{u.user_qq} UID：{u.uid} "
-                    f"{date} 原神树脂提醒"
+                    f"genshin_resin_remind add_job CHECK：USER：{u.user_qq} UID：{u.uid}启动原神树脂提醒 "
                )


@@ -144,17 +142,19 @@ async def _remind(user_id: int, uid: str):
    now = datetime.now(pytz.timezone("Asia/Shanghai"))
    next_time = None
    if code == 200:
-        current_resin = data["current_resin"]  # 当前树脂
-        max_resin = data["max_resin"]  # 最大树脂
+        current_resin = int(data["current_resin"])  # 当前树脂
+        max_resin = int(data["max_resin"])  # 最大树脂
        msg = f"你的已经存了 {current_resin} 个树脂了！不要忘记刷掉！"
        # resin_recovery_time = data["resin_recovery_time"]  # 树脂全部回复时间
        if current_resin < max_resin:
            user_manager.remove(uid)
            user_manager.remove_overflow(uid)
-        if max_resin - 40 < current_resin <= max_resin - 20:
-            next_time = now + timedelta(minutes=(max_resin - 20 - current_resin + 1) * 8, seconds=10)
-        elif current_resin < max_resin:
-            next_time = now + timedelta(minutes=(max_resin - current_resin) * 8, seconds=10)
+        if current_resin < max_resin - 40:
+            next_time = now + timedelta(minutes=(max_resin - 40 - current_resin) * 8)
+        elif max_resin - 40 <= current_resin < max_resin - 20:
+            next_time = now + timedelta(minutes=(max_resin - 20 - current_resin) * 8)
+        elif max_resin - 20 <= current_resin < max_resin:
+            next_time = now + timedelta(minutes=(max_resin - current_resin) * 8)
        elif current_resin == max_resin:
            custom_overflow_resin = Config.get_config("resin_remind", "CUSTOM_RESIN_OVERFLOW_REMIND")
            if user_manager.is_overflow(uid) and custom_overflow_resin:
@@ -164,6 +164,7 @@ async def _remind(user_id: int, uid: str):
                msg = f"你的树脂都溢出 {custom_overflow_resin} 个了！浪费可耻！"
            else:
                next_time = now + timedelta(minutes=40 * 8 + random.randint(5, 50))
+
        if not user_manager.exists(uid) and current_resin >= max_resin - 40:
            if current_resin == max_resin:
                user_manager.append(uid)
@@ -187,6 +188,7 @@ async def _remind(user_id: int, uid: str):
                        )
                    except ActionFailed as e:
                        logger.error(f"树脂提醒推送发生错误 {type(e)}：{e}")
+
    if not next_time:
        if user_manager.check(uid) and Config.get_config("resin_remind", "AUTO_CLOSE_QUERY_FAIL_RESIN_REMIND"):
            await Genshin.set_resin_remind(int(uid), False)
@@ -197,10 +199,13 @@ async def _remind(user_id: int, uid: str):
        user_manager.remove_error_count(uid)
    await Genshin.set_user_resin_recovery_time(int(uid), next_time)
    scheduler.add_job(
-        _remind,
        _remind,
        "date",
        run_date=next_time,
        id=f"genshin_resin_remind_{uid}_{user_id}",
        args=[user_id, uid],
    )
+    logger.info(
+                        f"genshin_resin_remind add_job：USER：{user_id} UID：{uid} "
+                        f"{next_time} 原神树脂提醒"
+                    )
@@ -1,6 +1,7 @@
 from nonebot import on_command, on_notice
 from nonebot.adapters.onebot.v11 import (
    Bot,
+    ActionFailed,
    GroupMessageEvent,
    PokeNotifyEvent,
    Message
@@ -24,7 +25,6 @@ from nonebot.rule import to_me
 from datetime import datetime, timedelta
 from configs.config import NICKNAME
 from apscheduler.jobstores.base import JobLookupError
-from nonebot.adapters.onebot.v11.exception import ActionFailed
 from nonebot.params import CommandArg
 import random
 import time
@@ -124,7 +124,7 @@ async def _(bot: Bot, event: GroupMessageEvent, arg: Message = CommandArg()):
                redbag_data[event.group_id]["amount"]
                - redbag_data[event.group_id]["open_amount"]
            )
-            await return_gold(event.user_id, event.group_id, amount)
+            await return_gold(redbag_data[event.group_id]["user_id"], event.group_id, amount)
            await gold_redbag.send(
                f'{redbag_data[event.group_id]["nickname"]}的红包过时未开完，退还{amount}金币...'
            )
@@ -61,22 +61,23 @@ async def generate_open_redbag_pic(user_id: int, send_user_nickname: str, amount
 async def _generate_open_redbag_pic(user_id: int, send_user_nickname: str, amount: int, text: str):
    send_user_nickname += '的红包'
    amount = str(amount)
-    head = BuildImage(1000, 980, font_size=30, background=f'{IMAGE_PATH}/prts/redbag_12.png')
+    random_redbag = random.choice(os.listdir(f"{IMAGE_PATH}/prts/redbag_1"))
+    head = BuildImage(1000, 980, font_size=30, background=f'{IMAGE_PATH}/prts/redbag_1/{random_redbag}')
    size = BuildImage(0, 0, font_size=50).getsize(send_user_nickname)
    # QQ头像
-    ava_bk = BuildImage(100 + size[0], 66, color='white', font_size=50)
-    ava = BuildImage(66, 66, background=BytesIO(await get_user_avatar(user_id)))
+    ava_bk = BuildImage(100 + size[0], 66, is_alpha=True, font_size=50)
+    ava = BuildImage(66, 66, is_alpha=True, background=BytesIO(await get_user_avatar(user_id)))
    ava_bk.paste(ava)
    ava_bk.text((100, 7), send_user_nickname)
    # ava_bk.show()
    ava_bk_w, ava_bk_h = ava_bk.size
-    head.paste(ava_bk, (int((1000 - ava_bk_w) / 2), 300))
+    head.paste(ava_bk, (int((1000 - ava_bk_w) / 2), 300), alpha=True)
    # 金额
    size = BuildImage(0, 0, font_size=150).getsize(amount)
-    price = BuildImage(size[0], size[1], font_size=150)
+    price = BuildImage(size[0], size[1], is_alpha=True, font_size=150)
    price.text((0, 0), amount, fill=(209, 171, 108))
    # 金币中文
-    head.paste(price, (int((1000 - size[0]) / 2) - 50, 460))
+    head.paste(price, (int((1000 - size[0]) / 2) - 50, 460), alpha=True)
    head.text((int((1000 - size[0]) / 2 + size[0]) - 50, 500 + size[1] - 70), '金币', fill=(209, 171, 108))
    # 剩余数量和金额
    head.text((350, 900), text, (198, 198, 198))
@@ -65,8 +65,8 @@ async def arg_handle(
    if int(img_id) > max_id or int(img_id) < 0:
        await delete_img.finish(f"Id超过上下限，上限：{max_id}", at_sender=True)
    try:
-        if (TEMP_PATH / "delete.jpg").exists():
-            (TEMP_PATH / "delete.jpg").unlink()
+        if (TEMP_PATH / f"{event.user_id}_delete.jpg").exists():
+            (TEMP_PATH / f"{event.user_id}_delete.jpg").unlink()
        logger.info(f"删除{cn2py(state['path'])}图片 {img_id}.jpg 成功")
    except Exception as e:
        logger.warning(f"删除图片 delete.jpg 失败 e{e}")
@@ -36,7 +36,7 @@ __plugin_settings__ = {
    "limit_superuser": False,
    "cmd": ["发送图片"] + Config.get_config("image_management", "IMAGE_DIR_LIST"),
 }
-__plugin_resources__ = {"pa": IMAGE_PATH}
+__plugin_resources__ = {"pa": IMAGE_PATH / "pa"}

 Config.add_plugin_config(
    "_task",
@@ -1,8 +1,7 @@
 from nonebot import on_message, on_command
-from nonebot.adapters.onebot.v11 import Bot, GroupMessageEvent, Message
+from nonebot.adapters.onebot.v11 import Bot, GroupMessageEvent, Message, ActionFailed
 from nonebot.adapters.onebot.v11.permission import GROUP
 from utils.utils import is_number, get_message_img, get_message_text
-from nonebot.adapters.onebot.v11.exception import ActionFailed
 from configs.path_config import DATA_PATH, TEMP_PATH
 from utils.image_utils import get_img_hash
 from services.log import logger
@@ -72,9 +71,7 @@ def save_data():


 async def download_img_and_hash(url, group_id) -> str:
-    if await AsyncHttpx.download_file(
-        url, TEMP_PATH / f"mute_{group_id}_img.jpg"
-    ):
+    if await AsyncHttpx.download_file(url, TEMP_PATH / f"mute_{group_id}_img.jpg"):
        return str(get_img_hash(TEMP_PATH / f"mute_{group_id}_img.jpg"))
    return ""

@@ -133,11 +130,19 @@ async def _(bot: Bot, event: GroupMessageEvent):


@mute_setting.handle()
-async def _(event: GroupMessageEvent, cmd: Tuple[str, ...] = Command(), arg: Message = CommandArg()):
+async def _(
+    event: GroupMessageEvent,
+    cmd: Tuple[str, ...] = Command(),
+    arg: Message = CommandArg(),
+):
    global mute_data
    group_id = str(event.group_id)
    if not mute_data.get(group_id):
-        mute_data[group_id] = {"count": Config.get_config("mute", "MUTE_DEFAULT_COUNT"), "time": Config.get_config("mute", "MUTE_DEFAULT_TIME"), "duration": Config.get_config("mute", "MUTE_DEFAULT_DURATION")}
+        mute_data[group_id] = {
+            "count": Config.get_config("mute", "MUTE_DEFAULT_COUNT"),
+            "time": Config.get_config("mute", "MUTE_DEFAULT_TIME"),
+            "duration": Config.get_config("mute", "MUTE_DEFAULT_DURATION"),
+        }
    msg = arg.extract_plain_text().strip()
    if cmd[0] == "刷屏检测设置":
        await mute_setting.finish(
@@ -157,8 +162,6 @@ async def _(event: GroupMessageEvent, cmd: Tuple[str, ...] = Command(), arg: Mes
    if cmd[0] == "设置刷屏禁言时长":
        mute_data[group_id]["duration"] = int(msg)
        msg += " 分钟"
-    await mute_setting.send(f'刷屏检测：{cmd[0]}为 {msg}')
-    logger.info(
-        f'USER {event.user_id} GROUP {group_id} {cmd[0]}：{msg}'
-    )
+    await mute_setting.send(f"刷屏检测：{cmd[0]}为 {msg}")
+    logger.info(f"USER {event.user_id} GROUP {group_id} {cmd[0]}：{msg}")
    save_data()
@@ -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 "狂牙大行动"))


 # 重置开箱
@@ -7,7 +7,7 @@ from .models.open_cases_user import OpenCasesUser
 from services.log import logger
 from utils.utils import get_bot, cn2py
 from asyncio.exceptions import TimeoutError
-from nonebot.adapters.onebot.v11.exception import ActionFailed
+from nonebot.adapters.onebot.v11 import ActionFailed
 from configs.config import Config
 from utils.manager import group_manager
 from .config import *
@@ -1,166 +1,164 @@
-# from nonebot import on_message
-# from services.log import logger
-# from nonebot.adapters.onebot.v11 import GroupMessageEvent
-# from utils.utils import get_message_json, get_local_proxy, is_number, get_message_text
-# from nonebot.adapters.onebot.v11.permission import GROUP
-# from utils.message_builder import image
-# from nonebot.adapters.onebot.v11.exception import ActionFailed
-# from utils.image_utils import BuildImage
-# from utils.browser import get_browser
-# from configs.path_config import IMAGE_PATH
-# from utils.http_utils import AsyncHttpx
-# from configs.config import Config
-# from utils.user_agent import get_user_agent
-# import aiohttp
-# import asyncio
-# import time
-# import ujson as json
-#
-#
-# __zx_plugin_name__ = "B站转发解析"
-# __plugin_usage__ = """
-# usage：
-#     B站转发解析，解析b站分享信息，支持bv，bilibili链接，b站手机端转发卡片，cv，b23.tv，且5分钟内不解析相同url
-# """.strip()
-# __plugin_des__ = "B站转发解析"
-# __plugin_type__ = ("其他",)
-# __plugin_version__ = 0.1
-# __plugin_author__ = "HibiKier"
-# __plugin_task__ = {"bilibili_parse": "b站转发解析"}
-# Config.add_plugin_config(
-#     "_task",
-#     "DEFAULT_BILIBILI_PARSE",
-#     True,
-#     help_="被动 B站转发解析 进群默认开关状态",
-#     default_value=True,
-# )
-#
-#
-# parse_bilibili_json = on_message(priority=1, permission=GROUP, block=False)
-#
-# _tmp = {}
-#
-#
-# @parse_bilibili_json.handle()
-# async def _(event: GroupMessageEvent):
-#     vd_info = None
-#     url = None
-#     if get_message_json(event.json()):
-#         try:
-#             data = json.loads(get_message_json(event.json())[0]["data"])
-#         except (IndexError, KeyError):
-#             data = None
-#         if data:
-#             # 转发视频
-#             if data.get("desc") == "哔哩哔哩":
-#                 async with aiohttp.ClientSession(
-#                     headers=get_user_agent()
-#                 ) as session:
-#                     async with session.get(
-#                             data["meta"]["detail_1"]["qqdocurl"],
-#                             proxy=get_local_proxy(),
-#                             timeout=7,
-#                     ) as response:
-#                         url = str(response.url).split("?")[0]
-#                         bvid = url.split("/")[-1]
-#                         vd_info = await video.Video(bvid=bvid).get_info()
-#                 # response = await AsyncHttpx.get(
-#                 #     data["meta"]["detail_1"]["qqdocurl"], timeout=7
-#                 # )
-#                 # url = str(response.url).split("?")[0]
-#                 # bvid = url.split("/")[-1]
-#                 # vd_info = await video.Video(bvid=bvid).get_info()
-#             # 转发专栏
-#             if (
-#                 data.get("meta")
-#                 and data["meta"].get("news")
-#                 and data["meta"]["news"].get("desc") == "哔哩哔哩专栏"
-#             ):
-#                 url = data["meta"]["news"]["jumpUrl"]
-#                 page = None
-#                 try:
-#                     browser = await get_browser()
-#                     if not browser:
-#                         return
-#                     page = await browser.new_page(
-#                         user_agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36"
-#                         " (KHTML, like Gecko) Chrome/93.0.4530.0 Safari/537.36"
-#                     )
-#                     await page.goto(url, wait_until="networkidle", timeout=10000)
-#                     await page.set_viewport_size({"width": 2560, "height": 1080})
-#                     await page.click("#app > div")
-#                     div = await page.query_selector("#app > div")
-#                     await div.screenshot(
-#                         path=f"{IMAGE_PATH}/temp/cv_{event.user_id}.png",
-#                         timeout=100000,
-#                     )
-#                     await asyncio.get_event_loop().run_in_executor(
-#                         None, resize, f"{IMAGE_PATH}/temp/cv_{event.user_id}.png"
-#                     )
-#                     await parse_bilibili_json.send(
-#                         "[[_task|bilibili_parse]]" + image(f"cv_{event.user_id}.png", "temp")
-#                     )
-#                     await page.close()
-#                     logger.info(
-#                         f"USER {event.user_id} GROUP {event.group_id} 解析bilibili转发 {url}"
-#                     )
-#                 except Exception as e:
-#                     logger.error(f"尝试解析bilibili专栏 {url} 失败 {type(e)}：{e}")
-#                     if page:
-#                         await page.close()
-#                 return
-#     # BV
-#     if msg := get_message_text(event.json()):
-#         if "BV" in msg:
-#             index = msg.find("BV")
-#             if len(msg[index + 2 :]) >= 10:
-#                 msg = msg[index : index + 12]
-#                 url = f"https://www.bilibili.com/video/{msg}"
-#                 vd_info = await video.Video(bvid=msg).get_info()
-#         elif "av" in msg:
-#             index = msg.find("av")
-#             if len(msg[index + 2 :]) >= 9:
-#                 msg = msg[index + 2 : index + 11]
-#                 if is_number(msg):
-#                     url = f"https://www.bilibili.com/video/{msg}"
-#                     vd_info = await video.Video(aid=int(msg)).get_info()
-#         elif "https://b23.tv" in msg:
-#             url = "https://" + msg[msg.find("b23.tv") : msg.find("b23.tv") + 13]
-#             res = await AsyncHttpx.get(url, timeout=7)
-#             url = str(res.url).split("?")[0]
-#             bvid = url.split("/")[-1]
-#             vd_info = await video.Video(bvid=bvid).get_info()
-#     if vd_info:
-#         if (
-#             url in _tmp.keys() and time.time() - _tmp[url] > 30
-#         ) or url not in _tmp.keys():
-#             _tmp[url] = time.time()
-#             aid = vd_info["aid"]
-#             title = vd_info["title"]
-#             author = vd_info["owner"]["name"]
-#             reply = vd_info["stat"]["reply"]  # 回复
-#             favorite = vd_info["stat"]["favorite"]  # 收藏
-#             coin = vd_info["stat"]["coin"]  # 投币
-#             # like = vd_info['stat']['like']      # 点赞
-#             # danmu = vd_info['stat']['danmaku']  # 弹幕
-#             date = time.strftime("%Y-%m-%d", time.localtime(vd_info["ctime"]))
-#             try:
-#                 await parse_bilibili_json.send(
-#                     "[[_task|bilibili_parse]]" +
-#                     image(vd_info["pic"]) + f"\nav{aid}\n标题：{title}\n"
-#                     f"UP：{author}\n"
-#                     f"上传日期：{date}\n"
-#                     f"回复：{reply}，收藏：{favorite}，投币：{coin}\n"
-#                     f"{url}"
-#                 )
-#             except ActionFailed:
-#                 logger.warning(f"{event.group_id} 发送bilibili解析失败")
-#             else:
-#                 logger.info(
-#                     f"USER {event.user_id} GROUP {event.group_id} 解析bilibili转发 {url}"
-#                 )
-#
-#
-# def resize(path: str):
-#     A = BuildImage(0, 0, background=path, ratio=0.5)
-#     A.save(path)
+from nonebot import on_message
+from services.log import logger
+from nonebot.adapters.onebot.v11 import GroupMessageEvent, ActionFailed
+from utils.utils import get_message_json, get_local_proxy, is_number, get_message_text
+from nonebot.adapters.onebot.v11.permission import GROUP
+from utils.message_builder import image
+from utils.image_utils import BuildImage
+from utils.browser import get_browser
+from configs.path_config import IMAGE_PATH
+from utils.http_utils import AsyncHttpx
+from configs.config import Config
+from utils.user_agent import get_user_agent
+import aiohttp
+import asyncio
+import time
+import ujson as json
+from bilireq import video
+__zx_plugin_name__ = "B站转发解析"
+__plugin_usage__ = """
+usage：
+    B站转发解析，解析b站分享信息，支持bv，bilibili链接，b站手机端转发卡片，cv，b23.tv，且5分钟内不解析相同url
+""".strip()
+__plugin_des__ = "B站转发解析"
+__plugin_type__ = ("其他",)
+__plugin_version__ = 0.1
+__plugin_author__ = "HibiKier"
+__plugin_task__ = {"bilibili_parse": "b站转发解析"}
+Config.add_plugin_config(
+    "_task",
+    "DEFAULT_BILIBILI_PARSE",
+    True,
+    help_="被动 B站转发解析 进群默认开关状态",
+    default_value=True,
+)
+
+
+parse_bilibili_json = on_message(priority=1, permission=GROUP, block=False)
+
+_tmp = {}
+
+
+@parse_bilibili_json.handle()
+async def _(event: GroupMessageEvent):
+    vd_info = None
+    url = None
+    if get_message_json(event.json()):
+        try:
+            data = json.loads(get_message_json(event.json())[0]["data"])
+        except (IndexError, KeyError):
+            data = None
+        if data:
+            # 转发视频
+            if data.get("desc") == "哔哩哔哩":
+                async with aiohttp.ClientSession(
+                    headers=get_user_agent()
+                ) as session:
+                    async with session.get(
+                            data["meta"]["detail_1"]["qqdocurl"],
+                            proxy=get_local_proxy(),
+                            timeout=7,
+                    ) as response:
+                        url = str(response.url).split("?")[0]
+                        bvid = url.split("/")[-1]
+                        vd_info = await video.get_video_base_info(bvid)
+                # response = await AsyncHttpx.get(
+                #     data["meta"]["detail_1"]["qqdocurl"], timeout=7
+                # )
+                # url = str(response.url).split("?")[0]
+                # bvid = url.split("/")[-1]
+                # vd_info = await video.Video(bvid=bvid).get_info()
+            # 转发专栏
+            if (
+                data.get("meta")
+                and data["meta"].get("news")
+                and data["meta"]["news"].get("desc") == "哔哩哔哩专栏"
+            ):
+                url = data["meta"]["news"]["jumpUrl"]
+                page = None
+                try:
+                    browser = await get_browser()
+                    if not browser:
+                        return
+                    page = await browser.new_page(
+                        user_agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36"
+                        " (KHTML, like Gecko) Chrome/93.0.4530.0 Safari/537.36"
+                    )
+                    await page.goto(url, wait_until="networkidle", timeout=10000)
+                    await page.set_viewport_size({"width": 2560, "height": 1080})
+                    await page.click("#app > div")
+                    div = await page.query_selector("#app > div")
+                    await div.screenshot(
+                        path=f"{IMAGE_PATH}/temp/cv_{event.user_id}.png",
+                        timeout=100000,
+                    )
+                    await asyncio.get_event_loop().run_in_executor(
+                        None, resize, f"{IMAGE_PATH}/temp/cv_{event.user_id}.png"
+                    )
+                    await parse_bilibili_json.send(
+                        "[[_task|bilibili_parse]]" + image(f"cv_{event.user_id}.png", "temp")
+                    )
+                    await page.close()
+                    logger.info(
+                        f"USER {event.user_id} GROUP {event.group_id} 解析bilibili转发 {url}"
+                    )
+                except Exception as e:
+                    logger.error(f"尝试解析bilibili专栏 {url} 失败 {type(e)}：{e}")
+                    if page:
+                        await page.close()
+                return
+    # BV
+    if msg := get_message_text(event.json()):
+        if "BV" in msg:
+            index = msg.find("BV")
+            if len(msg[index + 2 :]) >= 10:
+                msg = msg[index : index + 12]
+                url = f"https://www.bilibili.com/video/{msg}"
+                vd_info = await video.get_video_base_info(msg)
+        elif "av" in msg:
+            index = msg.find("av")
+            if len(msg[index + 2 :]) >= 9:
+                msg = msg[index + 2 : index + 11]
+                if is_number(msg):
+                    url = f"https://www.bilibili.com/video/{msg}"
+                    vd_info = await video.get_video_base_info(msg)
+        elif "https://b23.tv" in msg:
+            url = "https://" + msg[msg.find("b23.tv") : msg.find("b23.tv") + 13]
+            res = await AsyncHttpx.get(url, timeout=7)
+            url = str(res.url).split("?")[0]
+            bvid = url.split("/")[-1]
+            vd_info = await video.get_video_base_info(bvid)
+    if vd_info:
+        if (
+            url in _tmp.keys() and time.time() - _tmp[url] > 30
+        ) or url not in _tmp.keys():
+            _tmp[url] = time.time()
+            aid = vd_info["aid"]
+            title = vd_info["title"]
+            author = vd_info["owner"]["name"]
+            reply = vd_info["stat"]["reply"]  # 回复
+            favorite = vd_info["stat"]["favorite"]  # 收藏
+            coin = vd_info["stat"]["coin"]  # 投币
+            # like = vd_info['stat']['like']      # 点赞
+            # danmu = vd_info['stat']['danmaku']  # 弹幕
+            date = time.strftime("%Y-%m-%d", time.localtime(vd_info["ctime"]))
+            try:
+                await parse_bilibili_json.send(
+                    "[[_task|bilibili_parse]]" +
+                    image(vd_info["pic"]) + f"\nav{aid}\n标题：{title}\n"
+                    f"UP：{author}\n"
+                    f"上传日期：{date}\n"
+                    f"回复：{reply}，收藏：{favorite}，投币：{coin}\n"
+                    f"{url}"
+                )
+            except ActionFailed:
+                logger.warning(f"{event.group_id} 发送bilibili解析失败")
+            else:
+                logger.info(
+                    f"USER {event.user_id} GROUP {event.group_id} 解析bilibili转发 {url}"
+                )
+
+
+def resize(path: str):
+    A = BuildImage(0, 0, background=path, ratio=0.5)
+    A.save(path)
@@ -4,7 +4,7 @@ from asyncio.locks import Semaphore
 from asyncio.exceptions import TimeoutError
 from ._model.pixiv import Pixiv
 from typing import List, Optional
-from utils.utils import change_pixiv_image_links
+from utils.utils import change_pixiv_image_links, change_img_md5
 from utils.image_utils import BuildImage
 from utils.http_utils import AsyncHttpx
 from services.log import logger
@@ -238,6 +238,7 @@ async def get_image(img_url: str, user_id: int) -> Optional[str]:
                TEMP_PATH / f"pix_{user_id}_{img_url.split('/')[-1][:-4]}.jpg", "wb"
            ) as f:
                await f.write(response.content)
+            change_img_md5(TEMP_PATH / f"pix_{user_id}_{img_url.split('/')[-1][:-4]}.jpg")
            return TEMP_PATH / f"pix_{user_id}_{img_url.split('/')[-1][:-4]}.jpg"
        except TimeoutError:
            logger.warning(f"PIX：{img_url} 图片下载超时...")
@@ -20,6 +20,11 @@ usage：
        pix ?*[tags]: 通过 tag 获取相似图片，不含tag时随机抽取
        pid [uid]: 通过uid获取图片
        pix pid[pid]: 查看图库中指定pid图片
+        示例：pix 萝莉 白丝
+        示例：pix 萝莉 白丝 10  （10为数量）
+        示例：pix #02      （当tag只有1个tag且为数字时，使用#标记，否则将被判定为数量）
+        示例：pix 34582394     （查询指定uid图片）
+        示例：pix pid:12323423     （查询指定pid图片）
 """.strip()
 __plugin_superuser_usage__ = """
 usage：
@@ -88,9 +93,12 @@ async def _(bot: Bot, event: MessageEvent, arg: Message = CommandArg()):
            nsfw_tag == 2 and not Config.get_config("pix", "ALLOW_GROUP_R18")
        ):
            await pix.finish("你不能看这些噢，这些都是是留给管理员看的...")
-    if n := len(x) == 1 and is_number(x[0]) and int(x[0]) < 100:
-        num = int(x[0])
-        keyword = ""
+    if (n := len(x)) == 1:
+        if is_number(x[0]) and int(x[0]) < 100:
+            num = int(x[0])
+            keyword = ""
+        elif x[0].startswith("#"):
+            keyword = x[0][1:]
    elif n > 1:
        if is_number(x[-1]):
            num = int(x[-1])
@@ -124,6 +132,7 @@ async def _(bot: Bot, event: MessageEvent, arg: Message = CommandArg()):
            all_image = await OmegaPixivIllusts.query_images(
                pid=int(pid), nsfw_tag=nsfw_tag
            )
+        num = len(all_image)
    else:
        tmp = await Pixiv.query_images(
            x, r18=1 if nsfw_tag == 2 else 0, num=pix_num
@@ -1,11 +1,10 @@
-from nonebot.adapters.onebot.v11 import Bot, MessageEvent, GroupMessageEvent, Message
+from nonebot.adapters.onebot.v11 import Bot, MessageEvent, GroupMessageEvent, Message, NetworkError
 from nonebot.matcher import Matcher
 from nonebot.params import CommandArg
 from nonebot import on_command
 from utils.utils import is_number
 from .data_source import get_pixiv_urls, download_pixiv_imgs, search_pixiv_urls
 from services.log import logger
-from nonebot.adapters.onebot.v11.exception import NetworkError
 from asyncio.exceptions import TimeoutError
 from utils.message_builder import custom_forward_msg
 from configs.config import Config
@@ -71,6 +70,11 @@ __plugin_configs__ = {
        "value": 20,
        "help": "作品最大页数限制，超过的作品会被略过",
        "default_value": 20
+    },
+    "ALLOW_GROUP_R18": {
+        "value": False,
+        "help": "允许群聊中使用 r18 参数",
+        "default_value": False
    }
 }
 Config.add_plugin_config(
@@ -154,7 +158,7 @@ async def _(bot: Bot, event: MessageEvent, arg: Message = CommandArg()):
 async def _(bot: Bot, event: MessageEvent, arg: Message = CommandArg()):
    msg = arg.extract_plain_text().strip()
    if isinstance(event, GroupMessageEvent):
-        if "r18" in msg.lower():
+        if "r18" in msg.lower() and not Config.get_config("pixiv_rank_search", "ALLOW_GROUP_R18"):
            await pixiv_keyword.finish("(脸红#) 你不会害羞的 八嘎！", at_sender=True)
    r18 = 0 if "r18" in msg else 1
    msg = msg.replace("r18", "").strip().split()
@@ -1,5 +1,6 @@
 from configs.path_config import IMAGE_PATH
 from utils.message_builder import image
+from utils.utils import change_img_md5
 from asyncio.exceptions import TimeoutError
 from configs.config import Config
 from utils.http_utils import AsyncHttpx
@@ -143,6 +144,7 @@ async def download_pixiv_imgs(
                        file,
                        timeout=Config.get_config("pixiv_rank_search", "TIMEOUT"),
                    ):
+                        change_img_md5(file)
                        if forward_msg_index is not None:
                            result += image(
                                f"{user_id}_{forward_msg_index}_{index}_pixiv.jpg",
@@ -62,12 +62,12 @@ async def _poke_event(event: PokeNotifyEvent):
                rst = "气死我了！"
            await poke_.finish(rst + random.choice(poke__reply), at_sender=True)
        rand = random.random()
-        if rand <= 0.3:
-            path = random.choice(["luoli", "meitu"])
-            index = random.randint(0, len(os.listdir(IMAGE_PATH / "image_management" / path)))
+        path = random.choice(["luoli", "meitu"])
+        if rand <= 0.3 and len(os.listdir(IMAGE_PATH / "image_management" / path)) > 0:
+            index = random.randint(0, len(os.listdir(IMAGE_PATH / "image_management" / path)) - 1)
            result = f"id：{index}" + image(f"{index}.jpg", "image_management/" + path)
            await poke_.send(result)
-            logger.info(f"USER {event.user_id} 戳了戳我 回复: {result} \n {result}")
+            logger.info(f"USER {event.user_id} 戳了戳我 回复: {result}  {result}")
        elif 0.3 < rand < 0.6:
            voice = random.choice(os.listdir(RECORD_PATH / "dinggong"))
            result = record(voice, "dinggong")
@@ -1,3 +1,4 @@
+from services import logger
 from utils.http_utils import AsyncHttpx
 from configs.config import Config
 from configs.path_config import TEMP_PATH
@@ -39,12 +40,18 @@ async def get_saucenao_image(url: str) -> Union[str, List[str]]:
    ):
        msg_list.append(image(TEMP_PATH / f"saucenao_search_{index}.jpg"))
    for info in data:
-        similarity = info["header"]["similarity"]
-        tmp = f"相似度：{similarity}%\n"
-        for x in info["data"].keys():
-            if x != "ext_urls":
-                tmp += f"{x}：{info['data'][x]}\n"
-        if "source" not in info["data"].keys():
-            tmp += f'source：{info["data"]["ext_urls"][0]}\n'
-        msg_list.append(tmp[:-1])
+        try:
+            similarity = info["header"]["similarity"]
+            tmp = f"相似度：{similarity}%\n"
+            for x in info["data"].keys():
+                if x != "ext_urls":
+                    tmp += f"{x}：{info['data'][x]}\n"
+            try:
+                if "source" not in info["data"].keys():
+                    tmp += f'source：{info["data"]["ext_urls"][0]}\n'
+            except KeyError:
+                tmp += f'source：{info["header"]["thumbnail"]}\n'
+            msg_list.append(tmp[:-1])
+        except Exception as e:
+            logger.warning(f"识图获取图片信息发生错误 {type(e)}：{e}")
    return msg_list
@@ -6,13 +6,15 @@ from nonebot.message import run_postprocessor
 from nonebot.matcher import Matcher
 from typing import Optional, Type, Any
 from gino.exceptions import UninitializedError
+
+from utils.message_builder import custom_forward_msg
 from utils.utils import (
    is_number,
-    get_message_img,
 )
 from nonebot.typing import T_State
 from nonebot.adapters.onebot.v11 import (
    Bot,
+    ActionFailed,
    MessageEvent,
    GroupMessageEvent,
    PrivateMessageEvent,
@@ -30,7 +32,6 @@ from .data_source import (
    add_data_to_database,
    get_setu_count,
 )
-from nonebot.adapters.onebot.v11.exception import ActionFailed
 from configs.config import Config, NICKNAME
 from utils.manager import withdraw_message_manager
 from nonebot.params import CommandArg, Command, RegexGroup
@@ -98,6 +99,11 @@ __plugin_configs__ = {
    "TIMEOUT": {"value": 10, "help": "色图下载超时限制(秒)", "default_value": 10},
    "SHOW_INFO": {"value": True, "help": "是否显示色图的基本信息，如PID等", "default_value": True},
    "ALLOW_GROUP_R18": {"value": False, "help": "在群聊中启用R18权限", "default_value": False},
+    "MAX_ONCE_NUM2FORWARD": {
+        "value": None,
+        "help": "单次发送的图片数量达到指定值时转发为合并消息",
+        "default_value": None,
+    },
 }
 Config.add_plugin_config("pixiv", "PIXIV_NGINX_URL", "i.pixiv.re", help_="Pixiv反向代理")

@@ -133,7 +139,10 @@ setu_reg = on_regex("(.*)[份|发|张|个|次|点](.*)[瑟|色|涩]图$", priori

@setu.handle()
 async def _(
-    event: MessageEvent, cmd: Tuple[str, ...] = Command(), arg: Message = CommandArg()
+    bot: Bot,
+    event: MessageEvent,
+    cmd: Tuple[str, ...] = Command(),
+    arg: Message = CommandArg(),
 ):
    msg = arg.extract_plain_text().strip()
    if isinstance(event, GroupMessageEvent):
@@ -149,10 +158,7 @@ async def _(
    if cmd[0] == "色图r" and isinstance(event, PrivateMessageEvent):
        r18 = 1
        num = 10
-    elif (
-        cmd[0] == "色图r"
-        and isinstance(event, GroupMessageEvent)
-    ):
+    elif cmd[0] == "色图r" and isinstance(event, GroupMessageEvent):
        if not Config.get_config("send_setu", "ALLOW_GROUP_R18"):
            await setu.finish(
                random.choice(["这种不好意思的东西怎么可能给这么多人看啦", "羞羞脸！给我滚出克私聊！", "变态变态变态变态大变态！"])
@@ -178,7 +184,7 @@ async def _(
                Config.get_config("send_setu", "WITHDRAW_SETU_MESSAGE"),
            )
        return
-    await send_setu_handle(setu, event, cmd[0], msg, num, r18)
+    await send_setu_handle(bot, setu, event, cmd[0], msg, num, r18)


 num_key = {
@@ -197,7 +203,7 @@ num_key = {


@setu_reg.handle()
-async def _(event: MessageEvent, reg_group: Tuple[Any, ...] = RegexGroup()):
+async def _(bot: Bot, event: MessageEvent, reg_group: Tuple[Any, ...] = RegexGroup()):
    if isinstance(event, GroupMessageEvent):
        impression = (
            await SignGroupUser.ensure(event.user_id, event.group_id)
@@ -214,10 +220,11 @@ async def _(event: MessageEvent, reg_group: Tuple[Any, ...] = RegexGroup()):
        num = int(num)
    except ValueError:
        num = 1
-    await send_setu_handle(setu_reg, event, "色图", tags, num, 0)
+    await send_setu_handle(bot, setu_reg, event, "色图", tags, num, 0)


 async def send_setu_handle(
+    bot: Bot,
    matcher: Type[Matcher],
    event: MessageEvent,
    command: str,
@@ -300,27 +307,48 @@ async def send_setu_handle(
        if code != 200:
            await matcher.finish(setu_list[0], at_sender=True)
    # 开始发图
+    forward_list = []
    for _ in range(num):
        if not setu_list:
            await setu.finish("坏了，已经没图了，被榨干了！")
        setu_image = random.choice(setu_list)
        setu_list.remove(setu_image)
-        try:
-            msg_id = await matcher.send(
+        if (
+            Config.get_config("send_setu", "MAX_ONCE_NUM2FORWARD")
+            and num >= Config.get_config("send_setu", "MAX_ONCE_NUM2FORWARD")
+            and isinstance(event, GroupMessageEvent)
+        ):
+            forward_list.append(
                Message(
                    gen_message(setu_image)
                    + (await check_local_exists_or_download(setu_image))[0]
                )
            )
-            withdraw_message_manager.withdraw_message(
-                event,
-                msg_id["message_id"],
-                Config.get_config("send_setu", "WITHDRAW_SETU_MESSAGE"),
-            )
-            logger.info(
-                f"(USER {event.user_id}, GROUP "
-                f"{event.group_id if isinstance(event, GroupMessageEvent) else 'private'})"
-                f" 发送本地色图 {setu_image.local_id}.png"
-            )
-        except ActionFailed:
-            await matcher.finish("坏了，这张图色过头了，我自己看看就行了！", at_sender=True)
+        else:
+            try:
+                msg_id = await matcher.send(
+                    Message(
+                        gen_message(setu_image)
+                        + (await check_local_exists_or_download(setu_image))[0]
+                    )
+                )
+                withdraw_message_manager.withdraw_message(
+                    event,
+                    msg_id["message_id"],
+                    Config.get_config("send_setu", "WITHDRAW_SETU_MESSAGE"),
+                )
+                logger.info(
+                    f"(USER {event.user_id}, GROUP "
+                    f"{event.group_id if isinstance(event, GroupMessageEvent) else 'private'})"
+                    f" 发送本地色图 {setu_image.local_id}.png"
+                )
+            except ActionFailed:
+                await matcher.finish("坏了，这张图色过头了，我自己看看就行了！", at_sender=True)
+    if forward_list:
+        msg_id = await bot.send_group_forward_msg(
+            group_id=event.group_id,
+            messages=custom_forward_msg(forward_list, bot.self_id),
+        )
+        withdraw_message_manager.withdraw_message(
+            event, msg_id, Config.get_config("send_setu", "WITHDRAW_SETU_MESSAGE")
+        )
@@ -2,6 +2,7 @@ from configs.path_config import IMAGE_PATH, TEMP_PATH
 from utils.message_builder import image
 from services.log import logger
 from utils.image_utils import get_img_hash, compressed_image
+from utils.utils import change_img_md5
 from asyncpg.exceptions import UniqueViolationError
 from asyncio.exceptions import TimeoutError
 from typing import List, Optional
@@ -31,7 +32,7 @@ async def get_setu_urls(
    params = {
        "r18": r18,  # 添加r18参数 0为否，1为是，2为混合
        "tag": tags,  # 若指定tag
-        "num": 100,  # 一次返回的结果数量
+        "num": 20,  # 一次返回的结果数量
        "size": ["original"],
    }
    for count in range(3):
@@ -111,6 +112,7 @@ async def search_online_setu(
                        path_ / f"{index}.jpg",
                    )
            logger.info(f"下载 lolicon 图片 {url_} 成功， id：{index}")
+            change_img_md5(path_ / file_name)
            return image(path_ / file_name), index
        except TimeoutError:
            pass
@@ -128,6 +130,7 @@ async def check_local_exists_or_download(setu_image: Setu) -> "MessageSegment, i
        path_ = r18_path if setu_image.is_r18 else path
        file = IMAGE_PATH / path_ / f"{setu_image.local_id}.jpg"
        if file.exists():
+            change_img_md5(file)
            return image(f"{setu_image.local_id}.jpg", path_), 200
    return await search_online_setu(setu_image.img_url, id_, path_)

@@ -24,6 +24,8 @@ from io import BytesIO
 import asyncio
 import random
 import nonebot
+import time
+import locale
 import os


@@ -260,15 +262,12 @@ def _generate_card(
        today_data.text((0, 25), f"金币 + {gold}")
        _type = "sign"
    current_date = datetime.now()
-    week = current_date.isoweekday()
+    current_datetime_str = current_date.strftime("%Y-%m-%d %a %H:%M:%S")
    data = current_date.date()
-    hour = current_date.hour
-    minute = current_date.minute
-    second = current_date.second
    data_img = BuildImage(
        0,
        0,
-        plain_text=f"时间：{data} {weekdays[week]} {hour}:{minute}:{second}",
+        plain_text=f"时间：{current_datetime_str}",
        color=(255, 255, 255, 0),
        font_size=20,
    )
@@ -16,7 +16,7 @@ async def translate_msg(language_type, msg):
    }
    data = (await AsyncHttpx.post(url, data=data)).json()
    if data["errorCode"] == 0:
-        return f'原文：{msg}\n翻译{data["translateResult"][0][0]["tgt"]}'
+        return f'原文：{msg}\n翻译：{data["translateResult"][0][0]["tgt"]}'
    return "翻译惜败.."


@@ -232,7 +232,7 @@ async def _(
            result += image(b64=pic2b64(img))
    if method in ["模糊效果", "6"]:
        for i in range(index):
-            img = Image.open(TEMP_PATH / f"temp/{event.user_id}_{i}_update.png").filter(
+            img = Image.open(TEMP_PATH / f"{event.user_id}_{i}_update.png").filter(
                ImageFilter.BLUR
            )
            result += image(b64=pic2b64(img))
@@ -1,70 +1,78 @@
-from nonebot import on_command
-from nonebot.adapters.onebot.v11 import MessageEvent, GroupMessageEvent, Message
-from nonebot.params import CommandArg
-from services.log import logger
-from ._data_source import get_data, gen_wbtop_pic
-from utils.utils import is_number
-from configs.path_config import IMAGE_PATH
-from utils.http_utils import AsyncPlaywright
-import asyncio
-
-__zx_plugin_name__ = "微博热搜"
-__plugin_usage__ = """
-usage：
-    在QQ上吃个瓜
-    指令：
-        微博热搜：发送实时热搜
-        微博热搜 [id]：截图该热搜页面
-        示例：微博热搜 5
-""".strip()
-__plugin_des__ = "刚买完瓜，在吃瓜现场"
-__plugin_cmd__ = ["微博热搜", "微博热搜 [id]"]
-__plugin_version__ = 0.1
-__plugin_author__ = "HibiKier"
-__plugin_settings__ = {
-    "level": 5,
-    "default_status": True,
-    "limit_superuser": False,
-    "cmd": ["微博热搜"],
-}
-
-wbtop = on_command("wbtop", aliases={"微博热搜"}, priority=5, block=True)
-
-
-wbtop_url = "https://v2.alapi.cn/api/new/wbtop"
-
-wbtop_data = []
-
-
-@wbtop.handle()
-async def _(event: MessageEvent, arg: Message = CommandArg()):
-    global wbtop_data
-    msg = arg.extract_plain_text().strip()
-    if not wbtop_data or not msg:
-        data, code = await get_data(wbtop_url)
-        if code != 200:
-            await wbtop.finish(data, at_sender=True)
-        wbtop_data = data["data"]
-        if not msg:
-            img = await asyncio.get_event_loop().run_in_executor(
-                None, gen_wbtop_pic, wbtop_data
-            )
-            await wbtop.send(img)
-            logger.info(
-                f"(USER {event.user_id}, GROUP {event.group_id if isinstance(event, GroupMessageEvent) else 'private'})"
-                f" 查询微博热搜"
-            )
-    if is_number(msg) and 0 < int(msg) <= 50:
-        url = wbtop_data[int(msg) - 1]["url"]
-        await wbtop.send("开始截取数据...")
-        img = await AsyncPlaywright.screenshot(
-            url,
-            f"{IMAGE_PATH}/temp/wbtop_{event.user_id}.png",
-            "#pl_feed_main",
-            wait_time=12
-        )
-        if img:
-            await wbtop.send(img)
-        else:
-            await wbtop.send("发生了一些错误.....")
-
+from nonebot import on_command
+from nonebot.adapters.onebot.v11 import MessageEvent, GroupMessageEvent, Message
+from nonebot.params import CommandArg
+from services.log import logger
+from .data_source import gen_wbtop_pic,get_wbtop
+from utils.utils import is_number
+from configs.path_config import IMAGE_PATH
+from utils.http_utils import AsyncPlaywright
+import asyncio
+import datetime
+__zx_plugin_name__ = "微博热搜"
+__plugin_usage__ = """
+usage：
+    在QQ上吃个瓜
+    指令：
+        微博热搜：发送实时热搜
+        微博热搜 [id]：截图该热搜页面
+        示例：微博热搜 5
+""".strip()
+__plugin_des__ = "刚买完瓜，在吃瓜现场"
+__plugin_cmd__ = ["微博热搜", "微博热搜 [id]"]
+__plugin_version__ = 0.2
+__plugin_author__ = "HibiKier & yajiwa"
+__plugin_settings__ = {
+    "level": 5,
+    "default_status": True,
+    "limit_superuser": False,
+    "cmd": ["微博热搜"],
+}
+
+wbtop = on_command("wbtop", aliases={"微博热搜"}, priority=5, block=True)
+
+
+wbtop_url = "https://weibo.com/ajax/side/hotSearch"
+
+wbtop_data = []
+
+
+@wbtop.handle()
+async def _(event: MessageEvent, arg: Message = CommandArg()):
+    global wbtop_data
+    msg = arg.extract_plain_text().strip()
+    if not wbtop_data or not msg:
+        if wbtop_data:
+            now_time = datetime.datetime.now()
+            if now_time > wbtop_data["time"] + datetime.timedelta(minutes=5):
+                data, code = await get_wbtop(wbtop_url)
+                if code != 200:
+                    await wbtop.finish(data, at_sender=True)
+                wbtop_data = data
+        else:
+            data, code = await get_wbtop(wbtop_url)
+            if code != 200:
+                await wbtop.finish(data, at_sender=True)
+            wbtop_data = data
+        if not msg:
+            img = await asyncio.get_event_loop().run_in_executor(
+                None, gen_wbtop_pic, wbtop_data["data"]
+            )
+            await wbtop.send(img)
+            logger.info(
+                f"(USER {event.user_id}, GROUP {event.group_id if isinstance(event, GroupMessageEvent) else 'private'})"
+                f" 查询微博热搜"
+            )
+    if is_number(msg) and 0 < int(msg) <= 50:
+        url = wbtop_data["data"][int(msg) - 1]["url"]
+        await wbtop.send("开始截取数据...")
+        img = await AsyncPlaywright.screenshot(
+            url,
+            f"{IMAGE_PATH}/temp/wbtop_{event.user_id}.png",
+            "#pl_feed_main",
+            wait_time=12
+        )
+        if img:
+            await wbtop.send(img)
+        else:
+            await wbtop.send("发生了一些错误.....")
+
@@ -0,0 +1,62 @@
+from nonebot.adapters.onebot.v11 import MessageSegment
+from utils.image_utils import BuildImage
+from utils.message_builder import image
+from configs.path_config import IMAGE_PATH
+from typing import Tuple, Union
+from utils.http_utils import AsyncHttpx
+import datetime
+
+
+async def get_wbtop(url: str) -> Tuple[Union[dict, str], int]:
+    """
+    :param url: 请求链接
+    """
+    n = 0
+    while True:
+        try:
+            data = []
+            get_response = (await AsyncHttpx.get(url, timeout=20))
+            if get_response.status_code == 200:
+                data_json = get_response.json()['data']['realtime']
+                for data_item in data_json:
+                    # 如果是广告，则不添加
+                    if 'is_ad' in data_item:
+                        continue
+                    dic = {
+                        'hot_word': data_item['note'],
+                        'hot_word_num': str(data_item['num']),
+                        'url': 'https://s.weibo.com/weibo?q=%23' + data_item['word'] + '%23',
+                    }
+                    data.append(dic)
+                if not data:
+                    return "没有搜索到...", 997
+                return {'data': data, 'time': datetime.datetime.now()}, 200
+            else:
+                if n > 2:
+                    return f'获取失败,请十分钟后再试', 999
+                else:
+                    n += 1
+                    continue
+        except TimeoutError:
+            return "超时了....", 998
+
+
+def gen_wbtop_pic(data: dict) -> MessageSegment:
+    """
+    生成微博热搜图片
+    :param data: 微博热搜数据
+    """
+    bk = BuildImage(700, 32 * 50 + 280, 700, 32, color="#797979")
+    wbtop_bk = BuildImage(700, 280, background=f"{IMAGE_PATH}/other/webtop.png")
+    bk.paste(wbtop_bk)
+    text_bk = BuildImage(700, 32 * 50, 700, 32, color="#797979")
+    for i, data in enumerate(data):
+        title = f"{i + 1}. {data['hot_word']}"
+        hot = str(data["hot_word_num"])
+        img = BuildImage(700, 30, font_size=20)
+        w, h = img.getsize(title)
+        img.text((10, int((30 - h) / 2)), title)
+        img.text((580, int((30 - h) / 2)), hot)
+        text_bk.paste(img)
+    bk.paste(text_bk, (0, 280))
+    return image(b64=bk.pic2bs4())
@@ -1,20 +1,36 @@
 from configs.config import Config as gConfig
 from .api import *
 from .auth import *
-
-
-gConfig.add_plugin_config(
-    "web-ui",
-    "username",
-    "admin",
-    name="web-ui",
-    help_="前端管理用户名"
+from nonebot.matcher import Matcher
+from nonebot.message import run_preprocessor, IgnoredException
+from utils.manager import plugins2settings_manager
+from nonebot.typing import T_State
+from nonebot.adapters.onebot.v11 import (
+    Bot,
+    MessageEvent
 )

-gConfig.add_plugin_config(
-    "web-ui",
-    "password",
-    None,
-    name="web-ui",
-    help_="前端管理密码"
-)
+
+gConfig.add_plugin_config("web-ui", "username", "admin", name="web-ui", help_="前端管理用户名")
+
+gConfig.add_plugin_config("web-ui", "password", None, name="web-ui", help_="前端管理密码")
+
+
+# 使用webui访问api后plugins2settings中的cmd字段将从list变为str
+# 暂时找不到原因
+# 先使用hook修复
+@run_preprocessor
+async def _(matcher: Matcher, bot: Bot, event: MessageEvent, state: T_State):
+    flag = False
+    for module in plugins2settings_manager.keys():
+        if isinstance(plugins2settings_manager.get_plugin_data(module).get("cmd"), str):
+            plugins2settings_manager.set_module_data(
+                module,
+                "cmd",
+                plugins2settings_manager.get_plugin_data(module).get("cmd").split(","),
+                False
+            )
+            flag = True
+        if flag:
+            plugins2settings_manager.save()
+
@@ -58,4 +58,4 @@ async def _(group: GroupResult, user: User = Depends(token_to_user)) -> Result:
        group_manager.turn_on_group_bot_status(group_id)
    else:
        group_manager.shutdown_group_bot_status(group_id)
-    return Result(code=200)
+    return Result(code=200, data="修改成功！")
@@ -1,3 +1,5 @@
+from pydantic import ValidationError
+
 from configs.config import Config
 from services.log import logger
 from utils.manager import (plugins2block_manager, plugins2cd_manager,
@@ -85,6 +87,10 @@ def _(type_: Optional[str], user: User = Depends(token_to_user)) -> Result:
                        id_ += 1
                    data["plugin_config"] = tmp
                plugin_list.append(Plugin(**data))
+            except (AttributeError, ValidationError) as e:
+                logger.error(
+                    f"WEB_UI GET /webui/plugins model：{model} 发生错误 {type(e)}：{e}"
+                )
            except Exception as e:
                logger.error(
                    f"WEB_UI GET /webui/plugins model：{model} 发生错误 {type(e)}：{e}"
@@ -108,7 +114,7 @@ def _(plugin: Plugin, user: User = Depends(token_to_user)) -> Result:
                if str(c.value).lower() in ["true", "false"] and (
                    c.default_value is None or isinstance(c.default_value, bool)
                ):
-                    c.value = True if str(c.value).lower() == "true" else False
+                    c.value = str(c.value).lower() == "true"
                elif isinstance(
                    Config.get_config(plugin.model, c.key, c.value), int
                ) or isinstance(c.default_value, int):
@@ -121,12 +127,24 @@ def _(plugin: Plugin, user: User = Depends(token_to_user)) -> Result:
                    isinstance(Config.get_config(plugin.model, c.key, c.value), list)
                    or isinstance(c.default_value, list)
                ):
+                    default_value = Config.get_config(plugin.model, c.key, c.value)
                    c.value = c.value.split(",")
+                    if default_value and isinstance(default_value[0], int):
+                        c.value = [int(x) for x in c.value]
+                    elif default_value and isinstance(default_value[0], float):
+                        c.value = [float(x) for x in c.value]
+                    elif default_value and isinstance(default_value[0], bool):
+                        temp = []
+                        for x in c.value:
+                            temp.append(x.lower() == "true")
+                        c.value = temp
                Config.set_config(plugin.model, c.key, c.value)
            Config.save(None, True)
        else:
            if plugin.plugin_settings:
                for key, value in plugin.plugin_settings:
+                    if key == "cmd":
+                        value = value.split(",")
                    plugins2settings_manager.set_module_data(plugin.model, key, value)
            if plugin.plugin_manager:
                for key, value in plugin.plugin_manager:
@@ -139,4 +157,4 @@ def _(plugin: Plugin, user: User = Depends(token_to_user)) -> Result:
            code=500,
            data=f"WEB_UI POST /webui/plugins model：{plugin.model} 发生错误 {type(e)}：{e}",
        )
-    return Result(code=200)
+    return Result(code=200, data="修改成功！")
@@ -34,7 +34,7 @@ async def _(parma: RequestParma, user: User = Depends(token_to_user)) -> Result:
    操作请求
    :param parma: 参数
    """
-    result = "ok"
+    result = "操作成功！"
    flag = 3
    if bot := get_bot():
        if parma.handle == "approve":
@@ -29,7 +29,7 @@ disk_data = {"data": []}


@app.get("/webui/system")
-async def _(user: User = Depends(token_to_user)) -> Result:
+async def _() -> Result:
    return await get_system_data()


@@ -74,7 +74,7 @@ async def _(user: User = Depends(token_to_user)) -> Result:
    )


-async def get_system_data():
+async def get_system_data(user: User = Depends(token_to_user)):
    """
    说明：
        获取系统信息，资源文件大小，网络状态等
@@ -92,7 +92,7 @@ async def get_system_data():
        logger.warning(f"访问Google失败... {type(e)}: {e}")
        google = 404
    network = SystemNetwork(baidu=baidu, google=google)
-    disk = await asyncio.get_event_loop().run_in_executor(None, _get_system_disk)
+    disk = await asyncio.get_event_loop().run_in_executor(None, _get_system_disk, None)
    status = await asyncio.get_event_loop().run_in_executor(None, _get_system_status)
    return Result(
        code=200,
@@ -105,7 +105,7 @@ async def get_system_data():
    )


-def _get_system_status() -> SystemStatus:
+def _get_system_status(user: User = Depends(token_to_user)) -> SystemStatus:
    """
    说明：
        获取系统信息等
@@ -123,7 +123,7 @@ def _get_system_status() -> SystemStatus:


 def _get_system_disk(
-    type_: Optional[str],
+    type_: Optional[str], user: User = Depends(token_to_user)
 ) -> Union[SystemFolderSize, Dict[str, Union[float, datetime]]]:
    """
    说明：
@@ -1,4 +1,6 @@
+import json
 from datetime import datetime, timedelta
+from configs.path_config import DATA_PATH
 from typing import Optional
 from starlette import status
 from fastapi import Depends, HTTPException
@@ -8,6 +10,8 @@ from configs.config import Config
 from jose import JWTError, jwt
 import nonebot

+from ..config import Result
+
 app = nonebot.get_app()


@@ -18,6 +22,13 @@ ACCESS_TOKEN_EXPIRE_MINUTES = 30
 oauth2_scheme = OAuth2PasswordBearer(tokenUrl="webui/login")


+token_file = DATA_PATH / "web_ui" / "token.json"
+token_file.parent.mkdir(parents=True, exist_ok=True)
+token_data = {"token": []}
+if token_file.exists():
+    token_data = json.load(open(token_file, 'r', encoding='utf8'))
+
+
 class User(BaseModel):
    username: str
    password: str
@@ -62,6 +73,11 @@ async def login_get_token(form_data: OAuth2PasswordRequestForm = Depends()):
    if not user or user.password != form_data.password:
        raise form_exception
    access_token = create_token(user=user, expires_delta=timedelta(minutes=ACCESS_TOKEN_EXPIRE_MINUTES))
+    token_data["token"].append(access_token)
+    if len(token_data["token"]) > 3:
+        token_data["token"] = token_data["token"][1:]
+    with open(token_file, 'w', encoding="utf8") as f:
+        json.dump(token_data, f, ensure_ascii=False, indent=4)
    return {"access_token": access_token, "token_type": "bearer"}


@@ -72,16 +88,18 @@ credentials_exception = HTTPException(
 )


+@app.post("/webui/auth")
 def token_to_user(token: str = Depends(oauth2_scheme)):
-    try:
-        payload = jwt.decode(token, SECRET_KEY, algorithms=[ALGORITHM])
-        username, expire = payload.get("sub"), payload.get("exp")
-        user = get_user(username)
-        if user is None:
-            raise JWTError
-    except JWTError:
-        raise credentials_exception
-    return user
+    if token not in token_data["token"]:
+        try:
+            payload = jwt.decode(token, SECRET_KEY, algorithms=[ALGORITHM])
+            username, expire = payload.get("sub"), payload.get("exp")
+            user = get_user(username)
+            if user is None:
+                raise JWTError
+        except JWTError:
+            return Result(code=401)
+    return Result(code=200, data="ok")


 if __name__ == '__main__':
@@ -7,7 +7,7 @@ import nonebot

 app = nonebot.get_app()

-origins = ["http://localhost"]
+origins = ["*"]

 app.add_middleware(
    CORSMiddleware,
@@ -45,7 +45,7 @@ class CountLimit(BaseModel):
    """
    max_count: int
    status: bool
-    limit_type: bool
+    limit_type: str
    rst: Optional[str]


@@ -61,7 +61,7 @@ async def _(event: MessageEvent, arg: Message = CommandArg()):
    msg_sp = msg.split("<|>")
    w, h = w2b.size
    add_h, font_size = init_h_font_size(h)
-    bg = BuildImage(w, h + add_h, color="black", font_size=font_size)
+    bg = BuildImage(w, h + add_h, color="black", font_size=int(font_size))
    bg.paste(w2b)
    chinese_msg = formalization_msg(msg)
    if not bg.check_font_size(chinese_msg):
@@ -1,20 +1,18 @@
 import re
-
-from nonebot.adapters.onebot.v11 import Bot, GroupMessageEvent, Event
+from nonebot.adapters.onebot.v11 import GroupMessageEvent, Event
 from utils.utils import get_message_img_file
-from nonebot.typing import T_State
 from .model import WordBank


-async def check(bot: Bot, event: Event, state: T_State) -> bool:
+async def check(event: Event) -> bool:
    if isinstance(event, GroupMessageEvent):
        msg = event.raw_message
        list_img = get_message_img_file(event.json())
        if list_img:
            for img_file in list_img:
-                strinfo = re.compile(f"{img_file},subType=\d*]")
+                strinfo = re.compile(f"{img_file},.*?]")
                msg = strinfo.sub(f'{img_file}]', msg)
-        return bool(
-            await WordBank.check(event.group_id, msg, event.is_tome())
-        )
+        strinfo_face = re.compile(f",type=sticker]")
+        msg = strinfo_face.sub(f']', msg)
+        return bool(await WordBank.check(event.group_id, msg,))
    return False
@@ -1,9 +1,10 @@
-from utils.message_builder import image, at
+from utils.message_builder import image, at, face
+from typing import Tuple
 from ._rule import check
 from .model import WordBank
 from configs.path_config import DATA_PATH
 from nonebot.adapters.onebot.v11 import GroupMessageEvent
-from utils.utils import get_message_at, get_message_img
+from utils.utils import get_message_at, get_message_img, change_img_md5
 from nonebot import on_message
 from models.group_member_info import GroupInfoUser
 from utils.utils import get_message_img_file, is_number
@@ -23,16 +24,16 @@ async def _(event: GroupMessageEvent):
    list_img = get_message_img_file(event.json())
    if list_img:
        for img_file in list_img:
-            strinfo = re.compile(f"{img_file},subType=\d*]")
+            strinfo = re.compile(f"{img_file},.*?]")
            msg = strinfo.sub(f'{img_file}]', msg)
-    q = await WordBank.check(
-        event.group_id, msg, event.is_tome()
-    )
+    strinfo_face = re.compile(f",type=sticker]")
+    msg = strinfo_face.sub(f']', msg)
+    q = await WordBank.check(event.group_id, msg, )
    await message_handle.send(await get_one_answer(event, q.format, q.answer))


 # 处理单条回答
-async def get_one_answer(event, format, _answer, all=1):
+async def get_one_answer(event, format: str, _answer: str, all: bool = True) -> str:
    path = data_dir / f"{event.group_id}"
    placeholder_list = (
        [
@@ -50,12 +51,13 @@ async def get_one_answer(event, format, _answer, all=1):
    else:
        for idx, placeholder in placeholder_list:
            if placeholder.endswith("jpg"):
+                change_img_md5(path / placeholder)
                answer += _a[: _a.find(f"[__placeholder_{idx}]")] + image(
                    path / placeholder
                )
            else:
-                if all == 1:
-                    answer += _a[: _a.find(f"[__placeholder_{idx}]")] + at(placeholder)
+                if all:
+                    answer += _a[: _a.find(f"[__placeholder_{idx}]")] + at(int(placeholder))
                else:
                    q = await GroupInfoUser.get_member_info(
                        int(placeholder), event.group_id)
@@ -65,7 +67,7 @@ async def get_one_answer(event, format, _answer, all=1):


 # 处理单条问题
-async def get_one_problem(event, problem):
+async def get_one_problem(event, problem: str, ) -> Tuple[str, str]:
    strinfo = re.compile(f",subType=\d")
    problem = strinfo.sub('', problem)
    _problem = problem
@@ -93,7 +95,7 @@ async def get_one_problem(event, problem):


 # 显示单条数据库问题
-async def get_one_image_problem(event, problem):
+async def get_one_image_problem(event, problem: str) -> str:
    path = data_dir / f"{event.group_id}" / "problem"
    placeholder_list = []
    idx = 0
@@ -127,3 +129,19 @@ async def get_one_image_problem(event, problem):
            _p = _p[_p.find(f"[__placeholder_{idx}]") + len(f"[__placeholder_{idx}]"):]

    return problem + _p
+
+
+# 替换cq码
+async def replace_cq(group_id, msg: str, is_face: bool = True) -> str:
+    strinfo_img = re.compile(f"\[CQ:image.*?]")
+    msg = strinfo_img.sub('[图片]', msg)
+    at_list = re.findall(rf"\[CQ:at,qq=(.*?)]", msg)
+    if at_list:
+        for ats in at_list:
+            q = await GroupInfoUser.get_member_info(
+                int(ats), group_id)
+            msg = msg.replace(f'[CQ:at,qq={ats}]', "@" + q.user_name)
+    if is_face:
+        strinfo_face = re.compile(f"\[CQ:face,id=.*?]")
+        msg = strinfo_face.sub('[表情]', msg)
+    return msg
@@ -1,9 +1,7 @@
 from services.db_context import db
 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
 from configs.config import Config

@@ -125,58 +123,40 @@ class WordBank(db.Model):
        q.sort()
        _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, is_tome: bool = False) -> Optional["WordBank"]:
+    async def check(cls, group_id: int, problem: str) -> Optional["WordBank"]:
        """
        检测词条并随机返回
        :param group_id: 群号
        :param problem: 问题
-        :param is_tome：是否at真寻
        """
-        if is_tome:
+        if problem:
+            FUZZY = Config.get_config("word_bank", "WORD_BANK_FUZZY")
+            KEY = Config.get_config("word_bank", "WORD_BANK_KEY")
            q = await cls.query.where(
-                (cls.group_id == group_id)
+                (cls.group_id == group_id) & (cls.problem == problem)
            ).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
+            if KEY and FUZZY:
+                q_fuzzy = await cls.query.where(
+                    (cls.group_id == group_id) & (cls.search_type == 2) & (
+                        cls.problem.contains(f'{problem}'))).gino.all()
+                q_key = await cls.query.where((cls.group_id == group_id) & (cls.search_type == 1)).gino.all()
+                q_key = [x for x in q_key if str(x.problem) in (problem)]
+                q += q_fuzzy + q_key
+            elif FUZZY:
+                q_fuzzy = await cls.query.where(
+                    (cls.group_id == group_id) & (cls.search_type == 2) & (
+                        cls.problem.contains(f'{problem}'))).gino.all()
+                q += q_fuzzy
+            elif KEY:
+                q_key = await cls.query.where((cls.group_id == group_id) & (cls.search_type == 1)).gino.all()
+                q_key = [x for x in q_key if str(x.problem) in (problem)]
+                q += q_key
        else:
-            if problem:
-                FUZZY = Config.get_config("word_bank", "WORD_BANK_FUZZY")
-                KEY = Config.get_config("word_bank", "WORD_BANK_KEY")
-                q = await cls.query.where(
-                    (cls.group_id == group_id) & (cls.problem == problem)
-                ).gino.all()
-                if KEY and FUZZY:
-                    q_fuzzy = await cls.query.where(
-                        (cls.group_id == group_id) & (cls.search_type == 2) & (
-                            cls.problem.contains(f'{problem}'))).gino.all()
-                    q_key = await cls.query.where((cls.group_id == group_id) & (cls.search_type == 1)).gino.all()
-                    q_key = [x for x in q_key if str(x.problem) in (problem)]
-                    q += q_fuzzy + q_key
-                elif FUZZY:
-                    q_fuzzy = await cls.query.where(
-                        (cls.group_id == group_id) & (cls.search_type == 2) & (
-                            cls.problem.contains(f'{problem}'))).gino.all()
-                    q += q_fuzzy
-                elif KEY:
-                    q_key = await cls.query.where((cls.group_id == group_id) & (cls.search_type == 1)).gino.all()
-                    q_key = [x for x in q_key if str(x.problem) in (problem)]
-                    q += q_key
-            else:
-                return None
+            return None

        return random.choice(q) if q else None

@@ -6,14 +6,13 @@ from utils.http_utils import AsyncHttpx
 from ._data_source import WordBankBuilder
 from utils.message_builder import image
 from utils.image_utils import text2image
-from .message_handle import get_one_answer, get_one_problem, get_one_image_problem
+from .message_handle import get_one_answer, get_one_problem, get_one_image_problem, replace_cq
 from .model import WordBank
 from nonebot.adapters.onebot.v11 import (
    Bot,
    GroupMessageEvent,
    Message
 )
-from nonebot.typing import T_State
 from nonebot import on_command
 import random
 import os
@@ -69,7 +68,7 @@ show_word = on_command("显示词条", aliases={"查看词条"}, priority=5, blo


@add_word.handle()
-async def _(bot: Bot, event: GroupMessageEvent, state: T_State, arg: Message = CommandArg()):
+async def _(event: GroupMessageEvent, arg: Message = CommandArg()):
    msg = str(arg)
    r = re.search(r"问(.+)\s?答([\s\S]*)", msg)
    if not r:
@@ -81,12 +80,7 @@ async def _(bot: Bot, event: GroupMessageEvent, state: T_State, arg: Message = C
    if not answer:
        await add_word.finish("未检测到词条回答...")
    idx = 0
-    for n in bot.config.nickname:
-        if n and problem.startswith(n):
-            _problem = f"[_to_me|{n}]" + problem[len(n):]
-            break
-    else:
-        _problem = problem
+    _problem = problem
    search_type = 0
    if re.search("^关键字|词(.*)", msg):
        search_type = 1
@@ -94,7 +88,7 @@ async def _(bot: Bot, event: GroupMessageEvent, state: T_State, arg: Message = C
        search_type = 2
    _builder = await get__builder(event, _problem, answer, idx)
    if await _builder.save(search_type):
-        logger.info(f"已保存词条 问：{_builder.problem} 答：{msg}")
+        logger.info(f"已保存词条 问：{_builder.problem} 答：{answer}")
        await add_word.send("已保存词条：" + _builder.problem)
    else:
        await delete_word.send("保存失败，可能是回答重复")
@@ -102,7 +96,7 @@ async def _(bot: Bot, event: GroupMessageEvent, state: T_State, arg: Message = C

@delete_word.handle()
 async def _(event: GroupMessageEvent, arg: Message = CommandArg()):
-    msg = str(arg).strip()
+    msg = str(arg)
    if not msg:
        await delete_word.finish("此命令之后需要跟随指定词条，通过“显示词条“查看")
    index = None
@@ -124,7 +118,10 @@ async def _(event: GroupMessageEvent, arg: Message = CommandArg()):
        if answer := await WordBank.delete_problem_answer(
                event.user_id, event.group_id, _problem, index
        ):
-            await delete_word.send("删除词条成功：" + problem + f"\n回答：\n{answer}")
+
+            await delete_word.send(Message(
+                "删除词条成功：\n问" + await replace_cq(event.group_id, problem, False) + f"\n回答：\n" + await replace_cq(
+                    event.group_id, answer, False) + "\n"))
            logger.info(
                f"(USER {event.user_id}, GROUP "
                f"{event.group_id if isinstance(event, GroupMessageEvent) else 'private'})"
@@ -137,7 +134,7 @@ async def _(event: GroupMessageEvent, arg: Message = CommandArg()):


@update_word.handle()
-async def _(bot: Bot, event: GroupMessageEvent, arg: Message = CommandArg()):
+async def _(event: GroupMessageEvent, arg: Message = CommandArg()):
    msg = str(arg)
    if not msg:
        await update_word.finish("此命令之后需要跟随指定词条，通过“显示词条“查看")
@@ -157,12 +154,7 @@ async def _(bot: Bot, event: GroupMessageEvent, arg: Message = CommandArg()):
    else:
        await update_word.finish("此命令之后需要跟随修改内容")
    idx = 0
-    for n in bot.config.nickname:
-        if n and problem.startswith(n):
-            _problem = f"[_to_me|{n}]" + problem[len(n):]
-            break
-    else:
-        _problem = problem
+    _problem = problem
    _builder = await get__builder(event, _problem, new_answer, idx)

    try:
@@ -185,8 +177,8 @@ async def _(bot: Bot, event: GroupMessageEvent, arg: Message = CommandArg()):
    if not msg:
        _problem_list = await WordBank.get_group_all_problem(event.group_id)
        if not _problem_list:
-            await show_word.finish("该群未收录任何词条..")
-        _problem_list = [f"\t{i}. {x}" for i, x in enumerate(_problem_list)]
+            await show_word.finish("该群未收录任replace_cq何词条..")
+        _problem_list = [f"\t{i}. {await replace_cq(event.group_id, x)}" for i, x in enumerate(_problem_list)]
        long_problem_list = len(_problem_list)
        max_line = Config.get_config("word_bank", "WORD_BANK_MIX")
        if long_problem_list > max_line:
@@ -245,10 +237,11 @@ async def _(bot: Bot, event: GroupMessageEvent, arg: Message = CommandArg()):

        else:
            # 解析图片和@
-            _answer_img_nu_list = [await get_one_answer(event, format, answer, 0) for answer, format in _answer_list]
+            _answer_img_nu_list = [await get_one_answer(event, format, answer, False) for answer, format in
+                                   _answer_list]
            word_nu = len(_answer_img_nu_list)
            img_nu = 0
-            answer = "词条" + msg + "回答："
+            answer = "词条" + msg + "\n回答："
            for i, x, in enumerate(_answer_img_nu_list):
                r = re.findall(rf"\[CQ:image,file=", str(x))
                if r:
@@ -265,7 +258,7 @@ async def _(bot: Bot, event: GroupMessageEvent, arg: Message = CommandArg()):
            # await show_word.send(f"词条 {msg} 回答：\n" + "\n".join(_answer_list))


-async def get__builder(event, _problem, answer, idx):
+async def get__builder(event, _problem: str, answer: str, idx: int):
    (data_dir / f"{event.group_id}").mkdir(exist_ok=True, parents=True)
    (data_dir / f"{event.group_id}" / "problem").mkdir(exist_ok=True, parents=True)
    _builder = WordBankBuilder(event.user_id, event.group_id, _problem)
@@ -293,16 +286,16 @@ async def get__builder(event, _problem, answer, idx):
                if f"__placeholder_{rand}_{idx}.jpg" not in os.listdir(data_dir / f"{event.group_id}"):
                    break
                rand = random.randint(1, 10000) + random.randint(1, 114514)
-            strinfo = re.compile(f"\[CQ:image,file={r.group(1)},url={_x_list[0]}\?{_x_list[1]},subType=\d*?]")
+            strinfo = re.compile(f"\[CQ:image,file={r.group(1)},.*url={_x_list[0]}\?{_x_list[1]}.*?]")
            answer = strinfo.sub(f"[__placeholder_{idx}]", answer)
            await AsyncHttpx.download_file(
                img, data_dir / f"{event.group_id}" / f"__placeholder_{rand}_{idx}.jpg"
            )
            _builder.set_placeholder(idx, f"__placeholder_{rand}_{idx}.jpg")
            idx += 1
-        r_problem = re.search(rf"\[CQ:image,file=(.*?),url={_x}.*?]", _p)
+        r_problem = re.search(rf"\[CQ:image,file=(.*?)(,subType=\d)?,url={_x}.*?]", _p)
        if r_problem:
-            strinfo = re.compile(f",url={_x_list[0]}\?{_x_list[1]},subType=\d*?]")
+            strinfo = re.compile(f"(,subType=\d)?,url={_x_list[0]}\?{_x_list[1]}.*?]")
            _problem = strinfo.sub(f"]", _problem)
            _p = strinfo.sub(f"]", _p)
            problem += _p[: _p.find(f"[CQ:image,file={r_problem.group(1)}]")] + image(img)
@@ -19,7 +19,7 @@ aiohttp = "3.7.4.post0"
 beautifulsoup4 = "4.9.3"
 feedparser = "^6.0.8"
 gino = "^1.0.1"
-httpx = "^0.22.0"
+httpx = "^0.23.0"
 ImageHash = "^4.2.1"
 jieba = "^0.42.1"
 lxml = "4.6.5"
@@ -39,9 +39,10 @@ dateparser = "^1.1.0"
 cn2an = "^0.5.16"
 python-jose = "^3.3.0"
 python-multipart = "^0.0.5"
-bilireq = "^0.1.2"
+bilireq = "^0.2.0"
 emoji = "^1.7.0"
 wordcloud = "^1.8.1"
+rich = "^12.4.3"

 [tool.poetry.dev-dependencies]

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
HibiKier	d6110e3c6f	update bilibili_sub	2022-07-03 22:00:49 +08:00
HibiKier	4c5302bd4c	fix shop update goods	2022-07-03 16:47:19 +08:00
HibiKier	21ee3d5c3e	update send_setu	2022-07-03 16:33:14 +08:00
HibiKier	e5c036cee8	update shop image	2022-07-03 13:55:26 +08:00
HibiKier	6f82488af7	Merge pull request #879 from VirtualTowel/main 修复图库内图片无法被连续删除的问题	2022-07-03 13:53:49 +08:00
VirtualTowel	57a7903c63	修复图库内图片无法被连续删除的问题	2022-07-01 20:12:39 +08:00
HibiKier	27b89b333a	Merge pull request #866 from Excalibur5100/main 修复色图插件api修改无法搜索图片	2022-06-28 20:48:33 +08:00
Excalibur5100	ce2c4e7492	修复色图插件最近加tag参数后搜不到图的问题插件所用API更新，最大数量num改为20 https://api.lolicon.app/#/setu	2022-06-28 19:48:59 +08:00
HibiKier	cad98a2a33	Update goods_info.py	2022-06-26 22:23:19 +08:00
HibiKier	40da48e685	update models	2022-06-26 19:29:51 +08:00
HibiKier	1c393e5c3e	update shop daily_limit	2022-06-26 03:08:23 +08:00
HibiKier	667c143c74	update pix	2022-06-26 01:37:47 +08:00
HibiKier	bc089c18ce	update bt	2022-06-26 01:26:14 +08:00
HibiKier	24b730c0e2	Merge pull request #847 from po-lan/main 对WSL虚拟机代理添加写法	2022-06-24 20:59:28 +08:00
po-lan	9ed9e9b973	对WSL虚拟机代理添加写法	2022-06-23 17:57:47 +08:00
HibiKier	5b0027aa3d	Update README.md	2022-06-22 22:49:26 +08:00
HibiKier	810c5e4e8b	Update README.md	2022-06-21 21:59:41 +08:00
HibiKier	907534958f	Merge pull request #840 from yajiwa/main update parse_bilibili	2022-06-21 21:59:23 +08:00
HibiKier	f08a18ab07	Update data_class.py	2022-06-21 21:01:14 +08:00
github-actions[bot]	40549d5ca7	Auto generate poetry.lock	2022-06-21 00:56:57 +00:00
yajiwa	3e67edc506	update pyproject.toml	2022-06-21 08:53:49 +08:00
yajiwa	9c56a81f65	update parse_bilibili	2022-06-21 08:50:05 +08:00
HibiKier	a9a636c9ae	Update plugins2settings_manager.py	2022-06-20 22:31:57 +08:00
HibiKier	98374dcd74	Update README.md	2022-06-20 22:07:48 +08:00
HibiKier	10ca6eec91	update webui	2022-06-20 21:54:10 +08:00
HibiKier	216d32cf21	Update README.md	2022-06-19 23:16:11 +08:00
HibiKier	248fae4fe6	Update __version__	2022-06-19 23:15:40 +08:00
HibiKier	b479b6839d	Update README.md	2022-06-19 22:29:44 +08:00
HibiKier	1a4e1e9515	Merge pull request #835 from yajiwa/main 词条优化问题展示,修改含机器人昵称和@逻辑	2022-06-19 22:29:20 +08:00
yajiwa	e5160a4ee8	Merge branch 'HibiKier:main' into main	2022-06-19 17:26:13 +08:00
yajiwa	56ea3964a7	update word_bank	2022-06-19 17:24:50 +08:00
HibiKier	ad73778286	update README.md	2022-06-19 16:55:02 +08:00
HibiKier	3e548f48c8	Merge pull request #828 from McElaga/main 修复原神树脂重复提醒的bug	2022-06-19 16:54:25 +08:00
HibiKier	ae466931fa	fix webui	2022-06-19 16:44:37 +08:00
HibiKier	68052b526f	update image_utils	2022-06-18 15:23:36 +08:00
HibiKier	903b5b88a7	update image_utils	2022-06-18 15:09:55 +08:00
HibiKier	007823d6b2	update README.md	2022-06-18 15:03:05 +08:00
HibiKier	db5c4fb349	Merge pull request #830 from po-lan/main 我不太会提交单个文件，我就把俄罗斯轮盘的文件改回去了，再提交的	2022-06-18 15:00:46 +08:00
HibiKier	c37901290a	fix nickname	2022-06-18 14:57:54 +08:00
HibiKier	da67f1f6f8	update webui	2022-06-18 14:48:46 +08:00
HibiKier	5172fa69e5	fix web ui	2022-06-18 14:31:44 +08:00
po-lan	dd7280cd0d	恢复原先的文件	2022-06-18 14:08:59 +08:00
McElaga	0d0f522c88	Merge branch 'HibiKier:main' into main	2022-06-18 09:27:12 +08:00
McElaga	5429e6ed5c	Merge branch 'main' of https://github.com/McElaga/zhenxun_bot	2022-06-18 09:15:24 +08:00
McElaga	9db69fa05b	修复一点逻辑小问题	2022-06-18 09:15:19 +08:00
HibiKier	3b8d52bcb5	Update README.md	2022-06-17 18:50:37 +08:00
HibiKier	807f39a336	Update README.md	2022-06-17 18:50:15 +08:00
HibiKier	fea2f30461	Merge pull request #820 from LambdaYH/patch-2 修复wordbank的一些小问题	2022-06-17 18:49:42 +08:00
po-lan	5d97e3f95f	Update __init__.py	2022-06-16 16:15:39 +08:00
po-lan	63e6ca3e99	Update __init__.py	2022-06-16 15:40:46 +08:00
po-lan	b11590ec3c	ban掉被击毙的人一段时间	2022-06-16 15:38:20 +08:00
po-lan	3a43ed6919	如果需要保存到 config 可以少调用一次	2022-06-16 14:38:41 +08:00
po-lan	15ce9c91fb	Update __init__.py	2022-06-16 14:25:22 +08:00
LambdaYH	0e8d7537d4	fix wordbank	2022-06-16 00:43:32 +08:00
Cinte	1fca0787be	fix: 修复之前更改正则引入的问题	2022-06-15 23:16:39 +08:00
HibiKier	af30285c00	Update browser.py	2022-06-15 10:08:43 +08:00
HibiKier	a84cab7afd	replace bt url	2022-06-14 20:40:11 +08:00
HibiKier	593573ddfb	fix pix	2022-06-14 19:48:32 +08:00
HibiKier	e9e9f81bdb	Merge pull request #806 from LambdaYH/patch-2 fix: 修复添加词条时对answer中图片的处理	2022-06-14 19:31:53 +08:00
HibiKier	61f624841b	Merge pull request #810 from LambdaYH/patch-3 fix: 自动更新群组	2022-06-14 19:31:18 +08:00
HibiKier	4bb38a2730	Merge pull request #812 from po-lan/main 可关闭 ssl 验证	2022-06-14 19:22:25 +08:00
HibiKier	d4ec0df00c	Update http_utils.py	2022-06-14 19:22:12 +08:00
po-lan	c8a7d855f8	Update http_utils.py	2022-06-14 18:47:43 +08:00
Cinte	73a126dcd5	fix: 自动更新群组	2022-06-14 09:18:03 +08:00
HibiKier	0736533389	fix search_image	2022-06-13 22:16:45 +08:00
Cinte	2695d658ab	fix: 修复添加词条时对answer中图片的处理	2022-06-13 22:11:18 +08:00
HibiKier	947166e793	Merge pull request #804 from po-lan/main Windows 重启适配	2022-06-13 20:20:30 +08:00
po-lan	80c49a7cf5	Update __init__.py	2022-06-13 15:34:28 +08:00
po-lan	55bfa8f669	Update __init__.py Windows 重启适配	2022-06-13 15:24:28 +08:00
HibiKier	74ade14f5e	Update README.md	2022-06-13 11:07:34 +08:00
HibiKier	c9b5218ebc	Merge pull request #798 from CopilotLaLaLa/main webui中token.json文件写入补充	2022-06-13 11:07:11 +08:00
HibiKier	b324b2bd65	Merge pull request #800 from yajiwa/main update setu_img	2022-06-13 11:06:20 +08:00
HibiKier	35c038efa2	Update utils.py	2022-06-13 11:05:16 +08:00
HibiKier	caa404d58d	Update utils.py	2022-06-13 11:03:21 +08:00
yajiwa	830103b9d5	update change_img_md5	2022-06-13 10:59:29 +08:00
yajiwa	6e18379597	update setu_img	2022-06-13 10:08:51 +08:00
yajiwa	6effbacb28	add change_img_md5	2022-06-13 10:08:09 +08:00
CopilotLaLaLa	a20a1a0234	同步原仓库	2022-06-12 15:23:10 +00:00
CopilotLaLaLa	3667724061	token_json文件写入	2022-06-12 15:16:07 +00:00
HibiKier	785179e4a7	update pix	2022-06-11 17:57:19 +08:00
HibiKier	715338f821	Merge pull request #791 from mmmjie/main 两处BUG的修复	2022-06-10 21:31:51 +08:00
mmmjie	7d5a82ab6d	Update update_picture.py 对于temp/temp的错误路径，减少了一个temp TEMP_PATH 已经指向了一个temp了	2022-06-10 00:37:18 +08:00
mmmjie	e764cfcc1c	Update white2black_image.py 随着7b836ac 对utils/image_utils.py 的改动调整此插件对于 utils/image_utils.py改动的引用部分	2022-06-10 00:35:57 +08:00
HibiKier	363acf37bc	fix bug and update	2022-06-09 20:39:48 +08:00
HibiKier	5fd687c1e4	Merge pull request #778 from SinKy-Yan/main fix auto update bug	2022-06-09 19:37:26 +08:00
HibiKier	dbedcbb93d	Update pyproject.toml	2022-06-08 11:51:32 +08:00
HibiKier	9e9611f11f	Update README.md	2022-06-08 11:43:10 +08:00
HibiKier	44002838da	Merge pull request #779 from MingxuanGame/main chore(deps): update `nonebot-adapter-onebot`	2022-06-08 11:42:43 +08:00
MingxuanGame	4daab8459f	chore(deps): update `nonebot-adapter-onebot`	2022-06-07 11:57:34 +00:00
HibiKier	5a002f75cc	Merge pull request #777 from LambdaYH/patch-1 fix image_utils.py	2022-06-07 19:27:31 +08:00
源源球球✨	a2180a1365	fix auto update bug	2022-06-07 10:19:23 +00:00
Cinte	7b836acf36	fix image_utils.py https://github.com/HibiKier/zhenxun_bot/commit/ae8a214a3a5c08a51cacd1dc37583c0b32e6332f 之前这个commit里面看到函数参数有写着int类型就把`font_size`类型转换给去了，结果导致了部分地方输入float类型后报错。现在改回来	2022-06-07 17:06:16 +08:00
HibiKier	a112a561cc	Update README.md	2022-06-05 20:30:49 +08:00
HibiKier	6dcc2a69f4	Update README.md	2022-06-05 19:56:42 +08:00
HibiKier	74e9c55a09	update v0.1.5.8	2022-06-05 19:51:23 +08:00
HibiKier	d4d6e736a4	Merge pull request #764 from McElaga/main 金币红包功能增加更多封面	2022-06-05 19:08:51 +08:00
HibiKier	5cf9938fa2	Merge pull request #763 from RShock/main fix gold_redbag	2022-06-05 19:04:40 +08:00
McElaga	72ad0ad983	commit on main	2022-06-04 12:34:18 +08:00
咕咕型小r	690750d91e	fix gold_redbag	2022-06-04 12:09:05 +08:00
HibiKier	9f1dfc4b9c	Merge pull request #756 from McElaga/main 修复原神树脂提醒bug(已实测)	2022-06-03 16:15:50 +08:00
HibiKier	05eab5307f	Update README.md	2022-06-03 16:13:29 +08:00
HibiKier	b0fe70c960	Merge pull request #745 from LambdaYH/main 稍微调整了一下查看所有请求中的年龄绘制	2022-06-03 16:07:01 +08:00
McElaga	09d7992bc4	comit on main	2022-06-03 12:09:15 +08:00
McElaga	c832a432c1	commit on main	2022-06-03 11:52:40 +08:00
HibiKier	41c22f4314	fix ShopRegister	2022-06-03 01:14:34 +08:00
HibiKier	252d45c79b	fix webui update plugin_shop	2022-06-03 00:59:00 +08:00
Cinte	ae8a214a3a	Update image_utils.py	2022-06-02 10:06:55 +08:00
LambdaYH	86ce6d7664	fix: 稍微调整了一下查看所有请求中的年龄绘制	2022-06-02 10:02:03 +08:00
McElaga	67e96d6106	commit on main	2022-06-02 08:55:24 +08:00
HibiKier	24d9ec2b75	Update __init__.py	2022-06-01 11:05:12 +08:00
HibiKier	501e47c6ec	fix image2text	2022-05-31 20:45:28 +08:00
HibiKier	5534a5a5c2	Merge pull request #707 from HiDolen/main 修复抽卡插件：方舟更新UP池信息时，若公告的第一个池子过期会导致无法更新UP池信息	2022-05-31 20:14:48 +08:00
HibiKier	7246aabf40	Merge pull request #712 from McElaga/main 修复发红包图片背景未透明化;修复原神树脂提醒参数错误	2022-05-31 20:07:35 +08:00
HibiKier	604ffae87e	Merge pull request #711 from LambdaYH/patch-1 bot_friend_group将group_handle.修改为friend_handle.	2022-05-31 20:06:12 +08:00
HibiKier	2d5c16456b	Merge pull request #721 from LambdaYH/patch-2 修复开启/关闭全部功能时帮助图片未重绘	2022-05-31 20:01:39 +08:00
Cinte	d44f7633dc	修复开启/关闭全部功能时帮助图片未重绘	2022-05-30 20:43:48 +08:00
Cinte	469ac4035c	大概是把group_handle写成了friend_handle	2022-05-30 11:27:14 +08:00
McElaga	dab218a6d7	commit on main	2022-05-30 11:14:47 +08:00
Dolen	d6fc675d57	修复抽卡插件：避免被跳过的卡池信息污染后面的卡池信息	2022-05-30 11:11:49 +08:00
McElaga	04148f7365	commit on main	2022-05-30 11:00:19 +08:00
Dolen	4c34ac570f	修复抽卡插件：方舟更新UP池信息时，若公告的第一个池子过期会导致无法更新UP池信息	2022-05-29 23:13:36 +08:00
HibiKier	fbdb8758a3	Update README.md	2022-05-29 22:21:26 +08:00
HibiKier	2d08747d70	Merge pull request #705 from yajiwa/main 商店插件判断是否有requirements.txt文件	2022-05-29 22:21:03 +08:00
yajiwa	0b4bacbbd1	update plugin_shop	2022-05-29 21:57:01 +08:00
yajiwa	e0412c7edb	Merge branch 'HibiKier:main' into main	2022-05-29 21:03:12 +08:00
HibiKier	38501cebf1	Update data_source.py	2022-05-29 20:56:03 +08:00
HibiKier	ee45d0217e	Update __init__.py	2022-05-29 20:55:32 +08:00
HibiKier	558f362919	update v0.1.5.8	2022-05-29 20:47:18 +08:00
HibiKier	fb9db2f50c	fix	2022-05-29 19:57:57 +08:00
HibiKier	c1862e9c68	fix bt	2022-05-29 19:15:29 +08:00
HibiKier	731bde8e28	update v0.1.5.7	2022-05-29 19:14:36 +08:00
HibiKier	47c87f8694	update db_context	2022-05-28 22:50:23 +08:00
HibiKier	5558cdacc3	Update README.md	2022-05-28 21:09:58 +08:00
HibiKier	4650d244a5	Merge pull request #688 from McElaga/main 修复微博热搜报错,发红包小bug	2022-05-28 21:08:17 +08:00
HibiKier	c65b8aae07	update webui	2022-05-28 20:57:08 +08:00
HibiKier	7ba2fb9584	update black_word	2022-05-28 20:55:14 +08:00
HibiKier	9a2cfd0c9b	zhenxun_update add config	2022-05-28 18:28:38 +08:00
HibiKier	a7d61b1f2b	add config	2022-05-28 18:12:08 +08:00
HibiKier	7ab185f7d7	fix poke	2022-05-28 17:48:28 +08:00
HibiKier	724541d691	fix bug	2022-05-28 17:22:51 +08:00
McElaga	baa6cda9c2	commit on main	2022-05-28 10:31:27 +08:00
HibiKier	9c987e9aad	log2cn	2022-05-26 22:49:48 +08:00
HibiKier	134974ea9c	Merge pull request #667 from NumberSir/main 更新抽卡插件	2022-05-26 22:43:11 +08:00
HibiKier	2d946958e3	Merge pull request #668 from HanakoLuna/patch-1 更新BT搜索源地址	2022-05-26 22:42:37 +08:00
Lya_Yami	ffe010e9ce	更新BT搜索源地址	2022-05-26 20:47:12 +08:00
HibiKier	1c67252b0c	Update README.md	2022-05-26 20:26:14 +08:00
HibiKier	60c1be25d4	Merge pull request #643 from LambdaYH/patch-1 修复[滴滴滴]会被转义成[滴滴滴]导致无法触发的问题	2022-05-26 20:25:45 +08:00
Number_Sir	18323a0916	更新抽卡插件修复了方舟抽卡图文不符的问题修复了方舟许多三星抽不出来的问题修复了方舟重载卡池失败的问题	2022-05-26 20:07:09 +08:00
HibiKier	9d98abded9	Merge pull request #660 from Sakuracio/main Replace URL	2022-05-26 19:49:23 +08:00
MangataAkihi	b06a742b8c	Update README.md	2022-05-26 17:20:37 +08:00
github-actions[bot]	87fe44f188	Auto generate poetry.lock	2022-05-26 09:18:16 +00:00
Cinte	96f6ef1693	修复[滴滴滴]会被转义成[滴滴滴]导致无法触发的问题	2022-05-26 09:59:45 +08:00
github-actions[bot]	374b7b7261	Auto generate poetry.lock	2022-05-25 23:42:48 +00:00
HibiKier	23c4141e55	Update README.md	2022-05-25 20:53:09 +08:00
HibiKier	c21200c2a9	Merge pull request #610 from yajiwa/main 修复碧蓝航线/明日方舟up池解析出错的问题	2022-05-25 20:52:58 +08:00
HibiKier	4a8b94259d	Merge pull request #602 from HiDolen/main-patch 修改翻译插件，添加缺失的冒号	2022-05-25 20:49:51 +08:00
HibiKier	28a58df27b	Merge pull request #607 from MingxuanGame/main feat: stream downloading and progress	2022-05-25 20:49:20 +08:00
HibiKier	caaf486bbe	Merge branch 'main' into main	2022-05-25 20:49:07 +08:00
HibiKier	0a972a399e	Merge pull request #617 from mouhensama/main 把gamedraw的ba卡池搬运了过来并且进行了真寻的适配。	2022-05-25 20:44:07 +08:00
HibiKier	245dad1239	Merge pull request #624 from HiDolen/main-patch2 修改nickname插件：一处文案错误，添加敏感词	2022-05-25 20:42:51 +08:00
Dolen	a6b6a2fbff	修改nickname插件：一处文案错误	2022-05-25 17:21:00 +08:00
Dolen	53000a949b	修改nickname插件：添加一个敏感词	2022-05-25 17:03:44 +08:00
Dolen	eae1dd59a7	修改nickname插件：一处文案错误	2022-05-25 17:02:09 +08:00
HibiKier	e6347a76a8	Update issue-template.md	2022-05-25 14:44:28 +08:00
HibiKier	13e0fb3df7	Delete bug-issue-template.md	2022-05-25 13:42:22 +08:00
HibiKier	3f1b23ef8a	Update issue templates	2022-05-25 13:41:35 +08:00
HibiKier	acae7f0658	Create ISSUE_TEMPLATE.md	2022-05-25 13:37:29 +08:00
HibiKier	a9456b1bd6	Merge pull request #608 from AkashiCoin/main Use Action to automatically generate poetry.lock	2022-05-25 13:35:39 +08:00
mouhensama	e4d5a230d2	把nonebot_plugin_gamedraw的ba卡池搬运了过来并且进行了真寻的适配。	2022-05-25 11:47:08 +08:00
HibiKier	fedf44b9fa	Update README.md	2022-05-25 10:54:52 +08:00
HibiKier	451db104e8	Update config.py	2022-05-25 08:52:22 +08:00
HibiKier	9ac4c7f4e3	Update README.md	2022-05-25 08:52:15 +08:00
HibiKier	7cf1c6f016	Update README.md	2022-05-25 08:41:59 +08:00
yajiwa	6dd87ee301	fix draw_card	2022-05-25 07:02:42 +08:00
MingxuanGame	96837fa8db	fix: rich from dev dependent to main dependent	2022-05-25 01:19:12 +08:00
MingxuanGame	d816e76962	fix: rich from dev dependent to main dependent	2022-05-25 01:13:27 +08:00
AkashiCoin	310945d9cd	Merge branch 'HibiKier:main' into main	2022-05-25 01:01:11 +08:00
MingxuanGame	1aba480495	feat: stream downloading and progress	2022-05-25 00:56:41 +08:00
HibiKier	07407749fe	Update README.md	2022-05-24 22:05:38 +08:00
HibiKier	dfab70dd90	Merge pull request #581 from HiDolen/main 修复抽卡插件：方舟抽卡的抽取和显示问题	2022-05-24 22:05:13 +08:00
Dolen	3b15469c98	修改翻译插件，发送消息添加冒号	2022-05-24 08:59:14 -05:00
HibiKier	e4590800c2	Update README.md	2022-05-24 21:20:59 +08:00
HibiKier	c63d4b8ad0	Merge pull request #573 from jk6589jk/patch-2 修复复读不能复读图片的问题	2022-05-24 21:19:41 +08:00
HibiKier	1fb913e2ed	Merge pull request #576 from MingxuanGame/main refactor&fix(manager): modify argument	2022-05-24 21:18:22 +08:00
HibiKier	72ace2dab7	Merge pull request #579 from yajiwa/main 更新"微博热搜"接口	2022-05-24 21:14:51 +08:00
HibiKier	3bcef18629	Merge pull request #600 from sdy623/main bugfix: 修正了签到时日期时间的显示不补齐零的bug （符合日期时间表示法 ISO 8601）	2022-05-24 21:13:33 +08:00
sdy623	c91758519c	bugfix: 修正了签到时日期时间的显示不补齐零的bug （符合日期时间表示法 ISO 8601）	2022-05-24 20:19:32 +08:00
jk6589jk	9c8f2e7aa0	Update fudu.py	2022-05-24 14:01:08 +08:00
Dolen	5f377af6d5	修复抽卡插件：方舟抽卡的抽取和显示问题	2022-05-24 09:13:10 +08:00
yajiwa	570b5b1766	update wbtop	2022-05-24 06:01:23 +08:00
MingxuanGame	c4d53d58eb	refactor&fix(manager): modify argument	2022-05-24 01:27:55 +08:00
jk6589jk	ed65033cf1	修复复读不能复读图片的问题 IMAGE_PATH = Path() / "resources" / "image" TEMP_PATH = Path() / "resources" / "temp" image()默认读取在 resource/img 目录下，读写路径不同，导致找不到图片打断打断施法！，rst.endswith("打断施法！")在复读内容含有图片时会报错	2022-05-23 22:06:53 +08:00
HibiKier	41836bde26	Update README.md	2022-05-23 22:05:19 +08:00
github-actions[bot]	8d3f101a68	Auto generate poetry.lock	2022-05-21 18:38:05 +00:00
AkashiCoin	c8ac2b6281	Update Generate.yml	2022-05-22 02:35:20 +08:00
AkashiCoin	d7d8efd305	Merge branch 'HibiKier:main' into main	2022-05-22 02:04:34 +08:00
HibiKier	a4bc04c958	Update pid_search.py	2022-05-22 01:46:52 +08:00
AkashiCoin	5fc208c95a	Create Generate.yml	2022-05-22 00:29:54 +08:00