From 2885e6053c0e7fbfd6abd872daf158ca3ae73438 Mon Sep 17 00:00:00 2001 From: notnotype <=> Date: Sun, 7 Mar 2021 22:36:38 +0800 Subject: [PATCH 1/6] =?UTF-8?q?fix:=20mah=20adapter=20=E4=B8=8D=E8=83=BD?= =?UTF-8?q?=E6=8E=A5=E5=8F=97=E5=A5=BD=E5=8F=8B=E8=AF=B7=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nonebot/adapters/mirai/event/request.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/nonebot-adapter-mirai/nonebot/adapters/mirai/event/request.py b/packages/nonebot-adapter-mirai/nonebot/adapters/mirai/event/request.py index 3bf82f01..3081b8b4 100644 --- a/packages/nonebot-adapter-mirai/nonebot/adapters/mirai/event/request.py +++ b/packages/nonebot-adapter-mirai/nonebot/adapters/mirai/event/request.py @@ -36,7 +36,8 @@ class NewFriendRequestEvent(RequestEvent): 'eventId': self.event_id, 'groupId': self.group_id, 'fromId': self.from_id, - 'operate': 0 + 'operate': 0, + 'message': '' }) async def reject(self, @@ -46,7 +47,7 @@ class NewFriendRequestEvent(RequestEvent): """ :说明: - 拒绝此人的好友申请 + 拒绝此人的好友申请 :参数: @@ -135,7 +136,7 @@ class BotInvitedJoinGroupRequestEvent(RequestEvent): """ :说明: - 通过这份被邀请入群申请 + 通过这份被邀请入群申请 :参数: @@ -153,7 +154,7 @@ class BotInvitedJoinGroupRequestEvent(RequestEvent): """ :说明: - 拒绝这份被邀请入群申请 + 拒绝这份被邀请入群申请 :参数: From ad70fac377e251768d8204973cc3c982236a7304 Mon Sep 17 00:00:00 2001 From: notnotype Date: Sun, 7 Mar 2021 14:41:18 +0000 Subject: [PATCH 2/6] :memo: update api docs --- docs/api/drivers/fastapi.md | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/docs/api/drivers/fastapi.md b/docs/api/drivers/fastapi.md index fba15c68..3b2f4f23 100644 --- a/docs/api/drivers/fastapi.md +++ b/docs/api/drivers/fastapi.md @@ -28,7 +28,7 @@ FastAPI 驱动框架设置，详情参考 FastAPI 文档 * **说明** - openapi.json 地址，默认为 None 即关闭 + `openapi.json` 地址，默认为 `None` 即关闭 @@ -43,7 +43,7 @@ FastAPI 驱动框架设置，详情参考 FastAPI 文档 * **说明** - swagger 地址，默认为 None 即关闭 + `swagger` 地址，默认为 `None` 即关闭 @@ -58,7 +58,22 @@ FastAPI 驱动框架设置，详情参考 FastAPI 文档 * **说明** - redoc 地址，默认为 None 即关闭 + `redoc` 地址，默认为 `None` 即关闭 + + + +### `fastapi_reload_dirs` + + +* **类型** + + `List[str]` + + + +* **说明** + + `debug` 模式下重载监控文件夹列表，默认为 uvicorn 默认值 From e7101a1f39e498624d623f12010d8501c0b42169 Mon Sep 17 00:00:00 2001 From: SK-415 <36433929+SK-415@users.noreply.github.com> Date: Mon, 8 Mar 2021 16:39:33 +0800 Subject: [PATCH 3/6] fix: Plugin Store link in README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 80c07c84..35c18cbc 100644 --- a/README.md +++ b/README.md @@ -110,7 +110,7 @@ NoneBot2 的驱动框架 `Driver` 以及通信协议 `Adapter` 均可**自定义 或者尝试 [文档镜像](https://nonebot2-vercel-mirror.vercel.app) -- 其他插件请查看 [插件商店](https://v2.nonebot.dev/plugin-store.html) +- 其他插件请查看 [插件商店](https://v2.nonebot.dev/store.html) ## 贡献 From 89ff2dd3c59a77469d079be2271f4398fa60f379 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Mon, 8 Mar 2021 17:16:37 +0800 Subject: [PATCH 4/6] :memo: update readme --- README.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 35c18cbc..7b8cc1ce 100644 --- a/README.md +++ b/README.md @@ -72,13 +72,15 @@ NoneBot2 的驱动框架 `Driver` 以及通信协议 `Adapter` 均可**自定义 - [FastAPI](https://fastapi.tiangolo.com/) - [Quart](https://pgjones.gitlab.io/quart/) (异步 flask ) -目前 NoneBot2 内置的协议适配： +目前 NoneBot2 官方维护的协议适配： - [OneBot(CQHTTP) 协议](https://github.com/howmanybots/onebot/blob/master/README.md) (QQ 等) - [Mirai-API-HTTP 协议](https://github.com/project-mirai/mirai-api-http) - [钉钉](https://ding-doc.dingtalk.com/document#/org-dev-guide/elzz1p) - [Telegram](https://core.telegram.org/bots/api) _计划中_ +更多：[商店](https://v2.nonebot.dev/store.html) + ## 即刻开始 ~~完整~~文档可以在 [这里](https://v2.nonebot.dev/) 查看。 @@ -110,7 +112,7 @@ NoneBot2 的驱动框架 `Driver` 以及通信协议 `Adapter` 均可**自定义 或者尝试 [文档镜像](https://nonebot2-vercel-mirror.vercel.app) -- 其他插件请查看 [插件商店](https://v2.nonebot.dev/store.html) +- 其他插件请查看 [商店](https://v2.nonebot.dev/store.html) ## 贡献 From 5ee6beb4b8eef9919de0bfe008df5285c61712c3 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Wed, 10 Mar 2021 17:32:14 +0800 Subject: [PATCH 5/6] :ambulance: fix test reload --- tests/.env | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/.env b/tests/.env index 9ef1d705..c1b9dfb0 100644 --- a/tests/.env +++ b/tests/.env @@ -1,2 +1,3 @@ ENVIRONMENT=dev CUSTOM_CONFIG=common +FASTAPI_RELOAD_DIRS=["test_plugins"] From 46c65b919f4b40e121bcc1964fce07551093eaa5 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Thu, 11 Mar 2021 00:27:32 +0800 Subject: [PATCH 6/6] :bug: fix bot display bug --- docs/.vuepress/components/Bot.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/.vuepress/components/Bot.vue b/docs/.vuepress/components/Bot.vue index f2fad299..954a3ebd 100644 --- a/docs/.vuepress/components/Bot.vue +++ b/docs/.vuepress/components/Bot.vue @@ -141,7 +141,6 @@ export default { filteredBots() { return this.bots.filter(bot => { return ( - bot.id.indexOf(this.filterText || "") != -1 || bot.name.indexOf(this.filterText || "") != -1 || bot.desc.indexOf(this.filterText || "") != -1 || bot.author.indexOf(this.filterText || "") != -1