diff --git a/modules/core/locales/en_us.json b/modules/core/locales/en_us.json index ab45eeb5..34025e21 100644 --- a/modules/core/locales/en_us.json +++ b/modules/core/locales/en_us.json @@ -67,7 +67,6 @@ "core.message.forward_msg.disable": "Forward message disabled.", "core.message.forward_msg.disabled": "Forward message is disabled.\n", "core.message.forward_msg.enable": "Forward message enabled.", - "core.message.leave.confirm": "Are you sure? This action is irreversible.", "core.message.leave.success": "Goodbye.", "core.message.locale": "Current language: ", "core.message.locale.reload.failed": "Failed to reload the following string: ${detail}.", diff --git a/modules/core/locales/zh_cn.json b/modules/core/locales/zh_cn.json index 65265c70..8470ac20 100644 --- a/modules/core/locales/zh_cn.json +++ b/modules/core/locales/zh_cn.json @@ -67,7 +67,6 @@ "core.message.forward_msg.disable": "已关闭转发消息。", "core.message.forward_msg.disabled": "转发消息已关闭。", "core.message.forward_msg.enable": "已开启转发消息。", - "core.message.leave.confirm": "你确定吗?此操作不可逆。", "core.message.leave.success": "已执行,再见。", "core.message.locale": "当前使用的语言:", "core.message.locale.reload.failed": "以下字符串重载失败:${detail}。", diff --git a/modules/core/locales/zh_tw.json b/modules/core/locales/zh_tw.json index 896efde9..3875e500 100644 --- a/modules/core/locales/zh_tw.json +++ b/modules/core/locales/zh_tw.json @@ -67,7 +67,6 @@ "core.message.forward_msg.disable": "已停用轉發訊息。", "core.message.forward_msg.disabled": "轉發訊息已停用。", "core.message.forward_msg.enable": "已啟用轉發訊息。", - "core.message.leave.confirm": "你確定嗎?此行為不可逆。", "core.message.leave.success": "已執行,再見。", "core.message.locale": "目前使用的語言:", "core.message.locale.reload.failed": "以下字串重新加載失敗:${detail}。", diff --git a/modules/core/su_utils.py b/modules/core/su_utils.py index 989a2e06..c4709a83 100644 --- a/modules/core/su_utils.py +++ b/modules/core/su_utils.py @@ -155,8 +155,8 @@ async def _(msg: Bot.MessageSession): await msg.finish(msg.locale.t("core.message.set.invalid")) target_data = BotDBUtil.TargetInfo(target) if target_data.query is None: - wait_confirm = await msg.wait_confirm(msg.locale.t("core.message.set.confirm.init")) - if not wait_confirm: + confirm = await msg.wait_confirm(msg.locale.t("core.message.set.confirm.init")) + if not confirm: return modules = [m for m in [msg.parsed_msg['']] + msg.parsed_msg.get('...', []) if m in ModulesManager.return_modules_list(msg.target.target_from)] @@ -173,8 +173,8 @@ async def _(msg: Bot.MessageSession): await msg.finish(msg.locale.t("core.message.set.invalid")) target_data = BotDBUtil.TargetInfo(target) if target_data.query is None: - wait_confirm = await msg.wait_confirm(msg.locale.t("core.message.set.confirm.init")) - if not wait_confirm: + confirm = await msg.wait_confirm(msg.locale.t("core.message.set.confirm.init")) + if not confirm: return if v.startswith(('[', '{')): v = json.loads(v) diff --git a/modules/core/utils.py b/modules/core/utils.py index 44eeb27d..e28141b2 100644 --- a/modules/core/utils.py +++ b/modules/core/utils.py @@ -225,7 +225,7 @@ leave = module( @leave.handle() async def _(msg: Bot.MessageSession): - confirm = await msg.wait_confirm(msg.locale.t('core.message.leave.confirm')) + confirm = await msg.wait_confirm(msg.locale.t('core.message.confirm')) if confirm: await msg.send_message(msg.locale.t('core.message.leave.success')) await msg.call_api('set_group_leave', group_id=msg.session.target)