🔀 Merge pull request #61

hot fix #60
nonebot · Nov 18, 2020 · 04a3712 · 04a3712
2 parents 5efe190 + 39f508b
commit 04a3712
Show file tree

Hide file tree

Showing 46 changed files with 197 additions and 71 deletions.
diff --git a/archive/2.0.0a5/README.md → archive/2.0.0a6/README.md b/archive/2.0.0a5/README.md → archive/2.0.0a6/README.md
diff --git a/archive/2.0.0a6/advanced/README.md b/archive/2.0.0a6/advanced/README.md
@@ -0,0 +1,7 @@
+# 深入
+
+## 它如何工作？
+
+<!-- TODO: how to work -->
+
+~~未填坑~~
diff --git a/archive/2.0.0a6/advanced/permission.md b/archive/2.0.0a6/advanced/permission.md
@@ -0,0 +1 @@
+# 权限控制
diff --git a/archive/2.0.0a6/advanced/runtime-hook.md b/archive/2.0.0a6/advanced/runtime-hook.md
@@ -0,0 +1 @@
+# 运行时插槽
diff --git a/archive/2.0.0a6/advanced/scheduler.md b/archive/2.0.0a6/advanced/scheduler.md
@@ -0,0 +1 @@
+# 定时任务
diff --git a/archive/2.0.0a5/api/README.md → archive/2.0.0a6/api/README.md b/archive/2.0.0a5/api/README.md → archive/2.0.0a6/api/README.md
diff --git a/archive/2.0.0a5/api/adapters/README.md → archive/2.0.0a6/api/adapters/README.md b/archive/2.0.0a5/api/adapters/README.md → archive/2.0.0a6/api/adapters/README.md
diff --git a/archive/2.0.0a5/api/adapters/cqhttp.md → archive/2.0.0a6/api/adapters/cqhttp.md b/archive/2.0.0a5/api/adapters/cqhttp.md → archive/2.0.0a6/api/adapters/cqhttp.md
diff --git a/archive/2.0.0a5/api/config.md → archive/2.0.0a6/api/config.md b/archive/2.0.0a5/api/config.md → archive/2.0.0a6/api/config.md
diff --git a/archive/2.0.0a5/api/drivers/README.md → archive/2.0.0a6/api/drivers/README.md b/archive/2.0.0a5/api/drivers/README.md → archive/2.0.0a6/api/drivers/README.md
diff --git a/archive/2.0.0a5/api/drivers/fastapi.md → archive/2.0.0a6/api/drivers/fastapi.md b/archive/2.0.0a5/api/drivers/fastapi.md → archive/2.0.0a6/api/drivers/fastapi.md
diff --git a/archive/2.0.0a5/api/exception.md → archive/2.0.0a6/api/exception.md b/archive/2.0.0a5/api/exception.md → archive/2.0.0a6/api/exception.md
diff --git a/archive/2.0.0a5/api/log.md → archive/2.0.0a6/api/log.md b/archive/2.0.0a5/api/log.md → archive/2.0.0a6/api/log.md
diff --git a/archive/2.0.0a5/api/matcher.md → archive/2.0.0a6/api/matcher.md b/archive/2.0.0a5/api/matcher.md → archive/2.0.0a6/api/matcher.md
diff --git a/archive/2.0.0a5/api/message.md → archive/2.0.0a6/api/message.md b/archive/2.0.0a5/api/message.md → archive/2.0.0a6/api/message.md
diff --git a/archive/2.0.0a5/api/nonebot.md → archive/2.0.0a6/api/nonebot.md b/archive/2.0.0a5/api/nonebot.md → archive/2.0.0a6/api/nonebot.md
diff --git a/archive/2.0.0a5/api/permission.md → archive/2.0.0a6/api/permission.md b/archive/2.0.0a5/api/permission.md → archive/2.0.0a6/api/permission.md
diff --git a/archive/2.0.0a5/api/plugin.md → archive/2.0.0a6/api/plugin.md b/archive/2.0.0a5/api/plugin.md → archive/2.0.0a6/api/plugin.md
diff --git a/archive/2.0.0a5/api/rule.md → archive/2.0.0a6/api/rule.md b/archive/2.0.0a5/api/rule.md → archive/2.0.0a6/api/rule.md
diff --git a/archive/2.0.0a5/api/sched.md → archive/2.0.0a6/api/sched.md b/archive/2.0.0a5/api/sched.md → archive/2.0.0a6/api/sched.md
diff --git a/archive/2.0.0a5/api/typing.md → archive/2.0.0a6/api/typing.md b/archive/2.0.0a5/api/typing.md → archive/2.0.0a6/api/typing.md
diff --git a/archive/2.0.0a5/api/utils.md → archive/2.0.0a6/api/utils.md b/archive/2.0.0a5/api/utils.md → archive/2.0.0a6/api/utils.md
diff --git a/archive/2.0.0a5/guide/README.md → archive/2.0.0a6/guide/README.md b/archive/2.0.0a5/guide/README.md → archive/2.0.0a6/guide/README.md
@@ -18,12 +18,6 @@ NoneBot2 是一个可扩展的 Python 异步机器人框架，它会对机器人
 
 需要注意的是，NoneBot 仅支持 Python 3.7+ 及 CQHTTP(OneBot) 插件 v11+。
 
