update

bots/discord/slash_message.py

@@ -7,6 +7,7 @@ from config import Config
 from core.builtins import Plain, Image, MessageSession as MS
 from core.builtins.message.chain import MessageChain
 from core.builtins.message.internal import Embed
+from core.dirty_check import rickroll
 from core.logger import Logger
 from core.types import FinishedSession as FinS
 
@@ -41,7 +42,8 @@ class MessageSession(MS):
                           ) -> FinishedSession:
         msgchain = MessageChain(msgchain)
         if not msgchain.is_safe and not disable_secret_check:
-            return await self.sendMessage('https://wdf.ink/6Oup')
+            message = await rickroll()
+            return await self.sendMessage(message)
         self.sent.append(msgchain)
         count = 0
         send = []

config/config.toml.example

@@ -24,6 +24,7 @@ donate_url = "https://afdian.net/@teahouse"
 help_url = "https://bot.teahouse.team"
 issue_url = "https://github.com/Teahouse-Studios/bot/issues/new/choose"
 wiki_whitelist_url = "https://s.wd-ljt.com/botwhitelist"
+rickroll_url = "https://wdf.ink/6OUp"
 web_render_local =
 qq_account = 2314163511
 qq_host = "127.0.0.1:11451"
@@ -36,6 +37,7 @@ enable_urlmanager = True
 enable_tos = False
 enable_analytics = True
 enable_eval = True
+enable_rickroll = True
 coin_limit = 10000
 coin_faceup_rate = 4994
 coin_facedown_rate = 4994

core/dirty_check.py

@@ -14,7 +14,7 @@ import aiohttp
 from tenacity import retry, wait_fixed, stop_after_attempt
 
 from config import Config
-from core.builtins import EnableDirtyWordCheck
+from core.builtins import Bot, EnableDirtyWordCheck
 from core.logger import Logger
 from database.local import DirtyWordCache
 
@@ -38,10 +38,10 @@ def parse_data(result: dict):
             for itemDetail in itemResult['details']:
                 if 'contexts' in itemDetail:
                     for itemContext in itemDetail["contexts"]:
-                        content = re.sub(itemContext['context'], '<吃掉了>', content, flags=re.I)
+                        content = re.sub(itemContext['context'], Bot.MessageSession.locale.t("check.redacted"), content, flags=re.I)
                         status = False
                 else:
-                    content = "<全部吃掉了>"
+                    content = Bot.MessageSession.locale.t("check.redacted.all")
                     status = False
     return {'content': content, 'status': status, 'original': original_content}
 
@@ -156,3 +156,10 @@ async def check_bool(*text):
         if not x['status']:
             return True
     return False
+
+
+async def rickroll():
+    if Config("enable_rickroll"):
+        return Config("rickroll_url")
+    else:
+        return Bot.MessageSession.locale.t("check.redacted.all")

modules/ask/__init__.py

@@ -8,7 +8,7 @@ from langchain.callbacks import get_openai_callback
 from config import Config
 from core.builtins import Bot, Plain, Image
 from core.component import module
-from core.dirty_check import check_bool
+from core.dirty_check import check_bool, rickroll
 from core.exceptions import NoReportException
 from .agent import agent_executor
 from .formatting import generate_latex, generate_code_snippet
@@ -40,7 +40,7 @@ async def _(msg: Bot.MessageSession):
     else:
         question = msg.matched_msg[0]
     if await check_bool(question):
-        raise NoReportException('https://wdf.ink/6OUp')
+        raise NoReportException(await rickroll())
     with get_openai_callback() as cb:
         res = await agent_executor.arun(question)
         tokens = cb.total_tokens
@@ -61,7 +61,7 @@ async def _(msg: Bot.MessageSession):
             chain.append(Image(PILImage.open(io.BytesIO(await generate_code_snippet(block['content']['code'], block['content']['language'])))))
 
     if await check_bool(res):
-        raise NoReportException('https://wdf.ink/6OUp')
+        raise NoReportException(await rickroll())
     await msg.finish(chain)
 
 

modules/github/repo.py

