Small improvements

poster.py

@@ -6,23 +6,37 @@ from threading import Thread
 from time import time
 from traceback import format_exc
 from pathlib import Path
+from argparse import ArgumentParser
 
 from modules.logging import logWrite
 from modules.utils import configGet, jsonLoad, jsonSave, killProc, locale
 
 # Args =====================================================================================================================================
-if "--move-sent" in argv:
+parser = ArgumentParser(
+    prog = "Telegram Poster",
+    description = "Bot for posting some of your stuff and also receiving submissions."
+)
+
+parser.add_argument("-m", "--move-sent", action="store_true")
+parser.add_argument("-c", "--cleanup", action="store_true")
+parser.add_argument("--confirm", action="store_true")
+parser.add_argument("-i", "--cleanup-index", action="store_true")
+parser.add_argument("-n", "--norun", action="store_true")
+
+args = parser.parse_args()
+
+if args.move_sent:
     for entry in jsonLoad(configGet("index", "locations"))["sent"]:
         try:
             move(configGet("queue", "locations")+sep+entry, configGet("sent", "locations")+sep+entry)
         except FileNotFoundError:
-            logWrite(locale("move_sent_doesnt_exist", "console", locale=configGet("locale_log")).format(entry))
+            logWrite(locale("move_sent_doesnt_exist", "console", locale=configGet("locale")).format(entry))
         except Exception as exp:
-            logWrite(locale("move_sent_doesnt_exception", "console", locale=configGet("locale_log")).format(entry, exp))
+            logWrite(locale("move_sent_doesnt_exception", "console", locale=configGet("locale")).format(entry, exp))
-    logWrite(locale("move_sent_completed", "console", locale=configGet("locale_log")))
+    logWrite(locale("move_sent_completed", "console", locale=configGet("locale")))
 
-if "--cleanup" in argv:
+if args.cleanup:
-    if "--confirm" in argv:
+    if args.confirm:
         index = jsonLoad(configGet("index", "locations"))
         for entry in index["sent"]:
             try:
@@ -35,22 +49,22 @@ if "--cleanup" in argv:
                 except FileNotFoundError:
                     pass
             except Exception as exp:
-                logWrite(locale("cleanup_exception", "console", locale=configGet("locale_log")).format(entry, exp))
+                logWrite(locale("cleanup_exception", "console", locale=configGet("locale")).format(entry, exp))
             jsonSave(index, jsonLoad(configGet("index", "locations")))
-        logWrite(locale("cleanup_completed", "console", locale=configGet("locale_log")))
+        logWrite(locale("cleanup_completed", "console", locale=configGet("locale")))
     else:
-        logWrite(locale("cleanup_unathorized", "console", locale=configGet("locale_log")))
+        logWrite(locale("cleanup_unathorized", "console", locale=configGet("locale")))
 
-if "--cleanup-index" in argv:
+if args.cleanup_index:
-    if "--confirm" in argv:
+    if args.confirm:
         index = jsonLoad(configGet("index", "locations"))
         index["sent"] = []
         jsonSave(index, jsonLoad(configGet("index", "locations")))
-        logWrite(locale("cleanup_index_completed", "console", locale=configGet("locale_log")))
+        logWrite(locale("cleanup_index_completed", "console", locale=configGet("locale")))
     else:
-        logWrite(locale("cleanup_index_unathorized", "console", locale=configGet("locale_log")))
+        logWrite(locale("cleanup_index_unathorized", "console", locale=configGet("locale")))
 
-if "--norun" in argv:
+if args.norun:
     logWrite(locale("passed_norun", "console", locale=configGet("locale_log")))
     exit()
 #===========================================================================================================================================
@@ -58,13 +72,13 @@ if "--norun" in argv:
 
 # Import ===================================================================================================================================
 try:
-    import schedule
+    import schedule # type: ignore
-    from pyrogram.sync import idle
+    from pyrogram import Client, filters, idle # type: ignore
-    from pyrogram.client import Client
+    from pyrogram.types import ChatPermissions, ReplyKeyboardMarkup, InlineKeyboardMarkup, InlineKeyboardButton, BotCommand, BotCommandScopeChat # type: ignore
-    from pyrogram import filters
+    from pyrogram.raw.types import UpdateChannelMessageForwards, InputChannel, InputPeerChannel
-    from pyrogram.types import InlineKeyboardMarkup, InlineKeyboardButton, BotCommand, BotCommandScopeChat
+    from pyrogram.raw.functions.stats import GetMessagePublicForwards
 except ModuleNotFoundError:
-    print(locale("deps_missing", "console", locale=configGet("locale_log")), flush=True)
+    print(locale("deps_missing", "console", locale=configGet("locale")), flush=True)
     exit()
 #===========================================================================================================================================
 
@@ -138,11 +152,8 @@ def send_content():
         if len(list_queue) > 0:
             candidate_file = choice(list_queue)
             candidate = configGet("queue", "locations")+sep+candidate_file
-            if len(list_queue) <= 10:
-                if configGet("error", "reports"):
-                    app.send_message(configGet("admin"), locale("post_low", "message", locale=configGet("locale"))) # type: ignore
         else:
-            logWrite(locale("post_empty", "console", locale=configGet("locale_log")))
+            logWrite(locale("post_empty", "console", locale=configGet("locale")))
             if configGet("error", "reports"):
                 app.send_message(configGet("admin"), locale("post_empty", "message", locale=configGet("locale"))) # type: ignore
             return
@@ -160,44 +171,38 @@ def send_content():
         else:
             caption = caption
 
-        try:
+        if ext_type == "photo": # type: ignore
-            if ext_type == "photo": # type: ignore
 
