aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa

modules/mcbbs_news/__init__.py

@@ -12,7 +12,7 @@ mcbbs_news = module(
 
 @mcbbs_news.handle('{{mcbbs_news.help}}')
 async def main(msg: Bot.MessageSession):
-    res = await news()
+    res = await news(msg)
     Logger.debug('res' + str(res))
     if res is None:
         message = msg.locale.t('mcbbs_news.message.not_found')

modules/mcbbs_news/mcbbs_news.py

@@ -8,7 +8,7 @@ from core.logger import Logger
 from core.utils.http import get_url
 
 
-async def news():
+async def news(msg):
     api = 'https://www.mcbbs.net/forum-news-1.html'
     webrender = Config('web_render')
     if webrender:

modules/mcmod/__init__.py

@@ -12,11 +12,11 @@ mcmod = module(
 
 @mcmod.handle('<mod_name> {{mcmod.help.mod_name}}')
 async def main(msg: Bot.MessageSession):
-    message = await m(msg.parsed_msg['<mod_name>'])
+    message = await m(msg, msg.parsed_msg['<mod_name>'])
     await msg.finish(message)
 
 
 @mcmod.handle('details <content> {{mcmod.help.details}}')
 async def main(msg: Bot.MessageSession):
-    message = await m(msg.parsed_msg['<content>'], detail=True)
+    message = await m(msg, msg.parsed_msg['<content>'], detail=True)
     await msg.finish(message)

modules/mcmod/mcmod.py

@@ -11,7 +11,7 @@ api = 'https://search.mcmod.cn/s?key='
 api_details = 'https://search.mcmod.cn/s?filter=3&key='
 
 
-async def mcmod(keyword: str, detail: bool = False):
+async def mcmod(msg, keyword: str, detail: bool = False):
     endpoint = api_details if detail else api
     search_url = endpoint + quote(keyword)
     webrender = Config('web_render')
@@ -30,4 +30,4 @@ async def mcmod(keyword: str, detail: bool = False):
         desc = res.find('div', class_='body').text
         return f'{name}\n{str(Url(url))}\n{desc}'
     else:
-        return msg.locale.t('mcmod.message.not_found')
+        return msg.locale.t('mcmod.message.not_found')

modules/minecraft_news/__init__.py

@@ -68,7 +68,7 @@ async def start_check_news():
                 title = default_tile['title']
                 desc = default_tile['sub_header']
                 link = baseurl + o_article['article_url']
-                articletext = f'{msg.locale.t("minecraft_news.message.minecraft_news")}\n{title}\n  {desc}\n{str(Url(link))}'
+                articletext = f'Minecraft 官网发布了新的文章：\n{title}\n  {desc}\n{str(Url(link))}'
                 if title not in alist:
                     publish_date = datetime.strptime(o_article['publish_date'], '%d %B %Y %H:%M:%S %Z')
                     now = datetime.now()
@@ -106,7 +106,7 @@ async def feedback_news():
                     link = article['html_url']
                     Logger.info(f'huh, we find {name}.')
                     await bot.post_message('feedback_news',
-                                           f'{msg.locale.t("minecraft_news.message.feedback_news")}\n{name}\n{str(Url(link))}')
+                                           f'Minecraft Feedback 发布了新的文章：\n{name}\n{str(Url(link))}')
                     alist.append(name)
                     update_stored_list(bot, 'mcfeedbacknews', alist)
         except Exception:

modules/server/__init__.py

@@ -75,7 +75,7 @@ async def revoke(msg: Bot.MessageSession):
 
 
 async def s(msg: Bot.MessageSession, address, raw, showplayer, mode, enabled_addon):
-    sendmsg = await server(address, raw, showplayer, mode)
+    sendmsg = await server(msg, address, raw, showplayer, mode)
     if sendmsg != '':
         sendmsg = await check(sendmsg)
         for x in sendmsg:

modules/server/server.py

@@ -8,7 +8,7 @@ from core.builtins import ErrorMessage
 from core.logger import Logger
 
 
-async def server(address, raw=False, showplayer=False, mode='j'):
+async def server(msg, address, raw=False, showplayer=False, mode='j'):
     matchObj = re.match(r'(.*)[\s:](.*)', address, re.M | re.I)
     servers = []
     n = '\n'
@@ -102,4 +102,4 @@ async def server(address, raw=False, showplayer=False, mode='j'):
             traceback.print_exc()
         if raw:
             return n.join(servers)
-        return re.sub(r'§\w', "", n.join(servers))
+        return re.sub(r'§\w', "", n.join(servers))

modules/wiki/set.py

@@ -79,7 +79,7 @@ async def _(msg: Bot.MessageSession):
             result = '当前设置了以下Interwiki：\n' + \
                      '\n'.join([f'{x}: {query[x]}' for x in query])
             if base_interwiki_link is not None:
-                result += base_interwiki_link_msg
+                result += f'\n此处展示的是为机器人设定的自定义Interwiki，如需查看起始wiki的Interwiki，请见：{str(Url(base_interwiki_link))}'
             await msg.finish(result)
     else:
         await msg.finish('当前没有设置任何Interwiki，使用~wiki iw add <interwiki> <api_endpoint_link>添加一个。')