✨ message.pyi

Author: RF-Tar-Railt

pdm.lock

@@ -5,7 +5,7 @@ authors = [
     {name = "RF-Tar-Railt", email = "[email protected]"},
 ]
 dependencies = [
-    "tarina<0.7,>=0.6.8",
+    "tarina<0.8.0,>=0.7.1",
     "nepattern<1.0,>=0.7.7",
     "arclet-alconna<2.0,>=1.8.40",
     "arclet-alconna-tools>=0.7.10",
@@ -229,6 +229,7 @@ defineConstant = { PYDANTIC_V2 = true }
 typeCheckingMode = "basic"
 reportShadowedImports = false
 disableBytesTypePromotions = true
+reportSelfClsParameterName = false
 
 [tool.pdm.scripts]
 test = "pytest -v -W ignore ./tests/"

pyproject.toml

@@ -6,7 +6,7 @@
 
 __plugin_meta__ = PluginMetadata(
     name="lang",
-    description="i18n 指令",
+    description=Lang.nbp_alc_builtin.lang.help.main.cast(),
     usage="/lang list/switch [lang]",
     type="application",
     homepage="https://github.com/nonebot/plugin-alconna/blob/master/src/nonebot_plugin_alconna/builtins/plugins/lang.py",
@@ -20,9 +20,13 @@
     cmd = on_alconna(
         Alconna(
             "lang",
-            Option("list", Args["name?", str], help_text="查看支持的语言列表"),
-            Option("switch", Args["locale?", str, Field(completion=lambda: "比如 zh-CN")], help_text="切换语言"),
-            meta=CommandMeta("i18n配置相关功能", compact=True),
+            Option("list", Args["name?", str], help_text=Lang.nbp_alc_builtin.lang.help.list.cast()),
+            Option(
+                "switch",
+                Args["locale?", str, Field(completion=lambda: list(lang.locales))],
+                help_text=Lang.nbp_alc_builtin.lang.help.switch.cast(),
+            ),
+            meta=CommandMeta(Lang.nbp_alc_builtin.lang.help.main.cast(), compact=True),
         ),
         use_cmd_start=True,
     )

src/nonebot_plugin_alconna/builtins/plugins/lang.py

@@ -189,6 +189,29 @@
           "type": "object",
           "additionalProperties": false,
           "properties": {
+            "help": {
+              "title": "Help",
+              "description": "Scope 'help' of lang item",
+              "type": "object",
+              "additionalProperties": false,
+              "properties": {
+                "list": {
+                  "title": "list",
+                  "description": "value of lang item type 'list'",
+                  "type": "string"
+                },
+                "switch": {
+                  "title": "switch",
+                  "description": "value of lang item type 'switch'",
+                  "type": "string"
+                },
+                "main": {
+                  "title": "main",
+                  "description": "value of lang item type 'main'",
+                  "type": "string"
+                }
+              }
+            },
             "list": {
               "title": "list",
               "description": "value of lang item type 'list'",

src/nonebot_plugin_alconna/i18n/.lang.schema.json

@@ -70,6 +70,14 @@
           {
             "subtype": "lang",
             "types": [
+              {
+                "subtype": "help",
+                "types": [
+                  "list",
+                  "switch",
+                  "main"
+                ]
+              },
               "list",
               "switch",
               "locale_missing",

src/nonebot_plugin_alconna/i18n/.template.json

@@ -40,6 +40,11 @@
   },
   "nbp-alc/builtin": {
     "lang": {
+      "help": {
+        "list": "View the list of supported languages",
+        "switch": "Switch languages",
+        "main": "Related functions for Internationalization"
+      },
       "list": "Following languages are supported:",
       "switch": "Switch to '{locale}' successfully.",
       "locale_missing": "{:At(user, $event.get_user_id())}Missing locale argument, please input:",

src/nonebot_plugin_alconna/i18n/en-US.json

@@ -57,7 +57,14 @@ class NbpAlc:
     test = NbpAlcTest
 
 
+class NbpAlcBuiltinLangHelp:
+    list: LangItem = LangItem("nbp-alc/builtin", "lang.help.list")
+    switch: LangItem = LangItem("nbp-alc/builtin", "lang.help.switch")
+    main: LangItem = LangItem("nbp-alc/builtin", "lang.help.main")
+
+
 class NbpAlcBuiltinLang:
+    help = NbpAlcBuiltinLangHelp
     list: LangItem = LangItem("nbp-alc/builtin", "lang.list")
     switch: LangItem = LangItem("nbp-alc/builtin", "lang.switch")
     locale_missing: LangItem = LangItem("nbp-alc/builtin", "lang.locale_missing")

src/nonebot_plugin_alconna/i18n/model.py

@@ -40,6 +40,11 @@
   },
   "nbp-alc/builtin": {
     "lang": {
+      "help": {
+        "list": "查看支持的语言列表",
+        "switch": "切换语言",
+        "main": "国际化配置相关功能"
+      },
       "list": "支持的语言列表:",
       "switch": "切换语言成功: '{locale}'。",
       "locale_missing": "{:At(user, $event.get_user_id())}缺少语言参数，请输入：",

src/nonebot_plugin_alconna/i18n/zh-CN.json

@@ -13,6 +13,7 @@
 from nonebot.rule import Rule
 from nonebot.params import Depends
 from tarina import run_always_await
+from tarina.tools import annotation
 from nonebot.utils import escape_tag
 from tarina.lang.model import LangItem
 from nonebot.permission import Permission
@@ -34,7 +35,6 @@
 
 from .i18n import Lang
 from .config import Config
-from .util import annotation
 from .model import CompConfig
 from .rule import AlconnaRule
 from .uniseg.fallback import FallbackStrategy
@@ -694,7 +694,7 @@ def i18n(
             pass
         else:
             extra["$message_id"] = msg_id
-        msg._handle_i18n(extra)
+        msg._handle_i18n(extra)  # type: ignore
         return msg
 
     @classmethod

src/nonebot_plugin_alconna/matcher.py

@@ -248,7 +248,9 @@ async def handle(
         def _checker(_event: Event):
             return session_id == _event.get_session_id()
 
-        w = waiter(["message"], Matcher, keep_session=True, block=self.comp_config.get("block", False), rule=Rule(_checker))(self._waiter)  # type: ignore
+        assert self._waiter, "Waiter function is not set, please check the initialization of AlconnaRule."
+        assert waiter, "Waiter plugin is not installed, please install nonebot_plugin_waiter."
+        w = waiter(["message"], Matcher, keep_session=True, block=self.comp_config.get("block", False), rule=Rule(_checker))(self._waiter)
 
         while interface.available: