From fcccde1acda4a849a2928a9b731f4420c797dd8c Mon Sep 17 00:00:00 2001 From: MxEmerson <2382413024@qq.com> Date: Tue, 17 Sep 2024 21:31:12 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=BD=AE=E7=9B=98?= =?UTF-8?q?=E4=B8=8E=E6=94=B9=E5=90=8D=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/config/__init__.py | 2 +- src/plugins/take_name/__init__.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/common/config/__init__.py b/src/common/config/__init__.py index bf4150d..b4baed8 100644 --- a/src/common/config/__init__.py +++ b/src/common/config/__init__.py @@ -317,7 +317,7 @@ def roulette_mode(self) -> int: :return: 0 踢人 1 禁言 ''' mode = self._find('roulette_mode') - return mode if mode else plugin_config.default_roulette_mode + return mode if mode != None else plugin_config.default_roulette_mode def set_roulette_mode(self, mode: int) -> None: ''' diff --git a/src/plugins/take_name/__init__.py b/src/plugins/take_name/__init__.py index 4075a50..694f7e9 100644 --- a/src/plugins/take_name/__init__.py +++ b/src/plugins/take_name/__init__.py @@ -96,6 +96,7 @@ async def is_change_name_notice(bot: Bot, event: NoticeEvent, state: T_State) -> async def watch_name_handle(bot: Bot, event: NoticeEvent, state: T_State): group_id = event.group_id user_id = event.user_id + bot_id = event.self_id try: info = await bot.call_api('get_group_member_info', **{ @@ -117,7 +118,7 @@ async def watch_name_handle(bot: Bot, event: NoticeEvent, state: T_State): try: await bot.call_api('set_group_card', **{ 'group_id': group_id, - 'user_id': user_id, + 'user_id': bot_id, 'card': card }) From a01dd0abdeb8ce71032466dce799a2bb56b09420 Mon Sep 17 00:00:00 2001 From: MxEmerson <2382413024@qq.com> Date: Tue, 17 Sep 2024 21:34:20 +0800 Subject: [PATCH 2/3] =?UTF-8?q?refactor:=20=E5=88=A0=E9=99=A4=E8=BF=87?= =?UTF-8?q?=E6=97=B6=E7=9A=84=E9=85=8D=E7=BD=AE=EF=BC=8C=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?adapters=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit BREAKING CHANGE: 移除了`bot.py`，现在可以直接使用`nb run`运行 --- bot.py | 36 ------------------------------------ config.yml | 10 ---------- docker-compose.yml | 9 --------- pyproject.toml | 5 ++++- 4 files changed, 4 insertions(+), 56 deletions(-) delete mode 100644 bot.py delete mode 100644 config.yml diff --git a/bot.py b/bot.py deleted file mode 100644 index fb8730b..0000000 --- a/bot.py +++ /dev/null @@ -1,36 +0,0 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- - -import nonebot -from nonebot.adapters.onebot.v11 import Adapter as ONEBOT_V11Adapter - -# Custom your logger -# -# from nonebot.log import logger, default_format -# logger.add("error.log", -# rotation="00:00", -# diagnose=False, -# level="ERROR", -# format=default_format) - -# You can pass some keyword args config to init function -nonebot.init() -app = nonebot.get_asgi() - -driver = nonebot.get_driver() -driver.register_adapter(ONEBOT_V11Adapter) - - -# Please DO NOT modify this file unless you know what you are doing! -# As an alternative, you should use command `nb` or modify `pyproject.toml` to load plugins -nonebot.load_from_toml("pyproject.toml") - -# Modify some config / config depends on loaded configs -# -# config = driver.config -# do something... - - -if __name__ == "__main__": - nonebot.logger.warning("Always use `nb run` to start the bot instead of manually running!") - nonebot.run(app="__mp_main__:app") diff --git a/config.yml b/config.yml deleted file mode 100644 index 700417e..0000000 --- a/config.yml +++ /dev/null @@ -1,10 +0,0 @@ -account: - uin: 机器人QQ号 - password: "机器人密码" - -message: - post-format: array - -servers: - - ws-reverse: - universal: ws://127.0.0.1:8080/onebot/v11/ws \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index fa2223d..128165b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -40,14 +40,5 @@ services: - /opt/dockerstore/mongo/data:/data/db - /opt/dockerstore/mongo/logs:/var/log/mongodb - qsign: - container_name: qsign - image: xzhouqd/qsign:8.9.63 - environment: - - PORT=8080 - - COUNT=3 - - ANDROID_ID=114514 - restart: always - networks: pallasbot: diff --git a/pyproject.toml b/pyproject.toml index 3af6350..e878589 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -17,12 +17,15 @@ jieba-fast = "^0.53" pypinyin = "^0.49.0" asyncer = "^0.0.2" nonebot-plugin-apscheduler = "^0.3.0" -nonebot-plugin-gocqhttp = "^0.6.4" +setuptools = "^74.1.2" [tool.poetry.dev-dependencies] nb-cli = "^1.2.0" [tool.nonebot] +adapters = [ + { name = "OneBot V11", module_name = "nonebot.adapters.onebot.v11" } +] plugins = ["nonebot_plugin_apscheduler"] plugin_dirs = ["src/plugins"] From a9c87bf8293b064a9aa32cdfe40f3e5b4a63fb9b Mon Sep 17 00:00:00 2001 From: MxEmerson <2382413024@qq.com> Date: Tue, 17 Sep 2024 22:34:10 +0800 Subject: [PATCH 3/3] =?UTF-8?q?chore:=20=E6=9B=B4=E6=96=B0vscode=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E4=B8=8E=E8=B0=83=E8=AF=95=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vscode/launch.json | 5 +---- .vscode/settings.json | 9 ++++++++- bot.py | 15 +++++++++++++++ 3 files changed, 24 insertions(+), 5 deletions(-) create mode 100644 bot.py diff --git a/.vscode/launch.json b/.vscode/launch.json index 3863b15..a41b847 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -1,12 +1,9 @@ { - // 使用 IntelliSense 了解相关属性。 - // 悬停以查看现有属性的描述。 - // 欲了解更多信息，请访问: https://go.microsoft.com/fwlink/?linkid=830387 "version": "0.2.0", "configurations": [ { "name": "Python: Nonebot", - "type": "python", + "type": "debugpy", "request": "launch", "program": "${workspaceFolder}/bot.py", "console": "integratedTerminal", diff --git a/.vscode/settings.json b/.vscode/settings.json index 3516cb9..7d94d36 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,3 +1,10 @@ { - "python.formatting.provider": "autopep8" + "[python]": { + "diffEditor.ignoreTrimWhitespace": false, + "editor.defaultFormatter": "ms-python.autopep8", + "editor.formatOnType": true, + "editor.formatOnSave": true + }, + "python.languageServer": "Pylance", + "python.analysis.typeCheckingMode": "basic" } \ No newline at end of file diff --git a/bot.py b/bot.py new file mode 100644 index 0000000..7563acc --- /dev/null +++ b/bot.py @@ -0,0 +1,15 @@ +import nonebot +from nonebot.adapters.onebot.v11 import Adapter as ONEBOT_V11Adapter + + + +nonebot.init() + +driver = nonebot.get_driver() +driver.register_adapter(ONEBOT_V11Adapter) + + +nonebot.load_from_toml("pyproject.toml") + +if __name__ == "__main__": + nonebot.run() \ No newline at end of file