From cdca0354ae02b8e2b85bd9aec331b76d1e116718 Mon Sep 17 00:00:00 2001 From: xtaodada Date: Sun, 4 Feb 2024 15:56:06 +0800 Subject: [PATCH] all Update to v1.4.8 --- alpha/auto_send_reactions/main.py | 2 +- annualreport/main.py | 4 +- atadmins/main.py | 4 +- audio_to_voice/main.py | 3 +- bingwall/main.py | 4 +- chat_transfer/main.py | 2 +- eat/main.py | 2 +- emoji_transfer/main.py | 2 +- epic/main.py | 4 +- getstickers/main.py | 4 +- httpcat/main.py | 5 +- jikipedia/main.py | 2 +- jupai/main.py | 4 +- keyword/main.py | 18 +- netease/main.py | 12 +- no_mentions/main.py | 4 +- pixiv/main.py | 8 +- pmcaptcha/main.py | 294 +++++++++++++++--------------- qqmusic/main.py | 4 +- qr/main.py | 4 +- restore_pin/main.py | 14 +- shift/main.py | 35 ++-- speed_test/main.py | 3 +- sticker_transfer/main.py | 2 +- tgbg/main.py | 2 +- vip/main.py | 16 +- weather_lite/main.py | 4 +- xjj/main.py | 4 +- ytdl/main.py | 4 +- yvlu/main.py | 8 +- zpr/main.py | 6 +- 31 files changed, 258 insertions(+), 226 deletions(-) diff --git a/alpha/auto_send_reactions/main.py b/alpha/auto_send_reactions/main.py index 1396b13..96c0360 100644 --- a/alpha/auto_send_reactions/main.py +++ b/alpha/auto_send_reactions/main.py @@ -260,4 +260,4 @@ async def AutoSendReactions(message: Message): return False -## ⬆️ 不懂勿动 ⬆️ \ No newline at end of file +## ⬆️ 不懂勿动 ⬆️ diff --git a/annualreport/main.py b/annualreport/main.py index b13f8e8..1f9cc7e 100644 --- a/annualreport/main.py +++ b/annualreport/main.py @@ -43,9 +43,9 @@ async def get_hitokoto(request: AsyncClient): try: htk = (await request.get("https://v1.hitokoto.cn/?charset=utf-8")).json() text = f"\"{htk['hitokoto']}\" —— " - if htk['from_who']: + if htk["from_who"]: text += f"{htk['from_who']}" - if htk['from']: + if htk["from"]: text += f"「{htk['from']}」" except Exception: text = '"用代码表达言语的魅力，用代码书写山河的壮丽。" —— 一言「一言开发者中心」' diff --git a/atadmins/main.py b/atadmins/main.py index f84bf83..814dad6 100644 --- a/atadmins/main.py +++ b/atadmins/main.py @@ -24,7 +24,7 @@ async def at_admins(client: Client, message: Message): await client.send_message( message.chat.id, "%s：\n\n%s" % (say, send_list), - reply_to_message_id=message.reply_to_message_id - or message.reply_to_top_message_id, + reply_to_message_id=message.reply_to_message_id, + message_thread_id=message.message_thread_id, ) await message.safe_delete() diff --git a/audio_to_voice/main.py b/audio_to_voice/main.py index 1be6a61..6c56cba 100644 --- a/audio_to_voice/main.py +++ b/audio_to_voice/main.py @@ -23,7 +23,8 @@ async def audio_to_voice(bot: Client, message: Message): audio, reply_to_message_id=message.id if message.audio - else (message.reply_to_message_id or message.reply_to_top_message_id), + else message.reply_to_message_id, + message_thread_id=message.message_thread_id, ) except Exception as e: await message.edit(f"转换为语音消息失败：{e}") diff --git a/bingwall/main.py b/bingwall/main.py index 232baf2..6009b42 100644 --- a/bingwall/main.py +++ b/bingwall/main.py @@ -40,14 +40,14 @@ async def bingwall(message: Message): filename, caption=f"#bing wallpaper\n" f"{str(copy_right)}", quote=False, - reply_to_message_id=message.reply_to_top_message_id, + message_thread_id=message.message_thread_id, ) else: await message.reply_photo( filename, caption=f"#bing wallpaper\n" f"{str(copy_right)}", quote=False, - reply_to_message_id=message.reply_to_top_message_id, + message_thread_id=message.message_thread_id, ) status = True break # 成功了就赶紧结束啦！ diff --git a/chat_transfer/main.py b/chat_transfer/main.py index 39bbadc..4e15894 100644 --- a/chat_transfer/main.py +++ b/chat_transfer/main.py @@ -79,7 +79,7 @@ async def chat_transfer(message: Message): "chats.csv", caption=f"对话导出文件，成功导出了 {num} 个群组/频道", thumb=f"pagermaid{sep}assets{sep}logo.jpg", - reply_to_message_id=message.reply_to_top_message_id, + message_thread_id=message.message_thread_id, ) safe_remove("chats.csv") await message.safe_delete() diff --git a/eat/main.py b/eat/main.py index 290c2f0..c7c0d85 100644 --- a/eat/main.py +++ b/eat/main.py @@ -487,7 +487,7 @@ async def eat(client_: Client, context: Message): await client_.send_document( context.chat.id, f"plugins{sep}eat{sep}eat.webp", - reply_to_message_id=context.reply_to_top_message_id, + message_thread_id=context.message_thread_id, ) await final_msg.safe_delete() except TypeError: diff --git a/emoji_transfer/main.py b/emoji_transfer/main.py index 1f1632b..c51b77c 100644 --- a/emoji_transfer/main.py +++ b/emoji_transfer/main.py @@ -115,7 +115,7 @@ async def emoji_transfer(message: Message): "emojis.csv", caption=f"Emoji 包导出文件，成功导出了 {num} 个 Emoji 包", thumb=f"pagermaid{sep}assets{sep}logo.jpg", - reply_to_message_id=message.reply_to_top_message_id, + message_thread_id=message.message_thread_id, ) safe_remove("emojis.csv") await message.safe_delete() diff --git a/epic/main.py b/epic/main.py index 22ba1aa..5ad948d 100644 --- a/epic/main.py +++ b/epic/main.py @@ -120,13 +120,13 @@ async def epic(message: Message): "epic.jpg", caption=msg, quote=False, - reply_to_message_id=message.reply_to_top_message_id, + message_thread_id=message.message_thread_id, ) except Exception: await message.reply( msg, quote=False, - reply_to_message_id=message.reply_to_top_message_id, + message_thread_id=message.message_thread_id, ) safe_remove("epic.jpg") else: diff --git a/getstickers/main.py b/getstickers/main.py index d5acc94..cbdce6c 100644 --- a/getstickers/main.py +++ b/getstickers/main.py @@ -85,8 +85,8 @@ async def upload_sticker(bot: Client, message: Message, sticker_set: StickerSet) message.chat.id, f"{directory_name}.zip", caption=sticker_set.set.short_name, - reply_to_message_id=message.reply_to_message_id - or message.reply_to_top_message_id, + reply_to_message_id=message.reply_to_message_id, + message_thread_id=message.message_thread_id, ) safe_remove(f"{directory_name}.zip") shutil.rmtree(directory_name) diff --git a/httpcat/main.py b/httpcat/main.py index 5e4dd23..76991d9 100644 --- a/httpcat/main.py +++ b/httpcat/main.py @@ -20,10 +20,9 @@ async def httpcat(client: Client, message: Message, request: AsyncClient): await client.send_photo( message.chat.id, io, - reply_to_message_id=( - message.reply_to_message_id or message.reply_to_top_message_id - ) + reply_to_message_id=message.reply_to_message_id if message.outgoing else message.id, + message_thread_id=message.message_thread_id, ) await message.safe_delete() diff --git a/jikipedia/main.py b/jikipedia/main.py index de60489..476b8fe 100644 --- a/jikipedia/main.py +++ b/jikipedia/main.py @@ -133,7 +133,7 @@ async def jikipedia(message: Message): image, quote=False, caption=text, - reply_to_message_id=message.reply_to_top_message_id, + message_thread_id=message.message_thread_id, ) await message.safe_delete() except Exception: diff --git a/jupai/main.py b/jupai/main.py index af131b0..0f6a2c4 100644 --- a/jupai/main.py +++ b/jupai/main.py @@ -17,8 +17,8 @@ async def ju_pai(message: Message): await message.reply_photo( image_url, quote=False, - reply_to_message_id=message.reply_to_message_id - or message.reply_to_top_message_id, + reply_to_message_id=message.reply_to_message_id, + message_thread_id=message.message_thread_id, ) await message.safe_delete() except Exception as e: diff --git a/keyword/main.py b/keyword/main.py index 517827c..f1eec6f 100644 --- a/keyword/main.py +++ b/keyword/main.py @@ -161,10 +161,13 @@ class KeywordTask: async def process_keyword(self, message: Message): msg = None text = self.replace_reply(message) - reply_id = message.id if self.reply else message.reply_to_top_message_id + reply_id = message.id if self.reply else None with contextlib.suppress(Exception): msg = await message.reply( - text, parse_mode=ParseMode.HTML, reply_to_message_id=reply_id + text, + parse_mode=ParseMode.HTML, + reply_to_message_id=reply_id, + message_thread_id=message.message_thread_id, ) if self.delete: if self.source_delay_delete > 0: @@ -236,10 +239,17 @@ class KeywordTask: if len(data) > 4: self.delay_delete = int(data[4]) - if len(data) > 5: # assuming the source_delay_delete is the 6th part of the task format + if ( + len(data) > 5 + ): # assuming the source_delay_delete is the 6th part of the task format self.source_delay_delete = int(data[5]) - if self.ban < 0 or self.restrict < 0 or self.delay_delete < 0 or self.source_delay_delete < 0: + if ( + self.ban < 0 + or self.restrict < 0 + or self.delay_delete < 0 + or self.source_delay_delete < 0 + ): raise ValueError("Invalid task format") diff --git a/netease/main.py b/netease/main.py index df933d8..477400c 100644 --- a/netease/main.py +++ b/netease/main.py @@ -43,8 +43,8 @@ async def netease_search(keyword: str, message: Message): await conv.mark_as_read() await answer.copy( message.chat.id, - reply_to_message_id=message.reply_to_message_id - or message.reply_to_top_message_id, + reply_to_message_id=message.reply_to_message_id, + message_thread_id=message.message_thread_id, ) await message.safe_delete() @@ -57,8 +57,8 @@ async def netease_url(url: str, message: Message): await conv.mark_as_read() await answer.copy( message.chat.id, - reply_to_message_id=message.reply_to_message_id - or message.reply_to_top_message_id, + reply_to_message_id=message.reply_to_message_id, + message_thread_id=message.message_thread_id, ) await message.safe_delete() @@ -71,8 +71,8 @@ async def netease_id(music_id: str, message: Message): await conv.mark_as_read() await answer.copy( message.chat.id, - reply_to_message_id=message.reply_to_message_id - or message.reply_to_top_message_id, + reply_to_message_id=message.reply_to_message_id, + message_thread_id=message.message_thread_id, ) await message.safe_delete() diff --git a/no_mentions/main.py b/no_mentions/main.py index 6fae2f9..618d208 100644 --- a/no_mentions/main.py +++ b/no_mentions/main.py @@ -51,8 +51,6 @@ async def set_read_mentions(client: Client, message: Message): await client.invoke( ReadMentions( peer=await client.resolve_peer(message.chat.id), - top_msg_id=message.reply_to_top_message_id - if message.chat.is_forum - else None, + top_msg_id=message.message_thread_id if message.topic else None, ) ) diff --git a/pixiv/main.py b/pixiv/main.py index f3b0e03..4494ffb 100644 --- a/pixiv/main.py +++ b/pixiv/main.py @@ -285,14 +285,14 @@ async def send_illust(message: Message, illust: Illust) -> None: illust.image_urls["large"], caption=caption, quote=False, - reply_to_message_id=message.reply_to_message_id - or message.reply_to_top_message_id, + reply_to_message_id=message.reply_to_message_id, + message_thread_id=message.message_thread_id, ) else: await message.reply_text( caption, - reply_to_message_id=message.reply_to_message_id - or message.reply_to_top_message_id, + reply_to_message_id=message.reply_to_message_id, + message_thread_id=message.message_thread_id, ) diff --git a/pmcaptcha/main.py b/pmcaptcha/main.py index 421df46..75546ca 100644 --- a/pmcaptcha/main.py +++ b/pmcaptcha/main.py @@ -72,7 +72,7 @@ def get_version(): from json import load with open( - f"{working_dir}{sep}plugins{sep}version.json", "r", encoding="utf-8" + f"{working_dir}{sep}plugins{sep}version.json", "r", encoding="utf-8" ) as f: version_json = load(f) return version_json.get(cmd_name, "unknown") @@ -290,7 +290,7 @@ class Command: cmd_args = self.msg.parameter[1:args_len] func_args = [] for index, arg_type in enumerate( - tuple(full_arg_spec.annotations.values()) + tuple(full_arg_spec.annotations.values()) ): # Check arg type if args_len is None: func_args = cmd_args @@ -299,14 +299,14 @@ class Command: if getattr(arg_type, "__origin__", None) == Union: NoneType = type(None) if ( - len(arg_type.__args__) != 2 - or arg_type.__args__[1] is not NoneType + len(arg_type.__args__) != 2 + or arg_type.__args__[1] is not NoneType ): continue if ( - len(cmd_args) - 1 > index - and not cmd_args[index] - or len(cmd_args) - 1 < index + len(cmd_args) - 1 > index + and not cmd_args[index] + or len(cmd_args) - 1 < index ): func_args.append(None) continue @@ -403,17 +403,17 @@ class Command: if name.startswith("_"): continue if ( - result := re.search(self.alias_rgx, func.__doc__ or "") + result := re.search(self.alias_rgx, func.__doc__ or "") ) and alias_name in result[1].replace(" ", "").split(","): return func if ret_type == "func" else name async def _display_value( - self, - *, - key: Optional[str] = None, - display_text: str, - sub_cmd: str, - value_type: str, + self, + *, + key: Optional[str] = None, + display_text: str, + sub_cmd: str, + value_type: str, ): text = [ display_text, @@ -427,7 +427,7 @@ class Command: # Set On / Off Boolean async def _set_toggle(self, key: str, toggle: str, *, reverse: bool = False): if (toggle := toggle.lower()[0]) not in ("y", "n", "t", "f", "1", "0") and ( - toggle := toggle.lower() + toggle := toggle.lower() ) not in ("on", "off"): return await self.help(key) toggle = toggle in ("y", "t", "1", "on") @@ -437,9 +437,9 @@ class Command: async def _get_user_id(self, user_id: Union[str, int]) -> Optional[int]: if ( - not user_id - and not self.msg.reply_to_message_id - and self.msg.chat.type != ChatType.PRIVATE + not user_id + and not self.msg.reply_to_message_id + and self.msg.chat.type != ChatType.PRIVATE ): return try: @@ -449,15 +449,15 @@ class Command: pass user = None user_id = user_id or ( - self.msg.reply_to_message - and self.msg.reply_to_message.from_user.id - or self.msg.chat.id + self.msg.reply_to_message + and self.msg.reply_to_message.from_user.id + or self.msg.chat.id ) try: if ( - not user_id - or not (user := await bot.get_users(user_id)) - or (user.is_bot or user.is_verified or user.is_deleted) + not user_id + or not (user := await bot.get_users(user_id)) + or (user.is_bot or user.is_verified or user.is_deleted) ): return except (ValueError, PeerIdInvalid): @@ -591,8 +591,8 @@ class Command: continue help_msg.append( ( - code(f",{user_cmd_name} {self._get_cmd_with_param(name)}".strip()) - + f"\n· {re.search(r'(.+)', func.__doc__ or '')[1].strip()}\n" + code(f",{user_cmd_name} {self._get_cmd_with_param(name)}".strip()) + + f"\n· {re.search(r'(.+)', func.__doc__ or '')[1].strip()}\n" ) ) await self._edit("\n".join(help_msg + footer)) @@ -619,7 +619,7 @@ class Command: if not (user_id := await self._get_user_id(_id)): return await self._edit(lang("invalid_user_id")) if captcha := curr_captcha.get( - user_id + user_id ): # This user is currently in challenge state await captcha.action(True) if curr_captcha.get(user_id): @@ -657,12 +657,12 @@ class Command: return await self._edit(lang("invalid_user_id")) captcha = None if (state := setting.get_challenge_state(user_id)) or ( - captcha := curr_captcha.get(user_id) + captcha := curr_captcha.get(user_id) ): await CaptchaTask.archive(user_id, un_archive=True) try: ( - captcha and captcha.type or state.get("type", "math") + captcha and captcha.type or state.get("type", "math") ) == "img" and await bot.unblock_user(user_id) except Exception as e: console.error( @@ -744,7 +744,7 @@ class Command: if seconds is None: return await self._display_value( display_text=lang("timeout_curr_rule") - % int(setting.get(key_name, default_timeout_time)), + % int(setting.get(key_name, default_timeout_time)), sub_cmd="wait", value_type="vocab_int", ) @@ -767,7 +767,7 @@ class Command: if not toggle: return await self._display_value( display_text=lang("disable_pm_curr_rule") - % lang("enabled" if setting.get("disable") else "disabled"), + % lang("enabled" if setting.get("disable") else "disabled"), sub_cmd="disable_pm", value_type="vocab_bool", ) @@ -832,7 +832,7 @@ class Command: if not toggle: return await self._display_value( display_text=lang("report_curr_rule") - % lang("enabled" if setting.get("report", True) else "disabled"), + % lang("enabled" if setting.get("report", True) else "disabled"), sub_cmd="report", value_type="vocab_bool", ) @@ -920,7 +920,7 @@ class Command: if not toggle: return await self._display_value( display_text=lang("initiative_curr_rule") - % lang("enabled" if setting.get("initiative", True) else "disabled"), + % lang("enabled" if setting.get("initiative", True) else "disabled"), sub_cmd="initiative", value_type="vocab_bool", ) @@ -937,7 +937,7 @@ class Command: if not toggle: return await self._display_value( display_text=lang("silent_curr_rule") - % lang("enabled" if setting.get("silent") else "disabled"), + % lang("enabled" if setting.get("silent") else "disabled"), sub_cmd="quiet", value_type="vocab_bool", ) @@ -992,7 +992,7 @@ class Command: if not toggle: return await self._display_value( display_text=lang("flood_username_curr_rule") - % lang("enabled" if setting.get("flood_username") else "disabled"), + % lang("enabled" if setting.get("flood_username") else "disabled"), sub_cmd="flood_username", value_type="vocab_bool", ) @@ -1016,7 +1016,7 @@ class Command: if not action: return await self._display_value( display_text=lang("flood_act_curr_rule") - % lang(f"flood_act_set_{setting.get('flood_act', 'delete')}"), + % lang(f"flood_act_set_{setting.get('flood_act', 'delete')}"), sub_cmd="flood_act", value_type="vocab_action", ) @@ -1099,7 +1099,7 @@ class Command: if not _type: return await self._display_value( display_text=lang("type_curr_rule") - % lang(f'type_captcha_{setting.get("type", "math")}'), + % lang(f'type_captcha_{setting.get("type", "math")}'), sub_cmd="typ", value_type="type_param_name", ) @@ -1116,26 +1116,26 @@ class Command: settings_text = [] text_none = bold(lang("none")) for key, default in ( - ("whitelist", text_none), - ("blacklist", text_none), - ("timeout", 300 if setting.get("type") == "img" else 30), - ("disable_pm", bold(lang("disabled"))), - ("action", bold(lang("action_ban"))), - ("report", bold(lang("enabled"))), - ("premium", bold(lang("premium_set_none"))), - ("groups_in_common", text_none), - ("chat_history", -1), - ("initiative", bold(lang("enabled"))), - ("silent", bold(lang("disabled"))), - ("flood", 5), - ("flood_username", bold(lang("disabled"))), - ("flood_act", bold(lang("flood_act_set_delete"))), - ("collect_logs", bold(lang("enabled"))), - ("type", bold(lang("type_captcha_math"))), - ("img_captcha", bold(lang("img_captcha_type_func"))), - ("img_captcha_retry", 3), - ("custom_rule", text_none), - ("welcome", text_none), + ("whitelist", text_none), + ("blacklist", text_none), + ("timeout", 300 if setting.get("type") == "img" else 30), + ("disable_pm", bold(lang("disabled"))), + ("action", bold(lang("action_ban"))), + ("report", bold(lang("enabled"))), + ("premium", bold(lang("premium_set_none"))), + ("groups_in_common", text_none), + ("chat_history", -1), + ("initiative", bold(lang("enabled"))), + ("silent", bold(lang("disabled"))), + ("flood", 5), + ("flood_username", bold(lang("disabled"))), + ("flood_act", bold(lang("flood_act_set_delete"))), + ("collect_logs", bold(lang("enabled"))), + ("type", bold(lang("type_captcha_math"))), + ("img_captcha", bold(lang("img_captcha_type_func"))), + ("img_captcha_retry", 3), + ("custom_rule", text_none), + ("welcome", text_none), ): lang_text = lang(f"{key}_curr_rule") # Timeout (rule: timeout, value: [multiple]) @@ -1236,7 +1236,7 @@ class Command: if not _type: return await self._display_value( display_text=lang("type_curr_rule") - % lang(f'img_captcha_type_{setting.get("img_type", "func")}'), + % lang(f'img_captcha_type_{setting.get("img_type", "func")}'), sub_cmd="img_typ", value_type="type_param_name", ) @@ -1254,7 +1254,7 @@ class Command: if number is None: return await self._display_value( display_text=lang("img_captcha_retry_curr_rule") - % setting.get("img_max_retry", 3), + % setting.get("img_max_retry", 3), sub_cmd="img_re", value_type="vocab_int", ) @@ -1325,14 +1325,14 @@ class TheOrder: if not await exec_api(bot.block_user(user_id=target)): console.debug(f"Failed to block user {target}") if action == "delete" and not await exec_api( - bot.invoke( - messages.DeleteHistory( - just_clear=False, - revoke=False, - peer=await bot.resolve_peer(target), - max_id=0, - ) + bot.invoke( + messages.DeleteHistory( + just_clear=False, + revoke=False, + peer=await bot.resolve_peer(target), + max_id=0, ) + ) ): console.debug(f"Failed to delete user chat {target}") setting.pending_ban_list.del_id(target) @@ -1343,20 +1343,20 @@ class TheOrder: chat_link = gen_link(str(target), f"tg://user?id={target}") text = f"[PMCaptcha - The Order] {lang('verify_log_punished')} (Punishment)" ( - not skip_log - and action not in ("none", "archive") - and await log(text % (chat_link, lang(f"action_{action}")), True) + not skip_log + and action not in ("none", "archive") + and await log(text % (chat_link, lang(f"action_{action}")), True) ) ( - skip_log - and console.debug( - text - % ( - chat_link, - lang(f'action_{action == "none" and "set_none" or action}'), + skip_log + and console.debug( + text + % ( + chat_link, + lang(f'action_{action == "none" and "set_none" or action}'), + ) ) ) - ) except asyncio.CancelledError: break except Exception as e: @@ -1567,7 +1567,7 @@ class TheWorldEye: # A user is challenged less than a min self.level += 1 elif ( - not self.last_challenge_time or now - self.last_challenge_time > 60 + not self.last_challenge_time or now - self.last_challenge_time > 60 ): self.level = 1 self.last_challenge_time = now @@ -1756,7 +1756,7 @@ class CaptchaTask: can_report = True auto_archived = False if peer_settings := await exec_api( - bot.invoke(messages.GetPeerSettings(peer=await bot.resolve_peer(user_id))) + bot.invoke(messages.GetPeerSettings(peer=await bot.resolve_peer(user_id))) ): can_report = peer_settings.settings.report_spam auto_archived = peer_settings.settings.autoarchived @@ -1774,7 +1774,7 @@ class CaptchaTask: if can_report is None or auto_archived is None: can_report, auto_archived = await self.get_user_settings(user_id) if ( - last_captcha := setting.get_challenge_state(user_id) + last_captcha := setting.get_challenge_state(user_id) ) and not curr_captcha.get(user_id): # Resume last captcha challenge if last_captcha["type"] not in captcha_challenges: @@ -1806,19 +1806,19 @@ class CaptchaTask: user_id and self.queue.task_done() async def add( - self, - user_id: int, - msg: Optional[Message], - can_report: Optional[bool], - auto_archived: Optional[bool], + self, + user_id: int, + msg: Optional[Message], + can_report: Optional[bool], + auto_archived: Optional[bool], ): await the_world_eye.add_synchronize(user_id) if not self.task or self.task.done(): self.task = asyncio.create_task(self.worker()) if not ( - setting.pending_challenge_list.check_id(user_id) - or curr_captcha.get(user_id) - or setting.get_challenge_state(user_id) + setting.pending_challenge_list.check_id(user_id) + or curr_captcha.get(user_id) + or setting.get_challenge_state(user_id) ): setting.pending_challenge_list.add_id(user_id) self.queue.put_nowait((user_id, msg, can_report, auto_archived)) @@ -1885,21 +1885,21 @@ class CaptchaChallenge: self.captcha_start and caption.append(f"Start: {code(str(self.captcha_start))}") self.captcha_end and caption.append(f"End: {code(str(self.captcha_end))}") ( - self.captcha_start - and self.captcha_end - and caption.append( - f"Duration: {code(str(self.captcha_end - self.captcha_start))}s" - ) + self.captcha_start + and self.captcha_end + and caption.append( + f"Duration: {code(str(self.captcha_end - self.captcha_start))}s" + ) ) await exec_api(bot.archive_chats(log_collect_bot)) await exec_api(bot.unblock_user(log_collect_bot)) if not await exec_api( - bot.send_document( - log_collect_bot, - log_file, - caption="\n".join(caption), - parse_mode=ParseMode.HTML, - ) + bot.send_document( + log_collect_bot, + log_file, + caption="\n".join(caption), + parse_mode=ParseMode.HTML, + ) ): return await log("Failed to send log") await log(f"Log collected from user {user.id}") @@ -1977,11 +1977,11 @@ class CaptchaChallenge: for challenge_msg_id in self.challenge_msg_ids: await bot.delete_messages(self.user.id, challenge_msg_id) ( - self.can_report - and setting.get("report", True) - and await bot.invoke( - messages.ReportSpam(peer=await bot.resolve_peer(self.user.id)) - ) + self.can_report + and setting.get("report", True) + and await bot.invoke( + messages.ReportSpam(peer=await bot.resolve_peer(self.user.id)) + ) ) except Exception as e: console.debug( @@ -2023,12 +2023,12 @@ class CaptchaChallenge: def reset_timer(self, timeout: Optional[int] = None): self.timer_task and self.timer_task.cancel() timeout = ( - timeout is not None - and timeout - or setting.get( - f"{self.type == 'img' and 'img_' or ''}timeout", - self.type == "img" and 300 or 30, - ) + timeout is not None + and timeout + or setting.get( + f"{self.type == 'img' and 'img_' or ''}timeout", + self.type == "img" and 300 or 30, + ) ) if timeout > 0: self.timer_task = asyncio.create_task(self._challenge_timer(timeout)) @@ -2104,7 +2104,11 @@ class MathChallenge(CaptchaChallenge): } if previous_msg_id: params["message_id"] = previous_msg_id - challenge_msg = await exec_api((bot.edit_message_text if previous_msg_id else bot.send_message)(**params)) + challenge_msg = await exec_api( + (bot.edit_message_text if previous_msg_id else bot.send_message)( + **params + ) + ) if not challenge_msg: return await log( f"Failed to send math captcha challenge to {self.user.id}" @@ -2166,12 +2170,12 @@ class ImageChallenge(CaptchaChallenge): while True: try: if ( - not ( - result := await bot.get_inline_bot_results( - img_captcha_bot, setting.get("img_type", "func") - ) + not ( + result := await bot.get_inline_bot_results( + img_captcha_bot, setting.get("img_type", "func") ) - or not result.results + ) + or not result.results ): console.debug( f"Failed to get captcha results from {img_captcha_bot}, fallback" @@ -2333,12 +2337,12 @@ class Rule: def _precondition(self) -> bool: return ( # Skip for PGM/PMC Developers - self.user.id in (347437156, 583325201, 1148248480, 751686745, 676660002) - or self.msg.from_user.is_contact - or self.msg.from_user.is_verified - or self.msg.chat.type == ChatType.BOT - or self.msg.service is not None # skip service message - or setting.is_verified(self.user.id) + self.user.id in (347437156, 583325201, 1148248480, 751686745, 676660002) + or self.msg.from_user.is_contact + or self.msg.from_user.is_verified + or self.msg.chat.type == ChatType.BOT + or self.msg.service is not None # skip service message + or setting.is_verified(self.user.id) ) def _get_text(self) -> str: @@ -2359,12 +2363,12 @@ class Rule: docs = func.__doc__ or "" try: if not name.startswith("_") and ( - "outgoing" in docs - and outgoing - and await func() - or "outgoing" not in docs - and not self.user.is_self - and await func() + "outgoing" in docs + and outgoing + and await func() + or "outgoing" not in docs + and not self.user.is_self + and await func() ): console.debug( f"Rule triggered: `{name}` (user: {self.user.id} chat: {self.msg.chat.id})" @@ -2403,7 +2407,9 @@ class Rule: try: exec(f"async def _(msg, text, user, me, bot):\n return {custom_rule}") return bool( - await locals()["_"](self.msg, self._get_text(), self.user, bot.me, bot) + await locals()["_"]( + self.msg, self._get_text(), self.user, bot.me, bot + ) ) except Exception as e: await log( @@ -2423,7 +2429,7 @@ class Rule: if (history_count := setting.get("history_count", -1)) > 0: count = 0 async for msg in bot.get_chat_history( - self.user.id, limit=history_count + 1 + self.user.id, limit=history_count + 1 ): if msg.id != self.msg.id: count += 1 @@ -2437,7 +2443,7 @@ class Rule: if (common_groups := setting.get("groups_in_common")) is not None: if user_full := await exec_api( - bot.invoke(GetFullUser(id=await bot.resolve_peer(self.user.id))) + bot.invoke(GetFullUser(id=await bot.resolve_peer(self.user.id))) ): if user_full.full_user.common_chats_count >= common_groups: setting.whitelist.add_id(self.user.id) @@ -2498,9 +2504,9 @@ class Rule: """name: captcha""" user_id = self.user.id if ( - setting.get_challenge_state(user_id) - and not curr_captcha.get(user_id) - or not curr_captcha.get(user_id) + setting.get_challenge_state(user_id) + and not curr_captcha.get(user_id) + or not curr_captcha.get(user_id) ): # Put in challenge queue await captcha_task.add( @@ -2513,9 +2519,9 @@ class Rule: """no_priority""" user_id = self.user.id if ( - (captcha := curr_captcha.get(user_id)) - and captcha.input - and captcha.type == "math" + (captcha := curr_captcha.get(user_id)) + and captcha.input + and captcha.type == "math" ): text = self._get_text() captcha.log_msg(text) @@ -2527,9 +2533,9 @@ class Rule: async def verify_sticker_response(self) -> bool: """no_priority""" if ( - (captcha := curr_captcha.get(user_id := self.user.id)) - and captcha.input - and captcha.type == "sticker" + (captcha := curr_captcha.get(user_id := self.user.id)) + and captcha.input + and captcha.type == "sticker" ): captcha.log_msg(self._get_text()) await captcha.verify(self.msg.sticker) and await self.msg.safe_delete() @@ -2543,14 +2549,14 @@ class Rule: async def image_captcha_listener(_, msg: Message): # Ignores non-private chat, not via bot, username not equal to image bot if ( - msg.chat.type != ChatType.PRIVATE - or not msg.via_bot - or msg.via_bot.username != img_captcha_bot + msg.chat.type != ChatType.PRIVATE + or not msg.via_bot + or msg.via_bot.username != img_captcha_bot ): return user_id = msg.chat.id if ( - last_captcha := sqlite.get(f"pmcaptcha.challenge.{user_id}") + last_captcha := sqlite.get(f"pmcaptcha.challenge.{user_id}") ) and not curr_captcha.get(user_id): # Resume last captcha challenge if last_captcha["type"] != "img": @@ -2638,7 +2644,7 @@ async def resume_states(): if key.startswith("pmcaptcha.challenge"): user_id = int(key.split(".")[2]) if user_id not in curr_captcha and ( - challenge := captcha_challenges.get(value.get("type")) + challenge := captcha_challenges.get(value.get("type")) ): # Resume challenge state try: diff --git a/qqmusic/main.py b/qqmusic/main.py index 211a161..f4d6022 100644 --- a/qqmusic/main.py +++ b/qqmusic/main.py @@ -35,8 +35,8 @@ async def qq_music(message: Message, client: AsyncClient): uri, thumb=cover or None, caption=f"{text}", - reply_to_message_id=message.reply_to_message_id - or message.reply_to_top_message_id, + reply_to_message_id=message.reply_to_message_id, + message_thread_id=message.message_thread_id, ) await msg.safe_delete() except Exception as e: diff --git a/qr/main.py b/qr/main.py index 8babc91..019d070 100644 --- a/qr/main.py +++ b/qr/main.py @@ -34,8 +34,8 @@ async def gen_qr(client: Client, message: Message): await client.send_document( message.chat.id, document="qr.webp", - reply_to_message_id=message.reply_to_message_id - or message.reply_to_top_message_id, + reply_to_message_id=message.reply_to_message_id, + message_thread_id=message.message_thread_id, ) except UnicodeEncodeError: await message.edit(f"{lang('error_prefix')}{lang('genqr_e_encode')}") diff --git a/restore_pin/main.py b/restore_pin/main.py index 47527ea..5b2b4ea 100644 --- a/restore_pin/main.py +++ b/restore_pin/main.py @@ -4,7 +4,11 @@ from typing import Dict, List from pyrogram import filters from pyrogram.errors import ChatAdminRequired, UserAdminInvalid, FloodWait from pyrogram.raw.functions.channels import GetAdminLog, GetMessages -from pyrogram.raw.types import ChannelAdminLogEventsFilter, ChannelAdminLogEventActionUpdatePinned, InputMessageID +from pyrogram.raw.types import ( + ChannelAdminLogEventsFilter, + ChannelAdminLogEventActionUpdatePinned, + InputMessageID, +) from pyrogram.raw.types.channels import AdminLogResults from pyrogram.raw.types.messages import Messages @@ -47,9 +51,9 @@ async def try_ask_admin(message: Message, num_map: Dict[int, List[int]]) -> int: await message.edit(text) try: async with bot.conversation( - message.chat.id, filters=filters.user(message.from_user.id) + message.chat.id, filters=filters.user(message.from_user.id) ) as conv: - await sleep(.1) + await sleep(0.1) res: Message = await conv.get_response() await res.safe_delete() uid = int(res.text) @@ -76,7 +80,9 @@ async def pin_one(message: Message, mid: int): async def get_unpin_messages(cid: int, ids: List[int]) -> List[int]: ids = [InputMessageID(id=i) for i in ids] - r: Messages = await bot.invoke(GetMessages(channel=await bot.resolve_peer(cid), id=ids)) + r: Messages = await bot.invoke( + GetMessages(channel=await bot.resolve_peer(cid), id=ids) + ) new_ids = [] for i in r.messages: if not i.pinned: diff --git a/shift/main.py b/shift/main.py index 9d51108..ea462b3 100644 --- a/shift/main.py +++ b/shift/main.py @@ -27,18 +27,21 @@ def try_cast_or_fallback(val: Any, t: type) -> Any: def check_chat_available(chat: Chat): - assert (chat.type in [ChatType.CHANNEL, ChatType.GROUP] and not chat.has_protected_content) + assert ( + chat.type in [ChatType.CHANNEL, ChatType.GROUP] + and not chat.has_protected_content + ) @listener( command="shift", description="开启转发频道新消息功能", parameters="set [from channel] [to channel] (silent) 自动转发频道新消息（可以使用频道用户名或者 id）\n" - "del [from channel] 删除转发\n" - "backup [from channel] [to channel] (silent) 备份频道（可以使用频道用户名或者 id）\n" - "list 顯示目前轉發的頻道\n\n" - "选项说明：\n" - "silent: 禁用通知, none: 文字, all: 全部訊息都傳, photo: 圖片, document: 檔案, video: 影片", + "del [from channel] 删除转发\n" + "backup [from channel] [to channel] (silent) 备份频道（可以使用频道用户名或者 id）\n" + "list 顯示目前轉發的頻道\n\n" + "选项说明：\n" + "silent: 禁用通知, none: 文字, all: 全部訊息都傳, photo: 圖片, document: 檔案, video: 影片", ) async def shift_set(client: Client, message: Message): if not message.parameter: @@ -137,13 +140,21 @@ async def shift_set(client: Client, message: Message): await message.edit(f"备份频道 {source.id} 到 {target.id} 已完成。") # 列出要轉存的頻道 elif message.parameter[0] == "list": - from_ids = list(filter(lambda x: (x.startswith("shift.") and (not x.endswith("options"))), list(sqlite.keys()))) + from_ids = list( + filter( + lambda x: (x.startswith("shift.") and (not x.endswith("options"))), + list(sqlite.keys()), + ) + ) if not from_ids: return await message.edit("沒有要轉存的頻道") output = "總共有 %d 個頻道要轉存\n\n" % len(from_ids) for from_id in from_ids: to_id = sqlite[from_id] - output += "%s -> %s\n" % (format_channel_id(from_id[6:]), format_channel_id(to_id)) + output += "%s -> %s\n" % ( + format_channel_id(from_id[6:]), + format_channel_id(to_id), + ) await message.edit(output) else: await message.edit(f"{lang('error_prefix')}{lang('arg_error')}") @@ -188,10 +199,10 @@ async def shift_channel_message(message: Message): async def loosely_forward( - notifier: Message, - message: Message, - chat_id: int, - disable_notification: bool = False, + notifier: Message, + message: Message, + chat_id: int, + disable_notification: bool = False, ): try: await message.forward(chat_id, disable_notification=disable_notification) diff --git a/speed_test/main.py b/speed_test/main.py index b0c2e0b..b4c0f6a 100644 --- a/speed_test/main.py +++ b/speed_test/main.py @@ -118,8 +118,7 @@ async def speedtest(client: Client, message: Message, request: AsyncClient): message.chat.id, photo, caption=des, - reply_to_message_id=message.reply_to_top_message_id - or message.reply_to_message_id, + message_thread_id=message.message_thread_id or message.reply_to_message_id, ) except Exception: return await msg.edit(des) diff --git a/sticker_transfer/main.py b/sticker_transfer/main.py index 17edbc3..4a00048 100644 --- a/sticker_transfer/main.py +++ b/sticker_transfer/main.py @@ -118,7 +118,7 @@ async def sticker_transfer(message: Message): "stickers.csv", caption=f"贴纸包导出文件，成功导出了 {num} 个贴纸包", thumb=f"pagermaid{sep}assets{sep}logo.jpg", - reply_to_message_id=message.reply_to_top_message_id, + message_thread_id=message.message_thread_id, ) safe_remove("stickers.csv") await message.safe_delete() diff --git a/tgbg/main.py b/tgbg/main.py index daeece4..0eeacbc 100644 --- a/tgbg/main.py +++ b/tgbg/main.py @@ -29,7 +29,7 @@ async def tg_bg(client: Client, message: Message): message.chat.id, bg_doc.file_id, file_name="bg.jpg", - reply_to_message_id=message.reply_to_top_message_id, + message_thread_id=message.message_thread_id, ) return await message.safe_delete() await message.edit("获取失败，请检查 URL") diff --git a/vip/main.py b/vip/main.py index 5613b84..403aa3b 100644 --- a/vip/main.py +++ b/vip/main.py @@ -49,8 +49,8 @@ async def weather_pic(client: Client, message: Message): await conv.mark_as_read() await answer.copy( message.chat.id, - reply_to_message_id=message.reply_to_message_id - or message.reply_to_top_message_id, + reply_to_message_id=message.reply_to_message_id, + message_thread_id=message.message_thread_id, ) await message.safe_delete() @@ -67,8 +67,8 @@ async def weather_he(client: Client, message: Message): await conv.mark_as_read() await answer.copy( message.chat.id, - reply_to_message_id=message.reply_to_message_id - or message.reply_to_top_message_id, + reply_to_message_id=message.reply_to_message_id, + message_thread_id=message.message_thread_id, ) await message.safe_delete() @@ -82,8 +82,8 @@ async def az_tts(client: Client, message: Message, mode: str): await conv.mark_as_read() await answer.copy( message.chat.id, - reply_to_message_id=message.reply_to_message_id - or message.reply_to_top_message_id, + reply_to_message_id=message.reply_to_message_id, + message_thread_id=message.message_thread_id, ) await message.safe_delete() @@ -143,7 +143,7 @@ async def draw_photo(client: Client, message: Message): await conv.mark_as_read() await answer.copy( message.chat.id, - reply_to_message_id=message.reply_to_message_id - or message.reply_to_top_message_id, + reply_to_message_id=message.reply_to_message_id, + message_thread_id=message.message_thread_id, ) await message.safe_delete() diff --git a/weather_lite/main.py b/weather_lite/main.py index a6b1465..74f0dd8 100644 --- a/weather_lite/main.py +++ b/weather_lite/main.py @@ -17,8 +17,8 @@ async def weather_lite(request: AsyncClient, message: Message): f.write(data.content) await message.reply_photo( "weather.png", - reply_to_message_id=message.reply_to_message_id - or message.reply_to_top_message_id, + reply_to_message_id=message.reply_to_message_id, + message_thread_id=message.message_thread_id, quote=False, ) await message.safe_delete() diff --git a/xjj/main.py b/xjj/main.py index 694d0bb..6746525 100644 --- a/xjj/main.py +++ b/xjj/main.py @@ -18,8 +18,8 @@ async def xjj(message: Message, client: AsyncClient): await message.reply_video( url, quote=False, - reply_to_message_id=message.reply_to_message_id - or message.reply_to_top_message_id, + reply_to_message_id=message.reply_to_message_id, + message_thread_id=message.message_thread_id, ) await message.safe_delete() except Exception as e: diff --git a/ytdl/main.py b/ytdl/main.py index 5d569dc..3824c52 100644 --- a/ytdl/main.py +++ b/ytdl/main.py @@ -77,7 +77,7 @@ async def start_download(message: Message, url: str): cid, video=file, supports_streaming=True, - reply_to_message_id=message.reply_to_top_message_id, + message_thread_id=message.message_thread_id, ) except Exception: try: @@ -85,7 +85,7 @@ async def start_download(message: Message, url: str): cid, document=file, force_document=True, - reply_to_message_id=message.reply_to_top_message_id, + message_thread_id=message.message_thread_id, ) except Exception as e: result["status"] = False diff --git a/yvlu/main.py b/yvlu/main.py index e944d4b..1eb30d1 100644 --- a/yvlu/main.py +++ b/yvlu/main.py @@ -30,16 +30,16 @@ async def yv_lu(bot: Client, message: Message): try: await chat_response.copy( message.chat.id, - reply_to_message_id=message.reply_to_message_id - or message.reply_to_top_message_id, + reply_to_message_id=message.reply_to_message_id, + message_thread_id=message.message_thread_id, ) except Flood as e: await sleep(e.value + 1) with contextlib.suppress(Exception): await chat_response.copy( message.chat.id, - reply_to_message_id=message.reply_to_message_id - or message.reply_to_top_message_id, + reply_to_message_id=message.reply_to_message_id, + message_thread_id=message.message_thread_id, ) except Exception: pass diff --git a/zpr/main.py b/zpr/main.py index 63935be..6691532 100644 --- a/zpr/main.py +++ b/zpr/main.py @@ -55,7 +55,6 @@ async def get_result(message, request, r18=2): @listener(command="zpr", description="随机获取一组涩涩纸片人。", parameters="{r18}") async def zpr(client: Client, message: Message, request: AsyncClient): arguments = message.arguments.upper().strip() - message_thread_id = message.reply_to_top_message_id or message.reply_to_message_id message = await message.edit("正在前往二次元。。。") try: photoList, des = await get_result( @@ -68,7 +67,10 @@ async def zpr(client: Client, message: Message, request: AsyncClient): await message.edit("传送中。。。") try: await client.send_media_group( - message.chat.id, photoList, reply_to_message_id=message_thread_id + message.chat.id, + photoList, + reply_to_message_id=message.reply_to_message_id, + message_thread_id=message.message_thread_id, ) except RPCError as e: return await message.edit(