From aca61b8c1a732d237e44ffcb0727fc0b4b81a7d8 Mon Sep 17 00:00:00 2001 From: Profitroll <47523801+profitrollgame@users.noreply.github.com> Date: Mon, 22 Aug 2022 11:51:40 +0200 Subject: [PATCH] AttributeError handling in get_submission --- main.py | 117 +++++++++++++++++++++++++++++--------------------------- 1 file changed, 60 insertions(+), 57 deletions(-) diff --git a/main.py b/main.py index fee58d0..9d30ca9 100644 --- a/main.py +++ b/main.py @@ -221,71 +221,74 @@ def subUnblock(user): @app.on_message(~ filters.scheduled & filters.photo | filters.video | filters.animation | filters.document) def get_submission(_, msg): - if msg.from_user.id not in jsonLoad(configGet("blocked", "locations")): - user_locale = msg.from_user.language_code - if not subLimited(msg.from_user): + try: + if msg.from_user.id not in jsonLoad(configGet("blocked", "locations")): + user_locale = msg.from_user.language_code + if not subLimited(msg.from_user): - if msg.document != None: - if msg.document.mime_type not in configGet("mime_types", "submission"): - msg.reply_text(locale("mime_not_allowed", "message", locale=user_locale), quote=True) - return - if msg.document.file_size > configGet("file_size", "submission"): - msg.reply_text(locale("document_too_large", "message", locale=user_locale).format(str(configGet("file_size", "submission")/1024/1024)), quote=True) - return + if msg.document != None: + if msg.document.mime_type not in configGet("mime_types", "submission"): + msg.reply_text(locale("mime_not_allowed", "message", locale=user_locale), quote=True) + return + if msg.document.file_size > configGet("file_size", "submission"): + msg.reply_text(locale("document_too_large", "message", locale=user_locale).format(str(configGet("file_size", "submission")/1024/1024)), quote=True) + return - if msg.video != None: - if msg.video.file_size > configGet("file_size", "submission"): - msg.reply_text(locale("document_too_large", "message", locale=user_locale).format(str(configGet("file_size", "submission")/1024/1024)), quote=True) - return + if msg.video != None: + if msg.video.file_size > configGet("file_size", "submission"): + msg.reply_text(locale("document_too_large", "message", locale=user_locale).format(str(configGet("file_size", "submission")/1024/1024)), quote=True) + return - buttons = [ - [ - InlineKeyboardButton(text=locale("sub_yes", "button", locale=configGet("locale")), callback_data=f"sub_yes_{msg.from_user.id}_{msg.id}") - ] - ] - - if msg.caption != None: - caption = str(msg.caption) - buttons[0].append( - InlineKeyboardButton(text=locale("sub_yes_caption", "button", locale=configGet("locale")), callback_data=f"sub_yes_{msg.from_user.id}_{msg.id}_caption") - ) - buttons[0].append( - InlineKeyboardButton(text=locale("sub_no", "button", locale=configGet("locale")), callback_data=f"sub_no_{msg.from_user.id}_{msg.id}") - ) - else: - caption = "" - buttons[0].append( - InlineKeyboardButton(text=locale("sub_no", "button", locale=configGet("locale")), callback_data=f"sub_no_{msg.from_user.id}_{msg.id}") - ) - - caption += locale("sub_by", "message", locale=locale(configGet("locale"))) - - if msg.from_user.first_name != None: - caption += f" {msg.from_user.first_name}" - if msg.from_user.last_name != None: - caption += f" {msg.from_user.last_name}" - if msg.from_user.username != None: - caption += f" (@{msg.from_user.username})" - if msg.from_user.phone_number != None: - caption += f" ({msg.from_user.phone_number})" - - msg.copy(configGet("admin"), caption=caption, reply_markup=InlineKeyboardMarkup(buttons)) - - if msg.from_user.id != configGet("admin"): - buttons += [ + buttons = [ [ - InlineKeyboardButton(text=locale("sub_block", "button", locale=configGet("locale")), callback_data=f"sub_block_{msg.from_user.id}") - ], - [ - InlineKeyboardButton(text=locale("sub_unblock", "button", locale=configGet("locale")), callback_data=f"sub_unblock_{msg.from_user.id}") + InlineKeyboardButton(text=locale("sub_yes", "button", locale=configGet("locale")), callback_data=f"sub_yes_{msg.from_user.id}_{msg.id}") ] ] - msg.reply_text(locale("sub_sent", "message", locale=user_locale), quote=True) - subLimit(msg.from_user) + if msg.caption != None: + caption = str(msg.caption) + buttons[0].append( + InlineKeyboardButton(text=locale("sub_yes_caption", "button", locale=configGet("locale")), callback_data=f"sub_yes_{msg.from_user.id}_{msg.id}_caption") + ) + buttons[0].append( + InlineKeyboardButton(text=locale("sub_no", "button", locale=configGet("locale")), callback_data=f"sub_no_{msg.from_user.id}_{msg.id}") + ) + else: + caption = "" + buttons[0].append( + InlineKeyboardButton(text=locale("sub_no", "button", locale=configGet("locale")), callback_data=f"sub_no_{msg.from_user.id}_{msg.id}") + ) - else: - msg.reply_text(locale("sub_cooldown", "message", locale=user_locale).format(str(configGet("timeout", "submission")))) + caption += locale("sub_by", "message", locale=locale(configGet("locale"))) + + if msg.from_user.first_name != None: + caption += f" {msg.from_user.first_name}" + if msg.from_user.last_name != None: + caption += f" {msg.from_user.last_name}" + if msg.from_user.username != None: + caption += f" (@{msg.from_user.username})" + if msg.from_user.phone_number != None: + caption += f" ({msg.from_user.phone_number})" + + msg.copy(configGet("admin"), caption=caption, reply_markup=InlineKeyboardMarkup(buttons)) + + if msg.from_user.id != configGet("admin"): + buttons += [ + [ + InlineKeyboardButton(text=locale("sub_block", "button", locale=configGet("locale")), callback_data=f"sub_block_{msg.from_user.id}") + ], + [ + InlineKeyboardButton(text=locale("sub_unblock", "button", locale=configGet("locale")), callback_data=f"sub_unblock_{msg.from_user.id}") + ] + ] + + msg.reply_text(locale("sub_sent", "message", locale=user_locale), quote=True) + subLimit(msg.from_user) + + else: + msg.reply_text(locale("sub_cooldown", "message", locale=user_locale).format(str(configGet("timeout", "submission")))) + except AttributeError: + logWrite(f"from_user in function get_submission does not seem to contain id") @app.on_callback_query(filters.regex("sub_yes_[\s\S]*_[\s\S]*")) # type: ignore def callback_query_yes(app, clb): # type: ignore