-                if configGet("enabled", "caption"):
+            if configGet("enabled", "caption"):
-                    if configGet("link", "caption") != None:
+                if configGet("link", "caption") != None:
-                        sent = app.send_photo(configGet("channel", "posting"), candidate, caption=caption, disable_notification=configGet("silent", "posting")) # type: ignore
+                    sent = app.send_photo(configGet("channel", "posting"), candidate, caption=caption, disable_notification=configGet("silent", "posting")) # type: ignore
-                    else:
-                        sent = app.send_photo(configGet("channel", "posting"), candidate, caption=caption, disable_notification=configGet("silent", "posting")) # type: ignore
                 else:
                     sent = app.send_photo(configGet("channel", "posting"), candidate, caption=caption, disable_notification=configGet("silent", "posting")) # type: ignore
+            else:
+                sent = app.send_photo(configGet("channel", "posting"), candidate, caption=caption, disable_notification=configGet("silent", "posting")) # type: ignore
 
-            elif ext_type == "video": # type: ignore
+        elif ext_type == "video": # type: ignore
 
-                if configGet("enabled", "caption"):
+            if configGet("enabled", "caption"):
-                    if configGet("link", "caption") != None:
+                if configGet("link", "caption") != None:
-                        sent = app.send_video(configGet("channel", "posting"), candidate, caption=caption, disable_notification=configGet("silent", "posting")) # type: ignore
+                    sent = app.send_video(configGet("channel", "posting"), candidate, caption=caption, disable_notification=configGet("silent", "posting")) # type: ignore
-                    else:
-                        sent = app.send_video(configGet("channel", "posting"), candidate, caption=caption, disable_notification=configGet("silent", "posting")) # type: ignore
                 else:
                     sent = app.send_video(configGet("channel", "posting"), candidate, caption=caption, disable_notification=configGet("silent", "posting")) # type: ignore
-
             else:
-                return
+                sent = app.send_video(configGet("channel", "posting"), candidate, caption=caption, disable_notification=configGet("silent", "posting")) # type: ignore
-        except Exception as exp:
+
-            logWrite(locale("post_exception", "console", locale=configGet("locale_log")).format(str(exp), format_exc()))
+        else:
-            if configGet("error", "reports"):
-                app.send_message(configGet("admin"), locale("post_exception", "message", locale=configGet("locale")).format(exp, traceback.format_exc())) # type: ignore
             return
 
         index["sent"].append(candidate_file)
-        index["last_id"] = sent.id # type: ignore
+        index["last_id"] = sent.id
 
         jsonSave(index, configGet("index", "locations"))
 
         if configGet("move_sent", "posting"):
             move(candidate, configGet("sent", "locations")+sep+candidate_file)
 
-        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
+        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
 
         if configGet("sent", "reports"):
             app.send_message(configGet("admin"), f"Posted `{candidate_file}`", disable_web_page_preview=True, reply_markup=InlineKeyboardMarkup([
@@ -205,10 +210,10 @@ def send_content():
             ])) # type: ignore
 
     except Exception as exp:
-        logWrite(locale("post_exception", "console", locale=configGet("locale_log")).format(str(exp), format_exc()))
+        logWrite(locale("post_exception", "console", locale=configGet("locale")).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
-        return
+        pass
 
 
     # Work in progress
@@ -236,7 +241,7 @@ if configGet("submit", "mode"):
 def cmd_kill(app, msg):
 
     if msg.from_user.id == configGet("admin"):
-        logWrite(locale("shutdown", "console", locale=configGet("locale_log")).format(str(pid)))
+        logWrite(locale("shutdown", "console", locale=configGet("locale")).format(str(pid)))
         msg.reply_text(locale("shutdown", "message", locale=configGet("locale")).format(str(pid)))
         killProc(pid)
 
@@ -282,17 +287,14 @@ 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
 
@@ -327,28 +329,25 @@ if configGet("submit", "mode"):
                     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}")
                             ]
-                            # [
-                            #     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(locale("sub_received", "console", locale=configGet("locale_log")))
+            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
@@ -357,26 +356,18 @@ 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
@@ -386,44 +377,26 @@ 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_blocked", "message", locale=configGet("locale")))
+    app.send_message(int(fullclb[2]), locale("sub_msg_unavail", "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_unblocked", "message", locale=configGet("locale")))
+    app.send_message(int(fullclb[2]), locale("sub_msg_unavail", "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
@@ -451,23 +424,23 @@ if configGet("post", "mode"):
                 except:
                     pass
         except Exception as exp:
-            logWrite(locale("exception_occured", "console", locale=configGet("locale_log")).format(exp))
+            logWrite(locale("exception_occured", "console", locale=configGet("locale")).format(exp))
         except KeyboardInterrupt:
-            logWrite(locale("keyboard_interrupt", "console", locale=configGet("locale_log")))
+            logWrite(locale("keyboard_interrupt", "console", locale=configGet("locale")))
         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_log")).format(str(pid)))
+    logWrite(locale("startup", "console", locale=configGet("locale")).format(str(pid)))
 
     app.start() # type: ignore
     if configGet("startup", "reports"):
         app.send_message(configGet("admin"), locale("startup", "message", locale=configGet("locale")).format(str(pid))) # type: ignore
 
     if configGet("post", "mode"):
-        t = Thread(target=background_task) # type: ignore
+        t = Thread(target=background_task)
         t.start()
 
     if configGet("submit", "mode"):
@@ -497,6 +470,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_log")).format(str(pid)))
+    logWrite(locale("shutdown", "console", locale=configGet("locale")).format(str(pid)))
 
     killProc(pid)