Skip to content

Commit

Permalink
Merge pull request #129 from TopRealm/upstream
Browse files Browse the repository at this point in the history
Upstream
  • Loading branch information
ZoruaFox authored Dec 30, 2024
2 parents 791c34a + 6d84db1 commit 935e24d
Show file tree
Hide file tree
Showing 4 changed files with 60 additions and 34 deletions.
22 changes: 0 additions & 22 deletions .github/workflows/weekly-release.yml

This file was deleted.

1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,4 @@ assets/discord_slash_list.json
assets/modules_list.json
assets/schedulers_list.json
modules/yunhei/admins.json

14 changes: 2 additions & 12 deletions core/parser/message.py
Original file line number Diff line number Diff line change
Expand Up @@ -489,12 +489,7 @@ async def execute_submodule(msg: Bot.MessageSession, command_first_word):
errmsg = msg.locale.t('error.prompt.report', detail=str(e))

if Config('bug_report_url', bug_report_url_default, cfg_type=str):
bug_report_url = Url(
Config(
'bug_report_url',
bug_report_url_default,
cfg_type=str),
use_mm=False)
bug_report_url = Url(Config('bug_report_url', bug_report_url_default, cfg_type=str), use_mm=False)
errmsg += '\n' + msg.locale.t('error.prompt.address', url=bug_report_url)
await msg.send_message(errmsg)

Expand Down Expand Up @@ -635,12 +630,7 @@ async def execute_submodule(msg: Bot.MessageSession, command_first_word):
errmsg = msg.locale.t('error.prompt.report', detail=str(e))

if Config('bug_report_url', bug_report_url_default, cfg_type=str):
bug_report_url = Url(
Config(
'bug_report_url',
bug_report_url_default,
cfg_type=str),
use_mm=False)
bug_report_url = Url(Config('bug_report_url', bug_report_url_default, cfg_type=str), use_mm=False)
errmsg += '\n' + msg.locale.t('error.prompt.address', url=bug_report_url)
await msg.send_message(errmsg)

Expand Down
57 changes: 57 additions & 0 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 935e24d

Please sign in to comment.