Logging now has debug and bot has various modes

config.json

@@ -1,5 +1,6 @@
 {
     "module": null,
+    "mode": "both",
     "locale": "en",
     "locale_fallback": "en",
     "admin": 0,

data/index.json

@@ -1,4 +1,5 @@
 {
+    "last_id": 0,
     "sent": [],
     "captions": {}
 }

locale/en.json

@@ -4,6 +4,7 @@
         "rules": "Photos submission rules"
     },
     "commands_admin": {
+        "forwards": "Check post forwards",
         "reboot": "Restart the bot"
     },
     "message": {

locale/uk.json

@@ -4,6 +4,7 @@
         "rules": "Правила пропонування фото"
     },
     "commands_admin": {
+        "forwards": "Переглянути репости",
         "reboot": "Перезапустити бота"
     },
     "message": {

loop.bat

@@ -4,7 +4,7 @@ REM You can cd to your directory here, if you want
 REM cd C:\Users\user\TelegramPoster
 
 :start
-python main.py
+python poster.py
 echo To completely stop TelegramPoster now, please press Ctrl+C during the countdown!
 echo Restarting in 5 seconds...
 Timeout /t 5

loop.sh

@@ -5,7 +5,7 @@
 
 while true
 do
-    python main.py
+    python poster.py
     echo "To completely stop TelegramPoster now, please press Ctrl+C during the countdown!"
     echo "Restarting in:"
     for i in 5 4 3 2 1

modules/logging.py

@@ -12,37 +12,47 @@ with open(os.getcwd()+os.path.sep+"config.json", "r", encoding='utf8') as file:
     file.close()
 
 # Check latest log size
-def checkSize():
+def checkSize(debug=False):
 
     global log_folder
 
+    if debug:
+        log_file = "debug.log"
+    else:
+        log_file = "latest.log"
+
     try:
         os.makedirs(log_folder, exist_ok=True)
-        log = os.stat(os.path.join(log_folder, "latest.log"))
+        log = os.stat(os.path.join(log_folder, log_file))
         if (log.st_size / 1024) > log_size:
-            with open(os.path.join(log_folder, "latest.log"), 'rb') as f_in:
+            with open(os.path.join(log_folder, log_file), 'rb') as f_in:
                 with gzip.open(os.path.join(log_folder, f'{datetime.now().strftime("%d.%m.%Y_%H:%M:%S")}.log.gz'), 'wb') as f_out:
                     shutil.copyfileobj(f_in, f_out)
                     print(f'Copied {os.path.join(log_folder, datetime.now().strftime("%d.%m.%Y_%H:%M:%S"))}.log.gz')
-            open(os.path.join(log_folder, "latest.log"), 'w').close()
+            open(os.path.join(log_folder, log_file), 'w').close()
     except FileNotFoundError:
-        print(f'Log file {os.path.join(log_folder, "latest.log")} does not exist')
+        print(f'Log file {os.path.join(log_folder, log_file)} does not exist')
         pass
 
 # Append string to log
-def logAppend(message):
+def logAppend(message, debug=False):
 
     global log_folder
 
     message_formatted = f'[{datetime.now().strftime("%d.%m.%Y")}] [{datetime.now().strftime("%H:%M:%S")}] {message}'
-    checkSize()
+    checkSize(debug=debug)
 
-    log = open(os.path.join(log_folder, "latest.log"), 'a')
+    if debug:
+        log_file = "debug.log"
+    else:
+        log_file = "latest.log"
+
+    log = open(os.path.join(log_folder, log_file), 'a')
     log.write(f'{message_formatted}\n')
     log.close()
 
 # Print to stdout and then to log
-def logWrite(message):
+def logWrite(message, debug=False):
     # save to log file and rotation is to be done
-    logAppend(f'{message}')
+    logAppend(f'{message}', debug=debug)
     print(f"{message}", flush=True)

poster.py

@@ -61,6 +61,8 @@ try:
     import schedule # type: ignore
     from pyrogram import Client, filters, idle # type: ignore
     from pyrogram.types import ChatPermissions, ReplyKeyboardMarkup, InlineKeyboardMarkup, InlineKeyboardButton, BotCommand, BotCommandScopeChat # type: ignore
+    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)
     sys.exit()