@@ -4,6 +4,7 @@ import traceback
 from core.builtins import Bot
 from core.builtins import Image, Plain, Url, ErrorMessage
 from core.utils.http import get_url, download_to_cache
+from core.dirty_check import rickroll
 from modules.github.utils import time_diff, dirty_check, darkCheck
 
 
@@ -53,7 +54,7 @@ Created {time_diff(result['created_at'])} ago | Updated {time_diff(result['updat
 
         is_dirty = await dirty_check(message, result['owner']['login']) or darkCheck(message)
         if is_dirty:
-            message = 'https://wdf.ink/6OUp'
+            message = await rickroll()
             await msg.finish([Plain(message)])
         else:
             await msg.sendMessage([Plain(message)])

modules/github/search.py

@@ -2,6 +2,7 @@ import traceback
 
 from core.builtins import Bot, Url, ErrorMessage
 from core.utils.http import get_url
+from core.dirty_check import rickroll
 from modules.github.utils import dirty_check, darkCheck
 
 
@@ -29,7 +30,7 @@ async def search(msg: Bot.MessageSession):
 
         is_dirty = await dirty_check(message) or darkCheck(message)
         if is_dirty:
-            message = 'https://wdf.ink/6OUp'
+            message = await rickroll()
 
         await msg.finish(message)
     except ValueError as e:

modules/github/user.py

@@ -2,6 +2,7 @@ import traceback
 
 from core.builtins import Url, ErrorMessage, Bot
 from core.utils.http import get_url
+from core.dirty_check import rickroll
 from modules.github.utils import time_diff, dirty_check, darkCheck
 
 
@@ -38,7 +39,7 @@ Account Created {time_diff(result['created_at'])} ago | Latest activity {time_di
 
         is_dirty = await dirty_check(message, result['login']) or darkCheck(message)
         if is_dirty:
-            message = 'https://wdf.ink/6OUp'
+            message = await rickroll()
 
         await msg.finish(message)
     except ValueError as e:

modules/langconv/__init__.py

@@ -4,7 +4,7 @@ from langconv.language.zh import zh_cn, zh_hk, zh_tw
 
 from core.builtins import Bot
 from core.component import module
-from core.dirty_check import check_bool
+from core.dirty_check import check_bool, rickroll
 from core.exceptions import NoReportException
 
 l = module('langconv', developers=['Dianliang233'], alias={'lc': 'langconv'}, desc='{langconv.help}')
@@ -25,5 +25,5 @@ async def _(msg: Bot.MessageSession, language: str, content: str):
     stop = time.perf_counter_ns()
     delta = (stop - start) / 1000000
     if await check_bool(res):
-        raise NoReportException('https://wdf.ink/6OUp')
+        raise NoReportException(await rickroll())
     await msg.finish(res + '\n' + msg.locale.t('langconv.message.running_time', time=delta))

modules/maimai/libraries/maimaidx_api_data.py

@@ -1,7 +1,6 @@
 import ujson as json
 import os
 
-from core.builtins import ErrorMessage
 from core.utils.http import get_url, post_url
 from .maimaidx_music import get_cover_len5_id
 

modules/summary/__init__.py

@@ -5,7 +5,7 @@ import openai
 from config import Config
 from core.builtins import Bot
 from core.component import module
-from core.dirty_check import check_bool
+from core.dirty_check import check_bool, rickroll
 from core.logger import Logger
 
 openai.api_key = Config('openai_api_key')
@@ -63,5 +63,6 @@ async def _(msg: Bot.MessageSession):
     output = completion['choices'][0]['message']['content']
     await wait_msg.delete()
     if await check_bool(output):
-        await msg.finish('https://wdf.ink/6OUp')
+        message = await rickroll()
+        await msg.finish(message)
     await msg.finish(output, disable_secret_check=True)

modules/tweet/__init__.py

@@ -6,7 +6,7 @@ from config import Config
 from core.builtins import Bot
 from core.builtins.message import Image
 from core.component import module
-from core.dirty_check import check_bool
+from core.dirty_check import check_bool, rickroll
 from core.utils.http import download_to_cache, get_url
 
 web_render_local = Config('web_render_local')
@@ -31,7 +31,8 @@ async def _(msg: Bot.MessageSession, tweet: str):
         await msg.finish(msg.locale.t('tweet.message.not_found'))
     else:
         if await check_bool(res_json['pageProps']['tweet']['text'], res_json['pageProps']['tweet']['user']['name'], res_json['pageProps']['tweet']['user']['screen_name']):
-            await msg.finish('https://wdf.ink/6OUp')
+            message = await rickroll()
+            await msg.finish(message)
         else:
             css = '''
                 main {

modules/twenty_four/__init__.py

@@ -57,7 +57,7 @@ async def has_solution(numbers):
     expressions = list(itertools.product(operators, repeat=3))
     
     for perm in permutations:
-        for expr in expressions:
+        for expr in expressions: # 穷举就完事了
             exp = '((( {} {} {} ) {} {} ) {} {} )'.format(perm[0], expr[0], perm[1], expr[1], perm[2], expr[2], perm[3])
             if calc(exp) == 24:
                 return True

modules/wiki/utils/ab.py

@@ -16,7 +16,7 @@ async def ab(msg: Bot.MessageSession, wiki_url):
                                   filter_name=x['filter'], result=x['result']))
     y = await check(*d)
     y = '\n'.join(z['content'] for z in y)
-    if y.find('<吃掉了>') != -1 or y.find('<全部吃掉了>') != -1:
+    if y.find(msg.locale.t("check.redacted")) != -1 or y.find(msg.locale.t("check.redacted.all")) != -1:
         return f'{str(Url(pageurl))}\n{y}\n{msg.locale.t("wiki.message.utils.collapse")}\n{msg.locale.t("wiki.message.utils.banned")}'
     else:
         return f'{str(Url(pageurl))}\n{y}\n' + msg.locale.t("wiki.message.utils.collapse")

modules/wiki/utils/newbie.py

@@ -15,6 +15,6 @@ async def newbie(msg: Bot.MessageSession, wiki_url):
     y = await check(*d)
     y = '\n'.join(z['content'] for z in y)
     g = f'{pageurl}\n{y}\n{msg.locale.t("wiki.message.utils.collapse")}'
-    if g.find('<吃掉了>') != -1 or g.find('<全部吃掉了>') != -1:
+    if g.find(msg.locale.t("check.redacted")) != -1 or g.find(msg.locale.t("check.redacted.all")) != -1:
         g += f'\n{msg.locale.t("wiki.message.utils.banned")}'
     return g

modules/wiki/utils/rc.py

@@ -15,7 +15,7 @@ async def rc(msg: Bot.MessageSession, wiki_url):
                      ' ' + UTC8(x['timestamp'], 'onlytime'))
     y = await check(*d)
     y = '\n'.join(z['content'] for z in y)
-    if y.find('<吃掉了>') != -1 or y.find('<全部吃掉了>') != -1:
+    if y.find(msg.locale.t("check.redacted")) != -1 or y.find(msg.locale.t("check.redacted.all")) != -1:
         msg = f'{str(Url(pageurl))}\n{y}\n{msg.locale.t("wiki.message.utils.collapse")}\n{msg.locale.t("wiki.message.utils.banned")}'
     else:
         msg = f'{str(Url(pageurl))}\n{y}\n{msg.locale.t("wiki.message.utils.collapse")}'

modules/wolframalpha/__init__.py

@@ -5,7 +5,7 @@ import wolframalpha
 from config import Config
 from core.builtins import Bot, Image
 from core.component import module
-from core.dirty_check import check_bool
+from core.dirty_check import check_bool, rickroll
 
 client = wolframalpha.Client(Config('wolfram_alpha_appid'))
 
@@ -34,6 +34,7 @@ async def _(msg: Bot.MessageSession):
             images.append(pod.subpod['img']['@src'])
     bot_images = [Image(image) for image in images]
     if await check_bool(' '.join(answer)):
-        await msg.finish('https://wdf.ink/6OUp')
+        message = await rickroll()
+        await msg.finish(message)
     else:
         await msg.finish(['\n'.join(answer), *bot_images])