Integrated previous commits

Replaced user block logic
Integrated interval-based schedule
2023-02-17 21:55:38 +01:00 · 2023-02-17 21:54:52 +01:00 · 2023-02-17 21:54:30 +01:00 · 2023-02-17 21:54:14 +01:00 · 2023-02-17 21:53:57 +01:00 · 2023-02-17 21:53:43 +01:00
38 changed files with 623 additions and 1848 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -168,5 +168,4 @@ cython_debug/
 # Project
 cache
 data
-logs
-config.json
+logs
--- a/.renovaterc
+++ b/.renovaterc
@@ -1,20 +0,0 @@
-{
-    "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-    "extends": [
-        "config:base"
-    ],
-    "baseBranches": [
-        "dev"
-    ],
-    "packageRules": [
-        {
-            "matchUpdateTypes": [
-                "minor",
-                "patch",
-                "pin",
-                "digest"
-            ],
-            "automerge": true
-        }
-    ]
-}
--- a/README.md
+++ b/README.md
@@ -1,110 +1,60 @@
-<h1 align="center">TelegramPoster</h1>
-
-<p align="center">
-<a href="https://git.end-play.xyz/profitroll/TelegramPoster/src/branch/dev/LICENSE"><img alt="License: GPL" src="https://img.shields.io/badge/License-GPL-blue"></a>
-<a href="https://git.end-play.xyz/profitroll/TelegramPoster"><img alt="Code style: black" src="https://img.shields.io/badge/code%20style-black-000000.svg"></a>
-</p>  
-
-> Шукаєш інструкцію українською? А вона [ось тут](https://git.end-play.xyz/profitroll/TelegramPoster/src/branch/dev/README_uk.md) знаходиться)  
+# TelegramPoster
+> Шукаєш інструкцію українською? А вона [ось тут](https://git.end-play.xyz/profitroll/TelegramPoster/src/branch/master/README_uk.md) знаходиться)  

 This bot is used for one and only task - post pictures from my personal archive. Here's its source code so you can also host a bot and have fun with it. Just don't exepect it to be brilliant. It is not. But hey, you can always fork it ;)  

-## Dependencies
-
-* [Python 3.7+](https://www.python.org) (3.9+ recommended)
-* [MongoDB](https://www.mongodb.com)
-* [PhotosAPI](https://git.end-play.xyz/profitroll/PhotosAPI)  
-
-Use [MongoDB's installation manual](https://www.mongodb.com/docs/manual/installation) and [Photos API's README](https://git.end-play.xyz/profitroll/PhotosAPI/src/branch/master/README.md).  
-
-Please note that Photos API also requires MongoDB so it makes sense to install and configure Mongo first.
-
 ## Installation
-
-To make this bot run at first you need to have a Python interpreter, Photos API, MongoDB and optionally git. You can also ignore git and simply download source code, should also work fine. After that you're ready to go.  
+To make this bot run at first you need to have a Python interpreter and git. Google is your friend finding it. You can also ignore git and simply download source code, should also work fine. After that you're ready to go.  

 > In this README I assume that you're using default python in your
 > system and your system's PATH contains it. If your default python
 > is `python3` or for example `/home/user/.local/bin/python3.9` - use it instead.
-> If it's non-standard executable path - you should also change
+> If it's non-standart executable path - you should also change
 > it in scripts you will use (`loop.sh`, `loop.bat`, `start.sh` and `start.bat`).

-1. Install Mongo and Photos API:
-
-    1. Install MongoDB by following [official installation manual](https://www.mongodb.com/docs/manual/installation)
-    2. Install Photos API by following [Photos API's README](https://git.end-play.xyz/profitroll/PhotosAPI/src/branch/master/README.md)
-
-2. Download the bot:  
-
-    1. `git clone -b dev https://git.end-play.xyz/profitroll/TelegramPoster.git` (if you're using git)
-    2. `cd TelegramPoster`
-
-3. Create virtual environment [Optional]:
-
-    1. Install virtualenv module: `pip install virtualenv`
-    2. Create venv: `python -m venv env`
-    3. Activate it using `source venv/bin/activate` on Linux, `venv\Scripts\activate.bat` in CMD or `venv\Scripts\Activate.ps1` in PowerShell.
-
-4. Install project's dependencies:  
+1. Download the bot:  
+    1. `git clone https://git.end-play.xyz/profitroll/TelegramSender.git` (if you want to use git)  
+    2. `cd ./TelegramSender`

+2. Install dependencies:  
    `python -m pip install -r requirements.txt`  
-    Without installing those - bot cannot work at all.
+    Without installing those - bot cannot work at all

-5. Configure "bot" and "owner" with your favorite text editor:  
+3. Install optional dependencies [Not required]:  
+    `python -m pip install -r requirements-optional.txt`  
+    These are not required but can make the bot run a bit faster

-    1. Copy file `config_example.json` to `config.json`
-    2. Open `config.json` using your favorite text editor. For example `nano config.json`, but you can edit with vim, nano, on Windows it's Notepad or Notepad++. Whatever
-    3. Change `"owner"`, `"bot.api_id"`, `"bot.api_hash"` and `"bot.bot_token"` keys' values.  
+4. Configure your bot with a favorite text editor:  
+    `nano config.json`  
+    You can edit with vim, nano, on Windows it's Notepad or Notepad++. Whatever.  
+    If you don't know where to find bot_token and your id - here you can find some hints: [get bot token](https://www.siteguarding.com/en/how-to-get-telegram-bot-api-token), [get your id](https://www.alphr.com/telegram-find-user-id/), [get api_hash and api_id](https://core.telegram.org/api/obtaining_api_id).  
+    Also don't forget to change bot's working mode. Dict key `"mode"` contains keys `"post"` and `"submit"`, each of those can be either `true` or `false`.

-    If you don't know where to find bot_token and your id - here you can find some hints: [get bot token](https://www.siteguarding.com/en/how-to-get-telegram-bot-api-token), [get your id](https://www.alphr.com/telegram-find-user-id), [get api_hash and api_id](https://core.telegram.org/api/obtaining_api_id).  
+5. Add bot to the channel:  
+    To use your bot of course you need to have a channel or group otherwise makes no sense to have such a bot. [Here](https://stackoverflow.com/a/33497769) you can find a quick guide how to add your bot to a channel.

-6. Configure database and API:  
+6. Fill your contents folder:  
+    Of course bot cannot post something from nothing. Configure your `config.json` what media types bot should post (`"posting", "extensions"`), when to post them (`"posting", "time"`) and also where to find them (`"locations"`). You can also move them when sent by setting `"posting", "move_sent"` to `true`.

-    1. Configure database:
-        1. Change database host and port in keys `"database.host"` and `"database.port"`. For default local installation those will be `127.0.0.1` and `27017` respectively
-        2. Change database name to the one you like in `"database.name"`. It will be automatically created on start
-        3. If you've changed user and password to access the db, you should also change `"database.user"` and `"database.password"` keys, otherwise leave them `null` (default).
-
-    2. Configure Photos API:
-        1. Change `"posting.api.address"` to the one your API servers uses
-        2. Run your bot using `python poster.py --create-user --create-album` to configure its new user and album. You can also use manual user and album creation described [in the wiki](https://git.end-play.xyz/profitroll/TelegramPoster/wiki/Configuring-API). You can also change username, password and album in`"posting.api"` to the user and album you have if you already have Photos API album and user set up. In that case you don't need to create a new one.
-
-7. Add bot to the channel:  
-
-    To use your bot of course you need to have a channel or group otherwise makes no sense to have such a bot. [Here](https://stackoverflow.com/a/33497769) you can find a quick guide how to add your bot to a channel. After that simply set `"posting.channel"` to your channel's ID.
-
-8. Configure posting time:  
-
-    To make your bot post random content you need to configure `"posting.time"` with a list of "DD:MM" formatted strings or use `"posting.interval"` formatted as "XdXhXmXs". To use interval instead of selected time set `"posting.use_interval"` to `true`.
-
-9. Good to go, run it!  
-
-    Make sure MongoDB and Photos API are running and use `python poster.py` to start it.  
+6. Good to go, run it!  
+    `python ./main.py`  
    Or you can also use `.\start.bat` on Windows and `bash ./start.sh` on Linux.  
-    Additionally there are `loop.sh` and `loop.bat` available if you want your bot to start again after being stopped or after using `/shutdown` command.  
-
-If you need any further instructions on how to configure your bot or you had any difficulties doing so - please use [wiki in this repository](https://git.end-play.xyz/profitroll/TelegramPoster/wiki) to get more detailed instructions.  
+    Additionally there are `loop.sh` and `loop.bat` available if you want your bot to start again after being stopped or after using `/reboot` command.

 ## Command line arguments
-
 Of course bot also has them. You can perform some actions with them.  
-
-* `--create-user` - create new API user. Requires config key `"posting.api.address"` to be set;
-* `--create-album` - create new API album. Requires API address and user config (`"posting.api"`) to be complete.
+* `--move-sent` - allows you to move all sent files from queue to sent directories
+* `--cleanup` - purge files in both `queue` and `sent` folders if they're sent. Requires `--confirm` argument
+* `--cleanup-index` - purge all sent entries from index. Requires `--confirm` argument
+* `--norun` - allows you to execute above arguments without triggering the bot start itself

 Examples:  
-
-* `python poster.py --create-user`
-* `python poster.py --create-user --create-album`
-
-## Tips and improvements
-
-* You may want to configure your bot to work as a systemd service instead. There's [a tutorial for that](https://git.end-play.xyz/profitroll/TelegramPoster/wiki/Configuring-Service) in the wiki.
+* `python3 ./main.py --move-sent --norun`
+* `python3 ./main.py --cleanup --confirm`

 ## Localization
-
 Bot is capable of using custom locales. There are some that are pre-installed (English and Ukrainian), however you can add your own locales too.  

 All localization files are located in the `locale` folder, otherwise in folder specified in config file. Just copy locale file of your choice, name it in accordance to [IETF language tags](https://en.wikipedia.org/wiki/IETF_language_tag) (if you want your locale to be compatible with Telegram's locales) or define your own name. Save it as json and you're good to go. If you want to change default locale for messages, that cannot determine admin's locale - edit `"locale"` parameter in the `config.json`. If this locale is not available - `"locale_fallback"` will be used instead. If both are not available - error will be shown. For console output and logging locale you should edit `"locale_log"`.  

-We recommend to only make changes to your custom locale. Or at least always have your backup of for example `en.json` as your fallback.
+We recommend to only make changes to your custom locale. Or at least always have your backup of for example `en.json` as your fallback.
--- a/README_uk.md
+++ b/README_uk.md
@@ -1,16 +1,7 @@
-<h1 align="center">TelegramPoster</h1>
-
-<p align="center">
-<a href="https://git.end-play.xyz/profitroll/TelegramPoster/src/branch/master/LICENSE"><img alt="License: GPL" src="https://img.shields.io/badge/License-GPL-blue"></a>
-<a href="https://git.end-play.xyz/profitroll/TelegramPoster"><img alt="Code style: black" src="https://img.shields.io/badge/code%20style-black-000000.svg"></a>
-</p>  
-
-## ⚠️ Українська версія README dev гілки ще не готова! Користуйтесь англійською! ⚠️
-
+# TelegramPoster
 Цей бот використовується для однієї-єдиної задачі - розміщувати фотографії з мого особистого архіву. Ось його код, тож Ви також можете захостити бота самостійно та розважитися з ним. Тільки не очікуйте, що він ідеальним. Не буде. Але гей, Ви завжди можете його доробити під себе ;)

 ## Установка
-
 Для запуску цього бота спочатку потрібно мати інтерпретатор Python та встановлений git. Google — Ваш друг у пошуках. Ви також можете ігнорувати git і просто завантажити код, також має спрацювати добре. Після цього Ви готові до встановлення.

 > У цьому README я вважаю, що Ви використовуєте python за замовчуванням у своїй
@@ -49,23 +40,19 @@
    Крім того, доступні `loop.sh` і `loop.bat`, якщо ви хочете, щоб ваш бот запускався знову після зупинки або після використання команди `/reboot`.

 ## Аргументи командного рядка
-
 Звичайно, у бота вони також є. З ними можна виконувати деякі дії.  
-
 * `--move-sent` - дозволяє перемістити всі надіслані файли з черги до папки надісланих
 * `--cleanup` - очистити файли в папках `queue` і `sent`, якщо вони вже надіслані. Потрібен аргумент `--confirm`
 * `--cleanup-index` - видалити всі надіслані записи з індексу. Потрібен аргумент `--confirm`
 * `--norun` - дозволяє виконувати наведені вище аргументи, не запускаючи самого бота

 Приклади:  
-
 * `python3 ./main.py --move-sent --norun`
 * `python3 ./main.py --cleanup --confirm`

 ## Локалізація
-
 Бот може використовувати різні мови. Є деякі попередньо встановлені (Англійська та Українська), однак Ви можете додавати свої власні локалізації теж.  

 Всі файли локалізації знаходяться у папці `locale`, якщо в конфігураційному файлі не вказано іншу. Просто скопіюйте цікавлячий Вас файл, назвіть його відповідно до [тегів мови IETF](https://en.wikipedia.org/wiki/IETF_language_tag) (якщо Ви хочете, щоб переклад був сумісним з перекладами Telegram) або просто вкажіть свою власну назву. Збережіть свій переклад як json файл і все готово. Якщо ви хочете змінити мову за замовчуванням для повідомлень самого бота, які не можуть визначити мову адміністратора, відредагуйте параметр `"locale"` у `config.json`. Якщо ця мова недоступна, замість неї буде використано `"locale_fallback"`. Якщо обидві мови недоступні - буде показано помилку. Для зміни мови виведення консолі та логування вам слід відредагувати `"locale_log"`.  

-Ми рекомендуємо вносити будь-які зміни лише до вашої окремої мови. Або, принаймні, завжди мати резервну копію, наприклад, `en.json` як запасний варіант.
+Ми рекомендуємо вносити будь-які зміни лише до вашої окремої мови. Або, принаймні, завжди мати резервну копію, наприклад, `en.json` як запасний варіант.
--- a/classes/enums/submission_types.py
+++ b/classes/enums/submission_types.py
@@ -5,4 +5,4 @@ class SubmissionType(Enum):
    DOCUMENT = "document"
    VIDEO = "video"
    ANIMATION = "animation"
-    PHOTO = "photo"
+    PHOTO = "photo"
--- a/classes/exceptions.py
+++ b/classes/exceptions.py
@@ -4,55 +4,13 @@ from typing import Any
 class SubmissionUnavailableError(Exception):
    pass

-
 class SubmissionUploadError(Exception):
    def __init__(self, file_path: str, status_code: int, content: Any) -> None:
        self.status_code = status_code
        self.content = content
-        super().__init__(
-            f"Could not upload photo '{file_path}' due to HTTP {self.status_code}: {self.content}"
-        )
-
+        super().__init__(f"Could not upload photo '{file_path}' due to HTTP {self.status_code}: {self.content}")

 class SubmissionDuplicatesError(Exception):
    def __init__(self, file_path: str, duplicates: list) -> None:
        self.duplicates = duplicates
-        super().__init__(
-            f"Found duplicates of a photo '{file_path}': {self.duplicates}"
-        )
-
-
-class UserCreationError(Exception):
-    def __init__(self, code: int, data: str) -> None:
-        self.code = code
-        self.data = data
-        super().__init__(
-            f"Could not create a new user. API returned HTTP {self.code} with content: {self.data}"
-        )
-
-
-class UserCreationDuplicateError(Exception):
-    def __init__(self, username: str) -> None:
-        self.username = username
-        super().__init__(f"User '{self.username} already exists.'")
-
-
-class AlbumCreationError(Exception):
-    def __init__(self, code: int, data: str) -> None:
-        self.code = code
-        self.data = data
-        super().__init__(
-            f"Could not create a new album. API returned HTTP {self.code} with content: {self.data}"
-        )
-
-
-class AlbumCreationDuplicateError(Exception):
-    def __init__(self, name: str) -> None:
-        self.name = name
-        super().__init__(f"Album '{self.name} already exists.'")
-
-
-class AlbumCreationNameError(Exception):
-    def __init__(self, data: dict) -> None:
-        self.data = data
-        super().__init__(data["detail"])
+        super().__init__(f"Found duplicates of a photo '{file_path}': {self.duplicates}")
--- a/classes/poster_client.py
+++ b/classes/poster_client.py
@@ -1,8 +1,10 @@
 from os import path, remove, sep
 from shutil import rmtree
-from typing import Tuple, Union
+from typing import Union
 from pyrogram.client import Client
-from pyrogram.types import Message
+from pyrogram.types import Message, CallbackQuery
+from pyrogram.enums.parse_mode import ParseMode
+from pyrogram.session.session import Session
 from classes.exceptions import SubmissionDuplicatesError, SubmissionUnavailableError
 from modules.api_client import upload_pic
 from modules.database import col_submitted
@@ -11,16 +13,15 @@ from modules.logger import logWrite

 from modules.utils import configGet

-
 class PosterClient(Client):
-    def __init__(self, name: str, **kwargs):  # type: ignore
+
+    def __init__(self, name: str, **kwargs): # type: ignore
        super().__init__(name, **kwargs)
        self.owner = configGet("owner")
-        self.admins = configGet("admins") + [configGet("owner")]
+        self.admins = configGet("admins")+[configGet("owner")]

-    async def submit_photo(
-        self, id: str
-    ) -> Tuple[Union[Message, None], Union[str, None]]:
+    async def submit_photo(self, id: str) -> Union[Message, None]:
+        
        db_entry = col_submitted.find_one({"_id": ObjectId(id)})
        submission = None

@@ -28,71 +29,36 @@ class PosterClient(Client):
            raise SubmissionUnavailableError()
        else:
            if db_entry["temp"]["uuid"] is not None:
-                if not path.exists(
-                    path.join(
-                        configGet("data", "locations"),
-                        "submissions",
-                        db_entry["temp"]["uuid"],
-                        db_entry["temp"]["file"],
-                    )
-                ):
+                if not path.exists(path.join(configGet("data", "locations"), "submissions", db_entry["temp"]["uuid"], db_entry["temp"]["file"])):
                    raise SubmissionUnavailableError()
                else:
-                    filepath = path.join(
-                        configGet("data", "locations"),
-                        "submissions",
-                        db_entry["temp"]["uuid"],
-                        db_entry["temp"]["file"],
-                    )
-                    try:
-                        submission = await self.get_messages(
-                            db_entry["user"], db_entry["telegram"]["msg_id"]
-                        )
-                    except:
-                        pass
+                    filepath = path.join(configGet("data", "locations"), "submissions", db_entry["temp"]["uuid"], db_entry["temp"]["file"])
            else:
                try:
-                    submission = await self.get_messages(
-                        db_entry["user"], db_entry["telegram"]["msg_id"]
-                    )
-                    filepath = await self.download_media(
-                        submission, file_name=configGet("tmp", "locations") + sep
-                    )
+                    submission = await self.get_messages(db_entry["user"], db_entry["telegram"]["msg_id"])
+                    filepath = await self.download_media(submission, file_name=configGet("tmp", "locations")+sep)
                except:
                    raise SubmissionUnavailableError()
-
-        response = await upload_pic(
-            str(filepath), allow_duplicates=configGet("allow_duplicates", "submission")
-        )
+                
+        response = await upload_pic(str(filepath))

        if len(response[1]) > 0:
            raise SubmissionDuplicatesError(str(filepath), response[1])
-
-        col_submitted.find_one_and_update(
-            {"_id": ObjectId(id)}, {"$set": {"done": True}}
-        )
+        
+        col_submitted.find_one_and_update({"_id": ObjectId(id)}, {"$set": {"done": True}})

        try:
            if db_entry["temp"]["uuid"] is not None:
-                rmtree(
-                    path.join(
-                        configGet("data", "locations"),
-                        "submissions",
-                        db_entry["temp"]["uuid"],
-                    ),
-                    ignore_errors=True,
-                )
+                rmtree(path.join(configGet("data", "locations"), "submissions", db_entry["temp"]["uuid"]), ignore_errors=True)
            else:
                remove(str(filepath))
        except (FileNotFoundError, NotADirectoryError):
-            logWrite(
-                f"Could not delete '{filepath}' on submission accepted", debug=True
-            )
+            logWrite(f"Could not delete '{filepath}' on submission accepted", debug=True)

-        return submission, response[2]
+        return submission

    async def ban_user(self, id: int) -> None:
        pass

    async def unban_user(self, id: int) -> None:
-        pass
+        pass
--- a/classes/user.py
+++ b/classes/user.py
@@ -1,55 +1,17 @@
-from modules.app import app
 from datetime import datetime
-from modules.database import col_banned, col_users
-from modules.utils import configGet
+from modules.database import col_banned

+class PosterUser():

-class PosterUser:
    def __init__(self, id: int):
        self.id = id

    def is_blocked(self) -> bool:
-        """Check if user is banned from submitting content.
-
-        ### Returns:
-            `bool`: Must be `True` if banned and `False` if not
-        """
        return False if col_banned.find_one({"user": self.id}) is None else True
-
+    
    def block(self) -> None:
-        """Ban user from using command and submitting content."""
        if col_banned.find_one({"user": self.id}) is None:
            col_banned.insert_one({"user": self.id, "date": datetime.now()})

    def unblock(self) -> None:
-        """Allow user to use command and submit posts again."""
-        col_banned.find_one_and_delete({"user": self.id})
-
-    def is_limited(self) -> bool:
-        """Check if user is on a cooldown after submitting something.
-
-        ### Returns:
-            `bool`: Must be `True` if on the cooldown and `False` if not
-        """
-        if self.id in app.admins:
-            return False
-        else:
-            db_record = col_users.find_one({"user": self.id})
-            if db_record is None:
-                return False
-            return (
-                True
-                if (datetime.now() - db_record["cooldown"]).total_seconds()
-                < configGet("timeout", "submission")
-                else False
-            )
-
-    def limit(self) -> None:
-        """Restart user's cooldown. Used after post has been submitted."""
-        if (
-            col_users.find_one_and_update(
-                {"user": self.id}, {"$set": {"cooldown": datetime.now()}}
-            )
-            is None
-        ):
-            col_users.insert_one({"user": self.id, "cooldown": datetime.now()})
+        col_banned.find_one_and_delete({"user": self.id})
--- a/config_example.json
+++ b/config_example.json
@@ -1,4 +1,5 @@
 {
+    "module": null,
    "locale": "en",
    "locale_log": "en",
    "locale_fallback": "en",
@@ -18,12 +19,12 @@
    },
    "mode": {
        "post": true,
-        "submit": true
+        "submit": true,
+        "api_based": false
    },
    "reports": {
        "sent": false,
        "error": true,
-        "update": true,
        "startup": true,
        "shutdown": true
    },
@@ -38,6 +39,8 @@
        "sent": "data/sent",
        "queue": "data/queue",
        "index": "data/index.json",
+        "submit": "data/submit.json",
+        "blocked": "data/blocked.json",
        "locale": "locale"
    },
    "posting": {
@@ -46,12 +49,6 @@
        "move_sent": false,
        "use_interval": false,
        "interval": "1h30m",
-        "page_size": 300,
-        "submitted_caption": {
-            "enabled": true,
-            "ignore_admins": true,
-            "text": "#submitted"
-        },
        "extensions": {
            "photo": [
                "jpg",
@@ -87,17 +84,13 @@
    },
    "caption": {
        "enabled": false,
-        "link": null,
-        "text": [
-            "sample text"
-        ]
+        "text": "sample text",
+        "link": null
    },
    "submission": {
        "timeout": 30,
        "file_size": 15728640,
        "tmp_size": 15728640,
-        "allow_duplicates": false,
-        "send_uploaded_id": false,
        "require_confirmation": {
            "users": true,
            "admins": true
@@ -117,7 +110,6 @@
    "commands_admin": [
        "import",
        "export",
-        "remove",
-        "shutdown"
+        "reboot"
    ]
 }
--- a/docs/config_api.md
+++ b/docs/config_api.md
@@ -1 +0,0 @@
-# Configuring API connection
--- a/docs/config_channel.md
+++ b/docs/config_channel.md
@@ -1 +0,0 @@
-# Configuring channel and adding your bot
--- a/docs/config_posts.md
+++ b/docs/config_posts.md
@@ -1 +0,0 @@
-# Configuring posts and duplicates checker
--- a/docs/config_systemd.md
+++ b/docs/config_systemd.md
@@ -1 +0,0 @@
-# Configuring as systemd service
--- a/docs/config_time.md
+++ b/docs/config_time.md
@@ -1 +0,0 @@
-# Configuring posting time
--- a/docs/updating.md
+++ b/docs/updating.md
@@ -1 +0,0 @@
-# Updating your bot
--- a/locale/en.json
+++ b/locale/en.json
@@ -7,22 +7,15 @@
        "forwards": "Check post forwards",
        "import": "Submit .zip archive with photos",
        "export": "Get .zip archive with all photos",
-        "remove": "Delete photo by its ID",
-        "purge": "Completely purge bot's queue",
-        "shutdown": "Turn off the bot"
+        "reboot": "Restart the bot"
    },
    "message": {
        "start": "Hi and welcome!\n\nYou can submit your pictures and videos here. We'll review and add them, if we like them. Make sure you send your stuff one at a time and have chosen media that corresponds to our rules.\n\nYou can also write something to us in the description field. We'll send it with the submission itself, if needed.\n\nAlso, make sure you follow the /rules of submission, otherwise your submission will be declined. In case of spam/abuse you may even be blocked.\n\nHave fun and happy submitting!",
-        "rules": "Photos submission rules:\n1. No porn, only erotics and aesthetics\n2. Nipples are semi-allowed, should be either veiled or barely visible\n3. Genitalia strictly prohibited, but labia prints on clothes or nice pubes/panties/butts - are fine\n4. Submitting russians is forbidden",
+        "rules": "Photos submission rules:\n1. No porn, only erotics and aesthetics\n2. Nipples are semi-allowed, should be either veiled or barely visible\n3. Genitalia strictly prohibited, but labia prints on clothes or nice pubes/panties/butts - are fine",
        "shutdown": "Shutting down bot with pid `{0}`",
        "startup": "Starting with pid `{0}`",
-        "startup_downtime_minutes": "Starting with pid `{0}` (was down for {1} m.)",
-        "startup_downtime_hours": "Starting with pid `{0}` (was down for {1} h.)",
-        "startup_downtime_days": "Starting with pid `{0}` (was down for {1} d.)",
        "sub_yes": "✅ Submission approved and accepted",
-        "sub_yes_auto": "✅ Submission automatically accepted",
        "sub_no": "❌ Submission reviewed and declined",
-        "sub_dup": "⚠️ Submission automatically declined because database already contains this photo",
        "sub_blocked": "You were blocked and you can't submit media anymore.",
        "sub_unblocked": "You were unblocked and you can now submit media.",
        "sub_by": "\n\nSubmitted by:",
@@ -34,33 +27,13 @@
        "document_too_large": "File you've sent is too large. Please submit files not bigger than {0} MB",
        "mime_not_allowed": "File type not allowed. Please, consider using one of these: {0}",
        "post_exception": "Could not send content due to `{0}`\n\nTraceback:\n```{1}```",
-        "post_invalid_pic": "⚠️ Error {0} while sending photo\n```python\n{1}\n```",
+        "post_invalid_pic": "__TO_BE_ADDED__",
        "api_queue_empty": "Could not send content: `Queue is empty or contains only unsupported files.`",
-        "api_queue_error": "Could not get photo from API's queue. Check the log above or API's errors to get more info.",
+        "api_queue_error": "__TO_BE_ADDED__",
        "post_low": "Low amount of content: `There are only {0} files left in the queue.`",
-        "api_creds_invalid": "Could not authorize API access. Please check whether provided in config file are valid and update them if they're not.",
+        "api_creds_invalid": "__TO_BE_ADDED__",
        "sub_wip": "Post submission is now WIP. It will be available again in a few days. Thank you for your patience.",
-        "sub_error": "⚠️ Could not upload this image due to bot error. Admins are advised.",
-        "sub_error_admin": "User {0} could not submit photo without additional confirmation due to:\n```\n{1}\n```",
-        "import_request": "Please send me a zip archive with your media to be imported. Use /cancel if you want to abort this operation.",
-        "import_ignored": "No response, aborting import.",
-        "import_abort": "Import aborted.",
-        "import_invalid_media": "File to import must be a zip archive. Aborting.",
-        "import_invalid_mime": "Provided file is not supported. Please send `application/zip`. Aborting.",
-        "import_too_big": "You archive is `{0} GiB` big, but system has only `{1} GiB` free. Unpacking may take even more space. Aborting.",
-        "import_downloading": "Downloading archive...",
-        "import_unpacking": "Unpacking archive...",
-        "import_unpack_error": "Could not unpack the archive\n\nException: {0}\n\nTraceback:\n```python\n{1}\n```",
-        "import_uploading": "Uploading archive contents...",
-        "import_upload_error_duplicate": "Could not upload `{0}` because there're duplicates on server.",
-        "import_upload_error_other": "Could not upload `{0}`. Probably disallowed filetype.",
-        "import_finished": "Import finished.",
-        "remove_request": "Please send me an ID to delete. You might have it from upload dialog. Use /cancel if you want to abort this operation.",
-        "remove_ignored": "No response, aborting removal.",
-        "remove_abort": "Removal aborted.",
-        "remove_success": "Removed media with ID `{0}`.",
-        "remove_failure": "Could not remove media with ID `{0}`. Check if provided ID is correct and if it is - you can also check bot's log for details.",
-        "update_available": "**New version found**\nThere's a newer version of a bot found. You can update your bot to [{0}]({1}) using command line of your host.\n\n**Release notes**\n{2}\n\nRead more about updating you bot on the [wiki page](https://git.end-play.xyz/profitroll/TelegramPoster/wiki/Updating-Instance).\n\nPlease not that you can also disable this notification by editing `reports.update` key of the config."
+        "sub_duplicates_found": "__TO_BE_ADDED__"
    },
    "button": {
        "sub_yes": "✅ Accept",
@@ -80,17 +53,17 @@
        "sub_msg_unavail": "Submission message no longer exist",
        "sub_media_unavail": "Could not download submission",
        "sub_done": "You've already decided what to do with submission",
-        "sub_duplicates_found": "There're duplicates in bot's database",
-        "nothing": "🏁 This action is already finished"
+        "sub_upload_failed": "__TO_BE_ADDED__",
+        "sub_duplicates_found": "__TO_BE_ADDED__"
    },
    "console": {
        "shutdown": "Shutting down bot with pid {0}",
-        "startup": "Starting with pid {0}",
+        "startup":"Starting with pid {0}",
        "keyboard_interrupt": "\nShutting down...",
        "exception_occured": "Exception {0} happened on task execution",
        "post_sent": "Sent {0} to {1} with caption {2} and silently {3}",
        "post_exception": "Could not send content due to {0}. Traceback: {1}",
-        "post_invalid_pic": "Error while sending photo HTTP {0}: {1}",
+        "post_invalid_pic": "__TO_BE_ADDED__",
        "post_empty": "Could not send content due to queue empty or contains only forbidden 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})",
@@ -114,17 +87,6 @@
        "cleanup_completed": "Performed cleanup of the sent files",
        "cleanup_unathorized": "Requested cleanup of sent files but not authorized. Please pass '--confirm' to perform that",
        "cleanup_index_completed": "Performed cleanup of sent files index",
-        "cleanup_index_unathorized": "Requested cleanup of sent files index but not authorized. Please pass '--confirm' to perform that",
-        "random_pic_response": "Random pic response: {0}",
-        "random_pic_error_code": "Could not get photos from album {0}: HTTP {1}",
-        "random_pic_error_debug": "Could not get photos from '{0}/albums/{1}/photos?q=&page_size={2}&caption=queue' using token '{3}': HTTP {4}",
-        "find_pic_error": "Could not find image with name '{0}' and caption '{1}' due to: {2}",
-        "pic_upload_error": "Could not upload '{0}' to API: HTTP {1} with message '{2}'",
-        "api_creds_invalid": "Incorrect API credentials! Could not login into '{0}' using login '{1}': HTTP {2}",
-        "user_blocked": "User {0} has been blocked",
-        "user_unblocked": "User {0} has been unblocked",
-        "submission_accepted": "Submission with ID '{0}' accepted and uploaded with ID '{1}'",
-        "submission_rejected": "Submission with ID '{0}' rejected",
-        "submission_duplicate": "Submission with ID '{0}' could not be accepted because of the duplicates: {1}"
+        "cleanup_index_unathorized": "Requested cleanup of sent files index but not authorized. Please pass '--confirm' to perform that"
    }
 }
--- a/locale/uk.json
+++ b/locale/uk.json
@@ -7,22 +7,15 @@
        "forwards": "Переглянути репости",
        "import": "Надати боту .zip архів з фотографіями",
        "export": "Отримати .zip архів з усіма фотографіями",
-        "remove": "Видалити фото за його ID",
-        "purge": "Повністю видалити всю чергу бота",
-        "shutdown": "Вимкнути бота"
+        "reboot": "Перезапустити бота"
    },
    "message": {
        "start": "Привіт і ласкаво просимо!\n\nТут можна пропонувати свої фотографії та відео. Ми переглянемо та додамо їх, якщо вони нам сподобаються. Переконайтеся, що ви надсилаєте свої матеріали по одному та вибираєте медіа, які відповідають нашим правилам.\n\nВи також можете написати нам щось у полі опису. За потреби ми надішлемо це разом із самим фото.\n\nКрім того, переконайтеся, що ви дотримуєтеся /rules (правил) подання, інакше вашу пропозицію буде відхилено. У разі спаму/зловживань вас можуть навіть заблокувати.\n\nГарного дня та щасливого надсилання!",
-        "rules": "Правила пропонування фото:\n1. Ніякого порно, тільки еротика та естетика\n2. Соски можна, але або завуальовані, або зовсім ледь помітні\n3. Геніталії суворо ні, а ось відбитки статевих губ на одязі або гарні лобочки/трусики/попки - без проблем\n4. Пропонувати русню заборонено",
+        "rules": "Правила пропонування фото:\n1. Ніякого порно, тільки еротика та естетика\n2. Соски можна, але або завуальовані, або зовсім ледь помітні\n3. Геніталії суворо ні, а ось відбитки статевих губ на одязі або гарні лобочки/трусики/попки - без проблем",
        "shutdown": "Вимкнення бота з підом `{0}`",
        "startup": "Запуск бота з підом `{0}`",
-        "startup_downtime_minutes": "Запуск бота з підом `{0}` (лежав {1} хв.)",
-        "startup_downtime_hours": "Запуск бота з підом `{0}` (лежав {1} год.)",
-        "startup_downtime_days": "Запуск бота з підом `{0}` (лежав {1} дн.)",
        "sub_yes": "✅ Подання схвалено та прийнято",
-        "sub_yes_auto": "✅ Подання автоматично прийнято",
        "sub_no": "❌ Подання розглянуто та відхилено",
-        "sub_dup": "⚠️ Подання автоматично відхилено через наявність цього фото в базі даних",
        "sub_blocked": "Вас заблокували, ви більше не можете надсилати медіафайли.",
        "sub_unblocked": "Вас розблокували, тепер ви можете надсилати медіафайли.",
        "sub_by": "\n\nПредставлено:",
@@ -34,33 +27,13 @@
        "document_too_large": "Надісланий файл завеликий. Будь ласка, надсилайте файли не більше {0} Мб",
        "mime_not_allowed": "Тип файлу не дозволений. Розгляньте можливість використання одного з цих: {0}",
        "post_exception": "Не вдалося надіслати контент через `{0}`\n\nTraceback:\n```{1}```",
-        "post_invalid_pic": "⚠️ Помилка надсилання фото {0}\n```python\n{1}\n```",
+        "post_invalid_pic": "__TO_BE_ADDED__",
        "api_queue_empty": "Не вдалося надіслати контент: `Черга порожня або містить лише непідтримувані файли`.",
-        "api_queue_error": "Не вдалось отримати фото з черги API. Погляньте на логи вище а також на лог помилок API щоб дізнатись подробиці.",
+        "api_queue_error": "__TO_BE_ADDED__",
        "post_low": "Мала кількість контенту: `Залишилось всього {0} файлів в черзі.`",
-        "api_creds_invalid": "Не вдалося авторизувати запит до API. Будь ласка, перевірте чи дані авторизації в конфігураційному файлі вірні та оновіть їх, якщо це не так.",
+        "api_creds_invalid": "__TO_BE_ADDED__",
        "sub_wip": "Подання постів зараз знаходиться у розробці. Він буде знову доступний через кілька днів. Дякуємо за ваше терпіння.",
-        "sub_error": "⚠️ Не вдалось завантажити фото через помилку бота. Адміністрацію повідомлено.",
-        "sub_error_admin": "Користувач {0} не зміг надіслати фото без додаткової перевірки через помилку:\n```\n{1}\n```",
-        "import_request": "Будь ласка, надішліть zip-архів з медіа для імпортування. Використовуйте /cancel, якщо ви хочете перервати цю операцію.",
-        "import_ignored": "Немає відповіді, перериваємо імпорт.",
-        "import_abort": "Імпорт перервано.",
-        "import_invalid_media": "Файл для імпорту має бути zip-архівом. Перериваємо.",
-        "import_invalid_mime": "Наданий файл не підтримується. Будь ласка, надішліть `application/zip`. Перервано.",
-        "import_too_big": "Ваш архів має розмір `{0} GiB`, але система має лише `{1} GiB` вільних. Розпакування може зайняти значно більше місця. Перервано.",
-        "import_downloading": "Завантажуємо архів...",
-        "import_unpacking": "Розпаковуємо архів...",
-        "import_unpack_error": "Не вдалося розпакувати архів\n\nПомилка: {0}\n\nTraceback:\n```python\n{1}\n```",
-        "import_uploading": "Завантажуємо вміст архіву...",
-        "import_upload_error_duplicate": "Не вдалося завантажити `{0}`, оскільки на сервері є дублікати.",
-        "import_upload_error_other": "Не вдалося завантажити `{0}`. Ймовірно, заборонений тип файлу.",
-        "import_finished": "Імпорт завершено.",
-        "remove_request": "Будь ласка, надішліть мені ID для видалення. Ви могли отримати його з діалогу завантаження. Використовуйте /cancel, якщо ви хочете перервати цю операцію.",
-        "remove_ignored": "Немає відповіді, перериваємо видалення.",
-        "remove_abort": "Видалення перервано.",
-        "remove_success": "Видалено медіа з ID `{0}`.",
-        "remove_failure": "Не вдалося видалити медіа з ID `{0}`. Перевірте, чи вказано правильний ID, і якщо він правильний, ви також можете переглянути логи бота для отримання більш детальної інформації.",
-        "update_available": "**Знайдено нову версію**\nЗнайдено нову версію бота. Ви можете оновити бота до [{0}]({1}) за допомогою командного рядка вашого хосту.\n\n**Примітки до релізу**\n{2}\n\nДетальніше про оновлення бота можна знайти на [вікі-сторінці](https://git.end-play.xyz/profitroll/TelegramPoster/wiki/Updating-Instance).\n\nЗверніть увагу, що ви також можете вимкнути це сповіщення, відредагувавши ключ `reports.update` у конфігурації."
+        "sub_duplicates_found": "__TO_BE_ADDED__"
    },
    "button": {
        "sub_yes": "✅ Прийняти",
@@ -80,8 +53,8 @@
        "sub_msg_unavail": "Повідомлення більше не існує",
        "sub_media_unavail": "Не вдалося завантажити подання",
        "sub_done": "Ви вже обрали що зробити з цим поданням",
-        "sub_duplicates_found": "Знайдено дублікати в базі даних бота",
-        "nothing": "🏁 Цю дію вже було завершено"
+        "sub_upload_failed": "__TO_BE_ADDED__",
+        "sub_duplicates_found": "__TO_BE_ADDED__"
    },
    "console": {
        "shutdown": "Вимкнення бота з підом {0}",
@@ -90,7 +63,7 @@
        "exception_occured": "Помилка {0} сталась під час виконання",
        "post_sent": "Надіслано {0} у {1} з підписом {2} та без звуку {3}",
        "post_exception": "Не вдалося надіслати контент через {0}. Traceback: {1}",
-        "post_invalid_pic": "Помилка надсилання фото HTTP {0}: {1}",
+        "post_invalid_pic": "__TO_BE_ADDED__",
        "post_empty": "Не вдалося надіслати контент адже черга з дозволеними розширеннями порожня",
        "sub_mime_not_allowed": "Отримано подання від {0} але типу {1} який не є дозволеним",
        "sub_document_too_large": "Отримано подання від {0} але файл завеликий({1} > {2})",
@@ -114,17 +87,6 @@
        "cleanup_completed": "Виконано очищення надісланих файлів",
        "cleanup_unathorized": "Надіслано запит на очищення надісланих файлів, але не авторизовано. Для цього надайте аргумент '--confirm'",
        "cleanup_index_completed": "Виконано очищення індексу надісланих файлів",
-        "cleanup_index_unathorized": "Надіслано запит на очищення індексу надісланих файлів, але не авторизовано. Для цього надайте аргумент '--confirm'",
-        "random_pic_response": "Відповідь на пошук випадкової картинки: {0}",
-        "random_pic_error_code": "Не вдалося отримати фото з альбому {0}: HTTP {1}",
-        "random_pic_error_debug": "Не вдалося отримати фотографії з '{0}/albums/{1}/photos?q=&page_size={2}&caption=queue', використовуючи токен '{3}': HTTP {4}",
-        "find_pic_error": "Не вдалося знайти зображення з назвою '{0}' та підписом '{1}' через: {2}",
-        "pic_upload_error": "Не вдалося завантажити '{0}' до API: HTTP {1} з повідомленням '{2}'",
-        "api_creds_invalid": "Невірні облікові дані API! Не вдалося увійти в '{0}' за допомогою логіна '{1}': HTTP {2}",
-        "user_blocked": "Користувача {0} було заблоковано",
-        "user_unblocked": "Користувача {0} було розблоковано",
-        "submission_accepted": "Подання з ID '{0}' прийнято та завантажено з ID '{1}'",
-        "submission_rejected": "Подання з ID '{0}' відхилено",
-        "submission_duplicate": "Подання з ID '{0}' не може бути прийнято через наявність дублікатів: {1}"
+        "cleanup_index_unathorized": "Надіслано запит на очищення індексу надісланих файлів, але не авторизовано. Для цього надайте аргумент '--confirm'"
    }
 }
--- a/modules/api_client.py
+++ b/modules/api_client.py
@@ -4,260 +4,92 @@ import asyncio
 from base64 import b64decode, b64encode
 from os import makedirs, path, sep
 from random import choice
-from traceback import print_exc
 from typing import Tuple, Union

-import aiofiles
-from aiohttp import FormData
+from requests import get, patch, post
+from classes.exceptions import SubmissionUploadError

-from classes.exceptions import (
-    AlbumCreationDuplicateError,
-    AlbumCreationError,
-    AlbumCreationNameError,
-    SubmissionUploadError,
-    UserCreationDuplicateError,
-    UserCreationError,
-)
 from modules.logger import logWrite
-from modules.utils import configGet, locale
-from modules.http_client import http_session
+from modules.utils import configGet


 async def authorize() -> str:
    makedirs(configGet("cache", "locations"), exist_ok=True)
-    if path.exists(configGet("cache", "locations") + sep + "api_access") is True:
-        async with aiofiles.open(
-            configGet("cache", "locations") + sep + "api_access", "rb"
-        ) as file:
-            token = b64decode(await file.read()).decode("utf-8")
-        if (
-            await http_session.get(
-                configGet("address", "posting", "api") + "/users/me/",
-                headers={"Authorization": f"Bearer {token}"},
-            )
-        ).status == 200:
+    if path.exists(configGet("cache", "locations")+sep+"api_access") is True:
+        with open(configGet("cache", "locations")+sep+"api_access", "rb") as file:
+            token = b64decode(file.read()).decode("utf-8")
+        if get(configGet("address", "posting", "api")+"/users/me/", headers={"Authorization": f"Bearer {token}"}).status_code == 200:
            return token
    payload = {
        "grant_type": "password",
        "scope": "me albums.list albums.read albums.write photos.list photos.read photos.write videos.list videos.read videos.write",
        "username": configGet("username", "posting", "api"),
-        "password": configGet("password", "posting", "api"),
+        "password": configGet("password", "posting", "api")
    }
-    response = await http_session.post(
-        configGet("address", "posting", "api") + "/token", data=payload
-    )
-    if not response.ok:
-        logWrite(
-            locale(
-                "api_creds_invalid",
-                "console",
-                locale=configGet("locale_log").format(
-                    configGet("address", "posting", "api"),
-                    configGet("username", "posting", "api"),
-                    response.status,
-                ),
-            )
-        )
+    response = post(configGet("address", "posting", "api")+"/token", data=payload)
+    if response.status_code != 200:
+        logWrite(f'Incorrect API credentials! Could not login into "{configGet("address", "posting", "api")}" using login "{configGet("username", "posting", "api")}": HTTP {response.status_code}')
        raise ValueError
-    async with aiofiles.open(
-        configGet("cache", "locations") + sep + "api_access", "wb"
-    ) as file:
-        await file.write(
-            b64encode((await response.json())["access_token"].encode("utf-8"))
-        )
-    return (await response.json())["access_token"]
-
+    with open(configGet("cache", "locations")+sep+"api_access", "wb") as file:
+        file.write(b64encode(response.json()["access_token"].encode("utf-8")))
+    return response.json()["access_token"]

 async def random_pic(token: Union[str, None] = None) -> Tuple[str, str]:
    """Returns random image id and filename from the queue.

    ### Returns:
        * `Tuple[str, str]`: First value is an ID and the filename in the filesystem to be indexed.
-    """
+    """    
    token = await authorize() if token is None else token
-    logWrite(
-        f'{configGet("address", "posting", "api")}/albums/{configGet("album", "posting", "api")}/photos?q=&page_size={configGet("page_size", "posting")}&caption=queue'
-    )
-    resp = await http_session.get(
-        f'{configGet("address", "posting", "api")}/albums/{configGet("album", "posting", "api")}/photos?q=&page_size={configGet("page_size", "posting")}&caption=queue',
-        headers={"Authorization": f"Bearer {token}"},
-    )
-    logWrite(
-        locale("random_pic_response", "console", locale=configGet("locale_log")).format(
-            await resp.json()
-        ),
-        debug=True,
-    )
-    if resp.status != 200:
-        logWrite(
-            locale(
-                "random_pic_error_code",
-                "console",
-                locale=configGet("locale_log").format(
-                    configGet("album", "posting", "api"), resp.status
-                ),
-            ),
-        )
-        logWrite(
-            locale(
-                "random_pic_error_debug",
-                "console",
-                locale=configGet("locale_log").format(
-                    configGet("address", "posting", "api"),
-                    configGet("album", "posting", "api"),
-                    configGet("page_size", "posting"),
-                    token,
-                    resp.status,
-                ),
-            ),
-            debug=True,
-        )
+    logWrite(f'{configGet("address", "posting", "api")}/albums/{configGet("album", "posting", "api")}/photos?q=&page_size=100&caption=queue')
+    resp = get(f'{configGet("address", "posting", "api")}/albums/{configGet("album", "posting", "api")}/photos?q=&page_size=100&caption=queue', headers={"Authorization": f"Bearer {token}"})
+    if resp.status_code != 200:
+        logWrite(f'Could not get photos from album {configGet("album", "posting", "api")}: HTTP {resp.status_code}')
+        logWrite(f'Could not get photos from "{configGet("address", "posting", "api")}/albums/{configGet("album", "posting", "api")}/photos?q=&page_size=100&caption=queue" using token "{token}": HTTP {resp.status_code}', debug=True)
        raise ValueError
-    if len((await resp.json())["results"]) == 0:
+    if len(resp.json()["results"]) == 0:
        raise KeyError
-    pic = choice((await resp.json())["results"])
+    pic = choice(resp.json()["results"])
    return pic["id"], pic["filename"]

-
-async def upload_pic(
-    filepath: str, allow_duplicates: bool = False, token: Union[str, None] = None
-) -> Tuple[bool, list, Union[str, None]]:
+async def upload_pic(filepath: str, token: Union[str, None] = None) -> Tuple[bool, list]:
    token = await authorize() if token is None else token
    try:
        pic_name = path.basename(filepath)
-        logWrite(f"Uploading {pic_name} to the API...", debug=True)
-        async with aiofiles.open(filepath, "rb") as f:
-            file_bytes = await f.read()
-        formdata = FormData()
-        formdata.add_field(
-            "file", file_bytes, filename=pic_name, content_type="image/jpeg"
-        )
-        response = await http_session.post(
-            f'{configGet("address", "posting", "api")}/albums/{configGet("album", "posting", "api")}/photos',
-            params={
-                "caption": "queue",
-                "compress": "false",
-                "ignore_duplicates": str(allow_duplicates).lower(),
-            },
-            headers={"Authorization": f"Bearer {token}"},
-            data=formdata,
-        )
-        response_json = await response.json()
-        if response.status != 200 and response.status != 409:
-            logWrite(
-                locale(
-                    "pic_upload_error",
-                    "console",
-                    locale=configGet("locale_log").format(
-                        filepath, response.status, response.content
-                    ),
-                ),
-            )
-            raise SubmissionUploadError(
-                str(filepath), response.status, response.content
-            )
-        id = response_json["id"] if "id" in await response.json() else None
+        files = {'file': (pic_name, open(filepath, 'rb'), 'image/jpeg')}
+        response = post(f'{configGet("address", "posting", "api")}/albums/{configGet("album", "posting", "api")}/photos', params={"caption": "queue", "compress": False}, headers={"Authorization": f"Bearer {token}"}, files=files)
+        if response.status_code != 200 and response.status_code != 409:
+            logWrite(f"Could not upload '{filepath}' to API: HTTP {response.status_code} with message '{response.content}'")
+            raise SubmissionUploadError(str(filepath), response.status_code, response.content)
        duplicates = []
-        if "duplicates" in response_json:
-            for index, duplicate in enumerate(response_json["duplicates"]):  # type: ignore
-                if response_json["access_token"] is None:
-                    duplicates.append(
-                        f'`{duplicate["id"]}`:\n{configGet("address_external", "posting", "api")}/photos/{duplicate["id"]}'
-                    )
-                else:
-                    duplicates.append(
-                        f'`{duplicate["id"]}`:\n{configGet("address_external", "posting", "api")}/token/photo/{response_json["access_token"]}?id={index}'
-                    )
-        return True, duplicates, id
-    except Exception as exp:
-        print_exc()
-        return False, [], None
-
-
-async def find_pic(
-    name: str, caption: Union[str, None] = None, token: Union[str, None] = None
-) -> Union[dict, None]:
+        if "duplicates" in response.json():
+            for duplicate in response.json()["duplicates"]:
+                duplicates.append(f'{configGet("address_external", "posting", "api")}/photos/{duplicate["id"]}')
+        return True, duplicates
+    except:
+        return False, []
+    
+async def find_pic(name: str, caption: Union[str, None] = None, token: Union[str, None] = None) -> Union[dict, None]:
    token = await authorize() if token is None else token
    try:
-        response = await http_session.get(
-            f'{configGet("address", "posting", "api")}/albums/{configGet("album", "posting", "api")}/photos',
-            params={"q": name, "caption": caption},
-            headers={"Authorization": f"Bearer {token}"},
-        )
+        response = get(f'{configGet("address", "posting", "api")}/albums/{configGet("album", "posting", "api")}/photos', params={"q": name, "caption": caption}, headers={"Authorization": f"Bearer {token}"})
        # logWrite(response.json())
-        if response.status != 200:
+        if response.status_code != 200:
            return None
-        if len((await response.json())["results"]) == 0:
+        if len(response.json()["results"]) == 0:
            return None
-        return (await response.json())["results"]
+        return response.json()["results"]
    except Exception as exp:
-        logWrite(
-            locale(
-                "find_pic_error",
-                "console",
-                locale=configGet("locale_log").format(name, caption, exp),
-            ),
-        )
+        logWrite(f"Could not find image with name '{name}' and caption '{caption}' due to: {exp}")
        return None

-
 async def move_pic(id: str, token: Union[str, None] = None) -> bool:
    token = await authorize() if token is None else token
    try:
-        response = await http_session.patch(
-            f'{configGet("address", "posting", "api")}/photos/{id}?caption=sent',
-            headers={"Authorization": f"Bearer {token}"},
-        )
-        if response.status != 200:
-            logWrite(f"Media moving failed with HTTP {response.status}", debug=True)
-            return False
+        patch(f'{configGet("address", "posting", "api")}/photos/{id}?caption=sent', headers={"Authorization": f"Bearer {token}"})
        return True
    except:
        return False

-
-async def remove_pic(id: str, token: Union[str, None] = None) -> bool:
-    token = await authorize() if token is None else token
-    try:
-        response = await http_session.delete(
-            f'{configGet("address", "posting", "api")}/photos/{id}',
-            headers={"Authorization": f"Bearer {token}"},
-        )
-        if response.status != 204:
-            logWrite(f"Media removal failed with HTTP {response.status}", debug=True)
-            return False
-        return True
-    except:
-        return False
-
-
-async def create_user(username: str, email: str, password: str) -> None:
-    response = await http_session.post(
-        f'{configGet("address", "posting", "api")}/users',
-        data={"user": username, "email": email, "password": password},
-    )
-    if response.status == 409:
-        raise UserCreationDuplicateError(username)
-    elif response.status != 204:
-        raise UserCreationError(response.status, await response.text(encoding="utf-8"))
-    return None
-
-
-async def create_album(name: str, title: str) -> None:
-    token = await authorize()
-    response = await http_session.post(
-        f'{configGet("address", "posting", "api")}/albums',
-        params={"name": name, "title": title},
-        headers={"Authorization": f"Bearer {token}"},
-    )
-    if response.status == 409:
-        raise AlbumCreationDuplicateError(name)
-    elif response.status == 406:
-        raise AlbumCreationNameError(await response.json())
-    elif response.status != 200:
-        raise AlbumCreationError(response.status, await response.text(encoding="utf-8"))
-    return None
-
-
 if __name__ == "__main__":
-    print(asyncio.run(authorize()))
+    print(asyncio.run(authorize()))
--- a/modules/app.py
+++ b/modules/app.py
@@ -1,14 +1,4 @@
 from modules.utils import configGet
 from classes.poster_client import PosterClient
-from convopyro import Conversation

-app = PosterClient(
-    "duptsiaposter",
-    bot_token=configGet("bot_token", "bot"),
-    api_id=configGet("api_id", "bot"),
-    api_hash=configGet("api_hash", "bot"),
-)
-
-Conversation(app)
-
-users_with_context = []
+app = PosterClient("duptsiaposter", bot_token=configGet("bot_token", "bot"), api_id=configGet("api_id", "bot"), api_hash=configGet("api_hash", "bot"))
--- a/modules/cli.py
+++ b/modules/cli.py
@@ -1,78 +0,0 @@
-import asyncio
-from sys import exit
-from traceback import print_exc
-from modules.api_client import create_album, create_user, http_session
-from argparse import ArgumentParser
-
-from modules.utils import configSet
-
-parser = ArgumentParser(
-    prog="Telegram Poster",
-    description="Bot for posting some of your stuff and also receiving submissions.",
-)
-
-parser.add_argument("--create-user", action="store_true")
-parser.add_argument("--create-album", action="store_true")
-
-args = parser.parse_args()
-
-
-async def cli_create_user() -> None:
-    print(
-        "To set up Photos API connection you need to create a new user.\nIf you have email confirmation enabled in your Photos API config - you need to use a real email that will get a confirmation code afterwards.",
-        flush=True,
-    )
-    username = input("Choose username for new Photos API user: ").strip()
-    email = input(f"Choose email for user '{username}': ").strip()
-    password = input(f"Choose password for user '{username}': ").strip()
-    try:
-        result_1 = await create_user(username, email, password)
-        # asyncio.run(create_user(username, email, password))
-        configSet("username", username, "posting", "api")
-        configSet("password", password, "posting", "api")
-        none = input(
-            "Alright. If you have email confirmation enabled - please confirm registration by using the link in your email. After that press Enter. Otherwise just press Enter."
-        )
-    except Exception as exp:
-        print(f"Could not create a user due to {exp}", flush=True)
-        print_exc()
-        exit()
-    if not args.create_album:
-        print("You're done!", flush=True)
-        await http_session.close()
-        exit()
-    return None
-
-
-async def cli_create_album() -> None:
-    print(
-        "To use Photos API your user needs to have an album to store its data.\nThis wizard will help you to create a new album with its name and title.",
-        flush=True,
-    )
-    name = input("Choose a name for your album: ").strip()
-    title = input(f"Choose a title for album '{name}': ").strip()
-    try:
-        result_2 = await create_album(name, title)
-        # asyncio.run(create_album(name, title))
-        configSet("album", name, "posting", "api")
-    except Exception as exp:
-        print(f"Could not create an album due to {exp}", flush=True)
-        print_exc()
-        exit()
-    print("You're done!", flush=True)
-    await http_session.close()
-    exit()
-    return None
-
-
-if args.create_user or args.create_album:
-    loop = asyncio.get_event_loop()
-    tasks = []
-
-    if args.create_user:
-        loop.run_until_complete(asyncio.wait([loop.create_task(cli_create_user())]))
-
-    if args.create_album:
-        loop.run_until_complete(asyncio.wait([loop.create_task(cli_create_album())]))
-
-    loop.close()
--- a/modules/commands_register.py
+++ b/modules/commands_register.py
@@ -3,35 +3,21 @@ from classes.poster_client import PosterClient
 from pyrogram.types import BotCommand, BotCommandScopeChat
 from modules.utils import configGet, locale

+async def register_commands(app: PosterClient):

-async def register_commands(app: PosterClient) -> None:
    if configGet("submit", "mode"):
        # Registering user commands
        for entry in 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", "")
-                            ),
-                        )
-                    )
-                await app.set_bot_commands(
-                    commands_list, language_code=entry.replace(".json", "")
-                )
+                    commands_list.append(BotCommand(command, locale(command, "commands", locale=entry.replace(".json", ""))))
+                await app.set_bot_commands(commands_list, language_code=entry.replace(".json", ""))

        # 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")),
-                )
-            )
+            commands_list.append(BotCommand(command, locale(command, "commands", locale=configGet("locale_fallback"))))
        await app.set_bot_commands(commands_list)

    # Registering admin commands
@@ -39,19 +25,10 @@ async def register_commands(app: PosterClient) -> None:

    if configGet("submit", "mode"):
        for command in configGet("commands"):
-            commands_admin_list.append(
-                BotCommand(
-                    command, locale(command, "commands", locale=configGet("locale"))
-                )
-            )
+
+            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"))
-            )
-        )
+        commands_admin_list.append(BotCommand(command, locale(command, "commands_admin", locale=configGet("locale"))))

    for admin in app.admins:
-        await app.set_bot_commands(
-            commands_admin_list, scope=BotCommandScopeChat(chat_id=admin)
-        )
+        await app.set_bot_commands(commands_admin_list, scope=BotCommandScopeChat(chat_id=admin))
--- a/modules/database.py
+++ b/modules/database.py
@@ -8,16 +8,18 @@ with open("config.json", "r", encoding="utf-8") as f:
    f.close()

 if db_config["user"] is not None and db_config["password"] is not None:
-    con_string = "mongodb://{0}:{1}@{2}:{3}/{4}".format(
+    con_string = 'mongodb://{0}:{1}@{2}:{3}/{4}'.format(
        db_config["user"],
        db_config["password"],
        db_config["host"],
        db_config["port"],
-        db_config["name"],
+        db_config["name"]
    )
 else:
-    con_string = "mongodb://{0}:{1}/{2}".format(
-        db_config["host"], db_config["port"], db_config["name"]
+    con_string = 'mongodb://{0}:{1}/{2}'.format(
+        db_config["host"],
+        db_config["port"],
+        db_config["name"]
    )

 db_client = MongoClient(con_string)
@@ -32,4 +34,4 @@ for collection in ["sent", "users", "banned", "submitted"]:
 col_sent = db.get_collection("sent")
 col_users = db.get_collection("users")
 col_banned = db.get_collection("banned")
-col_submitted = db.get_collection("submitted")
+col_submitted = db.get_collection("submitted")
--- a/modules/http_client.py
+++ b/modules/http_client.py
@@ -1,6 +0,0 @@
-from aiohttp import ClientSession
-from ujson import dumps
-
-http_session = ClientSession(
-    json_serialize=dumps,
-)
--- a/modules/logger.py
+++ b/modules/logger.py
@@ -1,19 +1,23 @@
-from datetime import datetime
+try:
+    from ujson import loads
+except ModuleNotFoundError:
+    from json import loads
+
+from os import stat, makedirs, path, getcwd
 from gzip import open as gzipopen
-from os import getcwd, makedirs, path, stat
 from shutil import copyfileobj

-from ujson import loads
+from datetime import datetime

-with open(getcwd() + path.sep + "config.json", "r", encoding="utf8") as file:
+with open(getcwd()+path.sep+"config.json", "r", encoding='utf8') as file:
    json_contents = loads(file.read())
    log_size = json_contents["logging"]["size"]
    log_folder = json_contents["logging"]["location"]
    file.close()

-
 # Check latest log size
-def checkSize(debug=False) -> None:
+def checkSize(debug=False):
+
    global log_folder

    if debug:
@@ -25,26 +29,18 @@ def checkSize(debug=False) -> None:
        makedirs(log_folder, exist_ok=True)
        log = stat(path.join(log_folder, log_file))
        if (log.st_size / 1024) > log_size:
-            with open(path.join(log_folder, log_file), "rb") as f_in:
-                with gzipopen(
-                    path.join(
-                        log_folder,
-                        f'{datetime.now().strftime("%d.%m.%Y_%H:%M:%S")}.log.gz',
-                    ),
-                    "wb",
-                ) as f_out:
+            with open(path.join(log_folder, log_file), 'rb') as f_in:
+                with gzipopen(path.join(log_folder, f'{datetime.now().strftime("%d.%m.%Y_%H:%M:%S")}.log.gz'), 'wb') as f_out:
                    copyfileobj(f_in, f_out)
-                    print(
-                        f'Copied {path.join(log_folder, datetime.now().strftime("%d.%m.%Y_%H:%M:%S"))}.log.gz'
-                    )
-            open(path.join(log_folder, log_file), "w").close()
+                    print(f'Copied {path.join(log_folder, datetime.now().strftime("%d.%m.%Y_%H:%M:%S"))}.log.gz')
+            open(path.join(log_folder, log_file), 'w').close()
    except FileNotFoundError:
-        print(f"Log file {path.join(log_folder, log_file)} does not exist")
+        print(f'Log file {path.join(log_folder, log_file)} does not exist')
        pass

-
 # Append string to log
-def logAppend(message, debug=False) -> None:
+def logAppend(message, debug=False):
+
    global log_folder

    message_formatted = f'[{datetime.now().strftime("%d.%m.%Y")}] [{datetime.now().strftime("%H:%M:%S")}] {message}'
@@ -55,13 +51,12 @@ def logAppend(message, debug=False) -> None:
    else:
        log_file = "latest.log"

-    log = open(path.join(log_folder, log_file), "a")
-    log.write(f"{message_formatted}\n")
+    log = open(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, debug=False) -> None:
+def logWrite(message, debug=False):
    # save to log file and rotation is to be done
-    logAppend(f"{message}", debug=debug)
-    print(f"{message}", flush=True)
+    logAppend(f'{message}', debug=debug)
+    print(f"{message}", flush=True)
--- a/modules/scheduler.py
+++ b/modules/scheduler.py
@@ -10,22 +10,10 @@ scheduler = AsyncIOScheduler()

 if configGet("post", "mode"):
    if configGet("use_interval", "posting"):
-        scheduler.add_job(
-            send_content,
-            "interval",
-            seconds=timeparse(configGet("interval", "posting")),
-            args=[app],
-        )
+        scheduler.add_job(send_content, "interval", seconds=timeparse(configGet("interval", "posting")), args=[app])
    else:
        for entry in configGet("time", "posting"):
            dt_obj = datetime.strptime(entry, "%H:%M")
-            scheduler.add_job(
-                send_content, "cron", hour=dt_obj.hour, minute=dt_obj.minute, args=[app]
-            )
+            scheduler.add_job(send_content, "cron", hour=dt_obj.hour, minute=dt_obj.minute, args=[app])

-scheduler.add_job(
-    register_commands,
-    "date",
-    run_date=datetime.now() + timedelta(seconds=10),
-    args=[app],
-)
+scheduler.add_job(register_commands, "date", run_date=datetime.now()+timedelta(seconds=10), args=[app])
--- a/modules/sender.py
+++ b/modules/sender.py
@@ -1,29 +1,28 @@
 from datetime import datetime
 from os import makedirs, path
-from random import choice
-from shutil import rmtree
+from shutil import copyfileobj, rmtree
 from traceback import format_exc
 from uuid import uuid4
 from PIL import Image
-import aiofiles

+from bson import ObjectId
 from classes.poster_client import PosterClient
+from requests import get

-from modules.api_client import authorize, move_pic, random_pic, http_session
+from modules.api_client import authorize, move_pic, random_pic
 from modules.database import col_sent, col_submitted
 from modules.logger import logWrite
 from modules.utils import configGet, locale


-async def send_content(app: PosterClient) -> None:
+async def send_content(app: PosterClient):
+
    try:
+
        try:
            token = await authorize()
        except ValueError:
-            await app.send_message(
-                app.owner,
-                locale("api_creds_invalid", "message", locale=configGet("locale")),
-            )
+            await app.send_message(app.owner, locale("api_creds_invalid", "message", locale=configGet("locale")))
            return

        try:
@@ -31,37 +30,19 @@ async def send_content(app: PosterClient) -> None:
        except KeyError:
            logWrite(locale("post_empty", "console", locale=configGet("locale")))
            if configGet("error", "reports"):
-                await app.send_message(
-                    app.owner,
-                    locale("api_queue_empty", "message", locale=configGet("locale")),
-                )
+                await app.send_message(app.owner, locale("api_queue_empty", "message", locale=configGet("locale")))
            return
        except ValueError:
            if configGet("error", "reports"):
-                await app.send_message(
-                    app.owner,
-                    locale("api_queue_error", "message", locale=configGet("locale")),
-                )
+                await app.send_message(app.owner, locale("api_queue_error", "message", locale=configGet("locale")))
            return
+        
+        response = get(f'{configGet("address", "posting", "api")}/photos/{pic[0]}', headers={"Authorization": f"Bearer {token}"}, stream=True)

-        response = await http_session.get(
-            f'{configGet("address", "posting", "api")}/photos/{pic[0]}',
-            headers={"Authorization": f"Bearer {token}"},
-        )
-
-        if response.status != 200:
-            logWrite(
-                locale(
-                    "post_invalid_pic", "console", locale=configGet("locale")
-                ).format(response.status, str(response.json()))
-            )
+        if response.status_code != 200:
+            logWrite(locale("post_invalid_pic", "console", locale=configGet("locale")).format(str(response.json())))
            if configGet("error", "reports"):
-                await app.send_message(
-                    app.owner,
-                    locale(
-                        "post_invalid_pic", "message", locale=configGet("locale")
-                    ).format(response.status, response.json()),
-                )
+                await app.send_message(app.owner, locale("post_invalid_pic", "message", locale=configGet("locale")).format(response.json()))

        tmp_dir = str(uuid4())

@@ -69,89 +50,48 @@ async def send_content(app: PosterClient) -> None:

        tmp_path = path.join(tmp_dir, pic[1])

-        async with aiofiles.open(
-            path.join(configGet("tmp", "locations"), tmp_path), "wb"
-        ) as out_file:
-            await out_file.write(await response.read())
+        with open(path.join(configGet("tmp", "locations"), tmp_path), 'wb') as out_file:
+            copyfileobj(response.raw, out_file)

-        logWrite(
-            f'Candidate {pic[1]} ({pic[0]}) is {path.getsize(path.join(configGet("tmp", "locations"), tmp_path))} bytes big',
-            debug=True,
-        )
+        logWrite(f'Candidate {pic[1]} ({pic[0]}) is {path.getsize(path.join(configGet("tmp", "locations"), tmp_path))} bytes big', debug=True)

        if path.getsize(path.join(configGet("tmp", "locations"), tmp_path)) > 5242880:
            image = Image.open(path.join(configGet("tmp", "locations"), tmp_path))
            width, height = image.size
-            image = image.resize((int(width / 2), int(height / 2)), Image.ANTIALIAS)
+            image = image.resize((int(width/2), int(height/2)), Image.ANTIALIAS)
            if tmp_path.lower().endswith(".jpeg") or tmp_path.lower().endswith(".jpg"):
-                image.save(
-                    path.join(configGet("tmp", "locations"), tmp_path),
-                    "JPEG",
-                    optimize=True,
-                    quality=50,
-                )
+                image.save(path.join(configGet("tmp", "locations"), tmp_path), "JPEG", optimize=True, quality=50)
            elif tmp_path.lower().endswith(".png"):
-                image.save(
-                    path.join(configGet("tmp", "locations"), tmp_path),
-                    "PNG",
-                    optimize=True,
-                    compress_level=8,
-                )
+                image.save(path.join(configGet("tmp", "locations"), tmp_path), "PNG", optimize=True, compress_level=8)
            image.close()
-
+        
        if path.getsize(path.join(configGet("tmp", "locations"), tmp_path)) > 5242880:
-            rmtree(
-                path.join(configGet("tmp", "locations"), tmp_dir), ignore_errors=True
-            )
+            rmtree(path.join(configGet("tmp", "locations"), tmp_dir), ignore_errors=True)
            raise BytesWarning

        del response

-        submitted = col_submitted.find_one({"temp.file": pic[1]})
+        submitted_caption = col_submitted.find_one( {"image": ObjectId(pic[0])} )

-        if submitted is not None and submitted["caption"] is not None:
-            caption = submitted["caption"].strip()
+        if submitted_caption is not None:
+            caption = submitted_caption["caption"].strip()
        else:
            caption = ""

-        if (
-            submitted is not None
-            and configGet("enabled", "posting", "submitted_caption")
-            and (
-                (submitted["user"] not in app.admins)
-                or (configGet("ignore_admins", "posting", "submitted_caption") is False)
-            )
-        ):
-            caption = (
-                f"{caption}\n\n{configGet('text', 'posting', 'submitted_caption')}\n"
-            )
-        else:
-            caption = f"{caption}\n\n"
-
        if configGet("enabled", "caption"):
            if configGet("link", "caption") != None:
-                caption = f"{caption}[{choice(configGet('text', 'caption'))}]({configGet('link', 'caption')})"
+                caption = f"{caption}\n\n[{configGet('text', 'caption')}]({configGet('link', 'caption')})"
            else:
-                caption = f"{caption}{choice(configGet('text', 'caption'))}"
+                caption = f"{caption}\n\n{configGet('text', 'caption')}"
        else:
            caption = caption

        try:
-            sent = await app.send_photo(
-                configGet("channel", "posting"),
-                path.join(configGet("tmp", "locations"), tmp_path),
-                caption=caption,
-                disable_notification=configGet("silent", "posting"),
-            )
+            sent = await app.send_photo(configGet("channel", "posting"), path.join(configGet("tmp", "locations"), tmp_path), caption=caption, disable_notification=configGet("silent", "posting"))
        except Exception as exp:
            logWrite(f"Could not send image {pic[1]} ({pic[0]}) due to {exp}")
            if configGet("error", "reports"):
-                await app.send_message(
-                    app.owner,
-                    locale(
-                        "post_exception", "message", locale=configGet("locale")
-                    ).format(exp, format_exc()),
-                )
+                await app.send_message(app.owner, locale("post_exception", "message", locale=configGet("locale")).format(exp, format_exc()))
            # rmtree(path.join(configGet("tmp", "locations"), tmp_dir), ignore_errors=True)
            return

@@ -161,9 +101,7 @@ async def send_content(app: PosterClient) -> None:
                "image": pic[0],
                "filename": pic[1],
                "channel": configGet("channel", "posting"),
-                "caption": None
-                if (submitted is None or submitted["caption"] is None)
-                else submitted["caption"].strip(),
+                "caption": None if submitted_caption is None else submitted_caption["caption"].strip()
            }
        )

@@ -171,31 +109,147 @@ async def send_content(app: PosterClient) -> None:

        rmtree(path.join(configGet("tmp", "locations"), tmp_dir), ignore_errors=True)

-        logWrite(
-            locale("post_sent", "console", locale=configGet("locale")).format(
-                pic[0],
-                str(configGet("channel", "posting")),
-                caption.replace("\n", "%n"),
-                str(configGet("silent", "posting")),
-            )
-        )
+        logWrite(locale("post_sent", "console", locale=configGet("locale")).format(pic[0], str(configGet("channel", "posting")), caption.replace("\n", "%n"), str(configGet("silent", "posting"))))

    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")).format(str(exp), format_exc()))
        if configGet("error", "reports"):
-            await app.send_message(
-                app.owner,
-                locale("post_exception", "message", locale=configGet("locale")).format(
-                    exp, format_exc()
-                ),
-            )
+            await app.send_message(app.owner, locale("post_exception", "message", locale=configGet("locale")).format(exp, format_exc()))
        try:
-            rmtree(
-                path.join(configGet("tmp", "locations"), tmp_dir), ignore_errors=True
-            )
+            rmtree(path.join(configGet("tmp", "locations"), tmp_dir), ignore_errors=True)
        except:
            pass
+
+
+# async def send_content_old(app: PosterClient):
+
+#     # Send post to channel
+#     try:
+
+#         index = jsonLoad(configGet("index", "locations"))
+
+#         if configGet("api_based", "mode"):
+
+#             try:
+#                 pic = random_pic()
+#             except:
+#                 logWrite(locale("post_empty", "console", locale=configGet("locale")))
+#                 if configGet("error", "reports"):
+#                     await app.send_message(configGet("admin"), locale("post_empty", "message", locale=configGet("locale")))
+#                 return
+
+#             token = authorize()
+
+#             response = get(f'{configGet("address", "posting", "api")}/photos/{pic[0]}', headers={"Authorization": f"Bearer {token}"}, stream=True)
+
+#             with open(configGet("tmp", "locations")+sep+pic[0]+".jpg", 'wb') as out_file:
+#                 copyfileobj(response.raw, out_file)
+
+#             del response
+
+#             candidate = configGet("tmp", "locations")+sep+pic[0]+".jpg"
+#             candidate_file = pic[1]
+#             ext_type = "photo"
+
+#         if not configGet("api_based", "mode"):
+
+#             list_queue = listdir(configGet("queue", "locations"))
+
+#             for file in list_queue:
+
+#                 if not file in index["sent"]:
+
+#                     ext_match = False
+
+#                     for ext in configGet("photo", "posting", "extensions"):
+#                         if file.endswith(ext):
+#                             ext_match = True
+#                             ext_type = "photo"
+#                             break
+
+#                     for ext in configGet("video", "posting", "extensions"):
+#                         if file.endswith(ext):
+#                             ext_match = True
+#                             ext_type = "video"
+#                             break
+
+#                     if not ext_match:
+#                         list_queue.remove(file)
+
+#                 else:
+#                     list_queue.remove(file)
+
+#             if len(list_queue) > 0:
+#                 candidate_file = choice(list_queue)
+#                 candidate = configGet("queue", "locations")+sep+candidate_file
+#             else:
+#                 logWrite(locale("post_empty", "console", locale=configGet("locale")))
+#                 if configGet("error", "reports"):
+#                     await app.send_message(configGet("admin"), locale("post_empty", "message", locale=configGet("locale")))
+#                 return
+
+#         if candidate_file in index["captions"]:
+#             caption = index["captions"][candidate_file]
+#         else:
+#             caption = ""
+
+#         if configGet("enabled", "caption"):
+#             if configGet("link", "caption") != None:
+#                 caption = f"{caption}\n\n[{configGet('text', 'caption')}]({configGet('link', 'caption')})"
+#             else:
+#                 caption = f"{caption}\n\n{configGet('text', 'caption')}"
+#         else:
+#             caption = caption
+
+#         if ext_type == "photo":
+
+#             if configGet("enabled", "caption"):
+#                 if configGet("link", "caption") != None:
+#                     sent = await app.send_photo(configGet("channel", "posting"), candidate, caption=caption, disable_notification=configGet("silent", "posting"))
+#                 else:
+#                     sent = await app.send_photo(configGet("channel", "posting"), candidate, caption=caption, disable_notification=configGet("silent", "posting"))
+#             else:
+#                 sent = await app.send_photo(configGet("channel", "posting"), candidate, caption=caption, disable_notification=configGet("silent", "posting"))
+
+#         elif ext_type == "video":
+
+#             if configGet("enabled", "caption"):
+#                 if configGet("link", "caption") != None:
+#                     sent = await app.send_video(configGet("channel", "posting"), candidate, caption=caption, disable_notification=configGet("silent", "posting"))
+#                 else:
+#                     sent = await app.send_video(configGet("channel", "posting"), candidate, caption=caption, disable_notification=configGet("silent", "posting"))
+#             else:
+#                 sent = await app.send_video(configGet("channel", "posting"), candidate, caption=caption, disable_notification=configGet("silent", "posting"))
+
+#         else:
+#             return
+
+#         if configGet("api_based", "mode"):
+#             remove(configGet("tmp", "locations")+sep+pic[0]+".jpg")
+#             move_pic(pic[0])
+
+#         index["sent"].append(candidate_file)
+#         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")).format(candidate, ext_type, str(configGet("channel", "posting")), caption.replace("\n", "%n"), str(configGet("silent", "posting"))))
+
+#         if configGet("sent", "reports"):
+#             await app.send_message(configGet("admin"), f"Posted `{candidate_file}`", disable_web_page_preview=True, reply_markup=InlineKeyboardMarkup([
+#                 [InlineKeyboardButton(locale("post_view", "button", locale=configGet("locale")), url=sent.link)]
+#             ]))
+
+#     except Exception as exp:
+#         logWrite(locale("post_exception", "console", locale=configGet("locale")).format(str(exp), format_exc()))
+#         if configGet("error", "reports"):
+#             await app.send_message(configGet("admin"), locale("post_exception", "message", locale=configGet("locale")).format(exp, format_exc()))
+#         pass
+
+
+    # Work in progress
+    # Check last posts forwards
+    # check_forwards(app)
--- a/modules/submissions.py
+++ b/modules/submissions.py
@@ -0,0 +1,18 @@
+from modules.app import app
+from datetime import datetime
+from modules.utils import configGet
+from modules.database import col_users
+from pyrogram.types.user_and_chats import User
+
+def subLimit(user: User) -> None:
+    if col_users.find_one_and_update({"user": user.id}, {"$set": {"cooldown": datetime.now()}}) is None:
+        col_users.insert_one({"user": user.id, "cooldown": datetime.now()})
+
+def subLimited(user: User) -> bool:
+    if user.id in app.admins:
+        return False
+    else:
+        db_record = col_users.find_one({"user": user.id})
+        if db_record is None:
+            return False
+        return True if (datetime.now() - db_record["cooldown"]).total_seconds() < configGet("timeout", "submission") else False
--- a/modules/utils.py
+++ b/modules/utils.py
@@ -1,125 +1,36 @@
-from os import kill, makedirs
-from os import name as osname
-from os import path, sep
-from sys import exit
-from traceback import print_exc
-from typing import Any
-from zipfile import ZipFile
+try:
+    from ujson import JSONDecodeError as JSONDecodeError
+    from ujson import loads, dumps
+except ModuleNotFoundError:
+    from json import JSONDecodeError as JSONDecodeError
+    from json import loads, dumps

-import aiofiles
-from ujson import JSONDecodeError, dumps, loads
+from sys import exit
+from os import sep, kill
+from os import name as osname
+from traceback import print_exc

 from modules.logger import logWrite

-default_config = {
-    "locale": "en",
-    "locale_log": "en",
-    "locale_fallback": "en",
-    "owner": 0,
-    "admins": [],
-    "bot": {"api_id": 0, "api_hash": "", "bot_token": ""},
-    "database": {
-        "user": None,
-        "password": None,
-        "host": "127.0.0.1",
-        "port": 27017,
-        "name": "tgposter",
-    },
-    "mode": {"post": True, "submit": True},
-    "reports": {"sent": False, "error": True, "startup": True, "shutdown": True},
-    "logging": {"size": 512, "location": "logs"},
-    "locations": {
-        "tmp": "tmp",
-        "data": "data",
-        "cache": "cache",
-        "sent": "data/sent",
-        "queue": "data/queue",
-        "index": "data/index.json",
-        "locale": "locale",
-    },
-    "posting": {
-        "channel": 0,
-        "silent": False,
-        "move_sent": False,
-        "use_interval": False,
-        "interval": "1h30m",
-        "page_size": 300,
-        "submitted_caption": {
-            "enabled": True,
-            "ignore_admins": True,
-            "text": "#submitted",
-        },
-        "extensions": {
-            "photo": ["jpg", "png", "gif", "jpeg"],
-            "video": ["mp4", "avi", "mkv", "webm", "mov"],
-        },
-        "time": [
-            "08:00",
-            "10:00",
-            "12:00",
-            "14:00",
-            "16:00",
-            "18:00",
-            "20:00",
-            "22:00",
-        ],
-        "api": {
-            "address": "http://localhost:8054",
-            "address_external": "https://photos.domain.com",
-            "username": "",
-            "password": "",
-            "album": "",
-        },
-    },
-    "caption": {"enabled": False, "link": None, "text": ["sample text"]},
-    "submission": {
-        "timeout": 30,
-        "file_size": 15728640,
-        "tmp_size": 15728640,
-        "allow_duplicates": False,
-        "send_uploaded_id": False,
-        "require_confirmation": {"users": True, "admins": True},
-        "mime_types": [
-            "image/png",
-            "image/gif",
-            "image/jpeg",
-            "video/mp4",
-            "video/quicktime",
-        ],
-    },
-    "commands": ["start", "rules"],
-    "commands_admin": ["import", "export", "shutdown"],
-}
-
-
-def jsonLoad(filename: str) -> Any:
+def jsonLoad(filename):
    """Loads arg1 as json and returns its contents"""
-    with open(filename, "r", encoding="utf8") as file:
+    with open(filename, "r", encoding='utf8') as file:
        try:
            output = loads(file.read())
        except JSONDecodeError:
-            logWrite(
-                f"Could not load json file {filename}: file seems to be incorrect!\n{print_exc()}"
-            )
+            logWrite(f"Could not load json file {filename}: file seems to be incorrect!\n{print_exc()}")
            raise
        except FileNotFoundError:
-            logWrite(
-                f"Could not load json file {filename}: file does not seem to exist!\n{print_exc()}"
-            )
+            logWrite(f"Could not load json file {filename}: file does not seem to exist!\n{print_exc()}")
            raise
        file.close()
    return output

-
-def jsonSave(contents: Any, filename: str) -> None:
+def jsonSave(contents, filename):
    """Dumps dict/list arg1 to file arg2"""
    try:
-        with open(filename, "w", encoding="utf8") as file:
-            file.write(
-                dumps(
-                    contents, ensure_ascii=False, indent=4, escape_forward_slashes=False
-                )
-            )
+        with open(filename, "w", encoding='utf8') as file:
+            file.write(dumps(contents, ensure_ascii=False, indent=4))
            file.close()
    except Exception as exp:
        logWrite(f"Could not save json file {filename}: {exp}\n{print_exc()}")
@@ -132,7 +43,7 @@ def configSet(key: str, value, *args: str):
        * key (str): The last key of the keys path.
        * value (str/int/float/list/dict/None): Some needed value.
        * *args (str): Path to key like: dict[args][key].
-    """
+    """    
    this_dict = jsonLoad("config.json")
    string = "this_dict"
    for arg in args:
@@ -145,7 +56,6 @@ def configSet(key: str, value, *args: str):
    jsonSave(this_dict, "config.json")
    return

-
 def configGet(key: str, *args: str):
    """Get value of the config key
    Args:
@@ -153,25 +63,13 @@ def configGet(key: str, *args: str):
        * *args (str): Path to key like: dict[args][key].
    Returns:
        * any: Value of provided key
-    """
+    """    
    this_dict = jsonLoad("config.json")
-    try:
-        this_key = this_dict
-        for dict_key in args:
-            this_key = this_key[dict_key]
-        this_key[key]
-    except KeyError:
-        print(
-            f"Could not find config key '{key}' under path {args}: falling back to default config",
-            flush=True,
-        )
-        this_key = default_config
-        for dict_key in args:
-            this_key = this_key[dict_key]
-        configSet(key, this_key[key], *args)
+    this_key = this_dict
+    for dict_key in args:
+        this_key = this_key[dict_key]
    return this_key[key]

-
 def locale(key: str, *args: str, locale=configGet("locale")):
    """Get value of locale string
    Args:
@@ -180,73 +78,40 @@ def locale(key: str, *args: str, locale=configGet("locale")):
        * locale (str): Locale to looked up in. Defaults to config's locale value.
    Returns:
        * any: Value of provided locale key
-    """
-    if locale == None:
+    """ 
+    if (locale == None):
        locale = configGet("locale")
-
+    
    try:
        this_dict = jsonLoad(f'{configGet("locale", "locations")}{sep}{locale}.json')
    except FileNotFoundError:
        try:
-            this_dict = jsonLoad(
-                f'{configGet("locale", "locations")}{sep}{configGet("locale")}.json'
-            )
+            this_dict = jsonLoad(f'{configGet("locale", "locations")}{sep}{configGet("locale")}.json')
        except FileNotFoundError:
            try:
-                this_dict = jsonLoad(
-                    f'{configGet("locale_fallback", "locations")}{sep}{configGet("locale")}.json'
-                )
+                this_dict = jsonLoad(f'{configGet("locale_fallback", "locations")}{sep}{configGet("locale")}.json')
            except:
                return f'⚠️ Locale in config is invalid: could not get "{key}" in {str(args)} from locale "{locale}"'

    this_key = this_dict
    for dict_key in args:
        this_key = this_key[dict_key]
-
+        
    try:
        return this_key[key]
    except KeyError:
        return f'⚠️ Locale in config is invalid: could not get "{key}" in {str(args)} from locale "{locale}"'

-
-async def extract_and_save(handle: ZipFile, filename: str, destpath: str):
-    """Extract and save file from archive
-
-    Args:
-        * handle (ZipFile): ZipFile handler
-        * filename (str): File base name
-        * path (str): Path where to store
-    """
-    data = handle.read(filename)
-    filepath = path.join(destpath, filename)
-    try:
-        makedirs(path.dirname(filepath), exist_ok=True)
-        async with aiofiles.open(filepath, "wb") as fd:
-            await fd.write(data)
-        logWrite(f"Unzipped {filename}", debug=True)
-    except IsADirectoryError:
-        makedirs(filepath, exist_ok=True)
-    except FileNotFoundError:
-        pass
-    return
-
-
 try:
    from psutil import Process
 except ModuleNotFoundError:
    print(locale("deps_missing", "console", locale=configGet("locale")), flush=True)
    exit()

-
-def killProc(pid: int) -> None:
-    """Kill process by its PID. Meant to be used to kill the main process of bot itself.
-
-    ### Args:
-        * pid (`int`): PID of the target
-    """
+def killProc(pid):
    if osname == "posix":
        from signal import SIGKILL
-
        kill(pid, SIGKILL)
    else:
-        Process(pid).kill()
+        p = Process(pid)
+        p.kill()
--- a/plugins/callbacks/nothing.py
+++ b/plugins/callbacks/nothing.py
@@ -4,9 +4,8 @@ from pyrogram.types import CallbackQuery
 from classes.poster_client import PosterClient
 from modules.utils import locale

-
+# Callback empty ===============================================================================================================
@app.on_callback_query(filters.regex("nothing"))
 async def callback_query_nothing(app: PosterClient, clb: CallbackQuery):
-    await clb.answer(
-        text=locale("nothing", "callback", locale=clb.from_user.language_code)
-    )
+    await clb.answer(text=locale("nothing", "callback", locale=clb.from_user))
+# ==============================================================================================================================
--- a/plugins/callbacks/shutdown.py
+++ b/plugins/callbacks/shutdown.py
@@ -1,29 +0,0 @@
-from os import getpid, makedirs, path
-from time import time
-from modules.app import app
-from pyrogram import filters
-from pyrogram.types import CallbackQuery
-from classes.poster_client import PosterClient
-from modules.scheduler import scheduler
-from modules.logger import logWrite
-from modules.utils import configGet, jsonSave, locale
-
-
-@app.on_callback_query(filters.regex("shutdown"))
-async def callback_query_nothing(app: PosterClient, clb: CallbackQuery):
-    if clb.from_user.id in app.admins:
-        pid = getpid()
-        logWrite(f"Shutting down bot with pid {pid}")
-        await clb.answer()
-        await clb.message.reply_text(
-            locale("shutdown", "message", locale=clb.from_user.language_code).format(
-                pid
-            ),
-        )
-        scheduler.shutdown()
-        makedirs(configGet("cache", "locations"), exist_ok=True)
-        jsonSave(
-            {"timestamp": time()},
-            path.join(configGet("cache", "locations"), "shutdown_time"),
-        )
-        exit()
--- a/plugins/callbacks/submission.py
+++ b/plugins/callbacks/submission.py
@@ -1,3 +1,4 @@
+
 from os import path
 from shutil import rmtree
 from pyrogram import filters
@@ -7,7 +8,6 @@ from classes.poster_client import PosterClient
 from classes.user import PosterUser

 from modules.app import app
-from modules.logger import logWrite
 from modules.utils import configGet, locale
 from modules.database import col_submitted
 from bson import ObjectId
@@ -15,6 +15,7 @@ from bson import ObjectId

@app.on_callback_query(filters.regex("sub_yes_[\s\S]*"))
 async def callback_query_yes(app: PosterClient, clb: CallbackQuery):
+
    fullclb = str(clb.data).split("_")
    user_locale = clb.from_user.language_code

@@ -23,86 +24,22 @@ async def callback_query_yes(app: PosterClient, clb: CallbackQuery):
    try:
        submission = await app.submit_photo(fullclb[2])
    except SubmissionUnavailableError:
-        await clb.answer(
-            text=locale("sub_msg_unavail", "callback", locale=user_locale),
-            show_alert=True,
-        )
+        await clb.answer(text=locale("sub_msg_unavail", "callback", locale=user_locale), show_alert=True)
        return
    except SubmissionDuplicatesError as exp:
-        await clb.answer(
-            text=locale("sub_duplicates_found", "callback", locale=user_locale),
-            show_alert=True,
-        )
-        await clb.message.reply_text(
-            locale("sub_media_duplicates_list", "message", locale=user_locale).format(
-                "\n • ".join(exp.duplicates)
-            ),
-            quote=True,
-        )
-        logWrite(
-            locale(
-                "submission_duplicate",
-                "console",
-                locale=configGet("locale_log").format(
-                    fullclb[2],
-                    str(exp.duplicates),
-                ),
-            ),
-            debug=True,
-        )
+        await clb.answer(text=locale("sub_duplicates_found", "callback", locale=user_locale), show_alert=True)
+        await clb.message.reply_text(locale("sub_media_duplicates_list", "message", locale=user_locale).format("\n • ".join(exp.duplicates)), quote=True)
        return

-    if submission[0] is not None:
-        await submission[0].reply_text(
-            locale("sub_yes", "message", locale=submission[0].from_user.language_code),
-            quote=True,
-        )
+    if submission is not None:
+        await submission.reply_text(locale("sub_yes", "message", locale=submission.from_user.language_code), quote=True)
    elif db_entry is not None:
        await app.send_message(db_entry["user"], locale("sub_yes", "message"))

-    await clb.answer(
-        text=locale("sub_yes", "callback", locale=user_locale).format(fullclb[2]),
-        show_alert=True,
-    )
+    await clb.answer(text=locale("sub_yes", "callback", locale=user_locale).format(fullclb[2]), show_alert=True)

-    edited_markup = (
-        [
-            [
-                InlineKeyboardButton(
-                    text=str(locale("accepted", "button", locale=user_locale)),
-                    callback_data="nothing",
-                )
-            ],
-            clb.message.reply_markup.inline_keyboard[1],
-        ]
-        if len(clb.message.reply_markup.inline_keyboard) > 1
-        else [
-            [
-                InlineKeyboardButton(
-                    text=str(locale("accepted", "button", locale=user_locale)),
-                    callback_data="nothing",
-                )
-            ]
-        ]
-    )
-
-    if configGet("send_uploaded_id", "submission"):
-        await clb.message.edit_caption(
-            clb.message.caption + f"\n\nID: `{submission[1]}`"
-        )
-
-    await clb.message.edit_reply_markup(
-        reply_markup=InlineKeyboardMarkup(edited_markup)
-    )
-
-    logWrite(
-        locale(
-            "submission_accepted",
-            "console",
-            locale=configGet("locale_log").format(fullclb[2], submission[1]),
-        ),
-        debug=True,
-    )
+    edited_markup = [[InlineKeyboardButton(text=str(locale("accepted", "button")), callback_data="nothing")], clb.message.reply_markup.inline_keyboard[1]] if len(clb.message.reply_markup.inline_keyboard) > 1 else [[InlineKeyboardButton(text=str(locale("accepted", "button")), callback_data="nothing")]]
+    await clb.message.edit_reply_markup(reply_markup=InlineKeyboardMarkup(edited_markup))

    # try:
    #     if configGet("api_based", "mode") is True:
@@ -127,148 +64,61 @@ async def callback_query_yes(app: PosterClient, clb: CallbackQuery):
    # except:
    #     await clb.answer(text=locale("sub_media_unavail", "message", locale=user_locale), show_alert=True)
    #     return
+    # await submission.reply_text(locale("sub_yes", "message", locale=submission.from_user.language_code), quote=True)
+    # await clb.answer(text=locale("sub_yes", "callback", locale=user_locale).format(fullclb[2]), show_alert=True)
+
+    # edited_markup = [[InlineKeyboardButton(text=str(locale("accepted", "button")), callback_data="nothing")]]
+    # await clb.message.edit(text=clb.message.text, reply_markup=InlineKeyboardMarkup(edited_markup))


@app.on_callback_query(filters.regex("sub_no_[\s\S]*"))
 async def callback_query_no(app: PosterClient, clb: CallbackQuery):
+
    fullclb = str(clb.data).split("_")
    user_locale = clb.from_user.language_code

    db_entry = col_submitted.find_one_and_delete({"_id": ObjectId(fullclb[2])})

    if db_entry["temp"]["uuid"] is not None:
-        if path.exists(
-            path.join(
-                configGet("data", "locations"), "submissions", db_entry["temp"]["uuid"]
-            )
-        ):
-            rmtree(
-                path.join(
-                    configGet("data", "locations"),
-                    "submissions",
-                    db_entry["temp"]["uuid"],
-                ),
-                ignore_errors=True,
-            )
+        if path.exists(path.join(configGet("data", "locations"), "submissions", db_entry["temp"]["uuid"])):
+            rmtree(path.join(configGet("data", "locations"), "submissions", db_entry["temp"]["uuid"]), ignore_errors=True)

    try:
-        submission = await app.get_messages(
-            db_entry["user"], db_entry["telegram"]["msg_id"]
-        )
+        submission = await app.get_messages(db_entry["user"], db_entry["telegram"]["msg_id"])
    except:
-        await clb.answer(
-            text=locale("sub_msg_unavail", "message", locale=user_locale),
-            show_alert=True,
-        )
+        await clb.answer(text=locale("sub_msg_unavail", "message", locale=user_locale), show_alert=True)
        return
+    
+    await submission.reply_text(locale("sub_no", "message", locale=submission.from_user.language_code), quote=True)
+    await clb.answer(text=locale("sub_no", "callback", locale=user_locale).format(fullclb[2]), show_alert=True)

-    await submission.reply_text(
-        locale("sub_no", "message", locale=submission.from_user.language_code),
-        quote=True,
-    )
-    await clb.answer(
-        text=locale("sub_no", "callback", locale=user_locale).format(fullclb[2]),
-        show_alert=True,
-    )
-
-    edited_markup = (
-        [
-            [
-                InlineKeyboardButton(
-                    text=str(locale("declined", "button", locale=user_locale)),
-                    callback_data="nothing",
-                )
-            ],
-            clb.message.reply_markup.inline_keyboard[1],
-        ]
-        if len(clb.message.reply_markup.inline_keyboard) > 1
-        else [
-            [
-                InlineKeyboardButton(
-                    text=str(locale("declined", "button", locale=user_locale)),
-                    callback_data="nothing",
-                )
-            ]
-        ]
-    )
-    await clb.message.edit_reply_markup(
-        reply_markup=InlineKeyboardMarkup(edited_markup)
-    )
-    logWrite(
-        locale(
-            "submission_rejected",
-            "console",
-            locale=configGet("locale_log").format(fullclb[2]),
-        ),
-        debug=True,
-    )
+    edited_markup = [[InlineKeyboardButton(text=str(locale("declined", "button")), callback_data="nothing")], clb.message.reply_markup.inline_keyboard[1]] if len(clb.message.reply_markup.inline_keyboard) > 1 else [[InlineKeyboardButton(text=str(locale("declined", "button")), callback_data="nothing")]]
+    await clb.message.edit_reply_markup(reply_markup=InlineKeyboardMarkup(edited_markup))


@app.on_callback_query(filters.regex("sub_block_[\s\S]*"))
 async def callback_query_block(app: PosterClient, clb: CallbackQuery):
    fullclb = str(clb.data).split("_")
    user_locale = clb.from_user.language_code
-    await app.send_message(
-        int(fullclb[2]), locale("sub_blocked", "message", locale=configGet("locale"))
-    )
+    await app.send_message(int(fullclb[2]), locale("sub_blocked", "message", locale=configGet("locale")))
    PosterUser(int(fullclb[2])).block()
-    await clb.answer(
-        text=locale("sub_block", "callback", locale=user_locale).format(fullclb[2]),
-        show_alert=True,
-    )
+    await clb.answer(text=locale("sub_block", "callback", locale=user_locale).format(fullclb[2]), show_alert=True)

-    edited_markup = [
-        clb.message.reply_markup.inline_keyboard[0],
-        [
-            InlineKeyboardButton(
-                text=str(locale("sub_unblock", "button", locale=user_locale)),
-                callback_data=f"sub_unblock_{fullclb[2]}",
-            )
-        ],
-    ]
-    await clb.message.edit_reply_markup(
-        reply_markup=InlineKeyboardMarkup(edited_markup)
-    )
-    logWrite(
-        locale(
-            "user_blocked",
-            "console",
-            locale=configGet("locale_log").format(fullclb[2]),
-        ),
-        debug=True,
-    )
+    edited_markup = [clb.message.reply_markup.inline_keyboard[0], [InlineKeyboardButton(text=str(locale("sub_unblock", "button")), callback_data=f"sub_unblock_{fullclb[2]}")]]
+    await clb.message.edit_reply_markup(reply_markup=InlineKeyboardMarkup(edited_markup))
+    # edited_markup = [[InlineKeyboardButton(text=str(locale("accepted", "button")), callback_data="nothing")]]
+    # await clb.message.edit(text=clb.message.text, reply_markup=InlineKeyboardMarkup(edited_markup))


-@app.on_callback_query(filters.regex("sub_unblock_[\s\S]*"))
+@app.on_callback_query(filters.regex("sub_unblock_[\s\S]*")) 
 async def callback_query_unblock(app: PosterClient, clb: CallbackQuery):
    fullclb = str(clb.data).split("_")
    user_locale = clb.from_user.language_code
-    await app.send_message(
-        int(fullclb[2]), locale("sub_unblocked", "message", locale=configGet("locale"))
-    )
+    await app.send_message(int(fullclb[2]), locale("sub_unblocked", "message", locale=configGet("locale")))
    PosterUser(int(fullclb[2])).unblock()
-    await clb.answer(
-        text=locale("sub_unblock", "callback", locale=user_locale).format(fullclb[2]),
-        show_alert=True,
-    )
+    await clb.answer(text=locale("sub_unblock", "callback", locale=user_locale).format(fullclb[2]), show_alert=True)

-    edited_markup = [
-        clb.message.reply_markup.inline_keyboard[0],
-        [
-            InlineKeyboardButton(
-                text=str(locale("sub_block", "button", locale=user_locale)),
-                callback_data=f"sub_block_{fullclb[2]}",
-            )
-        ],
-    ]
-    await clb.message.edit_reply_markup(
-        reply_markup=InlineKeyboardMarkup(edited_markup)
-    )
-    logWrite(
-        locale(
-            "user_unblocked",
-            "console",
-            locale=configGet("locale_log").format(fullclb[2]),
-        ),
-        debug=True,
-    )
+    edited_markup = [clb.message.reply_markup.inline_keyboard[0], [InlineKeyboardButton(text=str(locale("sub_block", "button")), callback_data=f"sub_block_{fullclb[2]}")]]
+    await clb.message.edit_reply_markup(reply_markup=InlineKeyboardMarkup(edited_markup))
+    # edited_markup = [[InlineKeyboardButton(text=str(locale("accepted", "button")), callback_data="nothing")]]
+    # await clb.message.edit(text=clb.message.text, reply_markup=InlineKeyboardMarkup(edited_markup))
--- a/plugins/commands/general.py
+++ b/plugins/commands/general.py
@@ -1,45 +1,19 @@
-from os import getpid, makedirs, path
-from time import time
+from os import getpid

 from pyrogram import filters
-from pyrogram.types import Message, InlineKeyboardMarkup, InlineKeyboardButton
-
 from classes.poster_client import PosterClient
-from modules.app import app, users_with_context
+from pyrogram.types import Message
+
+from modules.app import app
 from modules.logger import logWrite
-from modules.scheduler import scheduler
-from modules.utils import configGet, jsonSave, locale
+from modules.utils import configGet, killProc, locale


-@app.on_message(~filters.scheduled & filters.command(["shutdown"], prefixes=["", "/"]))
+@app.on_message(~ filters.scheduled & filters.command(["kill", "die", "reboot"], prefixes=["", "/"]))
 async def cmd_kill(app: PosterClient, msg: Message):
+
    if msg.from_user.id in app.admins:
-        global users_with_context
-        if len(users_with_context) > 0:
-            await msg.reply_text(
-                f"There're {len(users_with_context)} unfinished users' contexts. If you turn off the bot, those will be lost. Please confirm shutdown using a button below.",
-                reply_markup=InlineKeyboardMarkup(
-                    [
-                        [
-                            InlineKeyboardButton(
-                                "Confirm shutdown", callback_data="shutdown"
-                            )
-                        ]
-                    ]
-                ),
-            )
-            return
        pid = getpid()
-        logWrite(f"Shutting down bot with pid {pid}")
-        await msg.reply_text(
-            locale("shutdown", "message", locale=msg.from_user.language_code).format(
-                pid
-            ),
-        )
-        scheduler.shutdown()
-        makedirs(configGet("cache", "locations"), exist_ok=True)
-        jsonSave(
-            {"timestamp": time()},
-            path.join(configGet("cache", "locations"), "shutdown_time"),
-        )
-        exit()
+        logWrite(locale("shutdown", "console", locale=configGet("locale")).format(str(pid)))
+        await msg.reply_text(locale("shutdown", "message", locale=configGet("locale")).format(str(pid)))
+        killProc(pid)
--- a/plugins/commands/mode_submit.py
+++ b/plugins/commands/mode_submit.py
@@ -7,17 +7,12 @@ from classes.user import PosterUser
 from classes.poster_client import PosterClient


-@app.on_message(~filters.scheduled & filters.command(["start"], prefixes="/"))
+@app.on_message(~ filters.scheduled & filters.command(["start"], prefixes="/"))
 async def cmd_start(app: PosterClient, msg: Message):
    if PosterUser(msg.from_user.id).is_blocked() is False:
-        await msg.reply_text(
-            locale("start", "message", locale=msg.from_user.language_code)
-        )
+        await msg.reply_text(locale("start", "message", locale=msg.from_user.language_code))

-
-@app.on_message(~filters.scheduled & filters.command(["rules", "help"], prefixes="/"))
+@app.on_message(~ filters.scheduled & filters.command(["rules", "help"], prefixes="/"))
 async def cmd_rules(app: PosterClient, msg: Message):
    if PosterUser(msg.from_user.id).is_blocked() is False:
-        await msg.reply_text(
-            locale("rules", "message", locale=msg.from_user.language_code)
-        )
+        await msg.reply_text(locale("rules", "message", locale=msg.from_user.language_code))
--- a/plugins/commands/photos.py
+++ b/plugins/commands/photos.py
@@ -1,214 +1,23 @@
-import asyncio
-from glob import iglob
-from os import getcwd, makedirs, path, remove
-from shutil import disk_usage, rmtree
-from traceback import format_exc
-from uuid import uuid4
-from zipfile import ZipFile
+from os import getpid

-from convopyro import listen_message
 from pyrogram import filters
+from classes.poster_client import PosterClient
 from pyrogram.types import Message

-from classes.poster_client import PosterClient
-from modules.api_client import remove_pic, upload_pic
-from modules.app import app, users_with_context
+from modules.app import app
 from modules.logger import logWrite
-from modules.utils import configGet, extract_and_save, locale
+from modules.utils import configGet, killProc, locale


-@app.on_message(~filters.scheduled & filters.command(["import"], prefixes=["", "/"]))
+@app.on_message(~ filters.scheduled & filters.command(["import"], prefixes=["", "/"]))
 async def cmd_import(app: PosterClient, msg: Message):
+
    if msg.from_user.id in app.admins:
-        global users_with_context
-        if msg.from_user.id not in users_with_context:
-            users_with_context.append(msg.from_user.id)
-        else:
-            return
-        await msg.reply_text(
-            locale("import_request", "message", locale=msg.from_user.language_code)
-        )
-        answer = await listen_message(app, msg.chat.id, timeout=600)
-        users_with_context.remove(msg.from_user.id)
-        if answer is None:
-            await msg.reply_text(
-                locale("import_ignored", "message", locale=msg.from_user.language_code),
-                quote=True,
-            )
-            return
-        if answer.text == "/cancel":
-            await answer.reply_text(
-                locale("import_abort", "message", locale=msg.from_user.language_code)
-            )
-            return
-        if answer.document is None:
-            await answer.reply_text(
-                locale(
-                    "import_invalid_media",
-                    "message",
-                    locale=msg.from_user.language_code,
-                ),
-                quote=True,
-            )
-            return
-        if answer.document.mime_type != "application/zip":
-            await answer.reply_text(
-                locale(
-                    "import_invalid_mime", "message", locale=msg.from_user.language_code
-                ),
-                quote=True,
-            )
-            return
-        if disk_usage(getcwd())[2] < (answer.document.file_size) * 3:
-            await msg.reply_text(
-                locale(
-                    "import_too_big", "message", locale=msg.from_user.language_code
-                ).format(
-                    answer.document.file_size // (2**30),
-                    disk_usage(getcwd())[2] // (2**30),
-                )
-            )
-            return
-        tmp_dir = str(uuid4())
-        logWrite(
-            f"Importing '{answer.document.file_name}' file {answer.document.file_size} bytes big (TMP ID {tmp_dir})"
-        )
-        makedirs(path.join(configGet("tmp", "locations"), tmp_dir), exist_ok=True)
-        tmp_path = path.join(configGet("tmp", "locations"), answer.document.file_id)
-        downloading = await answer.reply_text(
-            locale("import_downloading", "message", locale=msg.from_user.language_code),
-            quote=True,
-        )
-        await app.download_media(answer, file_name=tmp_path)
-        await downloading.edit(
-            locale("import_unpacking", "message", locale=msg.from_user.language_code)
-        )
-        try:
-            with ZipFile(tmp_path, "r") as handle:
-                tasks = [
-                    extract_and_save(
-                        handle, name, path.join(configGet("tmp", "locations"), tmp_dir)
-                    )
-                    for name in handle.namelist()
-                ]
-                _ = await asyncio.gather(*tasks)
-        except Exception as exp:
-            logWrite(
-                f"Could not import '{answer.document.file_name}' due to {exp}: {format_exc}"
-            )
-            await answer.reply_text(
-                locale(
-                    "import_unpack_error", "message", locale=msg.from_user.language_code
-                ).format(exp, format_exc())
-            )
-            return
-        logWrite(f"Downloaded '{answer.document.file_name}' - awaiting upload")
-        await downloading.edit(
-            locale("import_uploading", "message", locale=msg.from_user.language_code)
-        )
-        remove(tmp_path)
-
-        for filename in iglob(
-            path.join(configGet("tmp", "locations"), tmp_dir) + "**/**", recursive=True
-        ):
-            if not path.isfile(filename):
-                continue
-            # upload filename
-            uploaded = await upload_pic(filename)
-            if uploaded[0] is False:
-                logWrite(
-                    f"Could not upload '{filename}' from '{path.join(configGet('tmp', 'locations'), tmp_dir)}'. Duplicates: {str(uploaded[1])}",
-                    debug=True,
-                )
-                if len(uploaded[1]) > 0:
-                    await msg.reply_text(
-                        locale(
-                            "import_upload_error_duplicate",
-                            "message",
-                            locale=msg.from_user.language_code,
-                        ).format(path.basename(filename)),
-                        disable_notification=True,
-                    )
-                else:
-                    await msg.reply_text(
-                        locale(
-                            "import_upload_error_other",
-                            "message",
-                            locale=msg.from_user.language_code,
-                        ).format(path.basename(filename)),
-                        disable_notification=True,
-                    )
-            else:
-                logWrite(
-                    f"Uploaded '{filename}' from '{path.join(configGet('tmp', 'locations'), tmp_dir)}' and got ID {uploaded[2]}",
-                    debug=True,
-                )
-
-        await downloading.delete()
-        logWrite(
-            f"Removing '{path.join(configGet('tmp', 'locations'), tmp_dir)}' after uploading",
-            debug=True,
-        )
-        rmtree(path.join(configGet("tmp", "locations"), tmp_dir), ignore_errors=True)
-        await answer.reply_text(
-            locale("import_finished", "message", locale=msg.from_user.language_code),
-            quote=True,
-        )
-        return
+        pass


-@app.on_message(~filters.scheduled & filters.command(["export"], prefixes=["", "/"]))
+@app.on_message(~ filters.scheduled & filters.command(["export"], prefixes=["", "/"]))
 async def cmd_export(app: PosterClient, msg: Message):
+
    if msg.from_user.id in app.admins:
-        pass
-
-
-@app.on_message(~filters.scheduled & filters.command(["remove"], prefixes=["", "/"]))
-async def cmd_remove(app: PosterClient, msg: Message):
-    if msg.from_user.id in app.admins:
-        global users_with_context
-        if msg.from_user.id not in users_with_context:
-            users_with_context.append(msg.from_user.id)
-        else:
-            return
-        await msg.reply_text(
-            locale("remove_request", "message", locale=msg.from_user.language_code)
-        )
-        answer = await listen_message(app, msg.chat.id, timeout=600)
-        users_with_context.remove(msg.from_user.id)
-        if answer is None:
-            await msg.reply_text(
-                locale("remove_ignored", "message", locale=msg.from_user.language_code),
-                quote=True,
-            )
-            return
-        if answer.text == "/cancel":
-            await answer.reply_text(
-                locale("remove_abort", "message", locale=msg.from_user.language_code)
-            )
-            return
-        response = await remove_pic(answer.text)
-        if response:
-            logWrite(
-                f"Removed '{answer.text}' by request of user {answer.from_user.id}"
-            )
-            await answer.reply_text(
-                locale(
-                    "remove_success", "message", locale=msg.from_user.language_code
-                ).format(answer.text)
-            )
-        else:
-            logWrite(
-                f"Could not remove '{answer.text}' by request of user {answer.from_user.id}"
-            )
-            await answer.reply_text(
-                locale(
-                    "remove_failure", "message", locale=msg.from_user.language_code
-                ).format(answer.text)
-            )
-
-
-@app.on_message(~filters.scheduled & filters.command(["purge"], prefixes=["", "/"]))
-async def cmd_purge(app: PosterClient, msg: Message):
-    if msg.from_user.id in app.admins:
-        pass
+        pass
--- a/plugins/handlers/submission.py
+++ b/plugins/handlers/submission.py
@@ -1,149 +1,99 @@
-from datetime import datetime
+from datetime import datetime, timezone
 from os import makedirs, path, sep
 from traceback import format_exc
 from uuid import uuid4

 from pyrogram import filters
-from pyrogram.enums.chat_action import ChatAction
 from pyrogram.types import InlineKeyboardButton, InlineKeyboardMarkup, Message
-
-from classes.enums.submission_types import SubmissionType
+from pyrogram.enums.chat_action import ChatAction
 from classes.exceptions import SubmissionDuplicatesError
 from classes.poster_client import PosterClient
-from classes.user import PosterUser
-from modules.app import app, users_with_context
+
+from modules.app import app
 from modules.database import col_banned, col_submitted
 from modules.logger import logWrite
+from modules.submissions import subLimit, subLimited
 from modules.utils import configGet, locale
+from classes.enums.submission_types import SubmissionType


-@app.on_message(
-    ~filters.scheduled & filters.private & filters.photo
-    | filters.video
-    | filters.animation
-    | filters.document
-)
+@app.on_message(~filters.scheduled & filters.private & filters.photo | filters.video | filters.animation | filters.document)
 async def get_submission(app: PosterClient, msg: Message):
-    global users_with_context
-    if msg.from_user.id in users_with_context:
-        return
-    try:
-        if col_banned.find_one({"user": msg.from_user.id}) is not None:
-            return

+    try:
+
+        if col_banned.find_one( {"user": msg.from_user.id} ) is not None:
+            return
+        
        await app.send_chat_action(msg.chat.id, ChatAction.TYPING)

        user_locale = msg.from_user.language_code
        save_tmp = True
        contents = None

-        if PosterUser(msg.from_user.id).is_limited():
-            await msg.reply_text(
-                locale("sub_cooldown", "message", locale=user_locale).format(
-                    str(configGet("timeout", "submission"))
-                )
-            )
+        if subLimited(msg.from_user):
+            await msg.reply_text(locale("sub_cooldown", "message", locale=user_locale).format(str(configGet("timeout", "submission"))))
            return

        if msg.document is not None:
-            logWrite(
-                f"User {msg.from_user.id} is trying to submit a file of type '{msg.document.mime_type}' with name '{msg.document.file_name}' and size of {msg.document.file_size / 1024 / 1024} MB",
-                debug=True,
-            )
            if msg.document.mime_type not in configGet("mime_types", "submission"):
-                await msg.reply_text(
-                    locale("mime_not_allowed", "message", locale=user_locale).format(
-                        ", ".join(configGet("mime_types", "submission"))
-                    ),
-                    quote=True,
-                )
+                await msg.reply_text(locale("mime_not_allowed", "message", locale=user_locale), quote=True)
                return
            if msg.document.file_size > configGet("file_size", "submission"):
-                await msg.reply_text(
-                    locale("document_too_large", "message", locale=user_locale).format(
-                        str(configGet("file_size", "submission") / 1024 / 1024)
-                    ),
-                    quote=True,
-                )
+                await 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.file_size > configGet("tmp_size", "submission"):
                save_tmp = False
-            contents = (
-                msg.document.file_id,
-                SubmissionType.DOCUMENT,
-            )  # , msg.document.file_name
+            contents = msg.document.file_id, SubmissionType.DOCUMENT #, msg.document.file_name

        if msg.video is not None:
-            logWrite(
-                f"User {msg.from_user.id} is trying to submit a video with name '{msg.video.file_name}' and size of {msg.video.file_size / 1024 / 1024} MB",
-                debug=True,
-            )
            if msg.video.file_size > configGet("file_size", "submission"):
-                await msg.reply_text(
-                    locale("document_too_large", "message", locale=user_locale).format(
-                        str(configGet("file_size", "submission") / 1024 / 1024)
-                    ),
-                    quote=True,
-                )
+                await 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.file_size > configGet("tmp_size", "submission"):
                save_tmp = False
-            contents = msg.video.file_id, SubmissionType.VIDEO  # , msg.video.file_name
+            contents = msg.video.file_id, SubmissionType.VIDEO #, msg.video.file_name

        if msg.animation is not None:
-            logWrite(
-                f"User {msg.from_user.id} is trying to submit an animation with name '{msg.animation.file_name}' and size of {msg.animation.file_size / 1024 / 1024} MB",
-                debug=True,
-            )
            if msg.animation.file_size > configGet("file_size", "submission"):
-                await msg.reply_text(
-                    locale("document_too_large", "message", locale=user_locale).format(
-                        str(configGet("file_size", "submission") / 1024 / 1024)
-                    ),
-                    quote=True,
-                )
+                await msg.reply_text(locale("document_too_large", "message", locale=user_locale).format(str(configGet("file_size", "submission")/1024/1024)), quote=True)
                return
            if msg.animation.file_size > configGet("tmp_size", "submission"):
                save_tmp = False
-            contents = (
-                msg.animation.file_id,
-                SubmissionType.ANIMATION,
-            )  # , msg.animation.file_name
+            contents = msg.animation.file_id, SubmissionType.ANIMATION #, msg.animation.file_name

        if msg.photo is not None:
-            logWrite(
-                f"User {msg.from_user.id} is trying to submit a photo with ID '{msg.photo.file_id}' and size of {msg.photo.file_size / 1024 / 1024} MB",
-                debug=True,
-            )
-            contents = msg.photo.file_id, SubmissionType.PHOTO  # , "please_generate"
+            contents = msg.photo.file_id, SubmissionType.PHOTO #, "please_generate"

        if save_tmp is not None:
+
            if contents is None:
                return

            tmp_id = str(uuid4())
            # filename = tmp_id if contents[1] == "please_generate" else contents[1]
-            makedirs(
-                path.join(configGet("data", "locations"), "submissions", tmp_id),
-                exist_ok=True,
-            )
-            downloaded = await app.download_media(
-                msg,
-                path.join(configGet("data", "locations"), "submissions", tmp_id) + sep,
-            )
+            makedirs(path.join(configGet("data", "locations"), "submissions", tmp_id), exist_ok=True)
+            downloaded = await app.download_media(msg, path.join(configGet("data", "locations"), "submissions", tmp_id)+sep)
            inserted = col_submitted.insert_one(
                {
                    "user": msg.from_user.id,
                    "date": datetime.now(),
                    "done": False,
                    "type": contents[1].value,
-                    "temp": {"uuid": tmp_id, "file": path.basename(str(downloaded))},
-                    "telegram": {"msg_id": msg.id, "file_id": contents[0]},
-                    "caption": str(msg.caption) if msg.caption is not None else None,
+                    "temp": {
+                        "uuid": tmp_id,
+                        "file": path.basename(str(downloaded))
+                    },
+                    "telegram": {
+                        "msg_id": msg.id,
+                        "file_id": contents[0]
+                    },
+                    "caption": str(msg.caption) if msg.caption is not None else None
                }
            )
-
+                
        else:
+
            if contents is None:
                return

@@ -153,44 +103,36 @@ async def get_submission(app: PosterClient, msg: Message):
                    "date": datetime.now(),
                    "done": False,
                    "type": contents[1].value,
-                    "temp": {"uuid": None, "file": None},
-                    "telegram": {"msg_id": msg.id, "file_id": contents[0]},
-                    "caption": str(msg.caption) if msg.caption is not None else None,
+                    "temp": {
+                        "uuid": None,
+                        "file": None
+                    },
+                    "telegram": {
+                        "msg_id": msg.id,
+                        "file_id": contents[0]
+                    },
+                    "caption": str(msg.caption) if msg.caption is not None else None
                }
            )
-
+                
        buttons = [
            [
-                InlineKeyboardButton(
-                    text=locale("sub_yes", "button", locale=configGet("locale")),
-                    callback_data=f"sub_yes_{str(inserted.inserted_id)}",
-                )
+                InlineKeyboardButton(text=locale("sub_yes", "button", locale=configGet("locale")), callback_data=f"sub_yes_{str(inserted.inserted_id)}")
            ]
        ]

        if msg.caption is not None:
            caption = str(msg.caption)
            buttons[0].append(
-                InlineKeyboardButton(
-                    text=locale(
-                        "sub_yes_caption", "button", locale=configGet("locale")
-                    ),
-                    callback_data=f"sub_yes_{str(inserted.inserted_id)}_caption",
-                )
+                InlineKeyboardButton(text=locale("sub_yes_caption", "button", locale=configGet("locale")), callback_data=f"sub_yes_{str(inserted.inserted_id)}_caption")
            )
            buttons[0].append(
-                InlineKeyboardButton(
-                    text=locale("sub_no", "button", locale=configGet("locale")),
-                    callback_data=f"sub_no_{str(inserted.inserted_id)}",
-                )
+                InlineKeyboardButton(text=locale("sub_no", "button", locale=configGet("locale")), callback_data=f"sub_no_{str(inserted.inserted_id)}")
            )
        else:
            caption = ""
            buttons[0].append(
-                InlineKeyboardButton(
-                    text=locale("sub_no", "button", locale=configGet("locale")),
-                    callback_data=f"sub_no_{str(inserted.inserted_id)}",
-                )
+                InlineKeyboardButton(text=locale("sub_no", "button", locale=configGet("locale")), callback_data=f"sub_no_{str(inserted.inserted_id)}")
            )

        caption += locale("sub_by", "message", locale=locale(configGet("locale")))
@@ -204,84 +146,46 @@ async def get_submission(app: PosterClient, msg: Message):
        if msg.from_user.phone_number is not None:
            caption += f" ({msg.from_user.phone_number})"

-        if (
-            msg.from_user.id in app.admins
-            and configGet("admins", "submission", "require_confirmation") is False
-        ):
+        if msg.from_user.id in app.admins and configGet("admins", "submission", "require_confirmation") is False:
            try:
-                submitted = await app.submit_photo(str(inserted.inserted_id))
-                await msg.reply_text(
-                    locale("sub_yes_auto", "message", locale=user_locale),
-                    disable_notification=True,
-                    quote=True,
-                )
-                if configGet("send_uploaded_id", "submission"):
-                    caption += f"\n\nID: `{submitted[1]}`"
-                await msg.copy(app.owner, caption=caption, disable_notification=True)
-                return
-            except SubmissionDuplicatesError as exp:
-                await msg.reply_text(
-                    locale(
-                        "sub_media_duplicates_list", "message", locale=user_locale
-                    ).format("\n • ".join(exp.duplicates)),
-                    quote=True,
-                )
-                return
-            except Exception as exp:
-                await msg.reply_text(format_exc(), quote=True)
-                return
-        elif (
-            msg.from_user.id not in app.admins
-            and configGet("users", "submission", "require_confirmation") is False
-        ):
-            try:
-                submitted = await app.submit_photo(str(inserted.inserted_id))
-                await msg.reply_text(
-                    locale("sub_yes_auto", "message", locale=user_locale),
-                    disable_notification=True,
-                    quote=True,
-                )
-                if configGet("send_uploaded_id", "submission"):
-                    caption += f"\n\nID: `{submitted[1]}`"
+                await app.submit_photo(str(inserted.inserted_id))
                await msg.copy(app.owner, caption=caption)
                return
            except SubmissionDuplicatesError as exp:
-                await msg.reply_text(
-                    locale("sub_dup", "message", locale=user_locale), quote=True
-                )
+                await msg.reply_text(locale("sub_media_duplicates_list", "message", locale=user_locale).format("\n • ".join(exp.duplicates)), quote=True)
                return
            except Exception as exp:
-                await app.send_message(
-                    app.owner,
-                    locale("sub_error_admin", "message").format(
-                        msg.from_user.id, format_exc()
-                    ),
-                )
-                await msg.reply_text("sub_error", quote=True)
+                await msg.reply_text(format_exc())
+                return
+        elif msg.from_user.id not in app.admins and configGet("users", "submission", "require_confirmation") is False:
+            try:
+                await app.submit_photo(str(inserted.inserted_id))
+                await msg.copy(app.owner, caption=caption)
+                return
+            except SubmissionDuplicatesError as exp:
+                await msg.reply_text(locale("sub_media_duplicates_list", "message", locale=user_locale).format("\n • ".join(exp.duplicates)), quote=True)
+                return
+            except Exception as exp:
+                await app.send_message(app.owner, f"User {msg.from_user.id} could not submit photo without additional confirmation due to:\n```\n{format_exc()}\n```")
+                await msg.reply_text("Could not upload this image. Admins are advised.")
                return

        if msg.from_user.id not in app.admins:
            buttons += [
                [
-                    InlineKeyboardButton(
-                        text=locale("sub_block", "button", locale=configGet("locale")),
-                        callback_data=f"sub_block_{msg.from_user.id}",
-                    )
+                    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}")
+                # ]
            ]

-            PosterUser(msg.from_user.id).limit()
+            subLimit(msg.from_user)

        if msg.from_user.id != app.owner:
-            await msg.reply_text(
-                locale("sub_sent", "message", locale=user_locale),
-                disable_notification=True,
-                quote=True,
-            )
+            await msg.reply_text(locale("sub_sent", "message", locale=user_locale), quote=True)

-        await msg.copy(
-            app.owner, caption=caption, reply_markup=InlineKeyboardMarkup(buttons)
-        )
+        await msg.copy(app.owner, caption=caption, reply_markup=InlineKeyboardMarkup(buttons))

    except AttributeError:
-        logWrite(f"from_user in function get_submission does not seem to contain id")
+        logWrite(f"from_user in function get_submission does not seem to contain id")
--- a/poster.py
+++ b/poster.py
@@ -1,31 +1,83 @@
-from datetime import datetime
-from os import getpid, path
+from os import sep, remove, getpid
+from shutil import move
 from sys import exit
-from time import time
-from traceback import format_exc
-from modules.api_client import authorize
+from argparse import ArgumentParser

-from modules.cli import *
-from modules.http_client import http_session
 from modules.logger import logWrite
 from modules.scheduler import scheduler
-from modules.utils import configGet, jsonLoad, jsonSave, locale
+from modules.utils import configGet, jsonLoad, jsonSave, killProc, locale
+
+# Args =====================================================================================================================================
+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")).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")))
+
+if args.cleanup:
+    if args.confirm:
+        index = jsonLoad(configGet("index", "locations"))
+        for entry in index["sent"]:
+            try:
+                try:
+                    remove(configGet("queue", "locations")+sep+entry)
+                except FileNotFoundError:
+                    pass
+                try:
+                    remove(configGet("sent", "locations")+sep+entry)
+                except FileNotFoundError:
+                    pass
+            except Exception as 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")))
+    else:
+        logWrite(locale("cleanup_unathorized", "console", locale=configGet("locale")))
+
+if args.cleanup_index:
+    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")))
+    else:
+        logWrite(locale("cleanup_index_unathorized", "console", locale=configGet("locale")))
+
+if args.norun:
+    logWrite(locale("passed_norun", "console", locale=configGet("locale_log")))
+    exit()
+#===========================================================================================================================================
+

 # Import ===================================================================================================================================
 try:
-    from dateutil.relativedelta import relativedelta
-    from pyrogram.errors import bad_request_400
-    from pyrogram.sync import idle
-
    from modules.app import app
+    from pyrogram.sync import idle
+    from requests import get, post
 except ModuleNotFoundError:
    print(locale("deps_missing", "console", locale=configGet("locale")), flush=True)
    exit()
-# ===========================================================================================================================================
+#===========================================================================================================================================


 pid = getpid()
-version = 0.1

 # Work in progress
 # def check_forwards(app):
@@ -63,8 +115,6 @@ version = 0.1
 #     check_forwards(app)


-from plugins.callbacks.shutdown import *
-
 # Imports ==================================================================================================================================
 from plugins.commands.general import *

@@ -74,12 +124,9 @@ if configGet("submit", "mode"):
    from plugins.commands.mode_submit import *
    from plugins.handlers.submission import *

-if configGet("post", "mode"):
-    from plugins.commands.photos import *
-
-# if configGet("api_based", "mode"):
-# from modules.api_client import authorize
-# ===========================================================================================================================================
+if configGet("api_based", "mode"):
+    from modules.api_client import authorize
+#===========================================================================================================================================

 # Work in progress
 # Handle new forwards
@@ -121,146 +168,26 @@ if configGet("post", "mode"):
 #         uvloop.install()
 #     asyncio.run(main())

+if __name__ == "__main__":

-async def main():
-    logWrite(locale("startup", "console").format(str(pid)))
-
-    await app.start()
+    logWrite(locale("startup", "console", locale=configGet("locale")).format(str(pid)))

+    app.start()
+    
    if configGet("startup", "reports"):
-        try:
-            if path.exists(path.join(configGet("cache", "locations"), "shutdown_time")):
-                downtime = relativedelta(
-                    datetime.now(),
-                    datetime.fromtimestamp(
-                        jsonLoad(
-                            path.join(configGet("cache", "locations"), "shutdown_time")
-                        )["timestamp"]
-                    ),
-                )
-                if downtime.days >= 1:
-                    await app.send_message(
-                        configGet("owner"),
-                        locale(
-                            "startup_downtime_days",
-                            "message",
-                        ).format(pid, downtime.days),
-                    )
-                elif downtime.hours >= 1:
-                    await app.send_message(
-                        configGet("owner"),
-                        locale(
-                            "startup_downtime_hours",
-                            "message",
-                        ).format(pid, downtime.hours),
-                    )
-                else:
-                    await app.send_message(
-                        configGet("owner"),
-                        locale(
-                            "startup_downtime_minutes",
-                            "message",
-                            locale=configGet("locale"),
-                        ).format(pid, downtime.minutes),
-                    )
-            else:
-                await app.send_message(
-                    configGet("owner"),
-                    locale("startup", "message").format(pid),
-                )
-        except bad_request_400.PeerIdInvalid:
-            logWrite(
-                f"Could not send startup message to bot owner. Perhaps user has not started the bot yet."
-            )
-
-    if configGet("update", "reports"):
-        try:
-            check_update = await http_session.get(
-                "https://git.end-play.xyz/api/v1/repos/profitroll/TelegramPoster/releases?page=1&limit=1"
-            )
-            response = await check_update.json()
-            if len(response) == 0:
-                raise ValueError("No bot releases on git found.")
-            if float(response[0]["tag_name"].replace("v.", "")) > version:
-                logWrite(
-                    f'New version {response[0]["tag_name"].replace("v.", "")} found (current {version})'
-                )
-                await app.send_message(
-                    configGet("owner"),
-                    locale(
-                        "update_available",
-                        "message",
-                    ).format(
-                        response[0]["tag_name"],
-                        response[0]["html_url"],
-                        response[0]["body"],
-                    ),
-                )
-            else:
-                logWrite(f"No updates found, bot is up to date.")
-        except bad_request_400.PeerIdInvalid:
-            logWrite(
-                f"Could not send startup message to bot owner. Perhaps user has not started the bot yet."
-            )
-        except Exception as exp:
-            logWrite(f"Update check failed due to {exp}: {format_exc()}")
+        app.send_message(app.owner, locale("startup", "message", locale=configGet("locale")).format(str(pid)))

    if configGet("post", "mode"):
        scheduler.start()

-    try:
-        token = await authorize()
+    if configGet("api_based", "mode"):
+        token = authorize()
+        if len(get(f'{configGet("address", "posting", "api")}/albums?q={configGet("queue", "posting", "api", "albums")}', headers={"Authorization": f"Bearer {token}"}).json()["results"]) == 0:
+            post(f'{configGet("address", "posting", "api")}/albums?name={configGet("queue", "posting", "api", "albums")}&title={configGet("queue", "posting", "api", "albums")}', headers={"Authorization": f"Bearer {token}"})

-        if (
-            len(
-                (
-                    await (
-                        await http_session.get(
-                            f'{configGet("address", "posting", "api")}/albums?q={configGet("album", "posting", "api")}',
-                            headers={"Authorization": f"Bearer {token}"},
-                        )
-                    ).json()
-                )["results"]
-            )
-            == 0
-        ):
-            logWrite("Media album does not exist on API server. Trying to create it...")
-            try:
-                await http_session.post(
-                    f'{configGet("address", "posting", "api")}/albums?name={configGet("album", "posting", "api")}&title={configGet("album", "posting", "api")}',
-                    headers={"Authorization": f"Bearer {token}"},
-                )
-                logWrite("Created media album on API server.")
-            except Exception as exp:
-                logWrite(
-                    f"Could not create media album on API server due to {exp}: {format_exc()}"
-                )
-    except Exception as exp:
-        logWrite(f"Could not check if API album exists due to {exp}: {format_exc()}")
+    idle()

-    await idle()
+    app.send_message(app.owner, locale("shutdown", "message", locale=configGet("locale")).format(str(pid)))
+    logWrite(locale("shutdown", "console", locale=configGet("locale")).format(str(pid)))

-    try:
-        await app.send_message(
-            configGet("owner"),
-            locale("shutdown", "message").format(pid),
-        )
-    except bad_request_400.PeerIdInvalid:
-        logWrite(
-            f"Could not send shutdown message to bot owner. Perhaps user has not started the bot yet."
-        )
-
-    makedirs(configGet("cache", "locations"), exist_ok=True)
-    jsonSave(
-        {"timestamp": time()},
-        path.join(configGet("cache", "locations"), "shutdown_time"),
-    )
-
-    logWrite(locale("shutdown", "console").format(str(pid)))
-
-    scheduler.shutdown()
-
-
-if __name__ == "__main__":
-    loop = asyncio.get_event_loop()
-    loop.run_until_complete(main())
+    killProc(pid)
--- a/requirements-optional.txt
+++ b/requirements-optional.txt
@@ -0,0 +1,2 @@
+ujson~=5.7.0
+tgcrypto~=1.2.5
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,12 +1,7 @@
-python_dateutil==2.8.2
-apscheduler==3.10.1
-pytimeparse==1.1.8
-convopyro==0.5
-pyrogram==2.0.104
-aiofiles~=23.1.0
-tgcrypto==1.2.5
-aiohttp~=3.8.4
-psutil==5.9.5
-pymongo==4.3.3
-pillow~=9.5.0
-ujson==5.7.0
+apscheduler~=3.10.0
+pyrogram~=2.0.99
+requests~=2.28.2
+psutil~=5.9.4
+pymongo~=4.3.3
+pillow~=9.4.0
+pytimeparse~=1.1.8
Author	SHA1	Message	Date
Profitroll	664284a6f8	Integrated previous commits	2023-02-17 21:55:38 +01:00
Profitroll	bd9917fb17	Replaced user block logic	2023-02-17 21:54:52 +01:00
Profitroll	68ea087963	Integrated interval-based schedule	2023-02-17 21:54:30 +01:00
Profitroll	d1813856d9	Imported callback "nothing"	2023-02-17 21:54:14 +01:00
Profitroll	cf204577e4	Added external address for links	2023-02-17 21:53:57 +01:00
Profitroll	68c887999e	Divided admins and owner	2023-02-17 21:53:43 +01:00
Profitroll	642e17ee55	Image resize when too big	2023-02-17 16:46:44 +01:00
Profitroll	25af9b31f8	Changed Client to PosterClient	2023-02-17 16:46:33 +01:00
Profitroll	28fc359593	WIP: export and import	2023-02-17 16:46:13 +01:00
Profitroll	07203a9db9	Changed the way exceptions are handled	2023-02-17 16:45:51 +01:00
Profitroll	663a7b0db8	Submission without confirmation added	2023-02-17 16:44:56 +01:00
Profitroll	0d2e9fa6ec	Using PosterClient instead of Client	2023-02-17 16:44:30 +01:00
Profitroll	c90e5eb697	Added Pillow to requirements	2023-02-17 16:44:03 +01:00
Profitroll	f4359aa6cd	Added upload_pic method	2023-02-17 11:51:38 +01:00
profitroll	4cd37be5dc	WIP: New submission system	2023-02-16 16:41:01 +01:00
profitroll	05042f01c6	Disabled WIP warning	2023-02-15 14:07:40 +01:00