revert changes
This commit is contained in:
多羅狼
parent
7c7a466474
commit
8d4d7c6c17
2 changed files with 41 additions and 54 deletions
|
|
@ -24,9 +24,7 @@
|
|||
"core.help.module.enable_all": "开启所有模块。",
|
||||
"core.help.module.help": "查看帮助列表。",
|
||||
"core.help.module.help.detail": "查看一个模块的详细信息。",
|
||||
"core.help.module.help.legacy": "查看帮助列表。（旧版）",
|
||||
"core.help.module.list": "查看所有可用模块。",
|
||||
"core.help.module.list.legacy": "查看所有可用模块。（旧版）",
|
||||
"core.help.module.load": "加载一个/多个模块。",
|
||||
"core.help.module.reload": "重载一个/多个模块。",
|
||||
"core.help.module.unload": "卸载一个/多个模块。",
|
||||
|
|
@ -83,7 +81,6 @@
|
|||
"core.message.module.enable.success": "成功：开启模块“${module}”。",
|
||||
"core.message.module.help.author.type1": "模块作者：",
|
||||
"core.message.module.help.author.type2": "模块作者",
|
||||
"core.message.module.help.error.render_failed": "发生错误：表格无法正常显示，请尝试使用旧版。",
|
||||
"core.message.module.help.helpdoc.address": "在线模块文档：${help_url}",
|
||||
"core.message.module.help.legacy.availables": "当前可用的模块有：",
|
||||
"core.message.module.help.legacy.base": "基础命令：",
|
||||
|
|
|
|||
|
|
@ -29,14 +29,10 @@ m = module('module',
|
|||
'reload <module> ... {{core.help.module.reload}}',
|
||||
'load <module> ... {{core.help.module.load}}',
|
||||
'unload <module> ... {{core.help.module.unload}}',
|
||||
'list {{core.help.module.list}}',
|
||||
'list legacy {{core.help.module.list.legacy}}'], exclude_from=['QQ|Guild'])
|
||||
'list {{core.help.module.list}}'], exclude_from=['QQ|Guild'])
|
||||
async def _(msg: Bot.MessageSession):
|
||||
if msg.parsed_msg.get('list', False):
|
||||
legacy_help=False
|
||||
if msg.parsed_msg.get('legacy', False):
|
||||
legacy_help = True
|
||||
await modules_help(msg, legacy_help)
|
||||
await modules_help(msg)
|
||||
await config_modules(msg)
|
||||
|
||||
|
||||
|
|
@ -47,15 +43,11 @@ async def _(msg: Bot.MessageSession):
|
|||
'reload <module> ... {{core.help.module.reload}}',
|
||||
'load <module> ... {{core.help.module.load}}',
|
||||
'unload <module> ... {{core.help.module.unload}}',
|
||||
'list {{core.help.module.list}}',
|
||||
'list legacy {{core.help.module.list.legacy}}'], options_desc={'-g': '{core.help.option.module.g}'},
|
||||
'list {{core.help.module.list}}'], options_desc={'-g': '{core.help.option.module.g}'},
|
||||
available_for=['QQ|Guild'])
|
||||
async def _(msg: Bot.MessageSession):
|
||||
if msg.parsed_msg.get('list', False):
|
||||
legacy_help=False
|
||||
if msg.parsed_msg.get('legacy', False):
|
||||
legacy_help = True
|
||||
await modules_help(msg, legacy_help)
|
||||
await modules_help(msg)
|
||||
await config_modules(msg)
|
||||
|
||||
|
||||
|
|
@ -357,36 +349,13 @@ async def bot_help(msg: Bot.MessageSession):
|
|||
await msg.finish(msg.locale.t("core.message.module.help.not_found"))
|
||||
|
||||
|
||||
@hlp.command(['{{core.help.module.help}}',
|
||||
'legacy {{core.help.module.help.legacy}}'])
|
||||
@hlp.command('{{core.help.module.help}}')
|
||||
async def _(msg: Bot.MessageSession):
|
||||
module_list = ModulesManager.return_modules_list(
|
||||
targetFrom=msg.target.targetFrom)
|
||||
target_enabled_list = msg.enabled_modules
|
||||
legacy_help = False
|
||||
if 'legacy' in msg.parsed_msg or msg.Feature.image:
|
||||
legacy_help = True
|
||||
|
||||
if legacy_help:
|
||||
help_msg = [msg.locale.t("core.message.module.help.legacy.base")]
|
||||
essential = []
|
||||
for x in module_list:
|
||||
if module_list[x].base:
|
||||
essential.append(module_list[x].bind_prefix)
|
||||
help_msg.append(' | '.join(essential))
|
||||
help_msg.append(msg.locale.t("core.message.module.help.legacy.external"))
|
||||
module_ = []
|
||||
for x in module_list:
|
||||
if x in target_enabled_list:
|
||||
module_.append(x)
|
||||
help_msg.append(' | '.join(module_))
|
||||
help_msg.append(
|
||||
msg.locale.t(
|
||||
"core.message.module.help.legacy.more_information",
|
||||
prefix=msg.prefixes[0],
|
||||
help_url=Config('help_url')))
|
||||
await msg.finish('\n'.join(help_msg))
|
||||
elif msg.Feature.image:
|
||||
legacy_help = True
|
||||
if msg.Feature.image:
|
||||
try:
|
||||
tables = []
|
||||
essential = []
|
||||
|
|
@ -452,26 +421,25 @@ async def _(msg: Bot.MessageSession):
|
|||
if tables:
|
||||
render = await image_table_render(tables)
|
||||
if render:
|
||||
legacy_help = False
|
||||
await msg.finish([Image(render),
|
||||
Plain(msg.locale.t("core.message.module.help.more_information",
|
||||
prefix=msg.prefixes[0], help_url=Config('help_url'), donate_url=Config('donate_url')))])
|
||||
except Exception:
|
||||
await msg.sendMessage(msg.locale.t("core.message.module.help.error.render_failed"))
|
||||
traceback.print_exc()
|
||||
|
||||
|
||||
async def modules_help(msg: Bot.MessageSession, legacy_help):
|
||||
module_list = ModulesManager.return_modules_list(
|
||||
targetFrom=msg.target.targetFrom)
|
||||
if legacy_help:
|
||||
help_msg = [msg.locale.t("core.message.module.help.legacy.availables")]
|
||||
help_msg = [msg.locale.t("core.message.module.help.legacy.base")]
|
||||
essential = []
|
||||
for x in module_list:
|
||||
if module_list[x].base:
|
||||
essential.append(module_list[x].bind_prefix)
|
||||
help_msg.append(' | '.join(essential))
|
||||
help_msg.append(msg.locale.t("core.message.module.help.legacy.external"))
|
||||
module_ = []
|
||||
for x in module_list:
|
||||
if x[0] == '_':
|
||||
continue
|
||||
if module_list[x].base or module_list[x].required_superuser:
|
||||
continue
|
||||
module_.append(module_list[x].bind_prefix)
|
||||
if x in target_enabled_list:
|
||||
module_.append(x)
|
||||
help_msg.append(' | '.join(module_))
|
||||
help_msg.append(
|
||||
msg.locale.t(
|
||||
|
|
@ -479,7 +447,13 @@ async def modules_help(msg: Bot.MessageSession, legacy_help):
|
|||
prefix=msg.prefixes[0],
|
||||
help_url=Config('help_url')))
|
||||
await msg.finish('\n'.join(help_msg))
|
||||
elif msg.Feature.image:
|
||||
|
||||
|
||||
async def modules_help(msg: Bot.MessageSession):
|
||||
module_list = ModulesManager.return_modules_list(
|
||||
targetFrom=msg.target.targetFrom)
|
||||
legacy_help = True
|
||||
if msg.Feature.image:
|
||||
try:
|
||||
tables = []
|
||||
m = []
|
||||
|
|
@ -538,7 +512,23 @@ async def modules_help(msg: Bot.MessageSession, legacy_help):
|
|||
if tables:
|
||||
render = await image_table_render(tables)
|
||||
if render:
|
||||
legacy_help = False
|
||||
await msg.finish([Image(render)])
|
||||
except Exception:
|
||||
await msg.sendMessage(msg.locale.t("core.message.module.help.error.render_failed"))
|
||||
traceback.print_exc()
|
||||
if legacy_help:
|
||||
help_msg = [msg.locale.t("core.message.module.help.legacy.availables")]
|
||||
module_ = []
|
||||
for x in module_list:
|
||||
if x[0] == '_':
|
||||
continue
|
||||
if module_list[x].base or module_list[x].required_superuser:
|
||||
continue
|
||||
module_.append(module_list[x].bind_prefix)
|
||||
help_msg.append(' | '.join(module_))
|
||||
help_msg.append(
|
||||
msg.locale.t(
|
||||
"core.message.module.help.legacy.more_information",
|
||||
prefix=msg.prefixes[0],
|
||||
help_url=Config('help_url')))
|
||||
await msg.finish('\n'.join(help_msg))
|
||||
|
|
|
|||
Reference in a new issue