-## 它如何工作？
-
-<!-- TODO: how to work -->
-
-~~未填坑~~
-
 ## 特色
 
 - 提供直观的测试前端

diff --git a/archive/2.0.0a5/guide/basic-configuration.md → archive/2.0.0a6/guide/basic-configuration.md b/archive/2.0.0a5/guide/basic-configuration.md → archive/2.0.0a6/guide/basic-configuration.md
diff --git a/archive/2.0.0a5/guide/creating-a-handler.md → archive/2.0.0a6/guide/creating-a-handler.md b/archive/2.0.0a5/guide/creating-a-handler.md → archive/2.0.0a6/guide/creating-a-handler.md
diff --git a/archive/2.0.0a5/guide/creating-a-matcher.md → archive/2.0.0a6/guide/creating-a-matcher.md b/archive/2.0.0a5/guide/creating-a-matcher.md → archive/2.0.0a6/guide/creating-a-matcher.md
diff --git a/archive/2.0.0a5/guide/creating-a-plugin.md → archive/2.0.0a6/guide/creating-a-plugin.md b/archive/2.0.0a5/guide/creating-a-plugin.md → archive/2.0.0a6/guide/creating-a-plugin.md
diff --git a/archive/2.0.0a5/guide/creating-a-project.md → archive/2.0.0a6/guide/creating-a-project.md b/archive/2.0.0a5/guide/creating-a-project.md → archive/2.0.0a6/guide/creating-a-project.md
diff --git a/archive/2.0.0a5/guide/end-or-start.md → archive/2.0.0a6/guide/end-or-start.md b/archive/2.0.0a5/guide/end-or-start.md → archive/2.0.0a6/guide/end-or-start.md
@@ -5,3 +5,5 @@
 - 请千万注意事件处理器的优先级设定
 - 在匹配规则中请勿使用耗时极长的函数
 - 同一个用户可以**跨群**(**私聊**)继续他的事件处理（除非做出权限限制，将在后续介绍）
+
+如果你还不能满足，前往 [进阶](../advanced/README.md) 获得更多的功能信息。
diff --git a/archive/2.0.0a5/guide/getting-started.md → archive/2.0.0a6/guide/getting-started.md b/archive/2.0.0a5/guide/getting-started.md → archive/2.0.0a6/guide/getting-started.md
diff --git a/archive/2.0.0a5/guide/installation.md → archive/2.0.0a6/guide/installation.md b/archive/2.0.0a5/guide/installation.md → archive/2.0.0a6/guide/installation.md
diff --git a/archive/2.0.0a5/guide/loading-a-plugin.md → archive/2.0.0a6/guide/loading-a-plugin.md b/archive/2.0.0a5/guide/loading-a-plugin.md → archive/2.0.0a6/guide/loading-a-plugin.md
@@ -83,7 +83,39 @@ if __name__ == "__main__":
 
 <!-- TODO: 子插件 -->
 
-~~待填坑~~
+在插件中同样可以加载子插件，例如如下插件目录结构：
+
+<!-- prettier-ignore-start -->
+:::vue
+foo_plugin
+├── `plugins`
+│   ├── `sub_plugin1`
+│   │  └── \_\_init\_\_.py
+│   └── `sub_plugin2.py`
+├── `__init__.py`
+└── config.py
+:::
+<!-- prettier-ignore-end -->
+
+在插件目录下的 `__init__.py` 中添加如下代码：
+
+```python
+from pathlib import Path
+
+import nonebot
+
+# store all subplugins
+_sub_plugins = set()
+# load sub plugins
+_sub_plugins |= nonebot.load_plugins(
+    str((Path(__file__).parent / "plugins").resolve()))
+```
+
+插件将会被加载并存储于 `_sub_plugins` 中。
+
+:::tip 提示
+如果在父插件中需要定义事件响应器，应在**子插件被加载后**进行定义
+:::
 
 ## 运行结果
 

diff --git a/archive/2.0.0a5/sidebar.config.json → archive/2.0.0a6/sidebar.config.json b/archive/2.0.0a5/sidebar.config.json → archive/2.0.0a6/sidebar.config.json
@@ -15,13 +15,21 @@
           "text": "指南",
           "link": "/guide/"
         },
+        {
+          "text": "进阶",
+          "link": "/advanced/"
+        },
         {
           "text": "API",
           "link": "/api/"
         },
         {
           "text": "插件广场",
           "link": "/plugin-store"
+        },
+        {
+          "text": "更新日志",
+          "link": "/changelog"
         }
       ],
       "sidebarDepth": 2,
@@ -52,6 +60,19 @@
             ]
           }
         ],
