Merge branch 'Teahouse-Studios:master' into master

bots/aiocqhttp/message.py

@@ -39,6 +39,7 @@
 from core.utils.storedata import get_stored_list
 
 enable_analytics = Config("enable_analytics", False)
+qq_typing_emoji = str(Config("qq_typing_emoji", 181, (str, int), table_name="bot_aiocqhttp"))
 
 
 class FinishedSession(FinishedSessionT):
@@ -430,47 +431,31 @@ def __init__(self, msg: MessageSessionT):
         async def __aenter__(self):
             if self.msg.target.target_from == target_group_prefix:  # wtf onebot 11
                 obi = await get_onebot_implementation()
-                if obi == "ntqq":
+                if obi in ["llonebot", "napcat"]:
                     await bot.call_action(
                         "set_msg_emoji_like",
                         message_id=self.msg.session.message.message_id,
-                        emoji_id=str(
-                            Config(
-                                "qq_typing_emoji",
-                                181,
-                                (str, int),
-                                table_name="bot_aiocqhttp",
-                            )
-                        ),
-                    )
+                        emoji_id=qq_typing_emoji)
+                elif obi == "lagrange":
+                    await bot.call_action(
+                        "set_group_reaction",
+                        group_id=self.msg.session.target,
+                        message_id=self.msg.session.message.message_id,
+                        code=qq_typing_emoji,
+                        is_add=True)
                 else:
                     if self.msg.session.sender in last_send_typing_time:
-                        if (
-                            datetime.datetime.now().timestamp()
-                            - last_send_typing_time[self.msg.session.sender]
-                            <= 3600
-                        ):
+                        if datetime.datetime.now().timestamp() - last_send_typing_time[self.msg.session.sender] <= 3600:
                             return
-                    last_send_typing_time[self.msg.session.sender] = (
-                        datetime.datetime.now().timestamp()
-                    )
-
-                    if obi == "lagrange":
-                        await bot.call_action(
-                            "group_poke",
-                            group_id=self.msg.session.target,
-                            user_id=self.msg.session.sender,
-                        )
-                    elif obi == "shamrock":
+                    last_send_typing_time[self.msg.session.sender] = datetime.datetime.now().timestamp()
+                    if obi == "shamrock":
                         await bot.send_group_msg(
                             group_id=self.msg.session.target,
-                            message=f"[CQ:touch,id={self.msg.session.sender}]",
-                        )
+                            message=f"[CQ:touch,id={self.msg.session.sender}]")
                     elif obi == "go-cqhttp":
                         await bot.send_group_msg(
                             group_id=self.msg.session.target,
-                            message=f"[CQ:poke,qq={self.msg.session.sender}]",
-                        )
+                            message=f"[CQ:poke,qq={self.msg.session.sender}]")
                     else:
                         pass
 

bots/aiocqhttp/utils.py

@@ -14,8 +14,8 @@ async def get_onebot_implementation() -> Optional[str]:
     Logger.debug(str(data))
     app_name = data.get("app_name")
 
-    if app_name in ["NapCat.Onebot", "LLOneBot"]:
-        app_name = "ntqq"
+    if app_name == "NapCat.Onebot":
+        app_name = "napcat"
     elif app_name == "Lagrange.OneBot":
         app_name = "lagrange"
 

bots/qqbot/message.py

@@ -4,6 +4,7 @@
 
 import filetype
 from botpy.message import C2CMessage, DirectMessage, GroupMessage, Message
+from botpy.errors import ServerError
 from botpy.types.message import Reference
 
 from bots.qqbot.info import *
@@ -24,6 +25,7 @@
 from core.database import BotDBUtil
 from core.logger import Logger
 from core.utils.http import download, url_pattern
+from core.utils.image import msgchain2image
 
 enable_analytics = Config("enable_analytics", False)
 enable_send_url = Config("qq_bot_enable_send_url", False, table_name="bot_qqbot")
@@ -118,6 +120,7 @@ async def send_message(
                 )
                 if not msg_quote and quote:
                     msg = f"<@{self.session.message.author.id}> \n" + msg
+                msg = "" if not msg else msg
                 send = await self.session.message.reply(
                     content=msg, file_image=send_img, message_reference=msg_quote
                 )
@@ -149,6 +152,7 @@ async def send_message(
                     if quote and not send_img
                     else None
                 )
+                msg = "" if not msg else msg
                 send = await self.session.message.reply(
                     content=msg, file_image=send_img, message_reference=msg_quote
                 )
@@ -181,20 +185,30 @@ async def send_message(
                     )
                 if msg and self.session.message.id:
                     msg = "\n" + msg
