diff --git a/konabot/plugins/kona_ph/__init__.py b/konabot/plugins/kona_ph/__init__.py index 7e02316..ca9da4d 100644 --- a/konabot/plugins/kona_ph/__init__.py +++ b/konabot/plugins/kona_ph/__init__.py @@ -5,6 +5,7 @@ from math import ceil from loguru import logger from nonebot import on_message import nonebot +from nonebot.rule import to_me from nonebot_plugin_alconna import (Alconna, Args, UniMessage, UniMsg, on_alconna) from nonebot_plugin_apscheduler import scheduler @@ -15,7 +16,7 @@ from konabot.plugins.kona_ph.core.message import (get_daily_report, get_puzzle_description, get_submission_message) from konabot.plugins.kona_ph.core.storage import get_today_date -from konabot.plugins.kona_ph.manager import (PUZZLE_PAGE_SIZE, config, +from konabot.plugins.kona_ph.manager import (PUZZLE_PAGE_SIZE, create_admin_commands, puzzle_manager) from konabot.plugins.poster.poster_info import PosterInfo, register_poster_info @@ -28,15 +29,7 @@ register_poster_info("每日谜题", info=PosterInfo( )) -async def is_play_group(target: DepLongTaskTarget): - if target.is_private_chat: - return True - if target.channel_id in config.plugin_puzzle_playgroup: - return True - return False - - -cmd_submit = on_message(rule=is_play_group) +cmd_submit = on_message(rule=to_me()) @cmd_submit.handle() @@ -58,7 +51,7 @@ async def _(msg: UniMsg, target: DepLongTaskTarget): cmd_query = on_alconna(Alconna( r"re:(?:((?:(?:所以|话)说?)?今天的题目是什么[啊呀哇呢]?(?:\??)?)|今日谜?题目?)" -), rule=is_play_group) +), rule=to_me()) @cmd_query.handle() async def _(target: DepLongTaskTarget): @@ -71,7 +64,7 @@ async def _(target: DepLongTaskTarget): cmd_query_submission = on_alconna(Alconna( "今日答题情况" -), rule=is_play_group) +), rule=to_me()) @cmd_query_submission.handle() async def _(target: DepLongTaskTarget): @@ -86,7 +79,7 @@ cmd_history = on_alconna(Alconna( "历史题目", Args["page?", int], Args["index_id?", str], -), rule=is_play_group) +), rule=to_me()) @cmd_history.handle() async def _(target: DepLongTaskTarget, index_id: str = "", page: int = 1):