ryg/royalnet
ryg/royalnet
1
Fork 0
mirror of https://github.com/RYGhub/royalnet.git synced 2024-11-23 19:44:20 +00:00
Code Activity

Use forward author if /diario is in response to a forwarded message

Browse source
This commit is contained in:
Steffo 2019-02-28 20:51:34 +01:00
parent 9c2248402b
commit 2c30c58d48
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
telegrambot.py
View file

@ -247,9 +247,14 @@ def cmd_diario(bot: telegram.Bot, update: telegram.Update, session: db.Session):
reply(bot, update, strings.DIARIO.ERRORS.INVALID_SYNTAX) reply(bot, update, strings.DIARIO.ERRORS.INVALID_SYNTAX)
return return
text = update.message.reply_to_message.text text = update.message.reply_to_message.text
author = session.query(db.Telegram)\ if update.message.forward_from:
.filter_by(telegram_id=update.message.reply_to_message.from_user.id)\ author = session.query(db.Telegram) \
.one_or_none() .filter_by(telegram_id=update.message.forward_from.id) \
.one_or_none()
else:
author = session.query(db.Telegram)\
.filter_by(telegram_id=update.message.reply_to_message.from_user.id)\
.one_or_none()
saver = session.query(db.Telegram).filter_by(telegram_id=update.message.from_user.id).one_or_none() saver = session.query(db.Telegram).filter_by(telegram_id=update.message.from_user.id).one_or_none()
if text is None: if text is None:
reply(bot, update, strings.DIARIO.ERRORS.NO_TEXT) reply(bot, update, strings.DIARIO.ERRORS.NO_TEXT)