diff --git a/plugins/commands/photos.py b/plugins/commands/photos.py index a678795..82e0959 100644 --- a/plugins/commands/photos.py +++ b/plugins/commands/photos.py @@ -264,19 +264,19 @@ async def cmd_remove(app: PyroClient, msg: Message): app._("remove_request", "message", locale=msg.from_user.language_code) ) - answer = await listen_message(app, msg.chat.id, timeout=600) + answer_id = await listen_message(app, msg.chat.id, timeout=600) USERS_WITH_CONTEXT.remove(msg.from_user.id) - if answer is None: + if answer_id is None: await msg.reply_text( app._("remove_ignored", "message", locale=msg.from_user.language_code), quote=True, ) return - if answer.text == "/cancel": - await answer.reply_text( + if answer_id.text == "/cancel": + await answer_id.reply_text( app._("remove_abort", "message", locale=msg.from_user.language_code) ) return @@ -301,11 +301,11 @@ async def cmd_remove(app: PyroClient, msg: Message): USERS_WITH_CONTEXT.append(msg.from_user.id) - answer = await listen_message(app, msg.chat.id, timeout=600) + answer_kind = await listen_message(app, msg.chat.id, timeout=600) USERS_WITH_CONTEXT.remove(msg.from_user.id) - if answer is None: + if answer_kind is None: await msg.reply_text( app._("remove_ignored", "message", locale=msg.from_user.language_code), quote=True, @@ -313,19 +313,19 @@ async def cmd_remove(app: PyroClient, msg: Message): ) return - if answer.text == "/cancel": - await answer.reply_text( + if answer_kind.text == "/cancel": + await answer_kind.reply_text( app._("remove_abort", "message", locale=msg.from_user.language_code), reply_markup=ReplyKeyboardRemove(), ) return - if answer.text in app.in_all_locales("photo", "button"): + if answer_kind.text in app.in_all_locales("photo", "button"): func = photo_delete - elif answer.text in app.in_all_locales("video", "button"): + elif answer_kind.text in app.in_all_locales("video", "button"): func = video_delete else: - await answer.reply_text( + await answer_kind.reply_text( app._( "remove_unknown", "message", locale=msg.from_user.language_code ).format( @@ -336,27 +336,31 @@ async def cmd_remove(app: PyroClient, msg: Message): ) return - response = await func(id=answer.text, client=client) + response = await func(id=answer_id.text, client=client) if response: logger.info( - "Removed '%s' by request of user %s", answer.text, answer.from_user.id + "Removed %s '%s' by request of user %s", + answer_kind.text, + answer_id.text, + answer_id.from_user.id, ) - await answer.reply_text( + await answer_kind.reply_text( app._( "remove_success", "message", locale=msg.from_user.language_code - ).format(answer.text) + ).format(answer_id.text) ) else: logger.warning( - "Could not remove '%s' by request of user %s", - answer.text, - answer.from_user.id, + "Could not remove %s '%s' by request of user %s", + answer_kind.text, + answer_id.text, + answer_id.from_user.id, ) - await answer.reply_text( + await answer_kind.reply_text( app._( "remove_failure", "message", locale=msg.from_user.language_code - ).format(answer.text) + ).format(answer_id.text) )