@@ -71,16 +73,47 @@ pid = os.getpid()
 app = Client("duptsiaposter", bot_token=configGet("bot_token", "bot"), api_id=configGet("api_id", "bot"), api_hash=configGet("api_hash", "bot"))
 
 
+# Work in progress
+# def check_forwards(app):
+
+#     try:
+
+#         index = jsonLoad(configGet("index", "locations"))
+#         channel = app.get_chat(configGet("channel", "posting"))
+
+#         peer = app.resolve_peer(configGet("channel", "posting"))
+#         print(peer, flush=True)
+
+#         posts_list = [i for i in range(index["last_id"]-100,index["last_id"])]
+#         last_posts = app.get_messages(configGet("channel", "posting"), message_ids=posts_list)
+
+#         for post in last_posts:
+#             post_forwards = GetMessagePublicForwards(channel=peer, msg_id=post.id, offset_peer=peer, offset_rate=0, offset_id=0, limit=100)
+#             print(post_forwards, flush=True)
+#             for forward in post_forwards:
+#                 print(forward, flush=True)
+
+#     except Exception as exp:
+
+#         logWrite("Could not get last posts forwards due to {0} with traceback {1}".format(str(exp), traceback.format_exc()), debug=True)
+
+#         if configGet("error", "reports"):
+#             app.send_message(configGet("admin"), traceback.format_exc()) # type: ignore
+
+#         pass
+
+
 def send_content():
 
+    # Send post to channel
     try:
 
-        list_sent = jsonLoad(configGet("index", "locations"))
+        index = jsonLoad(configGet("index", "locations"))
         list_queue = os.listdir(configGet("queue", "locations"))
 
         for file in list_queue:
 
-            if not file in list_sent["sent"]:
+            if not file in index["sent"]:
 
                 ext_match = False
 
@@ -111,8 +144,6 @@ def send_content():
                 app.send_message(configGet("admin"), locale("post_empty", "message", locale=configGet("locale"))) # type: ignore
             return
 
-        index = jsonLoad(configGet("index", "locations"))
-
         if candidate_file in index["captions"]:
             caption = index["captions"][candidate_file]
         else:
@@ -149,8 +180,10 @@ def send_content():
         else:
             return
 
-        list_sent["sent"].append(candidate_file)
-        jsonSave(list_sent, configGet("index", "locations"))
+        index["sent"].append(candidate_file)
+        index["last_id"] = sent.id
+
+        jsonSave(index, configGet("index", "locations"))
 
         if configGet("move_sent", "posting"):
             shutil.move(candidate, configGet("sent", "locations")+os.sep+candidate_file)
@@ -169,15 +202,26 @@ def send_content():
         pass
 
 
-@app.on_message(~ filters.scheduled & filters.command(["start"], prefixes="/"))
-def cmd_start(app, msg):
-    if msg.from_user.id not in jsonLoad(configGet("blocked", "locations")):
-        msg.reply_text(locale("start", "message", locale=msg.from_user.language_code))
+    # Work in progress
+    # Check last posts forwards
+    # check_forwards(app)
 
-@app.on_message(~ filters.scheduled & filters.command(["rules", "help"], prefixes="/"))
-def cmd_rules(app, msg):
-    if msg.from_user.id not in jsonLoad(configGet("blocked", "locations")):
-        msg.reply_text(locale("rules", "message", locale=msg.from_user.language_code))
+if configGet("mode") in ["both", "submit"]:
+    @app.on_message(~ filters.scheduled & filters.command(["start"], prefixes="/"))
+    def cmd_start(app, msg):
+        if msg.from_user.id not in jsonLoad(configGet("blocked", "locations")):
+            msg.reply_text(locale("start", "message", locale=msg.from_user.language_code))
+
+if configGet("mode") in ["both", "submit"]:
+    @app.on_message(~ filters.scheduled & filters.command(["rules", "help"], prefixes="/"))
+    def cmd_rules(app, msg):
+        if msg.from_user.id not in jsonLoad(configGet("blocked", "locations")):
+            msg.reply_text(locale("rules", "message", locale=msg.from_user.language_code))
+
+# Work in progress
+# @app.on_message(~ filters.scheduled & filters.command(["forwards"], prefixes="/"))
+# def cmd_forwards(app, msg):
+#     check_forwards(app)
 
 @app.on_message(~ filters.scheduled & filters.command(["kill", "die", "reboot"], prefixes=["", "/"]))
 def cmd_kill(app, msg):
