From c8d80d07aa255277ebb1617146be4fc171ade90a Mon Sep 17 00:00:00 2001 From: Ljzd-PRO Date: Mon, 13 Nov 2023 03:11:46 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E8=B7=9F=E8=BF=9BQQ=E9=A2=91?= =?UTF-8?q?=E9=81=93=E9=80=82=E9=85=8D=E5=99=A8=E7=9A=84=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes #210 Closes #211 --- pyproject.toml | 4 ++-- src/nonebot_plugin_mystool/exchange.py | 2 +- src/nonebot_plugin_mystool/help.py | 2 +- src/nonebot_plugin_mystool/login.py | 4 ++-- src/nonebot_plugin_mystool/plan.py | 4 ++-- src/nonebot_plugin_mystool/user_check.py | 6 +++--- src/nonebot_plugin_mystool/utils.py | 7 ++++--- test-nonebot-project/pyproject.toml | 2 +- 8 files changed, 16 insertions(+), 15 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index b1fd662c..d0e0137b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -11,7 +11,7 @@ readme = "README.md" homepage = "https://github.com/Ljzd-PRO/nonebot-plugin-mystool" repository = "https://github.com/Ljzd-PRO/nonebot-plugin-mystool" documentation = "https://github.com/Ljzd-PRO/nonebot-plugin-mystool/wiki" -keywords = ["bot", "qq", "qqbot", "onebotv11", "onebot", "nonebot2", "nonebot", "mihoyo", "mihoyobbs", "qqguild", "star-rail", "genshin-impact"] +keywords = ["bot", "qq", "qqbot", "onebotv11", "onebot", "nonebot2", "nonebot", "mihoyo", "mihoyobbs", "qq-guild", "star-rail", "genshin-impact"] classifiers = [ "Programming Language :: Python :: 3", "License :: OSI Approved :: MIT License", @@ -30,7 +30,7 @@ ntplib = "^0.4.0" Pillow = ">=9.5,<11.0" requests = "^2.31.0" nonebot_adapter_onebot = "^2.2.4" -nonebot-adapter-qqguild = ">=0.2.4,<0.5.0" +nonebot-adapter-qq = "^1.0.1" tenacity = "^8.2.3" qrcode = "^7.4.2" pydantic = "^1.10.0" diff --git a/src/nonebot_plugin_mystool/exchange.py b/src/nonebot_plugin_mystool/exchange.py index 00ef4718..6c762f86 100644 --- a/src/nonebot_plugin_mystool/exchange.py +++ b/src/nonebot_plugin_mystool/exchange.py @@ -16,7 +16,7 @@ from apscheduler.events import JobExecutionEvent, EVENT_JOB_EXECUTED from nonebot import on_command, get_driver from nonebot.adapters.onebot.v11 import MessageEvent as OneBotV11MessageEvent, MessageSegment as OneBotV11MessageSegment -from nonebot.adapters.qqguild import MessageEvent as QQGuildMessageEvent, MessageSegment as QQGuildMessageSegment +from nonebot.adapters.qq import MessageEvent as QQGuildMessageEvent, MessageSegment as QQGuildMessageSegment from nonebot.internal.params import ArgStr from nonebot.matcher import Matcher from nonebot.params import ArgPlainText, T_State, CommandArg, Command diff --git a/src/nonebot_plugin_mystool/help.py b/src/nonebot_plugin_mystool/help.py index d64db3b3..5de01645 100644 --- a/src/nonebot_plugin_mystool/help.py +++ b/src/nonebot_plugin_mystool/help.py @@ -5,7 +5,7 @@ from typing import Union from nonebot import on_command -from nonebot.adapters.qqguild.exception import ActionFailed as QQGuildActionFailed +from nonebot.adapters.qq.exception import ActionFailed as QQGuildActionFailed from nonebot.internal.params import ArgStr from nonebot.matcher import Matcher from nonebot.params import CommandArg diff --git a/src/nonebot_plugin_mystool/login.py b/src/nonebot_plugin_mystool/login.py index 2528d2c8..2f474581 100644 --- a/src/nonebot_plugin_mystool/login.py +++ b/src/nonebot_plugin_mystool/login.py @@ -5,8 +5,8 @@ from typing import Union from nonebot import on_command -from nonebot.adapters.qqguild import MessageSegment as QQGuildMessageSegment, DirectMessageCreateEvent -from nonebot.adapters.qqguild.exception import AuditException +from nonebot.adapters.qq import MessageSegment as QQGuildMessageSegment, DirectMessageCreateEvent +from nonebot.adapters.qq.exception import AuditException from nonebot.exception import ActionFailed from nonebot.internal.matcher import Matcher from nonebot.internal.params import ArgStr diff --git a/src/nonebot_plugin_mystool/plan.py b/src/nonebot_plugin_mystool/plan.py index 8f1d428c..a2611848 100644 --- a/src/nonebot_plugin_mystool/plan.py +++ b/src/nonebot_plugin_mystool/plan.py @@ -8,9 +8,9 @@ from nonebot import on_command, get_adapters from nonebot.adapters.onebot.v11 import MessageSegment as OneBotV11MessageSegment, Adapter as OneBotV11Adapter, \ MessageEvent as OneBotV11MessageEvent -from nonebot.adapters.qqguild import MessageSegment as QQGuildMessageSegment, Adapter as QQGuildAdapter, \ +from nonebot.adapters.qq import MessageSegment as QQGuildMessageSegment, Adapter as QQGuildAdapter, \ MessageEvent as QQGuildMessageEvent -from nonebot.adapters.qqguild.exception import AuditException +from nonebot.adapters.qq.exception import AuditException from nonebot.exception import ActionFailed from nonebot.internal.matcher import Matcher from nonebot_plugin_apscheduler import scheduler diff --git a/src/nonebot_plugin_mystool/user_check.py b/src/nonebot_plugin_mystool/user_check.py index a619e65c..498a39c7 100644 --- a/src/nonebot_plugin_mystool/user_check.py +++ b/src/nonebot_plugin_mystool/user_check.py @@ -7,8 +7,8 @@ from nonebot import get_driver, on_request, on_command, Bot from nonebot.adapters.onebot.v11 import FriendRequestEvent, GroupRequestEvent, RequestEvent, Bot as OneBotV11Bot -from nonebot.adapters.qqguild import Bot as QQGuildBot, DirectMessageCreateEvent, MessageCreateEvent -from nonebot.adapters.qqguild.exception import ActionFailed as QQGuildActionFailed, AuditException +from nonebot.adapters.qq import Bot as QQGuildBot, DirectMessageCreateEvent, MessageCreateEvent +from nonebot.adapters.qq.exception import ActionFailed as QQGuildActionFailed, AuditException from nonebot.internal.matcher import Matcher from nonebot.params import CommandArg, Command @@ -22,7 +22,7 @@ @_driver.on_bot_connect -def check_qqguild_config(bot: QQGuildBot): +def check_qq_config(bot: QQGuildBot): """ 检查QQGuild适配器是否开启了私信功能 Intents.direct_message diff --git a/src/nonebot_plugin_mystool/utils.py b/src/nonebot_plugin_mystool/utils.py index bdea4439..92b69999 100644 --- a/src/nonebot_plugin_mystool/utils.py +++ b/src/nonebot_plugin_mystool/utils.py @@ -23,10 +23,11 @@ from nonebot.adapters import Message from nonebot.adapters.onebot.v11 import MessageEvent as OneBotV11MessageEvent, PrivateMessageEvent, GroupMessageEvent, \ Adapter as OneBotV11Adapter, Bot as OneBotV11Bot, ActionFailed as OneBotV11ActionFailed -from nonebot.adapters.qqguild import DirectMessageCreateEvent, MessageCreateEvent, \ +from nonebot.adapters.qq import DirectMessageCreateEvent, MessageCreateEvent, \ Adapter as QQGuildAdapter, Bot as QQGuildBot, MessageSegment as QQGuildMessageSegment, Message as QQGuildMessage -from nonebot.adapters.qqguild.api import DMS -from nonebot.adapters.qqguild.exception import ActionFailed as QQGuildActionFailed, AuditException + +from nonebot.adapters.qq.exception import ActionFailed as QQGuildActionFailed, AuditException +from nonebot.adapters.qq.models import DMS from nonebot.exception import ActionFailed from nonebot.internal.matcher import Matcher from nonebot.log import logger diff --git a/test-nonebot-project/pyproject.toml b/test-nonebot-project/pyproject.toml index fe4bed79..cfbb7f5f 100644 --- a/test-nonebot-project/pyproject.toml +++ b/test-nonebot-project/pyproject.toml @@ -8,7 +8,7 @@ requires-python = ">=3.8, <4.0" [tool.nonebot] adapters = [ { name = "OneBotV11", module_name = "nonebot.adapters.onebot.v11" }, - { name = "QQGuild", module_name = "nonebot.adapters.qqguild" } + { name = "QQGuild", module_name = "nonebot.adapters.qq" } ] plugins = ["nonebot_plugin_mystool"] plugin_dirs = []