1
0
Fork 0
Browse Source

Logging has been improved

master
Profitroll 2 months ago
parent
commit
dfc1e36f07
  1. 1
      config.json
  2. 20
      locale/en.json
  3. 24
      locale/uk.json
  4. 80
      poster.py

1
config.json

@ -1,6 +1,7 @@
{
"module": null,
"locale": "en",
"locale_log": "en",
"locale_fallback": "en",
"admin": 0,
"bot": {

20
locale/en.json

@ -30,7 +30,9 @@
"sub_no": "❌ Deny",
"sub_block": "☠ Block sender",
"sub_unblock": "🏳 Unblock sender",
"post_view": "View in channel"
"post_view": "View in channel",
"accepted": "✅ Accepted",
"declined": "❌ Declined"
},
"callback": {
"sub_yes": "✅ Submission approved",
@ -38,7 +40,8 @@
"sub_block": "User {0} has been blocked",
"sub_unblock": "User {0} has been unblocked",
"sub_msg_unavail": "Submission message no longer exist",
"sub_media_unavail": "Could not download submission"
"sub_media_unavail": "Could not download submission",
"sub_done": "You've already decided what to do with submission"
},
"console": {
"shutdown": "Shutting down bot with pid {0}",
@ -48,6 +51,19 @@
"post_sent": "Sent {0} of type {1} to {2} with caption {3} and silently {4}",
"post_exception": "Could not send content due to {0}. Traceback: {1}",
"post_empty": "Could not send content due to queue folder empty with allowed extensions",
"sub_mime_not_allowed": "Got submission from {0} but type of {1} which is not allowed",
"sub_document_too_large": "Got submission from {0} but but file is too large ({1} > {2})",
"sub_received": "Got submission from {0} with a caption {1}",
"sub_cooldown": "Got submission from {0} but user is on a cooldown",
"sub_no_id": "from_user in function get_submission does not contain id (maybe user posted in a channel)",
"sub_msg_unavail": "Could not download submission {0} from user {1}: message not available",
"sub_media_unavail": "Could not download submission {0} from user {1}: media not available",
"sub_media_downloading": "Downloading media of submission {0} from user {1}...",
"sub_media_downloaded": "Downloaded media of submission {0} from user {1}",
"sub_accepted": "Accepted submission {0} from user {1}",
"sub_declined": "Declined submission {0} from user {1}",
"sub_blocked": "Blocked user {0}",
"sub_unblocked": "Unblocked user {0}",
"deps_missing": "Required modules are not installed. Run 'pip3 install -r requirements.txt' and restart the program.",
"passed_norun": "Argument --norun passed, not running the main script",
"move_sent_doesnt_exist": "File '{0}' is already moved or does not exist",

24
locale/uk.json

@ -14,8 +14,8 @@
"startup": "Запуск бота з підом `{0}`",
"sub_yes": "✅ Подання схвалено та прийнято",
"sub_no": "❌ Подання розглянуто та відхилено",
"sub_blocked": "Вас заблокували, і ви більше не можете надсилати медіафайли.",
"sub_unblocked": "Вас розблокували, і тепер ви можете надсилати медіафайли.",
"sub_blocked": "Вас заблокували, ви більше не можете надсилати медіафайли.",
"sub_unblocked": "Вас розблокували, тепер ви можете надсилати медіафайли.",
"sub_by": "\n\nПредставлено:",
"sub_sent": "Медіа-файл надіслано.\nСкоро ми повідомимо вас, чи буде його прийнято.",
"sub_cooldown": "Ви можете надсилати лише 1 медіафайл на {0} секунд",
@ -30,7 +30,9 @@
"sub_no": "❌ Відхилити",
"sub_block": "☠ Заблокувати відправника",
"sub_unblock": "🏳 Розблокувати відправника",
"post_view": "Переглянути на каналі"
"post_view": "Переглянути на каналі",
"accepted": "✅ Прийнято",
"declined": "❌ Відхилено"
},
"callback": {
"sub_yes": "✅ Подання схвалено",
@ -38,7 +40,8 @@
"sub_block": "Користувача {0} заблоковано",
"sub_unblock": "Користувача {0} розблоковано",
"sub_msg_unavail": "Повідомлення більше не існує",
"sub_media_unavail": "Не вдалося завантажити подання"
"sub_media_unavail": "Не вдалося завантажити подання",
"sub_done": "Ви вже обрали що зробити з цим поданням"
},
"console": {
"shutdown": "Вимкнення бота з підом {0}",
@ -48,6 +51,19 @@
"post_sent": "Надіслано {0} типу {1} у {2} з підписом {3} та без звуку {4}",
"post_exception": "Не вдалося надіслати контент через {0}. Traceback: {1}",
"post_empty": "Не вдалося надіслати контент через порожню папку черги з дозволеними розширеннями",
"sub_mime_not_allowed": "Отримано подання від {0} але типу {1} який не є дозволеним",
"sub_document_too_large": "Отримано подання від {0} але файл завеликий({1} > {2})",
"sub_received": "Отримано подання від {0} з підписом {1}",
"sub_cooldown": "Отримано подання від {0} але користувач на тайм-ауті",
"sub_no_id": "from_user у функції get_submission не має атрибуту id (можливо, користувач запостив щось у канал)",
"sub_msg_unavail": "Не вдалося завантажити подання {0} від користувача {1}: повідомлення більше не існує",
"sub_media_unavail": "Не вдалося завантажити подання {0} від користувача {1}: медіафайл більше не існує",
"sub_media_downloading": "Завантажуємо медіа з подання {0} від користувача{1}...",
"sub_media_downloaded": "Завантажено медіа з подання{0} від користувача{1}",
"sub_accepted": "Прийнято подання {0} від користувача {1}",
"sub_declined": "Відхилено подання {0} від користувача {1}",
"sub_blocked": "Заблоковано користувача {0}",
"sub_unblocked": "Розблоковано користувача {0}",
"deps_missing": "Необхідні модулі не встановлені. Запустіть 'pip3 install -r requirements.txt' і перезапустіть програму.",
"passed_norun": "Аргумент --norun надано, основний скрипт не запускається",
"move_sent_doesnt_exist": "Файл '{0}' уже переміщено або він не існує",

80
poster.py

@ -16,10 +16,10 @@ if "--move-sent" in argv:
try:
move(configGet("queue", "locations")+sep+entry, configGet("sent", "locations")+sep+entry)
except FileNotFoundError:
logWrite(locale("move_sent_doesnt_exist", "console", locale=configGet("locale")).format(entry))
logWrite(locale("move_sent_doesnt_exist", "console", locale=configGet("locale_log")).format(entry))
except Exception as exp:
logWrite(locale("move_sent_doesnt_exception", "console", locale=configGet("locale")).format(entry, exp))
logWrite(locale("move_sent_completed", "console", locale=configGet("locale")))
logWrite(locale("move_sent_doesnt_exception", "console", locale=configGet("locale_log")).format(entry, exp))
logWrite(locale("move_sent_completed", "console", locale=configGet("locale_log")))
if "--cleanup" in argv:
if "--confirm" in argv:
@ -35,23 +35,23 @@ if "--cleanup" in argv:
except FileNotFoundError:
pass
except Exception as exp:
logWrite(locale("cleanup_exception", "console", locale=configGet("locale")).format(entry, exp))
logWrite(locale("cleanup_exception", "console", locale=configGet("locale_log")).format(entry, exp))
jsonSave(index, jsonLoad(configGet("index", "locations")))
logWrite(locale("cleanup_completed", "console", locale=configGet("locale")))
logWrite(locale("cleanup_completed", "console", locale=configGet("locale_log")))
else:
logWrite(locale("cleanup_unathorized", "console", locale=configGet("locale")))
logWrite(locale("cleanup_unathorized", "console", locale=configGet("locale_log")))
if "--cleanup-index" in argv:
if "--confirm" in argv:
index = jsonLoad(configGet("index", "locations"))
index["sent"] = []
jsonSave(index, jsonLoad(configGet("index", "locations")))
logWrite(locale("cleanup_index_completed", "console", locale=configGet("locale")))
logWrite(locale("cleanup_index_completed", "console", locale=configGet("locale_log")))
else:
logWrite(locale("cleanup_index_unathorized", "console", locale=configGet("locale")))
logWrite(locale("cleanup_index_unathorized", "console", locale=configGet("locale_log")))
if "--norun" in argv:
logWrite(locale("passed_norun", "console", locale=configGet("locale")))
logWrite(locale("passed_norun", "console", locale=configGet("locale_log")))
exit()
#===========================================================================================================================================
@ -64,7 +64,7 @@ try:
from pyrogram.raw.types import UpdateChannelMessageForwards, InputChannel, InputPeerChannel
from pyrogram.raw.functions.stats import GetMessagePublicForwards
except ModuleNotFoundError:
print(locale("deps_missing", "console", locale=configGet("locale")), flush=True)
print(locale("deps_missing", "console", locale=configGet("locale_log")), flush=True)
exit()
#===========================================================================================================================================
@ -139,7 +139,7 @@ def send_content():
candidate_file = choice(list_queue)
candidate = configGet("queue", "locations")+sep+candidate_file
else:
logWrite(locale("post_empty", "console", locale=configGet("locale")))
logWrite(locale("post_empty", "console", locale=configGet("locale_log")))
if configGet("error", "reports"):
app.send_message(configGet("admin"), locale("post_empty", "message", locale=configGet("locale"))) # type: ignore
return
@ -188,7 +188,7 @@ def send_content():
if configGet("move_sent", "posting"):
move(candidate, configGet("sent", "locations")+sep+candidate_file)
logWrite(locale("post_sent", "console", locale=configGet("locale")).format(candidate, ext_type, str(configGet("channel", "posting")), caption.replace("\n", "%n"), str(configGet("silent", "posting")))) # type: ignore
logWrite(locale("post_sent", "console", locale=configGet("locale_log")).format(candidate, ext_type, str(configGet("channel", "posting")), caption.replace("\n", "%n"), str(configGet("silent", "posting")))) # type: ignore
if configGet("sent", "reports"):
app.send_message(configGet("admin"), f"Posted `{candidate_file}`", disable_web_page_preview=True, reply_markup=InlineKeyboardMarkup([
@ -196,7 +196,7 @@ def send_content():
])) # type: ignore
except Exception as exp:
logWrite(locale("post_exception", "console", locale=configGet("locale")).format(str(exp), format_exc()))
logWrite(locale("post_exception", "console", locale=configGet("locale_log")).format(str(exp), format_exc()))
if configGet("error", "reports"):
app.send_message(configGet("admin"), locale("post_exception", "message", locale=configGet("locale")).format(exp, traceback.format_exc())) # type: ignore
pass
@ -227,7 +227,7 @@ if configGet("submit", "mode"):
def cmd_kill(app, msg):
if msg.from_user.id == configGet("admin"):
logWrite(locale("shutdown", "console", locale=configGet("locale")).format(str(pid)))
logWrite(locale("shutdown", "console", locale=configGet("locale_log")).format(str(pid)))
msg.reply_text(locale("shutdown", "message", locale=configGet("locale")).format(str(pid)))
killProc(pid)
@ -273,14 +273,17 @@ if configGet("submit", "mode"):
if msg.document != None:
if msg.document.mime_type not in configGet("mime_types", "submission"):
logWrite(locale("sub_mime_not_allowed", "console", locale=configGet("locale_log")).format(str(msg.from_user.id), msg.document.mime_type))
msg.reply_text(locale("mime_not_allowed", "message", locale=user_locale), quote=True)
return
if msg.document.file_size > configGet("file_size", "submission"):
logWrite(locale("sub_document_too_large", "console", locale=configGet("locale_log")).format(str(msg.from_user.id), str(msg.document.file_size), str(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"):
logWrite(locale("sub_document_too_large", "console", locale=configGet("locale_log")).format(str(msg.from_user.id), str(msg.document.file_size), str(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
@ -319,21 +322,24 @@ if configGet("submit", "mode"):
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_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)
logWrite(locale("sub_received", "console", locale=configGet("locale_log")).format(str(msg.from_user.id), str(msg.caption)))
msg.copy(configGet("admin"), caption=caption, reply_markup=InlineKeyboardMarkup(buttons))
else:
logWrite(locale("sub_cooldown", "console", locale=configGet("locale_log")).format(str(msg.from_user.id)))
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")
logWrite(locale("sub_received", "console", locale=configGet("locale_log")))
@app.on_callback_query(filters.regex("sub_yes_[\s\S]*_[\s\S]*")) # type: ignore
def callback_query_yes(app, clb): # type: ignore
@ -342,18 +348,26 @@ def callback_query_yes(app, clb): # type: ignore
try:
submission = app.get_messages(int(fullclb[2]), int(fullclb[3]))
except:
logWrite(locale("sub_msg_unavail", "console", locale=configGet("locale_log")).format(fullclb[3], fullclb[2]))
clb.answer(text=locale("sub_msg_unavail", "message", locale=user_locale), show_alert=True)
return
try:
logWrite(locale("sub_media_downloading", "console", locale=configGet("locale_log")).format(fullclb[3], fullclb[2]))
media = app.download_media(submission, file_name=configGet("queue", "locations")+sep)
if clb.data.endswith("_caption"):
index = jsonLoad(configGet("index", "locations"))
index["captions"][Path(media).name] = submission.caption
jsonSave(index, configGet("index", "locations"))
logWrite(locale("sub_media_downloaded", "console", locale=configGet("locale_log")).format(fullclb[3], fullclb[2]))
except:
logWrite(locale("sub_media_unavail", "console", locale=configGet("locale_log")).format(fullclb[3], fullclb[2]))
clb.answer(text=locale("sub_media_unavail", "message", locale=user_locale), show_alert=True)
return
logWrite(locale("sub_accepted", "console", locale=configGet("locale_log")).format(fullclb[3], fullclb[2]))
submission.reply_text(locale("sub_yes", "message", locale=submission.from_user.language_code), quote=True)
edited_markup = clb.message.reply_markup.inline_keyboard
edited_markup[0] = [InlineKeyboardButton(text=locale("accepted", "button", locale=configGet("locale")), callback_data=f"sub_done")]
clb.message.edit(text=clb.message.caption, reply_markup=InlineKeyboardMarkup(edited_markup))
clb.answer(text=locale("sub_yes", "callback", locale=user_locale).format(fullclb[2]), show_alert=True)
@app.on_callback_query(filters.regex("sub_no_[\s\S]*_[\s\S]*")) # type: ignore
@ -363,26 +377,44 @@ def callback_query_no(app, clb): # type: ignore
try:
submission = app.get_messages(int(fullclb[2]), int(fullclb[3]))
except:
logWrite(locale("sub_msg_unavail", "console", locale=configGet("locale_log")).format(fullclb[3], fullclb[2]))
clb.answer(text=locale("sub_msg_unavail", "message", locale=user_locale), show_alert=True)
return
logWrite(locale("sub_declined", "console", locale=configGet("locale_log")).format(fullclb[3], fullclb[2]))
submission.reply_text(locale("sub_no", "message", locale=submission.from_user.language_code), quote=True)
edited_markup = clb.message.reply_markup.inline_keyboard
edited_markup[0] = [InlineKeyboardButton(text=locale("declined", "button", locale=configGet("locale")), callback_data=f"sub_done")]
clb.message.edit(text=clb.message.caption, reply_markup=InlineKeyboardMarkup(edited_markup))
clb.answer(text=locale("sub_no", "callback", locale=user_locale).format(fullclb[2]), show_alert=True)
@app.on_callback_query(filters.regex("sub_block_[\s\S]*")) # type: ignore
def callback_query_block(app, clb): # type: ignore
fullclb = clb.data.split("_")
user_locale = clb.from_user.language_code
app.send_message(int(fullclb[2]), locale("sub_msg_unavail", "message", locale=configGet("locale")))
app.send_message(int(fullclb[2]), locale("sub_blocked", "message", locale=configGet("locale")))
subBlock(int(fullclb[2]))
logWrite(locale("sub_blocked", "console", locale=configGet("locale_log")).format(fullclb[2]))
edited_markup = clb.message.reply_markup.inline_keyboard
edited_markup[1] = [InlineKeyboardButton(text=locale("sub_unblock", "button", locale=configGet("locale")), callback_data=f"sub_unblock_{fullclb[2]}")]
clb.message.edit(text=clb.message.caption, reply_markup=InlineKeyboardMarkup(edited_markup))
clb.answer(text=locale("sub_block", "callback", locale=user_locale).format(fullclb[2]), show_alert=True)
@app.on_callback_query(filters.regex("sub_unblock_[\s\S]*")) # type: ignore
def callback_query_unblock(app, clb): # type: ignore
fullclb = clb.data.split("_")
user_locale = clb.from_user.language_code
app.send_message(int(fullclb[2]), locale("sub_msg_unavail", "message", locale=configGet("locale")))
app.send_message(int(fullclb[2]), locale("sub_unblocked", "message", locale=configGet("locale")))
subUnblock(int(fullclb[2]))
logWrite(locale("sub_unblocked", "console", locale=configGet("locale_log")).format(fullclb[2]))
edited_markup = clb.message.reply_markup.inline_keyboard
edited_markup[1] = [InlineKeyboardButton(text=locale("sub_block", "button", locale=configGet("locale")), callback_data=f"sub_block_{fullclb[2]}")]
clb.message.edit(text=clb.message.caption, reply_markup=InlineKeyboardMarkup(edited_markup))
clb.answer(text=locale("sub_unblock", "callback", locale=user_locale).format(fullclb[2]), show_alert=True)
@app.on_callback_query(filters.regex("sub_done")) # type: ignore
def callback_query_block(app, clb): # type: ignore
user_locale = clb.from_user.language_code
clb.answer(text=locale("sub_done", "callback", locale=user_locale), show_alert=True)
#===========================================================================================================================================
# Work in progress
@ -410,16 +442,16 @@ if configGet("post", "mode"):
except:
pass
except Exception as exp:
logWrite(locale("exception_occured", "console", locale=configGet("locale")).format(exp))
logWrite(locale("exception_occured", "console", locale=configGet("locale_log")).format(exp))
except KeyboardInterrupt:
logWrite(locale("keyboard_interrupt", "console", locale=configGet("locale")))
logWrite(locale("keyboard_interrupt", "console", locale=configGet("locale_log")))
if configGet("shutdown", "reports"):
app.send_message(configGet("admin"), locale("shutdown", "message", locale=configGet("locale")).format(str(pid))) # type: ignore
killProc(pid)
if __name__ == "__main__":
logWrite(locale("startup", "console", locale=configGet("locale")).format(str(pid)))
logWrite(locale("startup", "console", locale=configGet("locale_log")).format(str(pid)))
app.start() # type: ignore
if configGet("startup", "reports"):
@ -456,6 +488,6 @@ if __name__ == "__main__":
idle()
app.send_message(configGet("admin"), locale("shutdown", "message", locale=configGet("locale")).format(str(pid))) # type: ignore
logWrite(locale("shutdown", "console", locale=configGet("locale")).format(str(pid)))
logWrite(locale("shutdown", "console", locale=configGet("locale_log")).format(str(pid)))
killProc(pid)
Loading…
Cancel
Save