-                send = await self.session.message.reply(
-                    content=msg,
-                    msg_type=7 if send_img else 0,
-                    media=send_img,
-                    msg_seq=seq,
-                )
-                Logger.info(f"[Bot] -> [{self.target.target_id}]: {msg.strip()}")
-                if image_1:
-                    Logger.info(
-                        f"[Bot] -> [{self.target.target_id}]: Image: {str(image_1.__dict__)}"
+                msg = "" if not msg else msg
+                try:
+                    send = await self.session.message.reply(
+                        content=msg,
+                        msg_type=7 if send_img else 0,
+                        media=send_img,
+                        msg_seq=seq,
                     )
-                if send:
-                    sends.append(send)
-                    seq += 1
+                    Logger.info(f"[Bot] -> [{self.target.target_id}]: {msg.strip()}")
+                    if image_1:
+                        Logger.info(
+                            f"[Bot] -> [{self.target.target_id}]: Image: {str(image_1.__dict__)}"
+                        )
+                    if send:
+                        sends.append(send)
+                        seq += 1
+                except ServerError:
+                    img_chain = filtered_msg
+                    img_chain.insert(0, I18NContext("error.message.limited.msg2img"))
+                    img_chain.append(image_1) if image_1 else None
+                    imgs = await msgchain2image(img_chain, self)
+                    if imgs:
+                        imgs = [Image(img) for img in imgs]
+                        images = imgs + images
                 if images:
                     for img in images:
                         send_img = await self.session.message._api.post_group_file(
@@ -224,20 +238,30 @@ async def send_message(
                         file_type=1,
                         file_data=await image_1.get_base64(),
                     )
-                send = await self.session.message.reply(
-                    content=msg,
-                    msg_type=7 if send_img else 0,
-                    media=send_img,
-                    msg_seq=seq,
-                )
-                Logger.info(f"[Bot] -> [{self.target.target_id}]: {msg.strip()}")
-                if image_1:
-                    Logger.info(
-                        f"[Bot] -> [{self.target.target_id}]: Image: {str(image_1.__dict__)}"
+                msg = "" if not msg else msg
+                try:
+                    send = await self.session.message.reply(
+                        content=msg,
+                        msg_type=7 if send_img else 0,
+                        media=send_img,
+                        msg_seq=seq,
                     )
-                if send:
-                    sends.append(send)
-                    seq += 1
+                    Logger.info(f"[Bot] -> [{self.target.target_id}]: {msg.strip()}")
+                    if image_1:
+                        Logger.info(
+                            f"[Bot] -> [{self.target.target_id}]: Image: {str(image_1.__dict__)}"
+                        )
+                    if send:
+                        sends.append(send)
+                        seq += 1
+                except ServerError:
+                    img_chain = filtered_msg
+                    img_chain.insert(0, I18NContext("error.message.limited.msg2img"))
+                    img_chain.append(image_1) if image_1 else None
+                    imgs = await msgchain2image(img_chain, self)
+                    if imgs:
+                        imgs = [Image(img) for img in imgs]
+                        images = imgs + images
                 if images:
                     for img in images:
                         send_img = await self.session.message._api.post_c2c_file(

bots/web/bot.py

@@ -17,7 +17,7 @@
 WEBUI_PORT = Config("webui_port", 8081, table_name="bot_web")
 
 Info.client_name = client_name
-PrivateAssets.set(os.path.join(assets_path, "private", "api"))
+PrivateAssets.set(os.path.join(assets_path, "private", "web"))
 
 
 def run_fastapi():

console.py

@@ -66,7 +66,7 @@ async def console_command():
     try:
         session = PromptSession(history=FileHistory(console_history_path))
         while True:
-            m = await asyncio.to_thread(session.prompt, "> ")
+            m = await asyncio.to_thread(session.prompt)
             await send_command(m)
     except Exception:
         Logger.error(traceback.format_exc())

core/bot_init.py

@@ -54,7 +54,7 @@ async def load_secret():
 
 
 async def load_prompt(bot) -> None:
-    author_cache = os.path.join(PrivateAssets.path, "cache_restart_author")
+    author_cache = os.path.join(PrivateAssets.path, ".cache_restart_author")
     loader_cache = os.path.join(PrivateAssets.path, ".cache_loader")
     if os.path.exists(author_cache):
         with open(author_cache, "r", encoding="utf-8") as open_author_cache:
@@ -70,8 +70,7 @@ async def load_prompt(bot) -> None:
                         await m.send_direct_message(
                             m.parent.locale.t("loader.load.success")
                         )
-                    os.remove(author_cache)
-                    os.remove(loader_cache)
+        os.remove(author_cache)
 
 
 __all__ = ["init_async", "load_prompt"]

core/dirty_check.py

@@ -94,7 +94,13 @@ async def check(*text: Union[str, List[str]], additional_text=None) -> List[Dict
                 if not cache.need_insert:
                     query_list[q][pq] = parse_data(cache.get(), additional_text=additional_text)
 
-    call_api_list = {pq: [q] for q in query_list for pq in query_list[q] if not query_list[q][pq]}
+    call_api_list = {}
+    for q in query_list:
+        for pq in query_list[q]:
+            if not query_list[q][pq]:
+                if pq not in call_api_list:
+                    call_api_list.update({pq: []})
+                call_api_list[pq].append(q)
     call_api_list_ = list(call_api_list)
     Logger.debug(call_api_list_)
 

core/parser/message.py

@@ -26,6 +26,7 @@
 from core.utils.message import remove_duplicate_space
 
 qq_account = Config("qq_account", cfg_type=(int, str), table_name='bot_aiocqhttp')
+qq_limited_emoji = str(Config('qq_limited_emoji', 10060, (str, int), table_name='bot_aiocqhttp'))
 
 default_locale = Config("default_locale", cfg_type=str)
 enable_tos = Config('enable_tos', True)
@@ -446,15 +447,24 @@ async def execute_submodule(msg: Bot.MessageSession, command_first_word):
                 except SendMessageFailed:
                     if msg.target.target_from == qq_group_prefix:  # wtf onebot 11
                         obi = await get_onebot_implementation()
-                        if obi == 'ntqq':
-                            await msg.call_api('set_msg_emoji_like', message_id=msg.session.message.message_id,
-                                               emoji_id=str(Config('qq_limited_emoji', 10060, (str, int), table_name='bot_aiocqhttp')))
-                        elif obi == 'lagrange':
-                            await msg.call_api('group_poke', group_id=msg.session.target, user_id=int(qq_account))
-                        elif obi == 'shamrock':
-                            await msg.call_api('send_group_msg', group_id=msg.session.target, message=f'[CQ:touch,id={qq_account}]')
-                        elif obi == 'go-cqhttp':
-                            await msg.call_api('send_group_msg', group_id=msg.session.target, message=f'[CQ:poke,qq={qq_account}]')
+                        if obi in ["llonebot", "napcat"]:
+                            await msg.call_api("set_msg_emoji_like",
+                                               message_id=msg.session.message.message_id,
+                                               emoji_id=qq_limited_emoji)
+                        elif obi == "lagrange":
+                            await msg.call_api("set_group_reaction",
+                                               group_id=msg.session.target,
+                                               message_id=msg.session.message.message_id,
+                                               code=qq_limited_emoji,
+                                               is_add=True)
+                        elif obi == "shamrock":
+                            await msg.call_api("send_group_msg",
+                                               group_id=msg.session.target,
+                                               message=f"[CQ:touch,id={qq_account}]")
+                        elif obi == "go-cqhttp":
+                            await msg.call_api("send_group_msg",
+                                               group_id=msg.session.target,
+                                               message=f"[CQ:poke,qq={qq_account}]")
                         else:
                             pass
                     await msg.send_message(msg.locale.t("error.message.limited"))

modules/bilibili/__init__.py

@@ -72,7 +72,7 @@ async def _(msg: Bot.MessageSession):
 async def parse_shorturl(shorturl):
     try:
         async with httpx.AsyncClient() as client:
-            resp = await client.get(shorturl, allow_redirects=False)
+            resp = await client.get(shorturl, follow_redirects=False)
             target_url = resp.headers.get("Location")
 
         video = re.search(r"/video/([^/?]+)", target_url)

modules/core/su_utils.py

@@ -306,7 +306,7 @@ def restart():
 
 
 def write_version_cache(msg: Bot.MessageSession):
-    update = os.path.join(PrivateAssets.path, 'cache_restart_author')
+    update = os.path.join(PrivateAssets.path, '.cache_restart_author')
     with open(update, 'wb') as write_version:
         write_version.write(json.dumps({'From': msg.target.target_from, 'ID': msg.target.target_id}))
 

modules/wordle/__init__.py

@@ -232,7 +232,7 @@ async def _(msg: Bot.MessageSession):
 
     qc = CoolDown("wordle", msg)
     if not msg.target.client_name == "TEST" and not msg.check_super_user():
-        c = qc.check(150)
+        c = qc.check(180)
         if c != 0:
             await msg.finish(msg.locale.t("message.cooldown", time=int(150 - c)))