From 58f1ecc85752ed731421ce4614af0ff5fb79a4c2 Mon Sep 17 00:00:00 2001 From: Nahida Date: Thu, 23 Nov 2023 11:41:55 +0800 Subject: [PATCH] :sparkles: Add Set Command Plugin and Fix Some Bug --- plugins/admin/set_command.py | 90 +++++++++++++++++++++++++++++ plugins/genshin/daily_note_tasks.py | 1 + plugins/genshin/player_cards.py | 1 + resources/bot/help/help.jinja2 | 66 ++++++++++++--------- 4 files changed, 132 insertions(+), 26 deletions(-) create mode 100644 plugins/admin/set_command.py diff --git a/plugins/admin/set_command.py b/plugins/admin/set_command.py new file mode 100644 index 00000000..93d9ff72 --- /dev/null +++ b/plugins/admin/set_command.py @@ -0,0 +1,90 @@ +from typing import TYPE_CHECKING + +from telegram import BotCommand, BotCommandScopeAllPrivateChats, BotCommandScopeChat + +from core.plugin import Plugin, handler +from core.config import config +from utils.log import logger + +if TYPE_CHECKING: + from telegram import Update + from telegram.ext import ContextTypes + + +class SetCommandPlugin(Plugin): + @handler.command("set_command", block=False, admin=True) + @handler.command("set_commands", block=False, admin=True) + async def set_command(self, update: "Update", context: "ContextTypes.DEFAULT_TYPE"): + user = update.effective_user + message = update.effective_message + logger.info("用户 %s[%s] 发出 set_command 命令", user.full_name, user.id) + user_command = [ + BotCommand("cancel", "取消操作（解决一切玄学问题）"), + BotCommand("help_raw", "查看文本帮助"), + # gacha_log 相关 + BotCommand("wish_log", "查看抽卡记录"), + BotCommand("wish_log_import", "导入抽卡记录"), + BotCommand("wish_log_export", "导出抽卡记录"), + BotCommand("wish_log_delete", "删除抽卡记录"), + BotCommand("wish_count", "查看抽卡统计（按卡池）"), + BotCommand("pay_log", "查看充值记录"), + BotCommand("pay_log_import", "导入充值记录"), + BotCommand("pay_log_export", "导出充值记录"), + BotCommand("pay_log_delete", "删除充值记录"), + # Cookie 查询类 + BotCommand("sign", "米游社原神每日签到"), + BotCommand("dailynote_tasks", "自动便笺提醒"), + BotCommand("birthday_card", "领取角色生日画片"), + # 其他 + BotCommand("hilichurls", "丘丘语字典"), + BotCommand("birthday", "查询角色生日"), + BotCommand("setuid", "添加/重设UID"), + BotCommand("setcookie", "添加/重设Cookie"), + BotCommand("setdevice", "添加/重设设备"), + BotCommand("player", "管理用户绑定玩家"), + BotCommand("verify", "手动验证"), + BotCommand("redeem", "（国际服）兑换 Key"), + ] + group_command = [ + # 通用 + BotCommand("help", "帮助"), + BotCommand("quiz", "派蒙的十万个为什么"), + BotCommand("wish", " 非洲人模拟器（抽卡模拟器）"), + BotCommand("set_wish", "抽卡模拟器定轨"), + BotCommand("calendar", "活动日历"), + # Wiki 类 + BotCommand("weapon", "查询武器"), + BotCommand("strategy", "查询角色攻略"), + BotCommand("material", "角色培养素材查询"), + # UID 查询类 + BotCommand("stats", "玩家统计查询"), + BotCommand("player_card", "查询角色卡片"), + BotCommand("avatar_board", "角色排名"), + # Cookie 查询类 + BotCommand("dailynote", "查询实时便笺"), + BotCommand("ledger", "查询当月旅行札记"), + BotCommand("abyss", "查询深渊战绩"), + BotCommand("abyss_team", "查询深渊推荐配队"), + BotCommand("avatars", "查询角色练度"), + BotCommand("reg_time", "账号注册时间"), + BotCommand("daily_material", "今日素材表"), + ] + admin_command = [ + BotCommand("add_admin", "添加管理员"), + BotCommand("del_admin", "删除管理员"), + BotCommand("refresh_metadata", "刷新元数据"), + BotCommand("refresh_wiki", "刷新Wiki缓存"), + BotCommand("refresh_map", "刷新地图数据"), + BotCommand("save_entry", "保存条目数据"), + BotCommand("remove_all_entry", "删除全部条目数据"), + BotCommand("sign_all", "全部账号重新签到"), + BotCommand("send_log", "发送日志"), + BotCommand("update", "更新"), + ] + await context.bot.set_my_commands(commands=group_command) # 留空，default 为 botCommandScopeDefault, 所有聊天可见 + await context.bot.set_my_commands(commands=user_command, scope=BotCommandScopeAllPrivateChats) + if config.error.notification_chat_id: + await context.bot.set_my_commands( + commands=admin_command, scope=BotCommandScopeChat(config.error.notification_chat_id) + ) + await message.reply_text("设置命令成功") diff --git a/plugins/genshin/daily_note_tasks.py b/plugins/genshin/daily_note_tasks.py index 9c75201e..b566f81d 100644 --- a/plugins/genshin/daily_note_tasks.py +++ b/plugins/genshin/daily_note_tasks.py @@ -38,6 +38,7 @@ class DailyNoteTasksPlugin(Plugin.Conversation): self.note_system = note_system @conversation.entry_point + @handler.command(command="dailynote_tasks", filters=filters.ChatType.PRIVATE, block=False) @handler.command(command="daily_note_tasks", filters=filters.ChatType.PRIVATE, block=False) async def command_start(self, update: Update, _: CallbackContext) -> int: user = update.effective_user diff --git a/plugins/genshin/player_cards.py b/plugins/genshin/player_cards.py index a0669be0..8bcb7bd4 100644 --- a/plugins/genshin/player_cards.py +++ b/plugins/genshin/player_cards.py @@ -157,6 +157,7 @@ class PlayerCards(Plugin): return uid, ch_name @handler.command(command="player_card", block=False) + @handler.command(command="player_cards", block=False) @handler.message(filters=filters.Regex("^角色卡片查询(.*)"), block=False) async def player_cards(self, update: "Update", context: "ContextTypes.DEFAULT_TYPE") -> None: user = update.effective_user diff --git a/resources/bot/help/help.jinja2 b/resources/bot/help/help.jinja2 index 6a174540..1917687e 100644 --- a/resources/bot/help/help.jinja2 +++ b/resources/bot/help/help.jinja2 @@ -29,7 +29,7 @@
-

查询命令

+

常用命令

@@ -60,7 +60,14 @@
角色卡片
- +
+
+ /avatar_board + +
+
角色全球排行(akasha)
+
+
/dailynote @@ -103,17 +110,42 @@
原神账号注册时间
+
+
/daily_material
+
每日素材
+
+
+
+ /sign + +
+
每日签到 | 查询
+
+
+
+ /birthday_card + +
+
领取角色生日画片
+
+
+
+ /redeem + +
+
国际服兑换
+
- /gacha_log + /wish_log
抽卡记录
- /gacha_count + /wish_count
抽卡统计
@@ -125,17 +157,6 @@
充值记录
-
-
- /sign - -
-
每日签到 | 查询
-
-
-
/daily_material
-
每日素材
-
/hilichurls
@@ -143,14 +164,7 @@
/birthday
-
角色生日
-
-
-
- /birthday_card - -
-
领取角色生日画片
+
查询角色生日
/calendar
@@ -183,15 +197,15 @@
-
/gacha_log_import
+
/wish_log_import
导入抽卡记录
-
/gacha_log_export
+
/wish_log_export
导出抽卡记录
-
/gacha_log_delete
+
/wish_log_delete
删除抽卡记录