nonebot-plugin-werewolf 1.1.12__py3-none-any.whl → 1.1.13__py3-none-any.whl

nonebot_plugin_werewolf/__init__.py

@@ -10,7 +10,7 @@ from . import matchers as matchers
 from . import players as players
 from .config import Config
 
-__version__ = "1.1.12"
+__version__ = "1.1.13"
 __plugin_meta__ = PluginMetadata(
     name="狼人杀",
     description="适用于 Nonebot2 的狼人杀插件",

nonebot_plugin_werewolf/config.py

@@ -1,10 +1,11 @@
 import json
+import warnings
 from pathlib import Path
 from typing import Any, ClassVar, Final, Literal
 from typing_extensions import Self
 
 import nonebot
-from nonebot.compat import model_dump, type_validate_json
+from nonebot.compat import model_dump, model_validator, type_validate_json
 from nonebot_plugin_localstore import get_plugin_data_file
 from pydantic import BaseModel, Field
 
@@ -90,7 +91,18 @@ class MatcherPriorityConfig(BaseModel):
     preset: int = 1
     behavior: int = 1
     in_game: int = 10
-    stop: int = 10
+    stop: int = 9
+
+    @model_validator(mode="after")
+    @classmethod
+    def _validate(cls, model: Self) -> Self:
+        if model.in_game <= model.stop:
+            model.in_game = model.stop + 1
+            warnings.warn(
+                "in_game 的优先级必须低于 stop，已自动调整为 stop + 1",
+                stacklevel=2,
+            )
+        return model
 
 
 class PluginConfig(BaseModel):
@@ -99,6 +111,7 @@ class PluginConfig(BaseModel):
     stop_command: str | set[str] = "stop"
     require_at: bool | RequireAtConfig = True
     matcher_priority: MatcherPriorityConfig = MatcherPriorityConfig()
+    use_cmd_start: bool | None = None
 
     def get_stop_command(self) -> list[str]:
         return (

nonebot_plugin_werewolf/matchers/edit_behavior.py

@@ -118,6 +118,7 @@ alc = Alconna(
 edit_behavior = on_alconna(
     alc,
     permission=SUPERUSER,
+    use_cmd_start=config.use_cmd_start,
     priority=config.matcher_priority.behavior,
 )
 

nonebot_plugin_werewolf/matchers/edit_preset.py

@@ -72,6 +72,7 @@ alc = Alconna(
 edit_preset = on_alconna(
     alc,
     permission=SUPERUSER,
+    use_cmd_start=config.use_cmd_start,
     priority=config.matcher_priority.preset,
 )
 

nonebot_plugin_werewolf/matchers/message_in_game.py

@@ -25,8 +25,8 @@ stopcmd = on_alconna(
     Alconna(config.get_stop_command()[0]),
     rule=rule_in_game,
     block=True,
-    use_cmd_start=True,
     aliases=set(aliases) if (aliases := config.get_stop_command()[1:]) else None,
+    use_cmd_start=config.use_cmd_start,
     priority=config.matcher_priority.stop,
 )
 

nonebot_plugin_werewolf/matchers/start_game.py

@@ -32,6 +32,7 @@ start_game = on_alconna(
     if config.get_require_at("start")
     else rule_not_in_game,
     aliases={"狼人杀"},
+    use_cmd_start=config.use_cmd_start,
     priority=config.matcher_priority.start,
 )
 player_data_file = get_plugin_data_file("players.json")

nonebot_plugin_werewolf/matchers/superuser_ops.py

@@ -12,6 +12,7 @@ terminate = on_alconna(
     Alconna("中止游戏"),
     rule=to_me() if config.get_require_at("terminate") else None,
     permission=SUPERUSER,
+    use_cmd_start=config.use_cmd_start,
     priority=config.matcher_priority.terminate,
 )
 

{nonebot_plugin_werewolf-1.1.12.dist-info → nonebot_plugin_werewolf-1.1.13.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nonebot-plugin-werewolf
-Version: 1.1.12
+Version: 1.1.13
 Summary: 适用于 Nonebot2 的狼人杀插件
 Author-email: wyf7685 <wyf7685@163.com>
 License: MIT
@@ -53,7 +53,8 @@ _✨ 简单的狼人杀插件 ✨_
 <!-- ref: https://github.com/KomoriDev/Starify -->
 
 > [!IMPORTANT]
-> **收藏项目**，你将从 GitHub 上无延迟地接收所有发布通知～⭐️
+>
+> **收藏项目**，你将从 GitHub 上无延迟地接收所有发布通知～ ⭐️
 
 <img width="100%" src="https://starify.komoridevs.icu/api/starify?owner=wyf7685&repo=nonebot-plugin-werewolf" alt="starify" />
 
@@ -126,13 +127,14 @@ _✨ 简单的狼人杀插件 ✨_
 
 在 nonebot2 项目的 `.env` 文件中添加如下配置:
 
-|            配置项            | 必填 | 默认值  |           类型            |              说明              |
-| :--------------------------: | :--: | :-----: | :-----------------------: | :----------------------------: |
-|   `werewolf__enable_poke`    |  否  | `True`  |          `bool`           |   是否使用戳一戳简化操作流程   |
-|  `werewolf__enable_button`   |  否  | `False` |          `bool`           |      是否在交互中添加按钮      |
-|   `werewolf__stop_command`   |  否  | `stop`  |     `str \| set[str]`     |  修改游戏进程中的 `stop` 命令  |
-|    `werewolf__require_at`    |  否  | `True`  | `bool \| RequireAtConfig` | 部分命令是否需要 at 机器人触发 |
-| `werewolf__matcher_priority` |  否  |    -    |  `MatcherPriorityConfig`  | 配置插件 matcher 注册的优先级  |
+|            配置项            | 必填 | 默认值  |           类型            |                     说明                      |
+| :--------------------------: | :--: | :-----: | :-----------------------: | :-------------------------------------------: |
+|   `werewolf__enable_poke`    |  否  | `True`  |          `bool`           |          是否使用戳一戳简化操作流程           |
+|  `werewolf__enable_button`   |  否  | `False` |          `bool`           |             是否在交互中添加按钮              |
+|   `werewolf__stop_command`   |  否  | `stop`  |     `str \| set[str]`     |         修改游戏进程中的 `stop` 命令          |
+|    `werewolf__require_at`    |  否  | `True`  | `bool \| RequireAtConfig` |        部分命令是否需要 at 机器人触发         |
+| `werewolf__matcher_priority` |  否  |    -    |  `MatcherPriorityConfig`  |         配置插件 matcher 注册的优先级         |
+|  `werewolf__use_cmd_start`   |  否  | `None`  |      `bool \| None`       | 是否使用配置项 `COMMAND_START` 来作为命令前缀 |
 
 `werewolf__enable_poke` 仅在 `OneBot V11` 适配器 / `Satori/chronocat` 下生效
 
@@ -160,6 +162,8 @@ werewolf__require_at='{"start": true, "terminate": false}'
 - 如果遇到与其他插件的命令冲突, 可考虑修改此处的优先级配置
 - 配置应填入 JSON 对象, 可用键: `start` `terminate` `preset` `behavior` `in_game` `stop`
 
+`werewolf__use_cmd_start` 为 `None` 时，使用 alc 的 [全局配置](https://nonebot.dev/docs/next/best-practice/alconna/config#alconna_use_command_start)
+
 ## 🚀 使用
 
 > [!note]
@@ -295,6 +299,11 @@ werewolf__require_at='{"start": true, "terminate": false}'
 
 <!-- CHANGELOG -->
 
+- 2025.06.04 v1.1.13
+
+  - 添加配置项 `werewolf__use_cmd_start`, 用于配置插件命令前缀
+  - 调整 v1.1.11 优先级配置的默认值
+
 - 2025.06.01 v1.1.12
 
   - 禁用 `discord` 适配器中的按钮操作 ~~以后会写适配的...吗?~~

{nonebot_plugin_werewolf-1.1.12.dist-info → nonebot_plugin_werewolf-1.1.13.dist-info}/RECORD

@@ -1,5 +1,5 @@
-nonebot_plugin_werewolf/__init__.py,sha256=i29POIWhdp2Ev3yu8Q5IFgxEi8jYTqsVbSY1IuggAew,932
-nonebot_plugin_werewolf/config.py,sha256=EVitkkXL4Dv_LfePjknCa2uoeYt-e6aw_CRzTMbaEhQ,3736
+nonebot_plugin_werewolf/__init__.py,sha256=cj9lzoACNyphf7iZF5PkD9jxaMUzxQWYG_GE5cb649k,932
+nonebot_plugin_werewolf/config.py,sha256=fZ8xvEsjBxLZQjbYMvLA3CbGq0EAEj6JKSGe111ectM,4166
 nonebot_plugin_werewolf/constant.py,sha256=DqGgUfzsXt1Ls0tTHSSaYrUOZNuv6lgjfhfvdLR5DoM,1641
 nonebot_plugin_werewolf/dead_channel.py,sha256=Dzs9E-jU_alZgCnZzFbvJwgIXrSHSxyNy1yLb_6-0Oo,2720
 nonebot_plugin_werewolf/exception.py,sha256=SP9RdzsREB6PtpRfhZjxqybtvO0aw48hpN9QMU9jDZY,366
@@ -11,11 +11,11 @@ nonebot_plugin_werewolf/utils.py,sha256=V3JcguIHFxyOhkGE4vbc5Sd5g4oJAzxs69bLHuO-
 nonebot_plugin_werewolf/matchers/__init__.py,sha256=lQ9AZDEWgtbP-W8KWvjkEYc_UfTHSUwjaGdZ7PT3z0E,219
 nonebot_plugin_werewolf/matchers/_prepare_game.py,sha256=Cmzffbo79ecIJFzhTeOY8isOK7mvVJZr02AV7Zt-aBE,7855
 nonebot_plugin_werewolf/matchers/depends.py,sha256=DVc9Ewzja9ywJ8MyYxST8pnfpVNJhLXafhbZhEMuxt8,1350
-nonebot_plugin_werewolf/matchers/edit_behavior.py,sha256=8gTSnvJNqKGjmOts_5zYR4f5Qn-NxUlAvUsOCk6LYDw,7262
-nonebot_plugin_werewolf/matchers/edit_preset.py,sha256=DXd5v9TtpwCGxqhivUgz2AqwXSE9evE0lc2Z7OrEjV8,8056
-nonebot_plugin_werewolf/matchers/message_in_game.py,sha256=xpnUanxa-reVlaXnwBTwfoDWQc-MhsMq03tHFKjeEkQ,1052
-nonebot_plugin_werewolf/matchers/start_game.py,sha256=fYOPdxnE9xe9wr8tSecvypXF-ZwqZnNPNyNH2x8M7ws,4069
-nonebot_plugin_werewolf/matchers/superuser_ops.py,sha256=KLl1cJHogk3DAtEXfu_r-iqA6kggwE5lNVPuyZNyHos,833
+nonebot_plugin_werewolf/matchers/edit_behavior.py,sha256=cm_DtoyEhB1xujQiSrZd1uGaRfFjDl5lHsekaxJUKX0,7302
+nonebot_plugin_werewolf/matchers/edit_preset.py,sha256=Qn0jb3l0HbpuH1FWN8yklpbCPp-W8LKwOkfw-rtKNeM,8096
+nonebot_plugin_werewolf/matchers/message_in_game.py,sha256=3MYY1v9nkrbF-l-cJAoDzpmwvBCyb_QPumwuRPme_kY,1068
+nonebot_plugin_werewolf/matchers/start_game.py,sha256=Dg2N615UxiE6qKux70flKo642OdTwg3QlivoyMIZUwk,4109
+nonebot_plugin_werewolf/matchers/superuser_ops.py,sha256=urYaVsnd-Sx-h5ha0XDI62vHeiOfpwIptWp6ZP0UKqQ,873
 nonebot_plugin_werewolf/matchers/poke/__init__.py,sha256=LhWYvAYZsmJbnYMFj7Q032pvq5_P6FYRCzvnwuBvsb0,272
 nonebot_plugin_werewolf/matchers/poke/chronocat_poke.py,sha256=FEelbSnx8-44K3G24Zv059fxei1MjrnZaaUtlTUb7lc,3934
 nonebot_plugin_werewolf/matchers/poke/ob11_poke.py,sha256=fnRiy7INcz0Y_Awqd-J0wW2taXABHIDUfluE9rgAzw8,2542
@@ -30,8 +30,8 @@ nonebot_plugin_werewolf/players/shooter.py,sha256=XtTKspxodeqYwnxtBIwmgxaQEDXcfC
 nonebot_plugin_werewolf/players/werewolf.py,sha256=M-_OZ_E2drx7I0G7Ld8FJ7QjaRfAxOCCnI6YL4SDWYw,5325
 nonebot_plugin_werewolf/players/witch.py,sha256=5qeWI1FOi3iUuzMhuTSJVo8Izc0KHseMKvncucvRFSE,3041
 nonebot_plugin_werewolf/players/wolfking.py,sha256=CMZ5Tq74wupcRPjAzXHEF2Gts4z3thsD57q64uGp_-c,628
-nonebot_plugin_werewolf-1.1.12.dist-info/licenses/LICENSE,sha256=B_WbEqjGr6GYVNfEJPY31T1Opik7OtgOkhRs4Ig3e2M,1064
-nonebot_plugin_werewolf-1.1.12.dist-info/METADATA,sha256=_4tEZWDYjQqwkhnlTsbQA8Aik7fb1nUjpMxBMPMJ3Zs,14787
-nonebot_plugin_werewolf-1.1.12.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-nonebot_plugin_werewolf-1.1.12.dist-info/top_level.txt,sha256=wLTfg8sTKbH9lLT9LtU118C9cTspEBJareLsrYM52YA,24
-nonebot_plugin_werewolf-1.1.12.dist-info/RECORD,,
+nonebot_plugin_werewolf-1.1.13.dist-info/licenses/LICENSE,sha256=B_WbEqjGr6GYVNfEJPY31T1Opik7OtgOkhRs4Ig3e2M,1064
+nonebot_plugin_werewolf-1.1.13.dist-info/METADATA,sha256=1Fx9NCJroEmg3yGPSgm56Omb2VFjsYYpR8ps41C6lN8,15344
+nonebot_plugin_werewolf-1.1.13.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+nonebot_plugin_werewolf-1.1.13.dist-info/top_level.txt,sha256=wLTfg8sTKbH9lLT9LtU118C9cTspEBJareLsrYM52YA,24
+nonebot_plugin_werewolf-1.1.13.dist-info/RECORD,,