ceda_ei/minetest-telegram-bridge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix replies to non-chat messages by bot

Browse Source
This commit is contained in:
Ceda EI 2019-01-29 10:19:56 +05:30
parent 7bdebb7fd3
commit 17eb4e8bdd
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bot/bot.py
View File

@ -16,7 +16,8 @@ def get_text_or_type(msg, bot, truncate=False):
# Set message contents # Set message contents
if msg.text: if msg.text:
if msg.from_user.username == bot.username: if msg.from_user.username == bot.username and re.match('<.*?>(.*)',
msg.text):
x = re.compile('(<.*?>)(.*)') x = re.compile('(<.*?>)(.*)')
y = x.search(msg.text) y = x.search(msg.text)
z = y.group(2) z = y.group(2)
@ -59,7 +60,8 @@ def get_text_or_type(msg, bot, truncate=False):
# Set sender # Set sender
return_message = "" return_message = ""
for i in message.strip().split("\n"): for i in message.strip().split("\n"):
if msg.from_user.username != bot.username: if msg.from_user.username != bot.username or not re.match('<.*?>(.*)',
msg.text):
if msg.from_user.username: if msg.from_user.username:
return_message += f"@{msg.from_user.username}: " return_message += f"@{msg.from_user.username}: "
else: else:
@ -96,7 +98,9 @@ def direct_cmd(bot, update, text):
updater = Updater(token=config.api_key) updater = Updater(token=config.api_key)
dispatcher = updater.dispatcher dispatcher = updater.dispatcher
dispatcher.add_handler(CommandHandler('list', lambda x, y: direct_cmd(x, y, "list"))) dispatcher.add_handler(CommandHandler('list', lambda x, y: direct_cmd(x, y,
dispatcher.add_handler(CommandHandler('time', lambda x, y: direct_cmd(x, y, "time"))) "list")))
dispatcher.add_handler(CommandHandler('time', lambda x, y: direct_cmd(x, y,
"time")))
dispatcher.add_handler(MessageHandler(Filters.all, message_handling)) dispatcher.add_handler(MessageHandler(Filters.all, message_handling))
updater.start_polling() updater.start_polling()