From f8703557a060f3f3b804d93d07ee57de4ac4609c Mon Sep 17 00:00:00 2001 From: pear-studio Date: Wed, 4 Aug 2021 16:23:52 +0000 Subject: [PATCH 01/13] :beers: publish bot DicePP --- docs/.vuepress/public/bots.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/docs/.vuepress/public/bots.json b/docs/.vuepress/public/bots.json index fadd0218..ea9a71a5 100644 --- a/docs/.vuepress/public/bots.json +++ b/docs/.vuepress/public/bots.json @@ -40,5 +40,11 @@ "desc": "猜一猜游戏、新闻一览、英文每日一词一短语等等，含一键启动及docker容器部署就绪", "author": "ffreemt", "repo": "https://github.com/ffreemt/koyeb-nb2" + }, + { + "name": "DicePP", + "desc": "TRPG骰娘, 带先攻, 查询等功能, 主要面向DND5E. 面对骰主推出的船新版本, 内置Windows/Linux详细部署指南以及方便的自定义骰娘方法, 从回复文本到查询资料库都可轻松配置~", + "author": "pear-studio", + "repo": "https://github.com/pear-studio/nonebot-dicepp" } ] \ No newline at end of file From 0bd8d4fbbc7fc55b131231802ed2f7869978d87a Mon Sep 17 00:00:00 2001 From: kexue-z Date: Thu, 5 Aug 2021 07:30:36 +0000 Subject: [PATCH 02/13] =?UTF-8?q?:beers:=20publish=20plugin=20=E5=92=8C?= =?UTF-8?q?=E9=A3=8E=E5=A4=A9=E6=B0=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/.vuepress/public/plugins.json | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/docs/.vuepress/public/plugins.json b/docs/.vuepress/public/plugins.json index 4060da07..3c38831c 100644 --- a/docs/.vuepress/public/plugins.json +++ b/docs/.vuepress/public/plugins.json @@ -318,5 +318,13 @@ "desc": "通过FlightRadar24查询航班信息", "author": "IronWolf-K", "repo": "https://github.com/IronWolf-K/nonebot_plugin_fr24" + }, + { + "id": "nonebot_plugin_heweather", + "link": "nonebot-plugin-heweather", + "name": "和风天气", + "desc": "获取和风天气信息并转换为图片", + "author": "kexue-z", + "repo": "https://github.com/kexue-z/nonebot-plugin-heweather" } -] +] \ No newline at end of file From 05ea21becdf52d153230562a25e3592dab4bb186 Mon Sep 17 00:00:00 2001 From: ffreemt Date: Sun, 8 Aug 2021 05:44:37 +0000 Subject: [PATCH 03/13] :beers: publish plugin nonebot-plugin-autohelp --- docs/.vuepress/public/plugins.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/docs/.vuepress/public/plugins.json b/docs/.vuepress/public/plugins.json index 3c38831c..4fa68e67 100644 --- a/docs/.vuepress/public/plugins.json +++ b/docs/.vuepress/public/plugins.json @@ -326,5 +326,13 @@ "desc": "获取和风天气信息并转换为图片", "author": "kexue-z", "repo": "https://github.com/kexue-z/nonebot-plugin-heweather" + }, + { + "id": "nonebot_plugin_autohelp", + "link": "nonebot-plugin-autohelp", + "name": "nonebot-plugin-autohelp", + "desc": "响应help/菜单/帮助(群消息或私信)并提供已载入插件的帮助信息（如命令名，aliases，模块文档）", + "author": "ffreemt", + "repo": "https://github.com/ffreemt/nonebot-plugin-autohelp" } ] \ No newline at end of file From b098c8477be5652cae0c5e9ef224172738cb9dfc Mon Sep 17 00:00:00 2001 From: Sclock Date: Mon, 9 Aug 2021 13:39:24 +0000 Subject: [PATCH 04/13] =?UTF-8?q?:beers:=20publish=20plugin=20=E5=AD=A4?= =?UTF-8?q?=E5=AF=A1=E6=9C=BA=E5=99=A8=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/.vuepress/public/plugins.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/docs/.vuepress/public/plugins.json b/docs/.vuepress/public/plugins.json index 4fa68e67..9149e564 100644 --- a/docs/.vuepress/public/plugins.json +++ b/docs/.vuepress/public/plugins.json @@ -334,5 +334,13 @@ "desc": "响应help/菜单/帮助(群消息或私信)并提供已载入插件的帮助信息（如命令名，aliases，模块文档）", "author": "ffreemt", "repo": "https://github.com/ffreemt/nonebot-plugin-autohelp" + }, + { + "id": "gugua_bot", + "link": "gugua_bot", + "name": "孤寡机器人", + "desc": "让你的孤寡朋友露出阳光的笑容", + "author": "Sclock", + "repo": "https://github.com/Sclock/gugua" } ] \ No newline at end of file From eb3e20abfb86122d67404c666e80c9c5462f2de0 Mon Sep 17 00:00:00 2001 From: Sclock Date: Mon, 9 Aug 2021 16:45:05 +0000 Subject: [PATCH 05/13] =?UTF-8?q?:beers:=20publish=20plugin=20=E5=B8=83?= =?UTF-8?q?=E8=B0=B7=E6=9C=BA=E5=99=A8=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/.vuepress/public/plugins.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/docs/.vuepress/public/plugins.json b/docs/.vuepress/public/plugins.json index 9149e564..08bfc9e8 100644 --- a/docs/.vuepress/public/plugins.json +++ b/docs/.vuepress/public/plugins.json @@ -342,5 +342,13 @@ "desc": "让你的孤寡朋友露出阳光的笑容", "author": "Sclock", "repo": "https://github.com/Sclock/gugua" + }, + { + "id": "bugu_bot", + "link": "bugu_bot", + "name": "布谷机器人", + "desc": "增进你和你单身朋友的友谊", + "author": "Sclock", + "repo": "https://github.com/Sclock/bugu_bot" } ] \ No newline at end of file From 879767df01201c7df8e0ae834f19ce6c74d45506 Mon Sep 17 00:00:00 2001 From: rmuchan Date: Tue, 10 Aug 2021 03:01:04 +0000 Subject: [PATCH 06/13] :beers: publish plugin nonebot-plugin-flexperm --- docs/.vuepress/public/plugins.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/docs/.vuepress/public/plugins.json b/docs/.vuepress/public/plugins.json index 08bfc9e8..6bb74a6a 100644 --- a/docs/.vuepress/public/plugins.json +++ b/docs/.vuepress/public/plugins.json @@ -350,5 +350,13 @@ "desc": "增进你和你单身朋友的友谊", "author": "Sclock", "repo": "https://github.com/Sclock/bugu_bot" + }, + { + "id": "nonebot_plugin_flexperm", + "link": "nonebot-plugin-flexperm", + "name": "nonebot-plugin-flexperm", + "desc": "精细化的 NoneBot 权限管理插件", + "author": "rmuchan", + "repo": "https://github.com/rmuchan/nonebot-plugin-flexperm" } ] \ No newline at end of file From 18c6bea4517bc86f6f4d82cc929a210697eb7650 Mon Sep 17 00:00:00 2001 From: mri-moe <87687313+mri-moe@users.noreply.github.com> Date: Sat, 14 Aug 2021 13:04:15 +0800 Subject: [PATCH 07/13] =?UTF-8?q?=E2=9C=8F=EF=B8=8F=20add=20switcher=20for?= =?UTF-8?q?=20lark?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/api/adapters/feishu.md | 3 +++ packages/nonebot-adapter-feishu/nonebot/adapters/feishu/bot.py | 3 +++ .../nonebot-adapter-feishu/nonebot/adapters/feishu/config.py | 3 +++ 3 files changed, 9 insertions(+) diff --git a/docs/api/adapters/feishu.md b/docs/api/adapters/feishu.md index 0da2dc15..0e618f18 100644 --- a/docs/api/adapters/feishu.md +++ b/docs/api/adapters/feishu.md @@ -31,6 +31,9 @@ sidebarDepth: 0 * `tenant_access_token` / `feishu_tenant_access_token`: 请求飞书 API 后返回的租户密钥 + * `reigon` / `feishu_or_lark`: 设置后端使用飞书服务器还是Lark服务器 + + # NoneBot.adapters.feishu.exception 模块 diff --git a/packages/nonebot-adapter-feishu/nonebot/adapters/feishu/bot.py b/packages/nonebot-adapter-feishu/nonebot/adapters/feishu/bot.py index d513fb8c..6b527c09 100644 --- a/packages/nonebot-adapter-feishu/nonebot/adapters/feishu/bot.py +++ b/packages/nonebot-adapter-feishu/nonebot/adapters/feishu/bot.py @@ -136,6 +136,9 @@ class Bot(BaseBot): @property def api_root(self) -> str: + if self.feishu_config.region == "Lark" : + return "https://open.larksuite.com/open-apis/" + else: return "https://open.feishu.cn/open-apis/" @classmethod diff --git a/packages/nonebot-adapter-feishu/nonebot/adapters/feishu/config.py b/packages/nonebot-adapter-feishu/nonebot/adapters/feishu/config.py index 853f553e..07843d2b 100644 --- a/packages/nonebot-adapter-feishu/nonebot/adapters/feishu/config.py +++ b/packages/nonebot-adapter-feishu/nonebot/adapters/feishu/config.py @@ -14,6 +14,8 @@ class Config(BaseModel): - ``encrypt_key`` / ``feishu_encrypt_key``: 飞书开放平台后台“事件订阅”处设置的 Encrypt Key - ``verification_token`` / ``feishu_verification_token``: 飞书开放平台后台“事件订阅”处设置的 Verification Token - ``tenant_access_token`` / ``feishu_tenant_access_token``: 请求飞书 API 后返回的租户密钥 + - ``region`` / ``feishu_or_lark``: 选择飞书服务器还是Lark服务器,如留空则默认为飞书服务器 + """ app_id: Optional[str] = Field(default=None, alias="feishu_app_id") app_secret: Optional[str] = Field(default=None, alias="feishu_app_secret") @@ -22,6 +24,7 @@ class Config(BaseModel): alias="feishu_verification_token") tenant_access_token: Optional[str] = Field( default=None, alias="feishu_tenant_access_token") + region: Optional[str] = Field(default=None, alias="feishu_or_lark") class Config: extra = "ignore" From e4d1462585e5e3c1798eb1e378ba437cb9e55346 Mon Sep 17 00:00:00 2001 From: mri-moe Date: Mon, 16 Aug 2021 08:10:42 +0000 Subject: [PATCH 08/13] :memo: update api docs --- docs/api/adapters/feishu.md | 233 ------------------------------------ 1 file changed, 233 deletions(-) diff --git a/docs/api/adapters/feishu.md b/docs/api/adapters/feishu.md index 0e618f18..c6c9aae6 100644 --- a/docs/api/adapters/feishu.md +++ b/docs/api/adapters/feishu.md @@ -7,243 +7,10 @@ sidebarDepth: 0 # NoneBot.adapters.feishu.config 模块 - -## _class_ `Config` - -钉钉配置类 - - -* **配置项** - - - * `app_id` / `feishu_app_id`: 飞书开放平台后台“凭证与基础信息”处给出的 App ID - - - * `app_secret` / `feishu_app_secret`: 飞书开放平台后台“凭证与基础信息”处给出的 App Secret - - - * `encrypt_key` / `feishu_encrypt_key`: 飞书开放平台后台“事件订阅”处设置的 Encrypt Key - - - * `verification_token` / `feishu_verification_token`: 飞书开放平台后台“事件订阅”处设置的 Verification Token - - - * `tenant_access_token` / `feishu_tenant_access_token`: 请求飞书 API 后返回的租户密钥 - - - * `reigon` / `feishu_or_lark`: 设置后端使用飞书服务器还是Lark服务器 - - # NoneBot.adapters.feishu.exception 模块 - -## _exception_ `ActionFailed` - -基类：[`nonebot.exception.ActionFailed`](../exception.md#nonebot.exception.ActionFailed), `nonebot.adapters.feishu.exception.FeishuAdapterException` - - -* **说明** - - API 请求返回错误信息。 - - - -* **参数** - - - * `retcode: Optional[int]`: 错误码 - - - -## _exception_ `NetworkError` - -基类：[`nonebot.exception.NetworkError`](../exception.md#nonebot.exception.NetworkError), `nonebot.adapters.feishu.exception.FeishuAdapterException` - - -* **说明** - - 网络错误。 - - - -* **参数** - - - * `retcode: Optional[int]`: 错误码 - - # NoneBot.adapters.feishu.bot 模块 - -## `_check_at_me(bot, event)` - - -* **说明** - - 检查消息开头或结尾是否存在 @机器人，去除并赋值 `event.reply`, `event.to_me` - - - -* **参数** - - - * `bot: Bot`: Bot 对象 - - - * `event: Event`: Event 对象 - - - -## `_check_nickname(bot, event)` - - -* **说明** - - 检查消息开头是否存在昵称，去除并赋值 `event.to_me` - - - -* **参数** - - - * `bot: Bot`: Bot 对象 - - - * `event: Event`: Event 对象 - - - -## `_handle_api_result(result)` - - -* **说明** - - 处理 API 请求返回值。 - - - -* **参数** - - - * `result: Optional[Dict[str, Any]]`: API 返回数据 - - - -* **返回** - - - * `Any`: API 调用返回数据 - - - -* **异常** - - - * `ActionFailed`: API 调用失败 - - - -## _class_ `Bot` - -基类：[`nonebot.adapters._base.Bot`](README.md#nonebot.adapters._base.Bot) - -飞书 协议 Bot 适配。继承属性参考 [BaseBot](./#class-basebot) 。 - - -### _async_ `handle_message(message)` - - -* **说明** - - 处理事件并转换为 [Event](#class-event) - - - -### _async_ `call_api(api, **data)` - - -* **说明** - - 调用 飞书 协议 API - - - -* **参数** - - - * `api: str`: API 名称 - - - * `**data: Any`: API 参数 - - - -* **返回** - - - * `Any`: API 调用返回数据 - - - -* **异常** - - - * `NetworkError`: 网络错误 - - - * `ActionFailed`: API 调用失败 - - # NoneBot.adapters.feishu.message 模块 - -## _class_ `MessageSegment` - -基类：[`nonebot.adapters._base.MessageSegment`](README.md#nonebot.adapters._base.MessageSegment)[`Message`] - -飞书 协议 MessageSegment 适配。具体方法参考协议消息段类型或源码。 - - -## _class_ `Message` - -基类：[`nonebot.adapters._base.Message`](README.md#nonebot.adapters._base.Message)[`nonebot.adapters.feishu.message.MessageSegment`] - -飞书 协议 Message 适配。 - - -## _class_ `MessageSerializer` - -基类：`object` - -飞书 协议 Message 序列化器。 - - -## _class_ `MessageDeserializer` - -基类：`object` - -飞书 协议 Message 反序列化器。 - # NoneBot.adapters.feishu.event 模块 - - -## _class_ `Event` - -基类：[`nonebot.adapters._base.Event`](README.md#nonebot.adapters._base.Event) - -飞书协议事件。各事件字段参考 [飞书文档](https://open.feishu.cn/document/ukTMukTMukTM/uYDNxYjL2QTM24iN0EjN/event-list) - - -## `get_event_model(event_name)` - - -* **说明** - - 根据事件名获取对应 `Event Model` 及 `FallBack Event Model` 列表 - - - -* **返回** - - - * `List[Type[Event]]` From 45cec05bbcbe79eefb366b6c99de418306de5700 Mon Sep 17 00:00:00 2001 From: mri-moe <87687313+mri-moe@users.noreply.github.com> Date: Mon, 16 Aug 2021 16:24:33 +0800 Subject: [PATCH 09/13] Update bot.py --- .../nonebot-adapter-feishu/nonebot/adapters/feishu/bot.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/nonebot-adapter-feishu/nonebot/adapters/feishu/bot.py b/packages/nonebot-adapter-feishu/nonebot/adapters/feishu/bot.py index 6b527c09..3d797a80 100644 --- a/packages/nonebot-adapter-feishu/nonebot/adapters/feishu/bot.py +++ b/packages/nonebot-adapter-feishu/nonebot/adapters/feishu/bot.py @@ -137,9 +137,9 @@ class Bot(BaseBot): @property def api_root(self) -> str: if self.feishu_config.region == "Lark" : - return "https://open.larksuite.com/open-apis/" + return "https://open.larksuite.com/open-apis/" else: - return "https://open.feishu.cn/open-apis/" + return "https://open.feishu.cn/open-apis/" @classmethod def register(cls, driver: Driver, config: "Config"): From a3fa1a36c926f511bc3fd15bded1f480b8ccf9ac Mon Sep 17 00:00:00 2001 From: mri-moe Date: Mon, 16 Aug 2021 08:30:19 +0000 Subject: [PATCH 10/13] :memo: update api docs --- docs/api/adapters/feishu.md | 233 ++++++++++++++++++++++++++++++++++++ 1 file changed, 233 insertions(+) diff --git a/docs/api/adapters/feishu.md b/docs/api/adapters/feishu.md index c6c9aae6..be8ad00e 100644 --- a/docs/api/adapters/feishu.md +++ b/docs/api/adapters/feishu.md @@ -7,10 +7,243 @@ sidebarDepth: 0 # NoneBot.adapters.feishu.config 模块 + +## _class_ `Config` + +钉钉配置类 + + +* **配置项** + + + * `app_id` / `feishu_app_id`: 飞书开放平台后台“凭证与基础信息”处给出的 App ID + + + * `app_secret` / `feishu_app_secret`: 飞书开放平台后台“凭证与基础信息”处给出的 App Secret + + + * `encrypt_key` / `feishu_encrypt_key`: 飞书开放平台后台“事件订阅”处设置的 Encrypt Key + + + * `verification_token` / `feishu_verification_token`: 飞书开放平台后台“事件订阅”处设置的 Verification Token + + + * `tenant_access_token` / `feishu_tenant_access_token`: 请求飞书 API 后返回的租户密钥 + + + * `region` / `feishu_or_lark`: 选择飞书服务器还是Lark服务器,如留空则默认为飞书服务器 + + # NoneBot.adapters.feishu.exception 模块 + +## _exception_ `ActionFailed` + +基类：[`nonebot.exception.ActionFailed`](../exception.md#nonebot.exception.ActionFailed), `nonebot.adapters.feishu.exception.FeishuAdapterException` + + +* **说明** + + API 请求返回错误信息。 + + + +* **参数** + + + * `retcode: Optional[int]`: 错误码 + + + +## _exception_ `NetworkError` + +基类：[`nonebot.exception.NetworkError`](../exception.md#nonebot.exception.NetworkError), `nonebot.adapters.feishu.exception.FeishuAdapterException` + + +* **说明** + + 网络错误。 + + + +* **参数** + + + * `retcode: Optional[int]`: 错误码 + + # NoneBot.adapters.feishu.bot 模块 + +## `_check_at_me(bot, event)` + + +* **说明** + + 检查消息开头或结尾是否存在 @机器人，去除并赋值 `event.reply`, `event.to_me` + + + +* **参数** + + + * `bot: Bot`: Bot 对象 + + + * `event: Event`: Event 对象 + + + +## `_check_nickname(bot, event)` + + +* **说明** + + 检查消息开头是否存在昵称，去除并赋值 `event.to_me` + + + +* **参数** + + + * `bot: Bot`: Bot 对象 + + + * `event: Event`: Event 对象 + + + +## `_handle_api_result(result)` + + +* **说明** + + 处理 API 请求返回值。 + + + +* **参数** + + + * `result: Optional[Dict[str, Any]]`: API 返回数据 + + + +* **返回** + + + * `Any`: API 调用返回数据 + + + +* **异常** + + + * `ActionFailed`: API 调用失败 + + + +## _class_ `Bot` + +基类：[`nonebot.adapters._base.Bot`](README.md#nonebot.adapters._base.Bot) + +飞书 协议 Bot 适配。继承属性参考 [BaseBot](./#class-basebot) 。 + + +### _async_ `handle_message(message)` + + +* **说明** + + 处理事件并转换为 [Event](#class-event) + + + +### _async_ `call_api(api, **data)` + + +* **说明** + + 调用 飞书 协议 API + + + +* **参数** + + + * `api: str`: API 名称 + + + * `**data: Any`: API 参数 + + + +* **返回** + + + * `Any`: API 调用返回数据 + + + +* **异常** + + + * `NetworkError`: 网络错误 + + + * `ActionFailed`: API 调用失败 + + # NoneBot.adapters.feishu.message 模块 + +## _class_ `MessageSegment` + +基类：[`nonebot.adapters._base.MessageSegment`](README.md#nonebot.adapters._base.MessageSegment)[`Message`] + +飞书 协议 MessageSegment 适配。具体方法参考协议消息段类型或源码。 + + +## _class_ `Message` + +基类：[`nonebot.adapters._base.Message`](README.md#nonebot.adapters._base.Message)[`nonebot.adapters.feishu.message.MessageSegment`] + +飞书 协议 Message 适配。 + + +## _class_ `MessageSerializer` + +基类：`object` + +飞书 协议 Message 序列化器。 + + +## _class_ `MessageDeserializer` + +基类：`object` + +飞书 协议 Message 反序列化器。 + # NoneBot.adapters.feishu.event 模块 + + +## _class_ `Event` + +基类：[`nonebot.adapters._base.Event`](README.md#nonebot.adapters._base.Event) + +飞书协议事件。各事件字段参考 [飞书文档](https://open.feishu.cn/document/ukTMukTMukTM/uYDNxYjL2QTM24iN0EjN/event-list) + + +## `get_event_model(event_name)` + + +* **说明** + + 根据事件名获取对应 `Event Model` 及 `FallBack Event Model` 列表 + + + +* **返回** + + + * `List[Type[Event]]` From f63ef8d23b1b7a3233f0da34cc9f7f20e2c02f57 Mon Sep 17 00:00:00 2001 From: mri-moe <87687313+mri-moe@users.noreply.github.com> Date: Mon, 16 Aug 2021 17:03:44 +0800 Subject: [PATCH 11/13] :memo: update desc Co-authored-by: Ju4tCode <42488585+yanyongyu@users.noreply.github.com> --- .../nonebot-adapter-feishu/nonebot/adapters/feishu/config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/nonebot-adapter-feishu/nonebot/adapters/feishu/config.py b/packages/nonebot-adapter-feishu/nonebot/adapters/feishu/config.py index 07843d2b..6f7442d9 100644 --- a/packages/nonebot-adapter-feishu/nonebot/adapters/feishu/config.py +++ b/packages/nonebot-adapter-feishu/nonebot/adapters/feishu/config.py @@ -14,7 +14,7 @@ class Config(BaseModel): - ``encrypt_key`` / ``feishu_encrypt_key``: 飞书开放平台后台“事件订阅”处设置的 Encrypt Key - ``verification_token`` / ``feishu_verification_token``: 飞书开放平台后台“事件订阅”处设置的 Verification Token - ``tenant_access_token`` / ``feishu_tenant_access_token``: 请求飞书 API 后返回的租户密钥 - - ``region`` / ``feishu_or_lark``: 选择飞书服务器还是Lark服务器,如留空则默认为飞书服务器 + - ``region`` / ``feishu_or_lark``: 选择服务器，如为 ``"Lark"`` 则连接 Lark 服务器 """ app_id: Optional[str] = Field(default=None, alias="feishu_app_id") From 109cae6daca9ce6875ef08608132a71acf3ac160 Mon Sep 17 00:00:00 2001 From: StarHeartHunt Date: Mon, 16 Aug 2021 17:30:52 +0800 Subject: [PATCH 12/13] :wrench: add config for lark users --- .../nonebot-adapter-feishu/nonebot/adapters/feishu/bot.py | 2 +- .../nonebot-adapter-feishu/nonebot/adapters/feishu/config.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/nonebot-adapter-feishu/nonebot/adapters/feishu/bot.py b/packages/nonebot-adapter-feishu/nonebot/adapters/feishu/bot.py index 3d797a80..5f11cf71 100644 --- a/packages/nonebot-adapter-feishu/nonebot/adapters/feishu/bot.py +++ b/packages/nonebot-adapter-feishu/nonebot/adapters/feishu/bot.py @@ -136,7 +136,7 @@ class Bot(BaseBot): @property def api_root(self) -> str: - if self.feishu_config.region == "Lark" : + if self.feishu_config.is_lark: return "https://open.larksuite.com/open-apis/" else: return "https://open.feishu.cn/open-apis/" diff --git a/packages/nonebot-adapter-feishu/nonebot/adapters/feishu/config.py b/packages/nonebot-adapter-feishu/nonebot/adapters/feishu/config.py index 6f7442d9..c7422a7d 100644 --- a/packages/nonebot-adapter-feishu/nonebot/adapters/feishu/config.py +++ b/packages/nonebot-adapter-feishu/nonebot/adapters/feishu/config.py @@ -14,7 +14,7 @@ class Config(BaseModel): - ``encrypt_key`` / ``feishu_encrypt_key``: 飞书开放平台后台“事件订阅”处设置的 Encrypt Key - ``verification_token`` / ``feishu_verification_token``: 飞书开放平台后台“事件订阅”处设置的 Verification Token - ``tenant_access_token`` / ``feishu_tenant_access_token``: 请求飞书 API 后返回的租户密钥 - - ``region`` / ``feishu_or_lark``: 选择服务器，如为 ``"Lark"`` 则连接 Lark 服务器 + - ``is_lark`` / ``feishu_is_lark``: 是否使用Lark（飞书海外版），默认为 false """ app_id: Optional[str] = Field(default=None, alias="feishu_app_id") @@ -24,7 +24,7 @@ class Config(BaseModel): alias="feishu_verification_token") tenant_access_token: Optional[str] = Field( default=None, alias="feishu_tenant_access_token") - region: Optional[str] = Field(default=None, alias="feishu_or_lark") + is_lark: Optional[str] = Field(default=False, alias="feishu_is_lark") class Config: extra = "ignore" From 0d23a9ab8d00a5f8c5b4cc77c058b2443528e665 Mon Sep 17 00:00:00 2001 From: mri-moe Date: Mon, 16 Aug 2021 09:36:39 +0000 Subject: [PATCH 13/13] :memo: update api docs --- docs/api/adapters/feishu.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/api/adapters/feishu.md b/docs/api/adapters/feishu.md index be8ad00e..7a655c14 100644 --- a/docs/api/adapters/feishu.md +++ b/docs/api/adapters/feishu.md @@ -31,7 +31,7 @@ sidebarDepth: 0 * `tenant_access_token` / `feishu_tenant_access_token`: 请求飞书 API 后返回的租户密钥 - * `region` / `feishu_or_lark`: 选择飞书服务器还是Lark服务器,如留空则默认为飞书服务器 + * `is_lark` / `feishu_is_lark`: 是否使用Lark（飞书海外版），默认为 false # NoneBot.adapters.feishu.exception 模块