Sync/SlashBot
1
0
Fork 0
mirror of https://github.com/Rongronggg9/SlashBot.git synced 2025-04-28 22:23:31 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: non-reply topic messages treated as replies

Browse Source
This commit is contained in:
Rongrong 2025-03-16 19:05:37 +08:00
parent 9d1dd01fca
commit a66d9c3f67
No known key found for this signature in database
GPG Key ID: 1C2D45D45AB7FE94
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
SlashBot.py
View File

@ -206,9 +206,21 @@ def get_user(msg: telegram.Message) -> User:
return User(name=user.full_name or user.title, uid=user.id, username=user.username) return User(name=user.full_name or user.title, uid=user.id, username=user.username)
def get_reply(msg: telegram.Message) -> Optional[telegram.Message]:
"""
Telegram creates a false reply to the forum_topic_created service message
when a topic message is not replying to anything.
Filter it out.
"""
rpl = msg.reply_to_message
if rpl and not rpl.forum_topic_created:
return rpl
return None
def get_users(msg: telegram.Message) -> tuple[User, User]: def get_users(msg: telegram.Message) -> tuple[User, User]:
msg_from = msg msg_from = msg
msg_rpl = msg.reply_to_message or msg_from msg_rpl = get_reply(msg) or msg_from
from_user, rpl_user = get_user(msg_from), get_user(msg_rpl) from_user, rpl_user = get_user(msg_from), get_user(msg_rpl)
return from_user, rpl_user return from_user, rpl_user
@ -314,7 +326,7 @@ def repeat(update: telegram.Update, ctx: telegram.ext.CallbackContext, logger: _
@log @log
def pin(update: telegram.Update, _ctx: telegram.ext.CallbackContext, logger: _logger): def pin(update: telegram.Update, _ctx: telegram.ext.CallbackContext, logger: _logger):
msg = update.effective_message msg = update.effective_message
msg_to_pin = msg.reply_to_message msg_to_pin = get_reply(msg)
if not msg_to_pin: if not msg_to_pin:
vegetable = f'{Vegetable["reject"]} (Reply to a message to use the command)' vegetable = f'{Vegetable["reject"]} (Reply to a message to use the command)'
msg.reply_text(vegetable) msg.reply_text(vegetable)