From 4daab8459f7b1682fe2ff6e0bcb07dd95d9a5d4f Mon Sep 17 00:00:00 2001 From: MingxuanGame Date: Tue, 7 Jun 2022 11:57:34 +0000 Subject: [PATCH] chore(deps): update `nonebot-adapter-onebot` --- basic_plugins/apscheduler/__init__.py | 2 +- basic_plugins/group_handle/__init__.py | 2 +- basic_plugins/hooks/auth_hook.py | 2 +- basic_plugins/hooks/ban_hook.py | 2 +- basic_plugins/hooks/chkdsk_hook.py | 2 +- basic_plugins/invite_manager/__init__.py | 2 +- basic_plugins/super_cmd/manager_group.py | 22 ++++---- plugins/black_word/utils.py | 2 +- plugins/gold_redbag/__init__.py | 2 +- plugins/mute.py | 25 +++++---- plugins/open_cases/utils.py | 2 +- plugins/parse_bilibili_json.py | 3 +- plugins/pixiv_rank_search/__init__.py | 3 +- plugins/send_setu_/send_setu/__init__.py | 2 +- poetry.lock | 71 ++++++++++++++++++++++-- pyproject.toml | 8 +-- utils/manager/requests_manager.py | 3 +- 17 files changed, 109 insertions(+), 46 deletions(-) diff --git a/basic_plugins/apscheduler/__init__.py b/basic_plugins/apscheduler/__init__.py index 93d34f7d..3d44b22e 100755 --- a/basic_plugins/apscheduler/__init__.py +++ b/basic_plugins/apscheduler/__init__.py @@ -4,7 +4,7 @@ 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 diff --git a/basic_plugins/group_handle/__init__.py b/basic_plugins/group_handle/__init__.py index 61f8b252..e5ffb202 100755 --- a/basic_plugins/group_handle/__init__.py +++ b/basic_plugins/group_handle/__init__.py @@ -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 diff --git a/basic_plugins/hooks/auth_hook.py b/basic_plugins/hooks/auth_hook.py index 83c4d77f..c34d0fd2 100755 --- a/basic_plugins/hooks/auth_hook.py +++ b/basic_plugins/hooks/auth_hook.py @@ -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, diff --git a/basic_plugins/hooks/ban_hook.py b/basic_plugins/hooks/ban_hook.py index 547d1cf0..2d9689c2 100755 --- a/basic_plugins/hooks/ban_hook.py +++ b/basic_plugins/hooks/ban_hook.py @@ -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, ) diff --git a/basic_plugins/hooks/chkdsk_hook.py b/basic_plugins/hooks/chkdsk_hook.py index a3ac086e..055ffa1c 100755 --- a/basic_plugins/hooks/chkdsk_hook.py +++ b/basic_plugins/hooks/chkdsk_hook.py @@ -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, ) diff --git a/basic_plugins/invite_manager/__init__.py b/basic_plugins/invite_manager/__init__.py index 9aaaacdd..56c04d40 100755 --- a/basic_plugins/invite_manager/__init__.py +++ b/basic_plugins/invite_manager/__init__.py @@ -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 diff --git a/basic_plugins/super_cmd/manager_group.py b/basic_plugins/super_cmd/manager_group.py index 272e0098..e8649621 100755 --- a/basic_plugins/super_cmd/manager_group.py +++ b/basic_plugins/super_cmd/manager_group.py @@ -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]}群认证..") diff --git a/plugins/black_word/utils.py b/plugins/black_word/utils.py index 674be71f..88b45ec3 100644 --- a/plugins/black_word/utils.py +++ b/plugins/black_word/utils.py @@ -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 diff --git a/plugins/gold_redbag/__init__.py b/plugins/gold_redbag/__init__.py index c39d5f72..313125f3 100755 --- a/plugins/gold_redbag/__init__.py +++ b/plugins/gold_redbag/__init__.py @@ -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 diff --git a/plugins/mute.py b/plugins/mute.py index dddd28fc..c937dac6 100755 --- a/plugins/mute.py +++ b/plugins/mute.py @@ -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() diff --git a/plugins/open_cases/utils.py b/plugins/open_cases/utils.py index 7c953596..e85dfe4f 100755 --- a/plugins/open_cases/utils.py +++ b/plugins/open_cases/utils.py @@ -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 * diff --git a/plugins/parse_bilibili_json.py b/plugins/parse_bilibili_json.py index 54f5afc3..27f3256b 100755 --- a/plugins/parse_bilibili_json.py +++ b/plugins/parse_bilibili_json.py @@ -1,10 +1,9 @@ # from nonebot import on_message # from services.log import logger -# from nonebot.adapters.onebot.v11 import GroupMessageEvent +# 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 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 diff --git a/plugins/pixiv_rank_search/__init__.py b/plugins/pixiv_rank_search/__init__.py index 1c546ed8..558a06ef 100755 --- a/plugins/pixiv_rank_search/__init__.py +++ b/plugins/pixiv_rank_search/__init__.py @@ -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 diff --git a/plugins/send_setu_/send_setu/__init__.py b/plugins/send_setu_/send_setu/__init__.py index e4f67caf..cb00ff41 100755 --- a/plugins/send_setu_/send_setu/__init__.py +++ b/plugins/send_setu_/send_setu/__init__.py @@ -13,6 +13,7 @@ from utils.utils import ( from nonebot.typing import T_State from nonebot.adapters.onebot.v11 import ( Bot, + ActionFailed, MessageEvent, GroupMessageEvent, PrivateMessageEvent, @@ -30,7 +31,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 diff --git a/poetry.lock b/poetry.lock index 470f9a51..79c66f8a 100644 --- a/poetry.lock +++ b/poetry.lock @@ -525,6 +525,14 @@ pyparsing = ">=2.2.1" python-dateutil = ">=2.7" setuptools_scm = ">=4" +[[package]] +name = "msgpack" +version = "1.0.4" +description = "MessagePack serializer" +category = "main" +optional = false +python-versions = "*" + [[package]] name = "multidict" version = "6.0.2" @@ -543,14 +551,15 @@ python-versions = "*" [[package]] name = "nonebot-adapter-onebot" -version = "2.0.0b1" +version = "2.1.0" description = "OneBot(CQHTTP) adapter for nonebot2" category = "main" optional = false python-versions = ">=3.7.3,<4.0.0" [package.dependencies] -nonebot2 = ">=2.0.0-beta.1,<3.0.0" +msgpack = ">=1.0.3,<2.0.0" +nonebot2 = ">=2.0.0-beta.3,<3.0.0" [[package]] name = "nonebot-plugin-apscheduler" @@ -1653,6 +1662,60 @@ matplotlib = [ {file = "matplotlib-3.5.2-pp37-pypy37_pp73-win_amd64.whl", hash = "sha256:24173c23d1bcbaed5bf47b8785d27933a1ac26a5d772200a0f3e0e38f471b001"}, {file = "matplotlib-3.5.2.tar.gz", hash = "sha256:48cf850ce14fa18067f2d9e0d646763681948487a8080ec0af2686468b4607a2"}, ] +msgpack = [ + {file = "msgpack-1.0.4-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:4ab251d229d10498e9a2f3b1e68ef64cb393394ec477e3370c457f9430ce9250"}, + {file = "msgpack-1.0.4-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:112b0f93202d7c0fef0b7810d465fde23c746a2d482e1e2de2aafd2ce1492c88"}, + {file = "msgpack-1.0.4-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:002b5c72b6cd9b4bafd790f364b8480e859b4712e91f43014fe01e4f957b8467"}, + {file = "msgpack-1.0.4-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:35bc0faa494b0f1d851fd29129b2575b2e26d41d177caacd4206d81502d4c6a6"}, + {file = "msgpack-1.0.4-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4733359808c56d5d7756628736061c432ded018e7a1dff2d35a02439043321aa"}, + {file = "msgpack-1.0.4-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:eb514ad14edf07a1dbe63761fd30f89ae79b42625731e1ccf5e1f1092950eaa6"}, + {file = "msgpack-1.0.4-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:c23080fdeec4716aede32b4e0ef7e213c7b1093eede9ee010949f2a418ced6ba"}, + {file = "msgpack-1.0.4-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:49565b0e3d7896d9ea71d9095df15b7f75a035c49be733051c34762ca95bbf7e"}, + {file = "msgpack-1.0.4-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:aca0f1644d6b5a73eb3e74d4d64d5d8c6c3d577e753a04c9e9c87d07692c58db"}, + {file = "msgpack-1.0.4-cp310-cp310-win32.whl", hash = "sha256:0dfe3947db5fb9ce52aaea6ca28112a170db9eae75adf9339a1aec434dc954ef"}, + {file = "msgpack-1.0.4-cp310-cp310-win_amd64.whl", hash = "sha256:4dea20515f660aa6b7e964433b1808d098dcfcabbebeaaad240d11f909298075"}, + {file = "msgpack-1.0.4-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:e83f80a7fec1a62cf4e6c9a660e39c7f878f603737a0cdac8c13131d11d97f52"}, + {file = "msgpack-1.0.4-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3c11a48cf5e59026ad7cb0dc29e29a01b5a66a3e333dc11c04f7e991fc5510a9"}, + {file = "msgpack-1.0.4-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1276e8f34e139aeff1c77a3cefb295598b504ac5314d32c8c3d54d24fadb94c9"}, + {file = "msgpack-1.0.4-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:6c9566f2c39ccced0a38d37c26cc3570983b97833c365a6044edef3574a00c08"}, + {file = "msgpack-1.0.4-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:fcb8a47f43acc113e24e910399376f7277cf8508b27e5b88499f053de6b115a8"}, + {file = "msgpack-1.0.4-cp36-cp36m-musllinux_1_1_i686.whl", hash = "sha256:76ee788122de3a68a02ed6f3a16bbcd97bc7c2e39bd4d94be2f1821e7c4a64e6"}, + {file = "msgpack-1.0.4-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:0a68d3ac0104e2d3510de90a1091720157c319ceeb90d74f7b5295a6bee51bae"}, + {file = "msgpack-1.0.4-cp36-cp36m-win32.whl", hash = "sha256:85f279d88d8e833ec015650fd15ae5eddce0791e1e8a59165318f371158efec6"}, + {file = "msgpack-1.0.4-cp36-cp36m-win_amd64.whl", hash = "sha256:c1683841cd4fa45ac427c18854c3ec3cd9b681694caf5bff04edb9387602d661"}, + {file = "msgpack-1.0.4-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:a75dfb03f8b06f4ab093dafe3ddcc2d633259e6c3f74bb1b01996f5d8aa5868c"}, + {file = "msgpack-1.0.4-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9667bdfdf523c40d2511f0e98a6c9d3603be6b371ae9a238b7ef2dc4e7a427b0"}, + {file = "msgpack-1.0.4-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:11184bc7e56fd74c00ead4f9cc9a3091d62ecb96e97653add7a879a14b003227"}, + {file = "msgpack-1.0.4-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ac5bd7901487c4a1dd51a8c58f2632b15d838d07ceedaa5e4c080f7190925bff"}, + {file = "msgpack-1.0.4-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:1e91d641d2bfe91ba4c52039adc5bccf27c335356055825c7f88742c8bb900dd"}, + {file = "msgpack-1.0.4-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:2a2df1b55a78eb5f5b7d2a4bb221cd8363913830145fad05374a80bf0877cb1e"}, + {file = "msgpack-1.0.4-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:545e3cf0cf74f3e48b470f68ed19551ae6f9722814ea969305794645da091236"}, + {file = "msgpack-1.0.4-cp37-cp37m-win32.whl", hash = "sha256:2cc5ca2712ac0003bcb625c96368fd08a0f86bbc1a5578802512d87bc592fe44"}, + {file = "msgpack-1.0.4-cp37-cp37m-win_amd64.whl", hash = "sha256:eba96145051ccec0ec86611fe9cf693ce55f2a3ce89c06ed307de0e085730ec1"}, + {file = "msgpack-1.0.4-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:7760f85956c415578c17edb39eed99f9181a48375b0d4a94076d84148cf67b2d"}, + {file = "msgpack-1.0.4-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:449e57cc1ff18d3b444eb554e44613cffcccb32805d16726a5494038c3b93dab"}, + {file = "msgpack-1.0.4-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:d603de2b8d2ea3f3bcb2efe286849aa7a81531abc52d8454da12f46235092bcb"}, + {file = "msgpack-1.0.4-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:48f5d88c99f64c456413d74a975bd605a9b0526293218a3b77220a2c15458ba9"}, + {file = "msgpack-1.0.4-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6916c78f33602ecf0509cc40379271ba0f9ab572b066bd4bdafd7434dee4bc6e"}, + {file = "msgpack-1.0.4-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:81fc7ba725464651190b196f3cd848e8553d4d510114a954681fd0b9c479d7e1"}, + {file = "msgpack-1.0.4-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:d5b5b962221fa2c5d3a7f8133f9abffc114fe218eb4365e40f17732ade576c8e"}, + {file = "msgpack-1.0.4-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:77ccd2af37f3db0ea59fb280fa2165bf1b096510ba9fe0cc2bf8fa92a22fdb43"}, + {file = "msgpack-1.0.4-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:b17be2478b622939e39b816e0aa8242611cc8d3583d1cd8ec31b249f04623243"}, + {file = "msgpack-1.0.4-cp38-cp38-win32.whl", hash = "sha256:2bb8cdf50dd623392fa75525cce44a65a12a00c98e1e37bf0fb08ddce2ff60d2"}, + {file = "msgpack-1.0.4-cp38-cp38-win_amd64.whl", hash = "sha256:26b8feaca40a90cbe031b03d82b2898bf560027160d3eae1423f4a67654ec5d6"}, + {file = "msgpack-1.0.4-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:462497af5fd4e0edbb1559c352ad84f6c577ffbbb708566a0abaaa84acd9f3ae"}, + {file = "msgpack-1.0.4-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:2999623886c5c02deefe156e8f869c3b0aaeba14bfc50aa2486a0415178fce55"}, + {file = "msgpack-1.0.4-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:f0029245c51fd9473dc1aede1160b0a29f4a912e6b1dd353fa6d317085b219da"}, + {file = "msgpack-1.0.4-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ed6f7b854a823ea44cf94919ba3f727e230da29feb4a99711433f25800cf747f"}, + {file = "msgpack-1.0.4-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0df96d6eaf45ceca04b3f3b4b111b86b33785683d682c655063ef8057d61fd92"}, + {file = "msgpack-1.0.4-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:6a4192b1ab40f8dca3f2877b70e63799d95c62c068c84dc028b40a6cb03ccd0f"}, + {file = "msgpack-1.0.4-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:0e3590f9fb9f7fbc36df366267870e77269c03172d086fa76bb4eba8b2b46624"}, + {file = "msgpack-1.0.4-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:1576bd97527a93c44fa856770197dec00d223b0b9f36ef03f65bac60197cedf8"}, + {file = "msgpack-1.0.4-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:63e29d6e8c9ca22b21846234913c3466b7e4ee6e422f205a2988083de3b08cae"}, + {file = "msgpack-1.0.4-cp39-cp39-win32.whl", hash = "sha256:fb62ea4b62bfcb0b380d5680f9a4b3f9a2d166d9394e9bbd9666c0ee09a3645c"}, + {file = "msgpack-1.0.4-cp39-cp39-win_amd64.whl", hash = "sha256:4d5834a2a48965a349da1c5a79760d94a1a0172fbb5ab6b5b33cbf8447e109ce"}, + {file = "msgpack-1.0.4.tar.gz", hash = "sha256:f5d869c18f030202eb412f08b28d2afeea553d6613aee89e200d7aca7ef01f5f"}, +] multidict = [ {file = "multidict-6.0.2-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:0b9e95a740109c6047602f4db4da9949e6c5945cefbad34a1299775ddc9a62e2"}, {file = "multidict-6.0.2-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:ac0e27844758d7177989ce406acc6a83c16ed4524ebc363c1f748cba184d89d3"}, @@ -1719,8 +1782,8 @@ mypy-extensions = [ {file = "mypy_extensions-0.4.3.tar.gz", hash = "sha256:2d82818f5bb3e369420cb3c4060a7970edba416647068eb4c5343488a6c604a8"}, ] nonebot-adapter-onebot = [ - {file = "nonebot-adapter-onebot-2.0.0b1.tar.gz", hash = "sha256:9dad770371e577fead096ceacacc43b3ef304a8e238e8fff1163eefc4e947a75"}, - {file = "nonebot_adapter_onebot-2.0.0b1-py3-none-any.whl", hash = "sha256:ca1375de1dd503a5ab20440445026195b587e05a2b18ae8df9b6ab17c9e857b5"}, + {file = "nonebot-adapter-onebot-2.1.0.tar.gz", hash = "sha256:b3696235581a25f52dec8744b82102bf138637845d1bbaaf305b9e89423a562f"}, + {file = "nonebot_adapter_onebot-2.1.0-py3-none-any.whl", hash = "sha256:c1b4efd6a7ec22430897ba0e0698d58a95b2e28fe39c37271131c796ca366186"}, ] nonebot-plugin-apscheduler = [ {file = "nonebot-plugin-apscheduler-0.1.2.tar.gz", hash = "sha256:1765336cd388dde15f723ed12dbca942b04e4c25d5d7786878e447b09e68b909"}, diff --git a/pyproject.toml b/pyproject.toml index db6d99c1..7f08a92c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -5,10 +5,10 @@ description = "基于 Nonebot2 和 go-cqhttp 开发，以 postgresql 作为数 authors = ["HibiKier <775757368@qq.com>"] license = "AGPL" -[[tool.poetry.source]] -name = "ali" -default = true -url = "https://mirrors.aliyun.com/pypi/simple/" +# [[tool.poetry.source]] +# name = "ali" +# default = true +# url = "https://mirrors.aliyun.com/pypi/simple/" [tool.poetry.dependencies] python = "^3.8" diff --git a/utils/manager/requests_manager.py b/utils/manager/requests_manager.py index be5f6916..741978d2 100755 --- a/utils/manager/requests_manager.py +++ b/utils/manager/requests_manager.py @@ -1,6 +1,5 @@ from utils.manager.data_class import StaticData -from nonebot.adapters.onebot.v11 import Bot -from nonebot.adapters.onebot.v11.exception import ActionFailed +from nonebot.adapters.onebot.v11 import Bot, ActionFailed from services.log import logger from typing import Optional, Literal from utils.image_utils import BuildImage