AttributeError handling in get_submission
This commit is contained in:
parent
404a46ec15
commit
aca61b8c1a
117
main.py
117
main.py
@ -221,71 +221,74 @@ def subUnblock(user):
|
|||||||
|
|
||||||
@app.on_message(~ filters.scheduled & filters.photo | filters.video | filters.animation | filters.document)
|
@app.on_message(~ filters.scheduled & filters.photo | filters.video | filters.animation | filters.document)
|
||||||
def get_submission(_, msg):
|
def get_submission(_, msg):
|
||||||
if msg.from_user.id not in jsonLoad(configGet("blocked", "locations")):
|
try:
|
||||||
user_locale = msg.from_user.language_code
|
if msg.from_user.id not in jsonLoad(configGet("blocked", "locations")):
|
||||||
if not subLimited(msg.from_user):
|
user_locale = msg.from_user.language_code
|
||||||
|
if not subLimited(msg.from_user):
|
||||||
|
|
||||||
if msg.document != None:
|
if msg.document != None:
|
||||||
if msg.document.mime_type not in configGet("mime_types", "submission"):
|
if msg.document.mime_type not in configGet("mime_types", "submission"):
|
||||||
msg.reply_text(locale("mime_not_allowed", "message", locale=user_locale), quote=True)
|
msg.reply_text(locale("mime_not_allowed", "message", locale=user_locale), quote=True)
|
||||||
return
|
return
|
||||||
if msg.document.file_size > configGet("file_size", "submission"):
|
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)
|
msg.reply_text(locale("document_too_large", "message", locale=user_locale).format(str(configGet("file_size", "submission")/1024/1024)), quote=True)
|
||||||
return
|
return
|
||||||
|
|
||||||
if msg.video != None:
|
if msg.video != None:
|
||||||
if msg.video.file_size > configGet("file_size", "submission"):
|
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)
|
msg.reply_text(locale("document_too_large", "message", locale=user_locale).format(str(configGet("file_size", "submission")/1024/1024)), quote=True)
|
||||||
return
|
return
|
||||||
|
|
||||||
buttons = [
|
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 += [
|
|
||||||
[
|
[
|
||||||
InlineKeyboardButton(text=locale("sub_block", "button", locale=configGet("locale")), callback_data=f"sub_block_{msg.from_user.id}")
|
InlineKeyboardButton(text=locale("sub_yes", "button", locale=configGet("locale")), callback_data=f"sub_yes_{msg.from_user.id}_{msg.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)
|
if msg.caption != None:
|
||||||
subLimit(msg.from_user)
|
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:
|
caption += locale("sub_by", "message", locale=locale(configGet("locale")))
|
||||||
msg.reply_text(locale("sub_cooldown", "message", locale=user_locale).format(str(configGet("timeout", "submission"))))
|
|
||||||
|
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
|
@app.on_callback_query(filters.regex("sub_yes_[\s\S]*_[\s\S]*")) # type: ignore
|
||||||
def callback_query_yes(app, clb): # type: ignore
|
def callback_query_yes(app, clb): # type: ignore
|
||||||
|
Reference in New Issue
Block a user