@@ -219,76 +263,77 @@ def subUnblock(user):
         blocked.remove(user)
     jsonSave(blocked, configGet("blocked", "locations"))
 
-@app.on_message(~ filters.scheduled & filters.photo | filters.video | filters.animation | filters.document)
-def get_submission(_, msg):
-    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 configGet("mode") in ["both", "submit"]:
+    @app.on_message(~ filters.scheduled & filters.photo | filters.video | filters.animation | filters.document)
+    def get_submission(_, msg):
+        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"))))
-    except AttributeError:
-        logWrite(f"from_user in function get_submission does not seem to contain 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_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
@@ -340,6 +385,14 @@ def callback_query_unblock(app, clb): # type: ignore
     clb.answer(text=locale("sub_unblock", "callback", locale=user_locale).format(fullclb[2]), show_alert=True)
 #===========================================================================================================================================
 
+@app.on_raw_update()
+def fwd_got(app, update, users, chats):
+    if isinstance(update, UpdateChannelMessageForwards):
+        logWrite(f'Forward count increased to {update["forwards"]} on post {update["id"]} in channel {update["channel_id"]}')
+        logWrite(str(users), debug=True)
+        logWrite(str(chats), debug=True)
+    # else:
+        # logWrite(f"Got raw update of type {type(update)} with contents {update}", debug=True)
 
 for entry in configGet("time", "posting"):
     schedule.every().day.at(entry).do(send_content)
@@ -369,27 +422,30 @@ if __name__ == "__main__":
     if configGet("startup", "reports"):
         app.send_message(configGet("admin"), locale("startup", "message", locale=configGet("locale")).format(str(pid))) # type: ignore
 
-    t = Thread(target=background_task)
-    t.start()
+    if configGet("mode") in ["both", "post"]:
+        t = Thread(target=background_task)
+        t.start()
 
-    # Registering user commands
-    for entry in os.listdir(configGet("locale", "locations")):
-        if entry.endswith(".json"):
-            commands_list = []
-            for command in configGet("commands"):
-                commands_list.append(BotCommand(command, locale(command, "commands", locale=entry.replace(".json", ""))))
-            app.set_bot_commands(commands_list, language_code=entry.replace(".json", "")) # type: ignore
+    if configGet("mode") in ["both", "submit"]:
+        # Registering user commands
+        for entry in os.listdir(configGet("locale", "locations")):
+            if entry.endswith(".json"):
+                commands_list = []
+                for command in configGet("commands"):
+                    commands_list.append(BotCommand(command, locale(command, "commands", locale=entry.replace(".json", ""))))
+                app.set_bot_commands(commands_list, language_code=entry.replace(".json", "")) # type: ignore
 
-    # Registering user commands for fallback locale
-    commands_list = []
-    for command in configGet("commands"):
-        commands_list.append(BotCommand(command, locale(command, "commands", locale=configGet("locale_fallback"))))
-    app.set_bot_commands(commands_list) # type: ignore
+        # Registering user commands for fallback locale
+        commands_list = []
+        for command in configGet("commands"):
+            commands_list.append(BotCommand(command, locale(command, "commands", locale=configGet("locale_fallback"))))
+        app.set_bot_commands(commands_list) # type: ignore
 
     # Registering admin commands
     commands_admin_list = []
-    for command in configGet("commands"):
-        commands_admin_list.append(BotCommand(command, locale(command, "commands", locale=configGet("locale"))))
+    if configGet("mode") in ["both", "submit"]:
+        for command in configGet("commands"):
+            commands_admin_list.append(BotCommand(command, locale(command, "commands", locale=configGet("locale"))))
     for command in configGet("commands_admin"):
         commands_admin_list.append(BotCommand(command, locale(command, "commands_admin", locale=configGet("locale"))))
     app.set_bot_commands(commands_admin_list, scope=BotCommandScopeChat(chat_id=configGet("admin"))) # type: ignore

start.bat

@@ -3,4 +3,4 @@
 REM You can cd to your directory here, if you want
 REM cd C:\Users\user\TelegramPoster
 
-python main.py
+python poster.py

start.sh

@@ -3,4 +3,4 @@
 # You can cd to your directory here, if you want
 # cd /home/user/TelegramPoster
 
-python main.py
+python poster.py