+        "/advanced/": [
+          {
+            "title": "进阶",
+            "collapsable": false,
+            "sidebar": "auto",
+            "children": [
+              "",
+              "scheduler",
+              "permission",
+              "runtime-hook"
+            ]
+          }
+        ],
         "/api/": [
           {
             "title": "NoneBot Api Reference",

diff --git a/docs/.vuepress/config.js b/docs/.vuepress/config.js
@@ -79,8 +79,10 @@ module.exports = context => ({
         nav: [
           { text: "主页", link: "/" },
           { text: "指南", link: "/guide/" },
+          { text: "进阶", link: "/advanced/" },
           { text: "API", link: "/api/" },
-          { text: "插件广场", link: "/plugin-store" }
+          { text: "插件广场", link: "/plugin-store" },
+          { text: "更新日志", link: "/changelog" }
         ],
         sidebarDepth: 2,
         sidebar: {
@@ -110,6 +112,19 @@ module.exports = context => ({
               ]
             }
           ],
+          "/advanced/": [
+            {
+              title: "进阶",
+              collapsable: false,
+              sidebar: "auto",
+              children: [
+                "",
+                "scheduler",
+                "permission",
+                "runtime-hook"
+              ]
+            }
+          ],
           "/api/": [
             {
               title: "NoneBot Api Reference",

diff --git a/docs/.vuepress/versions.json b/docs/.vuepress/versions.json
@@ -1,4 +1,4 @@
 [
-  "2.0.0a5",
+  "2.0.0a6",
   "2.0.0a4"
 ]
diff --git a/docs/advanced/README.md b/docs/advanced/README.md
@@ -0,0 +1,7 @@
+# 深入
+
+## 它如何工作？
+
+<!-- TODO: how to work -->
+
+~~未填坑~~
diff --git a/docs/advanced/permission.md b/docs/advanced/permission.md
@@ -0,0 +1 @@
+# 权限控制
diff --git a/docs/advanced/runtime-hook.md b/docs/advanced/runtime-hook.md
@@ -0,0 +1 @@
+# 运行时插槽
diff --git a/docs/advanced/scheduler.md b/docs/advanced/scheduler.md
@@ -0,0 +1 @@
+# 定时任务
diff --git a/docs/guide/README.md b/docs/guide/README.md
@@ -18,12 +18,6 @@ NoneBot2 是一个可扩展的 Python 异步机器人框架，它会对机器人
 
 需要注意的是，NoneBot 仅支持 Python 3.7+ 及 CQHTTP(OneBot) 插件 v11+。
 
-## 它如何工作？
-
-<!-- TODO: how to work -->
-
-~~未填坑~~
-
 ## 特色
 
 - 提供直观的测试前端

diff --git a/docs/guide/end-or-start.md b/docs/guide/end-or-start.md
@@ -5,3 +5,5 @@
 - 请千万注意事件处理器的优先级设定
 - 在匹配规则中请勿使用耗时极长的函数
 - 同一个用户可以**跨群**(**私聊**)继续他的事件处理（除非做出权限限制，将在后续介绍）
+
+如果你还不能满足，前往 [进阶](../advanced/README.md) 获得更多的功能信息。
diff --git a/docs/guide/loading-a-plugin.md b/docs/guide/loading-a-plugin.md
@@ -83,7 +83,39 @@ if __name__ == "__main__":
 
 <!-- TODO: 子插件 -->
 
-~~待填坑~~
+在插件中同样可以加载子插件，例如如下插件目录结构：
+
+<!-- prettier-ignore-start -->
+:::vue
+foo_plugin
+├── `plugins`
+│   ├── `sub_plugin1`
+│   │  └── \_\_init\_\_.py
+│   └── `sub_plugin2.py`
+├── `__init__.py`
+└── config.py
+:::
+<!-- prettier-ignore-end -->
+
+在插件目录下的 `__init__.py` 中添加如下代码：
+
+```python
+from pathlib import Path
+
+import nonebot
+
+# store all subplugins
+_sub_plugins = set()
+# load sub plugins
+_sub_plugins |= nonebot.load_plugins(
+    str((Path(__file__).parent / "plugins").resolve()))
+```
+
+插件将会被加载并存储于 `_sub_plugins` 中。
+
+:::tip 提示
+如果在父插件中需要定义事件响应器，应在**子插件被加载后**进行定义
+:::
 
 ## 运行结果
 

diff --git a/nonebot/message.py b/nonebot/message.py
@@ -244,7 +244,7 @@ async def handle_event(bot: Bot, event: Event):
         results = await asyncio.gather(*pending_tasks, return_exceptions=True)
 
         for result in results:
-            if result is StopPropagation:
+            if isinstance(result, StopPropagation):
                 if not break_flag:
                     break_flag = True
                     logger.debug("Stop event propagation")

diff --git a/pages/changelog.md b/pages/changelog.md
@@ -0,0 +1,14 @@
+---
+sidebar: auto
+---
+
+# 更新日志
+
+## v2.0.0a6
+
+- 修复 block 失效问题 (hotfix)
+
+## v2.0.0a5
+
+- 更新插件指南文档
+- 修复临时事件响应器运行后删除造成的多次响应问题