Resolves #87

revert Update dependency aiohttp to ~=3.10.0 (#84)

This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [aiohttp](https://github.com/aio-libs/aiohttp) | minor | `~=3.9.1` -> `~=3.10.0` |

---

### Release Notes

<details>
<summary>aio-libs/aiohttp (aiohttp)</summary>

### [`v3.10.0`](https://github.com/aio-libs/aiohttp/blob/HEAD/CHANGES.rst#3100-2024-07-30)

[Compare Source](https://github.com/aio-libs/aiohttp/compare/v3.9.5...v3.10.0)

\========================

## Bug fixes

-   Fixed server response headers for `Content-Type` and `Content-Encoding` for
    static compressed files -- by :user:`steverep`.

    Server will now respond with a `Content-Type` appropriate for the compressed
    file (e.g. `"application/gzip"`), and omit the `Content-Encoding` header.
    Users should expect that most clients will no longer decompress such responses
    by default.

    *Related issues and pull requests on GitHub:*
    :issue:`4462`.

-   Fixed duplicate cookie expiration calls in the CookieJar implementation

    *Related issues and pull requests on GitHub:*
    :issue:`7784`.

-   Adjusted `FileResponse` to check file existence and access when preparing the response -- by :user:`steverep`.

    The :py:class:`~aiohttp.web.FileResponse` class was modified to respond with
    403 Forbidden or 404 Not Found as appropriate.  Previously, it would cause a
    server error if the path did not exist or could not be accessed.  Checks for
    existence, non-regular files, and permissions were expected to be done in the
    route handler.  For static routes, this now permits a compressed file to exist
    without its uncompressed variant and still be served.  In addition, this
    changes the response status for files without read permission to 403, and for
    non-regular files from 404 to 403 for consistency.

    *Related issues and pull requests on GitHub:*
    :issue:`8182`.

-   Fixed `AsyncResolver` to match `ThreadedResolver` behavior
    \-- by :user:`bdraco`.

    On system with IPv6 support, the :py:class:`~aiohttp.resolver.AsyncResolver` would not fallback
    to providing A records when AAAA records were not available.
    Additionally, unlike the :py:class:`~aiohttp.resolver.ThreadedResolver`, the :py:class:`~aiohttp.resolver.AsyncResolver`
    did not handle link-local addresses correctly.

    This change makes the behavior consistent with the :py:class:`~aiohttp.resolver.ThreadedResolver`.

    *Related issues and pull requests on GitHub:*
    :issue:`8270`.

-   Fixed `ws_connect` not respecting `receive_timeout`` on WS(S) connection. -- by :user:`arcivanov\`.

    *Related issues and pull requests on GitHub:*
    :issue:`8444`.

-   Removed blocking I/O in the event loop for static resources and refactored
    exception handling -- by :user:`steverep`.

    File system calls when handling requests for static routes were moved to a
    separate thread to potentially improve performance. Exception handling
    was tightened in order to only return 403 Forbidden or 404 Not Found responses
    for expected scenarios; 500 Internal Server Error would be returned for any
    unknown errors.

    *Related issues and pull requests on GitHub:*
    :issue:`8507`.

## Features

-   Added a Request.wait_for_disconnection() method, as means of allowing request handlers to be notified of premature client disconnections.

    *Related issues and pull requests on GitHub:*
    :issue:`2492`.

-   Added 5 new exceptions: :py:exc:`~aiohttp.InvalidUrlClientError`, :py:exc:`~aiohttp.RedirectClientError`,
    :py:exc:`~aiohttp.NonHttpUrlClientError`, :py:exc:`~aiohttp.InvalidUrlRedirectClientError`,
    :py:exc:`~aiohttp.NonHttpUrlRedirectClientError`

    :py:exc:`~aiohttp.InvalidUrlRedirectClientError`, :py:exc:`~aiohttp.NonHttpUrlRedirectClientError`
    are raised instead of :py:exc:`ValueError` or :py:exc:`~aiohttp.InvalidURL` when the redirect URL is invalid. Classes
    :py:exc:`~aiohttp.InvalidUrlClientError`, :py:exc:`~aiohttp.RedirectClientError`,
    :py:exc:`~aiohttp.NonHttpUrlClientError` are base for them.

    The :py:exc:`~aiohttp.InvalidURL` now exposes a `description` property with the text explanation of the error details.

    \-- by :user:`setla`, :user:`AraHaan`, and :user:`bdraco`

    *Related issues and pull requests on GitHub:*
    :issue:`2507`, :issue:`3315`, :issue:`6722`, :issue:`8481`, :issue:`8482`.

-   Added a feature to retry closed connections automatically for idempotent methods. -- by :user:`Dreamsorcerer`

    *Related issues and pull requests on GitHub:*
    :issue:`7297`.

-   Implemented filter_cookies() with domain-matching and path-matching on the keys, instead of testing every single cookie.
    This may break existing cookies that have been saved with `CookieJar.save()`. Cookies can be migrated with this script::

        import pickle
        with file_path.open("rb") as f:
            cookies = pickle.load(f)

        morsels = [(name, m) for c in cookies.values() for name, m in c.items()]
        cookies.clear()
        for name, m in morsels:
            cookies[(m["domain"], m["path"].rstrip("/"))][name] = m

        with file_path.open("wb") as f:
            pickle.dump(cookies, f, pickle.HIGHEST_PROTOCOL)

    *Related issues and pull requests on GitHub:*
    :issue:`7583`, :issue:`8535`.

-   Separated connection and socket timeout errors, from ServerTimeoutError.

    *Related issues and pull requests on GitHub:*
    :issue:`7801`.

-   Implemented happy eyeballs

    *Related issues and pull requests on GitHub:*
    :issue:`7954`.

-   Added server capability to check for static files with Brotli compression via a `.br` extension -- by :user:`steverep`.

    *Related issues and pull requests on GitHub:*
    :issue:`8062`.

## Removals and backward incompatible breaking changes

-   The shutdown logic in 3.9 waited on all tasks, which caused issues with some libraries.
    In 3.10 we've changed this logic to only wait on request handlers. This means that it's
    important for developers to correctly handle the lifecycle of background tasks using a
    library such as `aiojobs`. If an application is using `handler_cancellation=True` then
    it is also a good idea to ensure that any :func:`asyncio.shield` calls are replaced with
    :func:`aiojobs.aiohttp.shield`.

    Please read the updated documentation on these points: \
    https://docs.aiohttp.org/en/stable/web_advanced.html#graceful-shutdown \
    https://docs.aiohttp.org/en/stable/web_advanced.html#web-handler-cancellation

    \-- by :user:`Dreamsorcerer`

    *Related issues and pull requests on GitHub:*
    :issue:`8495`.

## Improved documentation

-   Added documentation for `aiohttp.web.FileResponse`.

    *Related issues and pull requests on GitHub:*
    :issue:`3958`.

-   Improved the docs for the `ssl` params.

    *Related issues and pull requests on GitHub:*
    :issue:`8403`.

## Contributor-facing changes

-   Enabled HTTP parser tests originally intended for 3.9.2 release -- by :user:`pajod`.

    *Related issues and pull requests on GitHub:*
    :issue:`8088`.

## Miscellaneous internal changes

-   Improved URL handler resolution time by indexing resources in the UrlDispatcher.
    For applications with a large number of handlers, this should increase performance significantly.
    \-- by :user:`bdraco`

    *Related issues and pull requests on GitHub:*
    :issue:`7829`.

-   Added `nacl_middleware <https://github.com/CosmicDNA/nacl_middleware>`\_ to the list of middlewares in the third party section of the documentation.

    *Related issues and pull requests on GitHub:*
    :issue:`8346`.

-   Minor improvements to static typing -- by :user:`Dreamsorcerer`.

    *Related issues and pull requests on GitHub:*
    :issue:`8364`.

-   Added a 3.11-specific overloads to `ClientSession`  -- by :user:`max-muoto`.

    *Related issues and pull requests on GitHub:*
    :issue:`8463`.

-   Simplified path checks for `UrlDispatcher.add_static()` method -- by :user:`steverep`.

    *Related issues and pull requests on GitHub:*
    :issue:`8491`.

-   Avoided creating a future on every websocket receive -- by :user:`bdraco`.

    *Related issues and pull requests on GitHub:*
    :issue:`8498`.

-   Updated identity checks for all `WSMsgType` type compares -- by :user:`bdraco`.

    *Related issues and pull requests on GitHub:*
    :issue:`8501`.

-   When using Python 3.12 or later, the writer is no longer scheduled on the event loop if it can finish synchronously. Avoiding event loop scheduling reduces latency and improves performance. -- by :user:`bdraco`.

    *Related issues and pull requests on GitHub:*
    :issue:`8510`.

-   Restored :py:class:`~aiohttp.resolver.AsyncResolver` to be the default resolver. -- by :user:`bdraco`.

    :py:class:`~aiohttp.resolver.AsyncResolver` was disabled by default because
    of IPv6 compatibility issues. These issues have been resolved and
    :py:class:`~aiohttp.resolver.AsyncResolver` is again now the default resolver.

    *Related issues and pull requests on GitHub:*
    :issue:`8522`.

***

</details>

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).

🚦 **Automerge**: Enabled.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box

---

This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNi4zNS4wIiwidXBkYXRlZEluVmVyIjoiMzYuMzUuMCIsInRhcmdldEJyYW5jaCI6ImRldiJ9-->

Reviewed-on: #84
Co-authored-by: Renovate <renovate@git.end-play.xyz>
Co-committed-by: Renovate <renovate@git.end-play.xyz>

.gitignore

@@ -153,8 +153,12 @@ cython_debug/
 #.idea/
 
 # Custom
+cache/
 config.json
+
 *.session
+*.session-wal
+*.session-shm
 *.session-journal
 
 venv

README.md

@@ -1,11 +1,11 @@
 <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/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>  
 
-> Шукаєш інструкцію українською? А вона [ось тут](https://git.end-play.xyz/profitroll/TelegramPoster/src/branch/dev/README_uk.md) знаходиться)  
+> Шукаєш інструкцію українською? А вона [ось тут](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 ;)  
 
@@ -21,7 +21,7 @@ Please note that Photos API also requires MongoDB so it makes sense to install a
 
 ## 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, Photos API, MongoDB and optionally git (if you want to update using `git pull`). 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
@@ -29,7 +29,7 @@ To make this bot run at first you need to have a Python interpreter, Photos API,
 > If it's non-standard 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 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)
@@ -42,19 +42,19 @@ To make this bot run at first you need to have a Python interpreter, Photos API,
 3. Create virtual environment [Optional]:
 
     1. Install virtualenv module: `pip install virtualenv`
-    2. Create venv: `python -m venv env`
+    2. Create venv: `python -m venv .venv`
-    3. Activate it using `source venv/bin/activate` on Linux, `venv\Scripts\activate.bat` in CMD or `venv\Scripts\Activate.ps1` in PowerShell.
+    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:  
 
     `python -m pip install -r requirements.txt`  
     Without installing those - bot cannot work at all.
 
-5. Configure "bot" and "owner" with your favorite text editor:  
+5. Configure required keys with your favorite text editor:  
 
-    1. Copy file `config_example.json` to `config.json`
+    1. Copy config file: `cp config_example.json 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
+    2. Open `config.json` using your favorite text editor. For example `nano config.json`, but you can also edit it with vim, mcedit, or Notepad/Notepad++ on Windows
-    3. Change `"bot.owner"`, `"reports.chat_id"`, `"bot.api_id"`, `"bot.api_hash"` and `"bot.bot_token"` keys' values.  
+    3. Change `"bot.owner"`, `"bot.api_id"`, `"bot.api_hash"` and `"bot.bot_token"` keys' values.  
 
     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).  
 
@@ -66,26 +66,26 @@ To make this bot run at first you need to have a Python interpreter, Photos API,
         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
+        1. Change `"posting.api.address"` and `"posting.api.address_external"` to the ones your API server uses
         2. Run your bot using `python main.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 and `"posting.comments"` to comments group's ID.
+    To use your bot of course you need to have a channel or group otherwise it 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 and `"posting.comments"` to comments group'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`.
+    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 main.py` to start it.  
+    Make sure MongoDB and Photos API are running and use `python main.py` to start the bot.  
     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.  
 
-## Command line arguments
+## CLI arguments
 
 Of course bot also has them. You can perform some actions with them.  
 
@@ -105,6 +105,6 @@ Examples:
 
 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"`.  
+All localization files are located in the `locale`. 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 - edit `"locale"` parameter in the `config.json`.  
 
 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.

README_uk.md

@@ -5,67 +5,104 @@
 <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 гілки ще не готова! Користуйтесь англійською! ⚠️
+Цей бот використовується для однієї-єдиної задачі - публікувати фотографії з мого особистого архіву. Ось його код, тож ви також можете запустити бота і погратися з ним самостійно. Тільки не очікуйте, що він буде ідеальним. Це не так. Але ви завжди можете його форкнути ;)  
 
-Цей бот використовується для однієї-єдиної задачі - розміщувати фотографії з мого особистого архіву. Ось його код, тож Ви також можете захостити бота самостійно та розважитися з ним. Тільки не очікуйте, що він ідеальним. Не буде. Але гей, Ви завжди можете його доробити під себе ;)
+## Залежності
 
-## Установка
+* [Python 3.8+](https://www.python.org) (рекомендується 3.9+)
+* [MongoDB](https://www.mongodb.com)
+* [PhotosAPI](https://git.end-play.xyz/profitroll/PhotosAPI)  
 
-Для запуску цього бота спочатку потрібно мати інтерпретатор Python та встановлений git. Google — Ваш друг у пошуках. Ви також можете ігнорувати git і просто завантажити код, також має спрацювати добре. Після цього Ви готові до встановлення.
+Користуйтесь [інструкцією зі встановлення MongoDB](https://www.mongodb.com/docs/manual/installation) та [README Photos API](https://git.end-play.xyz/profitroll/PhotosAPI/src/branch/master/README.md).  
 
-> У цьому README я вважаю, що Ви використовуєте python за замовчуванням у своїй
+Зверніть увагу, що Photos API також потребує MongoDB, тому має сенс спочатку встановити й налаштувати Mongo.
-> системі і PATH Вашої системи містить його. Якщо Ваш python за замовчуванням
-> є `python3` або, наприклад, `/home/user/.local/bin/python3.9` - використовуйте його натомість.
-> Якщо це нестандартний шлях до виконуваного файлу - Вам також слід змінити
-> це у скриптах, які Ви використовуватимете (`loop.sh`, `loop.bat`, `start.sh` та `start.bat`).
 
-1. Завантажте бота:  
+## Встановлення
-    1. `git clone https://git.end-play.xyz/profitroll/TelegramSender.git` (якщо хочете використовувати git)  
-    2. `cd ./TelegramSender`
 
-2. Встановіть залежності:  
+Щоб запустити бота, вам потрібно мати інтерпретатор Python, Photos API, MongoDB і, за бажанням, git (якщо ви хочете оновлювати за допомогою `git pull`). Ви також можете проігнорувати git і просто завантажити вихідний код, це також повинно спрацювати. Після цього ви готові до роботи.  
-    `python -m pip install -r requirements.txt`  
-    Без їх установки бот не зможе працювати взагалі
 
-3. Встановіть додаткові залежності [Не обов'язково]:  
+> У цьому README я припускаю, що ви використовуєте python за замовчуванням у вашій
-    `python -m pip install -r requirements-optional.txt`  
+> системі, і він міститься у вашому системному PATH. Якщо ваш python за замовчуванням
-    Вони не є обов’язковими, але можуть прискорити роботу бота
+> це `python3` або, наприклад, `/home/user/.local/bin/python3.9` - використовуйте його.
+> Якщо це нестандартний шлях до виконуваного файлу - вам також слід змінити
+> його у скриптах, які ви будете використовувати (`loop.sh`, `loop.bat`, `start.sh` та `start.bat`).
 
-4. Налаштуйте свого бота за допомогою текстового редактора:  
+1. Встановіть MongoDB та Photos API:
-    `nano config.json`  
-    Ви можете редагувати за допомогою vim, nano, у Windows це Notepad або Notepad++. На Ваш смак.  
-    Якщо Ви не знаєте, де знайти bot_token і свій ідентифікатор, тут Ви можете знайти кілька підказок: [отримати токен бота](https://www.siteguarding.com/en/how-to-get-telegram-bot-api-token), [отримати свій ідентифікатор](https://www.alphr.com/telegram-find-user-id/), [отримати api_hash і api_id](https://core.telegram.org/api/obtaining_api_id).  
-    Також не забудьте змінити режим роботи бота. Ключ `"mode"` має в собі ключі `"post"` та `"submit"`, кожен з який може бути `true` або `false`.
 
-5. Додайте бота на канал:  
+    1. Встановіть MongoDB, дотримуючись [офіційного посібника зі встановлення](https://www.mongodb.com/docs/manual/installation)
-    Звичайно, щоб використовувати свого бота, Вам потрібно мати канал або групу, інакше немає сенсу мати такого бота. [Тут](https://stackoverflow.com/a/33497769) Ви можете знайти короткий гайд, як додати свого бота до каналу.
+    2. Встановіть Photos API, дотримуючись [README Photos API](https://git.end-play.xyz/profitroll/PhotosAPI/src/branch/master/README.md)
 
-6. Заповніть папку вмістом:  
+2. Завантажте бота:  
-    Звичайно, бот не може опублікувати щось із нічого. Налаштуйте свій `config.json`, які медіа-типи бот повинен публікувати (`"posting", "extensions"`), коли їх публікувати (`"posting", "time"`), а також де їх знайти (`"locations"`). Ви також можете переміщати їх після надсилання, встановивши для `"posting", "move_sent"` значення `true`.
 
-6. Готово, запускайте!  
+    1. `git clone https://git.end-play.xyz/profitroll/TelegramPoster.git` (якщо ви використовуєте git)
-    `python ./main.py`  
+    2. `cd TelegramPoster`
-    Або ви також можете використовувати `.\start.bat` на Windows і `bash ./start.sh` на Linux.  
-    Крім того, доступні `loop.sh` і `loop.bat`, якщо ви хочете, щоб ваш бот запускався знову після зупинки або після використання команди `/reboot`.
 
-## Аргументи командного рядка
+3. Створіть віртуальне середовище [Необов'язково]:
 
-Звичайно, у бота вони також є. З ними можна виконувати деякі дії.  
+    1. Встановіть модуль virtualenv: `pip install virtualenv`
+    2. Створіть venv: `python -m venv .venv`
+    3. Активуйте його за допомогою `ource .venv/bin/activate` в Linux, `.venv\Scripts\activate.bat` в CMD або `.venv\Scripts\Activate.ps1` в PowerShell.
 
-* `--move-sent` - дозволяє перемістити всі надіслані файли з черги до папки надісланих
+4. Встановіть залежності проекту:  
-* `--cleanup` - очистити файли в папках `queue` і `sent`, якщо вони вже надіслані. Потрібен аргумент `--confirm`
+
-* `--cleanup-index` - видалити всі надіслані записи з індексу. Потрібен аргумент `--confirm`
+    `python -m pip install -r requirements.txt`.  
-* `--norun` - дозволяє виконувати наведені вище аргументи, не запускаючи самого бота
+    Без їх встановлення бот не зможе працювати взагалі.
+
+5. Налаштуйте необхідні ключі за допомогою вашого улюбленого текстового редактора:  
+
+    1. Скопіюйте конфігураційний файл: `cp config_example.json config.json`
+    2. Відкрийте `config.json` за допомогою вашого улюбленого текстового редактора. Наприклад, `nano config.json`, але ви також можете відредагувати його за допомогою vim, mcedit або Notepad/Notepad++ на Windows
+    3. Змініть значення ключів `"bot.owner"`, `"bot.api_id"`, `"bot.api_hash"` і `"bot.bot_token"`.  
+
+    Якщо ви не знаєте, де знайти bot_token і ваш id - тут ви можете знайти кілька підказок: [отримати токен бота](https://www.siteguarding.com/en/how-to-get-telegram-bot-api-token), [отримати свій id](https://www.alphr.com/telegram-find-user-id), [отримати api_hash та api_id](https://core.telegram.org/api/obtaining_api_id).
+
+6. Налаштування бази даних та API:  
+
+    1. Налаштуйте базу даних:
+        1. Змініть хост і порт бази даних у ключах `"database.host"` і `"database.port"`. Для локальної установки за замовчуванням це будуть `127.0.0.1` і `27017` відповідно
+        2. Змініть ім'я бази даних в `"database.name"`. Вона буде автоматично створена при запуску
+        3. Якщо ви змінили користувача та пароль для доступу до бази даних, вам також слід змінити ключі `"database.user"` та `"database.password"`, інакше залиште їх `null` (за замовчуванням).
+
+    2. Налаштуйте Photos API:
+        1. Змініть `"posting.api.address"` та `"posting.api.address_external"` на ті, що використовує ваш сервер API
+        2. Запустіть бота за допомогою `python main.py --create-user --create-album`, щоб налаштувати нового користувача та альбом. Ви також можете скористатися ручним створенням користувача і альбому, описаним [у вікі](https://git.end-play.xyz/profitroll/TelegramPoster/wiki/Configuring-API). Ви також можете змінити ім'я користувача, пароль і альбом у `"posting.api"` на користувача і альбом, які у вас є, якщо у вас вже налаштовані альбом і користувач Photos API. У цьому випадку вам не потрібно створювати нові.
+
+7. Додайте бота до каналу:  
+
+    Щоб використовувати бота, вам, звичайно, потрібно мати канал або групу, інакше немає сенсу мати такого бота. [Тут](https://stackoverflow.com/a/33497769) ви можете знайти короткий посібник, як додати бота до каналу. Після цього просто встановіть `"posting.channel"` на ID вашого каналу і `"posting.comments"` на ID групи коментарів.
+
+8. Налаштуйте час публікації:  
+
+    Щоб ваш бот публікував випадковий контент, вам потрібно налаштувати `"posting.time"` зі списком рядків у форматі "ДД:ММ" або використовувати `"posting.interval"` у форматі "XdXhXmXs". Щоб використовувати інтервал замість вибраного часу, встановіть `"posting.use_interval"` у значення `true`.
+
+9. Готово, запускайте!  
+
+    Переконайтеся, що MongoDB і Photos API запущені і використовуйте `python main.py` для запуску бота.  
+    Або ви також можете використовувати `.\start.bat` в Windows і `bash ./start.sh` в Linux.  
+    Додатково доступні `loop.sh` і `loop.bat`, якщо ви хочете, щоб ваш бот запустився знову після зупинки або після використання команди `/shutdown`.
+
+Якщо вам потрібні додаткові інструкції щодо налаштування бота або у вас виникли труднощі - скористайтеся [вікі в цьому репозиторії](https://git.end-play.xyz/profitroll/TelegramPoster/wiki), щоб отримати детальніші інструкції.  
+
+## CLI аргументи
+
+Звичайно, бот також має CLI аргументи. За допомогою них можна виконувати деякі дії.  
+
+* `--create-user` - створити нового користувача API. Потребує встановленого конфігураційного ключа `"posting.api.address"`;
+* `--create-album` - створити новий альбом API. Вимагає заповнених адреси API та конфігурації користувача (`"posting.api"`).
 
 Приклади:  
 
-* `python3 ./main.py --move-sent --norun`
+* `python main.py --create-user`
-* `python3 ./main.py --cleanup --confirm`
+* `python main.py --create-user --create-album`
+
+## Поради та покращення
+
+* Можливо, ви захочете налаштувати бота для роботи як системну службу. У вікі є [сторінка з цього питання](https://git.end-play.xyz/profitroll/TelegramPoster/wiki/Configuring-Service).
 
 ## Локалізація
 
-Бот може використовувати різні мови. Є деякі попередньо встановлені (Англійська та Українська), однак Ви можете додавати свої власні локалізації теж.  
+Бот може використовувати файли локалізації. Деякі з них встановлено за замовчуванням (англійська та українська), але ви також можете додавати свої власні.  
 
-Всі файли локалізації знаходяться у папці `locale`, якщо в конфігураційному файлі не вказано іншу. Просто скопіюйте цікавлячий Вас файл, назвіть його відповідно до [тегів мови IETF](https://en.wikipedia.org/wiki/IETF_language_tag) (якщо Ви хочете, щоб переклад був сумісним з перекладами Telegram) або просто вкажіть свою власну назву. Збережіть свій переклад як json файл і все готово. Якщо ви хочете змінити мову за замовчуванням для повідомлень самого бота, які не можуть визначити мову адміністратора, відредагуйте параметр `"locale"` у `config.json`. Якщо ця мова недоступна, замість неї буде використано `"locale_fallback"`. Якщо обидві мови недоступні - буде показано помилку. Для зміни мови виведення консолі та логування вам слід відредагувати `"locale_log"`.  
+Усі файли локалізації знаходяться у теці `locale`. Просто скопіюйте файл локалі за вашим вибором, назвіть його відповідно до [мовних кодів IETF](https://en.wikipedia.org/wiki/IETF_language_tag) (якщо ви хочете, щоб ваша локаль була сумісна з локалями Telegram) або дайте йому власну назву. Збережіть переклад у форматі json, і все буде готово. Якщо ви хочете змінити локаль за замовчуванням для повідомлень - відредагуйте параметр `"locale"` у файлі `config.json`.  
 
-Ми рекомендуємо вносити будь-які зміни лише до вашої окремої мови. Або, принаймні, завжди мати резервну копію, наприклад, `en.json` як запасний варіант.
+Ми рекомендуємо вносити зміни лише у вашу власну локаль. Або, принаймні, завжди мати резервну копію, наприклад, `en.json` як запасний варіант.

classes/pyroclient.py

@@ -11,12 +11,14 @@ from typing import Dict, List, Tuple, Union
 
 import aiofiles
 from aiohttp import ClientSession
+from apscheduler.schedulers.asyncio import AsyncIOScheduler
 from bson import ObjectId
 from libbot import json_write
 from libbot.i18n.sync import _
+from libbot.pyrogram.classes import PyroClient
 from photosapi_client.errors import UnexpectedStatus
 from pyrogram.errors import bad_request_400
-from pyrogram.types import Message
+from pyrogram.types import Message, User
 from pytimeparse.timeparse import timeparse
 from ujson import dumps, loads
 
@@ -26,6 +28,7 @@ from classes.exceptions import (
     SubmissionUnavailableError,
     SubmissionUnsupportedError,
 )
+from classes.pyrouser import PyroUser
 from modules.api_client import (
     BodyPhotoUpload,
     BodyVideoUpload,
@@ -36,32 +39,25 @@ from modules.api_client import (
     photo_upload,
     video_upload,
 )
-from modules.database import col_submitted
+from modules.database import col_submitted, col_users
 from modules.http_client import http_session
 from modules.sender import send_content
 
 logger = logging.getLogger(__name__)
 
 
-from datetime import datetime
-from typing import List, Union
-
-from apscheduler.schedulers.asyncio import AsyncIOScheduler
-from libbot.pyrogram.classes import PyroClient
-
-
 class PyroClient(PyroClient):
     def __init__(self, scheduler: AsyncIOScheduler):
-        super().__init__(scheduler=scheduler)
+        super().__init__(locales_root=Path("locale"), scheduler=scheduler)
 
-        self.version: float = 0.2
+        self.version: float = 0.3
 
         self.owner: int = self.config["bot"]["owner"]
         self.admins: List[int] = self.config["bot"]["admins"] + [
             self.config["bot"]["owner"]
         ]
 
-        self.sender_session = ClientSession()
+        self.sender_session: Union[ClientSession, None] = None
 
         self.scopes_placeholders: Dict[str, int] = {
             "owner": self.owner,
@@ -71,6 +67,9 @@ class PyroClient(PyroClient):
     async def start(self):
         await super().start()
 
+        if self.sender_session is None:
+            self.sender_session = ClientSession()
+
         if self.config["reports"]["update"]:
             try:
                 async with ClientSession(
@@ -108,8 +107,8 @@ class PyroClient(PyroClient):
                 logger.warning(
                     "Could not send startup message to bot owner. Perhaps user has not started the bot yet."
                 )
-            except Exception as exp:
+            except Exception as exc:
-                logger.exception("Update check failed due to %s: %s", exp, format_exc())
+                logger.exception("Update check failed due to %s: %s", exc, format_exc())
 
         if self.config["mode"]["post"]:
             if self.config["posting"]["use_interval"]:
@@ -138,14 +137,16 @@ class PyroClient(PyroClient):
         )
 
         await http_session.close()
+
+        if self.sender_session is not None:
             await self.sender_session.close()
 
         await super().stop()
 
     async def submit_media(
-        self, id: str
+        self, id: str, purge_caption: bool = False
     ) -> Tuple[Union[Message, None], Union[str, None]]:
-        db_entry = col_submitted.find_one({"_id": ObjectId(id)})
+        db_entry = await col_submitted.find_one({"_id": ObjectId(id)})
         submission = None
 
         if db_entry is None:
@@ -159,8 +160,8 @@ class PyroClient(PyroClient):
                 filepath = await self.download_media(
                     submission, file_name=self.config["locations"]["tmp"] + sep
                 )
-            except Exception as exp:
+            except Exception as exc:
-                raise SubmissionUnavailableError() from exp
+                raise SubmissionUnavailableError() from exc
 
         elif not Path(
             f"{self.config['locations']['data']}/submissions/{db_entry['temp']['uuid']}/{db_entry['temp']['file']}",
@@ -183,7 +184,7 @@ class PyroClient(PyroClient):
                 response = await photo_upload(
                     self.config["posting"]["api"]["album"],
                     client=client,
-                    multipart_data=BodyPhotoUpload(
+                    body=BodyPhotoUpload(
                         File(media_bytes, filepath.name, "image/jpeg")
                     ),
                     ignore_duplicates=self.config["submission"]["allow_duplicates"],
@@ -194,22 +195,20 @@ class PyroClient(PyroClient):
                 response = await video_upload(
                     self.config["posting"]["api"]["album"],
                     client=client,
-                    multipart_data=BodyVideoUpload(
+                    body=BodyVideoUpload(File(media_bytes, filepath.name, "video/*")),
-                        File(media_bytes, filepath.name, "video/*")
-                    ),
                     caption="queue",
                 )
             # elif db_entry["type"] == SubmissionType.ANIMATION.value:
             #     response = await video_upload(
             #         self.config["posting"]["api"]["album"],
             #         client=client,
-            #         multipart_data=BodyVideoUpload(
+            #         body=BodyVideoUpload(
             #             File(media_bytes, filepath.name, "video/*")
             #         ),
             #         caption="queue",
             #     )
-        except UnexpectedStatus as exp:
+        except UnexpectedStatus as exc:
-            raise SubmissionUnsupportedError(str(filepath)) from exp
+            raise SubmissionUnsupportedError(str(filepath)) from exc
 
         response_dict = (
             {}
@@ -230,10 +229,14 @@ class PyroClient(PyroClient):
                     )
             raise SubmissionDuplicatesError(str(filepath), duplicates)
 
-        col_submitted.find_one_and_update(
+        db_update = (
-            {"_id": ObjectId(id)}, {"$set": {"done": True}}
+            {"$set": {"done": True, "caption": None}}
+            if purge_caption
+            else {"$set": {"done": True}}
         )
 
+        await col_submitted.update_one({"_id": ObjectId(id)}, db_update)
+
         try:
             if db_entry["temp"]["uuid"] is not None:
                 rmtree(
@@ -249,11 +252,36 @@ class PyroClient(PyroClient):
 
         return (
             submission,
-            response.id if not hasattr(response, "parsed") else response.parsed.id,
+            response.parsed.id if hasattr(response, "parsed") else response.id,
         )
 
-    async def ban_user(self, id: int) -> None:
+    async def find_user(self, user: Union[int, User]) -> PyroUser:
-        pass
+        """Find User by it's ID or User object
 
-    async def unban_user(self, id: int) -> None:
+        ### Args:
-        pass
+            * user (`Union[int, User]`): ID or User object to extract ID from
+
+        ### Returns:
+            * `PyroUser`: PyroUser object
+        """
+        if (
+            await col_users.find_one(
+                {"id": user.id if isinstance(user, User) else user}
+            )  # type: ignore
+            is None
+        ):
+            await col_users.insert_one(
+                {
+                    "id": user.id if isinstance(user, User) else user,
+                    "locale": user.language_code if isinstance(user, User) else None,
+                    "banned": False,
+                    "cooldown": datetime(1970, 1, 1, 0, 0),
+                    "subscription": {"expires": datetime(1970, 1, 1, 0, 0)},
+                }
+            )  # type: ignore
+
+        db_record = await col_users.find_one(
+            {"id": user.id if isinstance(user, User) else user}
+        )  # type: ignore
+
+        return PyroUser(**db_record)

classes/pyrouser.py

@@ -0,0 +1,53 @@
+from dataclasses import dataclass
+from datetime import datetime
+from typing import Union
+
+from bson import ObjectId
+from libbot import config_get
+from libbot.pyrogram.classes import PyroClient
+
+from modules.database import col_users
+
+
+@dataclass
+class PyroUser:
+    """Dataclass of DB entry of a user"""
+
+    _id: ObjectId
+    id: int
+    locale: Union[str, None]
+    banned: bool
+    cooldown: datetime
+    subscription: dict
+
+    async def update_locale(self, locale: str) -> None:
+        await col_users.update_one({"_id": self._id}, {"$set": {"locale": locale}})
+
+    async def update_cooldown(self, time: datetime = datetime.now()) -> None:
+        await col_users.update_one({"_id": self._id}, {"$set": {"cooldown": time}})
+
+    async def block(self) -> None:
+        """Ban user from using command and submitting content."""
+        await col_users.update_one({"_id": self._id}, {"$set": {"banned": True}})
+
+    async def unblock(self) -> None:
+        """Allow user to use command and submit posts again."""
+        await col_users.update_one({"_id": self._id}, {"$set": {"banned": False}})
+
+    async def is_limited(self, app: Union[PyroClient, None] = None) -> bool:
+        """Check if user is on a cooldown after submitting something.
+
+        ### Returns:
+            `bool`: Must be `True` if on the cooldown and `False` if not
+        """
+        admins = (
+            await config_get("admins", "bot") + [await config_get("owner", "bot")]
+            if app is None
+            else app.admins
+        )
+
+        return (datetime.now() - self.cooldown).total_seconds() < (
+            app.config["submission"]["timeout"]
+            if app is not None
+            else await config_get("timeout", "submission")
+        )

classes/user.py

@@ -1,58 +0,0 @@
-from datetime import datetime
-
-from libbot import sync
-
-from modules.database import col_banned, col_users
-
-
-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 sync.config_get("admins", "bot"):
-            return False
-
-        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()
-            < sync.config_get("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()})

config_example.json

@@ -1,14 +1,12 @@
 {
     "locale": "en",
-    "locale_log": "en",
-    "locale_fallback": "en",
     "bot": {
         "owner": 0,
         "admins": [],
         "api_id": 0,
         "api_hash": "",
         "bot_token": "",
-        "max_concurrent_transmissions": 5,
+        "max_concurrent_transmissions": 1,
         "scoped_commands": true
     },
     "database": {
@@ -19,7 +17,7 @@
         "name": "tgposter"
     },
     "reports": {
-        "chat_id": 0,
+        "chat_id": "owner",
         "sent": false,
         "error": true,
         "update": true,
@@ -37,11 +35,7 @@
     "locations": {
         "tmp": "tmp",
         "data": "data",
-        "cache": "cache",
+        "cache": "cache"
-        "sent": "data/sent",
-        "queue": "data/queue",
-        "index": "data/index.json",
-        "locale": "locale"
     },
     "disabled_plugins": [],
     "posting": {
@@ -89,7 +83,8 @@
             "address_external": "https://photos.domain.com",
             "username": "",
             "password": "",
-            "album": ""
+            "album": "",
+            "timeout": 15.0
         }
     },
     "caption": {
@@ -139,6 +134,17 @@
                 }
             ]
         },
+        "language": {
+            "scopes": [
+                {
+                    "name": "BotCommandScopeDefault"
+                },
+                {
+                    "name": "BotCommandScopeChat",
+                    "chat_id": "owner"
+                }
+            ]
+        },
         "report": {
             "scopes": [
                 {

locale/en.json

@@ -1,7 +1,17 @@
 {
+    "metadata": {
+        "flag": "🇬🇧",
+        "name": "English",
+        "codes": [
+            "en",
+            "en-US",
+            "en-GB"
+        ]
+    },
     "commands": {
         "start": "Start using the bot",
         "rules": "Photos submission rules",
+        "language": "Change bot's language",
         "report": "Report this post",
         "forwards": "Check post forwards",
         "import": "Submit .zip archive with photos",
@@ -22,6 +32,7 @@
         "sub_yes_auto": "✅ Submission automatically accepted",
         "sub_no": "❌ Submission reviewed and declined",
         "sub_dup": "⚠️ Submission automatically declined because database already contains this photo",
+        "sub_deleted": "⚠️ Submission's database record ({0}) is not available.",
         "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:",
@@ -54,6 +65,7 @@
         "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.",
+        "locale_choice": "Alright. Please choose the language using keyboard below.",
         "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.",
@@ -88,50 +100,7 @@
         "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",
+        "locale_set": "Your language now is: {locale}",
         "nothing": "🏁 This action is already finished"
-    },
-    "console": {
-        "shutdown": "Shutting down bot 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_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})",
-        "sub_received": "Got submission from {0} with a caption {1}",
-        "sub_cooldown": "Got submission from {0} but user is on a cooldown",
-        "sub_no_id": "from_user in function get_submission does not contain id (maybe user posted in a channel)",
-        "sub_msg_unavail": "Could not download submission {0} from user {1}: message not available",
-        "sub_media_unavail": "Could not download submission {0} from user {1}: media not available",
-        "sub_media_downloading": "Downloading media of submission {0} from user {1}...",
-        "sub_media_downloaded": "Downloaded media of submission {0} from user {1}",
-        "sub_accepted": "Accepted submission {0} from user {1}",
-        "sub_declined": "Declined submission {0} from user {1}",
-        "sub_blocked": "Blocked user {0}",
-        "sub_unblocked": "Unblocked user {0}",
-        "deps_missing": "Required modules are not installed. Run 'pip3 install -r requirements.txt' and restart the program.",
-        "passed_norun": "Argument --norun passed, not running the main script",
-        "move_sent_doesnt_exist": "File '{0}' is already moved or does not exist",
-        "move_sent_doesnt_exception": "Could not move sent file '{0}' to '{1}' due to {2}",
-        "move_sent_completed": "Moved all sent files to the sent folder",
-        "cleanup_exception": "Could not remove '{0}' due to {1}",
-        "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}"
     }
 }

locale/uk.json

@@ -1,7 +1,16 @@
 {
+    "metadata": {
+        "flag": "🇺🇦",
+        "name": "Українська",
+        "codes": [
+            "uk",
+            "uk-UA"
+        ]
+    },
     "commands": {
         "start": "Почати користуватись ботом",
         "rules": "Правила пропонування фото",
+        "language": "Змінити мову бота",
         "report": "Поскаржитись на цей пост",
         "forwards": "Переглянути репости",
         "import": "Надати боту .zip архів з фотографіями",
@@ -22,6 +31,7 @@
         "sub_yes_auto": "✅ Подання автоматично прийнято",
         "sub_no": "❌ Подання розглянуто та відхилено",
         "sub_dup": "⚠️ Подання автоматично відхилено через наявність цього фото в базі даних",
+        "sub_deleted": "⚠️ Запис подання у базі даних ({0}) недоступний.",
         "sub_blocked": "Вас заблокували, ви більше не можете надсилати медіафайли.",
         "sub_unblocked": "Вас розблокували, тепер ви можете надсилати медіафайли.",
         "sub_by": "\n\nПредставлено:",
@@ -54,6 +64,7 @@
         "import_upload_error_duplicate": "Не вдалося завантажити `{0}`, оскільки на сервері є дублікати.",
         "import_upload_error_other": "Не вдалося завантажити `{0}`. Ймовірно, заборонений тип файлу.",
         "import_finished": "Імпорт завершено.",
+        "locale_choice": "Гаразд. Будь ласка, оберіть мову за допомогою клавіатури нижче.",
         "remove_request": "Будь ласка, надішліть мені ID для видалення. Ви могли отримати його з діалогу завантаження. Використовуйте /cancel, якщо ви хочете перервати цю операцію.",
         "remove_ignored": "Немає відповіді, перериваємо видалення.",
         "remove_abort": "Видалення перервано.",
@@ -88,50 +99,7 @@
         "sub_media_unavail": "Не вдалося завантажити подання",
         "sub_done": "Ви вже обрали що зробити з цим поданням",
         "sub_duplicates_found": "Знайдено дублікати в базі даних бота",
+        "locale_set": "Встановлено мову: {locale}",
         "nothing": "🏁 Цю дію вже було завершено"
-    },
-    "console": {
-        "shutdown": "Вимкнення бота з підом {0}",
-        "startup": "Запуск бота з підом {0}",
-        "keyboard_interrupt": "\nВимикаюсь...",
-        "exception_occured": "Помилка {0} сталась під час виконання",
-        "post_sent": "Надіслано {0} у {1} з підписом {2} та без звуку {3}",
-        "post_exception": "Не вдалося надіслати контент через {0}. Traceback: {1}",
-        "post_invalid_pic": "Помилка надсилання фото HTTP {0}: {1}",
-        "post_empty": "Не вдалося надіслати контент адже черга з дозволеними розширеннями порожня",
-        "sub_mime_not_allowed": "Отримано подання від {0} але типу {1} який не є дозволеним",
-        "sub_document_too_large": "Отримано подання від {0} але файл завеликий({1} > {2})",
-        "sub_received": "Отримано подання від {0} з підписом {1}",
-        "sub_cooldown": "Отримано подання від {0} але користувач на тайм-ауті",
-        "sub_no_id": "from_user у функції get_submission не має атрибуту id (можливо, користувач запостив щось у канал)",
-        "sub_msg_unavail": "Не вдалося завантажити подання {0} від користувача {1}: повідомлення більше не існує",
-        "sub_media_unavail": "Не вдалося завантажити подання {0} від користувача {1}: медіафайл більше не існує",
-        "sub_media_downloading": "Завантажуємо медіа з подання {0} від користувача{1}...",
-        "sub_media_downloaded": "Завантажено медіа з подання{0} від користувача{1}",
-        "sub_accepted": "Прийнято подання {0} від користувача {1}",
-        "sub_declined": "Відхилено подання {0} від користувача {1}",
-        "sub_blocked": "Заблоковано користувача {0}",
-        "sub_unblocked": "Розблоковано користувача {0}",
-        "deps_missing": "Необхідні модулі не встановлені. Запустіть 'pip3 install -r requirements.txt' і перезапустіть програму.",
-        "passed_norun": "Аргумент --norun надано, основний скрипт не запускається",
-        "move_sent_doesnt_exist": "Файл '{0}' уже переміщено або він не існує",
-        "move_sent_doesnt_exception": "Неможливо перемістити надісланий файл '{0}' до '{1}' через {2}",
-        "move_sent_completed": "Переміщено всі надіслані файли до папки надісланих",
-        "cleanup_exception": "Не вдалося видалити '{0}' через {1}",
-        "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}"
     }
 }

main.py

@@ -4,6 +4,10 @@ from os import getpid
 
 from convopyro import Conversation
 
+# This import MUST be done earlier than PyroClient!
+# Even if isort does not like it...
+from modules.cli import *
+
 from classes.pyroclient import PyroClient
 from modules.scheduler import scheduler
 

modules/api_client.py

@@ -100,15 +100,10 @@ async def authorize(custom_session: Union[ClientSession, None] = None) -> str:
     )
     if not response.ok:
         logger.warning(
-            i18n._(
+            "Incorrect API credentials! Could not login into '%s' using login '%s': HTTP %s",
-                "api_creds_invalid",
-                "console",
-                locale=(await config_get("locale_log")).format(
             await config_get("address", "posting", "api"),
             await config_get("username", "posting", "api"),
             response.status,
-                ),
-            )
         )
         raise ValueError
     async with aiofiles.open(
@@ -122,15 +117,14 @@ async def authorize(custom_session: Union[ClientSession, None] = None) -> str:
 
 
 unauthorized_client = Client(
-    base_url=sync.config_get("address", "posting", "api"),
+    sync.config_get("address", "posting", "api"),
-    timeout=5.0,
-    verify_ssl=True,
     raise_on_unexpected_status=True,
+    timeout=sync.config_get("timeout", "posting", "api"),
 )
 
 login_token = login(
     client=unauthorized_client,
-    form_data=BodyLoginForAccessTokenTokenPost(
+    body=BodyLoginForAccessTokenTokenPost(
         grant_type="password",
         scope="me albums.list albums.read albums.write photos.list photos.read photos.write videos.list videos.read videos.write",
         username=sync.config_get("username", "posting", "api"),
@@ -145,11 +139,10 @@ if not isinstance(login_token, Token):
     exit()
 
 client = AuthenticatedClient(
-    base_url=sync.config_get("address", "posting", "api"),
+    sync.config_get("address", "posting", "api"),
-    timeout=5.0,
-    verify_ssl=True,
-    raise_on_unexpected_status=True,
     token=login_token.access_token,
+    raise_on_unexpected_status=True,
+    timeout=sync.config_get("timeout", "posting", "api"),
 )
 
 if __name__ == "__main__":

modules/cli.py

@@ -0,0 +1,118 @@
+import asyncio
+from argparse import ArgumentParser
+from sys import exit
+from traceback import print_exc
+
+from libbot import config_get, config_set, sync
+from photosapi_client.api.default.album_create_albums_post import (
+    asyncio as album_create,
+)
+from photosapi_client.api.default.login_for_access_token_token_post import (
+    asyncio as login,
+)
+from photosapi_client.api.default.user_create_users_post import asyncio as user_create
+from photosapi_client.client import AuthenticatedClient, Client
+from photosapi_client.models.body_login_for_access_token_token_post import (
+    BodyLoginForAccessTokenTokenPost,
+)
+from photosapi_client.models.body_user_create_users_post import BodyUserCreateUsersPost
+
+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()
+
+if args.create_user or args.create_album:
+    unauthorized_client = Client(
+        base_url=sync.config_get("address", "posting", "api"),
+        timeout=5.0,
+        verify_ssl=True,
+        raise_on_unexpected_status=True,
+        follow_redirects=False,
+    )
+
+
+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 user_create(
+            client=unauthorized_client,
+            form_data=BodyUserCreateUsersPost(
+                user=username, email=email, password=password
+            ),
+        )
+        # asyncio.run(create_user(username, email, password))
+        await config_set("username", username, "posting", "api")
+        await config_set("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 exc:
+        print(f"Could not create a user due to {exc}", flush=True)
+        print_exc()
+        exit()
+    if not args.create_album:
+        print("You're done!", flush=True)
+        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:
+        login_token = await login(
+            client=unauthorized_client,
+            form_data=BodyLoginForAccessTokenTokenPost(
+                grant_type="password",
+                scope="me albums.list albums.read albums.write photos.list photos.read photos.write videos.list videos.read videos.write",
+                username=await config_get("username", "posting", "api"),
+                password=await config_get("password", "posting", "api"),
+            ),
+        )
+        client = AuthenticatedClient(
+            base_url=await config_get("address", "posting", "api"),
+            timeout=5.0,
+            verify_ssl=True,
+            raise_on_unexpected_status=True,
+            token=login_token.access_token,
+            follow_redirects=False,
+        )
+
+        result_2 = await album_create(client=client, name=name, title=title)
+        # asyncio.run(create_album(name, title))
+        await config_set("album", name, "posting", "api")
+    except Exception as exc:
+        print(f"Could not create an album due to {exc}", flush=True)
+        print_exc()
+        exit()
+    print("You're done!", flush=True)
+    exit()
+
+
+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()

modules/custom_filters.py

@@ -0,0 +1,18 @@
+"""Custom message filters"""
+
+from pyrogram import filters
+from pyrogram.types import Message
+
+from classes.pyroclient import PyroClient
+
+
+async def _mode_post_func(_, __: PyroClient, message: Message):
+    return __.config["mode"]["post"]
+
+
+async def _mode_submit_func(_, __: PyroClient, message: Message):
+    return __.config["mode"]["submit"]
+
+
+mode_post = filters.create(_mode_post_func)
+mode_submit = filters.create(_mode_submit_func)

modules/database.py

@@ -1,11 +1,9 @@
 """Module that provides all database columns"""
 
-from pymongo import MongoClient
+from async_pymongo import AsyncClient
-from ujson import loads
+from libbot import sync
 
-with open("config.json", "r", encoding="utf-8") as f:
+db_config = sync.config_get("database")
-    db_config = loads(f.read())["database"]
-    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(
@@ -20,16 +18,9 @@ else:
         db_config["host"], db_config["port"], db_config["name"]
     )
 
-db_client = MongoClient(con_string)
+db_client = AsyncClient(con_string)
 db = db_client.get_database(name=db_config["name"])
 
-collections = db.list_collection_names()
-
-for collection in ["sent", "users", "banned", "submitted"]:
-    if not collection in collections:
-        db.create_collection(collection)
-
 col_sent = db.get_collection("sent")
 col_users = db.get_collection("users")
-col_banned = db.get_collection("banned")
 col_submitted = db.get_collection("submitted")

modules/sender.py

@@ -77,12 +77,12 @@ async def send_content(app: PyroClient, http_session: ClientSession) -> None:
 
                     try:
                         response: File = await func_iter[1](id=media.id, client=client)
-                    except Exception as exp:
+                    except Exception as exc:
                         print_exc()
-                        logger.error("Media is invalid: %s", exp)
+                        logger.error("Media is invalid: %s", exc)
                         if app.config["reports"]["error"]:
                             await app.send_message(
-                                app.owner, f"Media is invalid: {exp}"
+                                app.owner, f"Media is invalid: {exc}"
                             )
                         return
 
@@ -103,15 +103,17 @@ async def send_content(app: PyroClient, http_session: ClientSession) -> None:
                 ).results[0]
                 try:
                     response: File = await func[1](id=media.id, client=client)
-                except Exception as exp:
+                except Exception as exc:
                     print_exc()
-                    logger.error("Media is invalid: %s", exp)
+                    logger.error("Media is invalid: %s", exc)
                     if app.config["reports"]["error"]:
-                        await app.send_message(app.owner, f"Media is invalid: {exp}")
+                        await app.send_message(app.owner, f"Media is invalid: {exc}")
                     return
 
         except (KeyError, AttributeError, TypeError, IndexError):
-            logger.info(app._("post_empty", "console"))
+            logger.info(
+                "Could not send content due to queue empty or contains only forbidden extensions"
+            )
             if app.config["reports"]["error"]:
                 await app.send_message(
                     app.owner,
@@ -150,7 +152,7 @@ async def send_content(app: PyroClient, http_session: ClientSession) -> None:
         ) and func[0] is photo_random:
             image = Image.open(path.join(app.config["locations"]["tmp"], 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.LANCZOS)
             if tmp_path.lower().endswith(".jpeg") or tmp_path.lower().endswith(".jpg"):
                 image.save(
                     path.join(app.config["locations"]["tmp"], tmp_path),
@@ -177,7 +179,7 @@ async def send_content(app: PyroClient, http_session: ClientSession) -> None:
 
         del response
 
-        submitted = col_submitted.find_one({"temp.file": media.filename})
+        submitted = await col_submitted.find_one({"temp.file": media.filename})
 
         if submitted is not None and submitted["caption"] is not None:
             caption = submitted["caption"].strip()
@@ -215,19 +217,19 @@ async def send_content(app: PyroClient, http_session: ClientSession) -> None:
                 caption=caption,
                 disable_notification=app.config["posting"]["silent"],
             )
-        except Exception as exp:
+        except Exception as exc:
             logger.error(
-                "Could not send media %s (%s) due to %s", media.filename, media.id, exp
+                "Could not send media %s (%s) due to %s", media.filename, media.id, exc
             )
             if app.config["reports"]["error"]:
                 await app.send_message(
                     app.owner,
-                    app._("post_exception", "message").format(exp, format_exc()),
+                    app._("post_exception", "message").format(exc, format_exc()),
                 )
             # rmtree(path.join(app.config['locations']['tmp'], tmp_dir), ignore_errors=True)
             return
 
-        col_sent.insert_one(
+        await col_sent.insert_one(
             {
                 "date": datetime.now(),
                 "image": media.id,
@@ -244,20 +246,21 @@ async def send_content(app: PyroClient, http_session: ClientSession) -> None:
         rmtree(path.join(app.config["locations"]["tmp"], tmp_dir), ignore_errors=True)
 
         logger.info(
-            app._("post_sent", "console").format(
+            "Sent %s to %s with caption %s and silently %s",
             media.id,
             str(app.config["posting"]["channel"]),
             caption.replace("\n", "%n"),
             str(app.config["posting"]["silent"]),
         )
-        )
 
-    except Exception as exp:
+    except Exception as exc:
-        logger.error(app._("post_exception", "console").format(str(exp), format_exc()))
+        logger.error(
+            "Could not send content due to %s. Traceback: %s", exc, format_exc()
+        )
         if app.config["reports"]["error"]:
             await app.send_message(
                 app.owner,
-                app._("post_exception", "message").format(exp, format_exc()),
+                app._("post_exception", "message").format(exc, format_exc()),
             )
         try:
             rmtree(

plugins/callbacks/nothing.py

@@ -6,7 +6,7 @@ from classes.pyroclient import PyroClient
 
 
 @Client.on_callback_query(filters.regex("nothing"))
-async def callback_query_nothing(app: PyroClient, clb: CallbackQuery):
+async def callback_query_nothing(app: PyroClient, callback: CallbackQuery):
-    await clb.answer(
+    user = await app.find_user(callback.from_user)
-        text=app._("nothing", "callback", locale=clb.from_user.language_code)
+
-    )
+    await callback.answer(text=app._("nothing", "callback", locale=user.locale))

plugins/callbacks/shutdown.py

@@ -10,11 +10,11 @@ from classes.pyroclient import PyroClient
 
 
 @Client.on_callback_query(filters.regex("shutdown"))
-async def callback_query_nothing(app: PyroClient, clb: CallbackQuery):
+async def callback_query_nothing(app: PyroClient, callback: CallbackQuery):
-    if clb.from_user.id not in app.admins:
+    if callback.from_user.id not in app.admins:
         return
 
-    await clb.answer()
+    await callback.answer()
 
     makedirs(await config_get("cache", "locations"), exist_ok=True)
     await json_write(

plugins/callbacks/submission.py

@@ -15,68 +15,76 @@ from classes.exceptions import (
     SubmissionUnsupportedError,
 )
 from classes.pyroclient import PyroClient
-from classes.user import PosterUser
 from modules.database import col_submitted
 
 logger = logging.getLogger(__name__)
 
 
 @Client.on_callback_query(filters.regex("sub_yes_[\s\S]*"))
-async def callback_query_yes(app: PyroClient, clb: CallbackQuery):
+async def callback_query_yes(app: PyroClient, callback: CallbackQuery):
-    fullclb = str(clb.data).split("_")
+    user = await app.find_user(callback.from_user)
-    user_locale = clb.from_user.language_code
+    fullcallback = str(callback.data).split("_")
 
-    db_entry = col_submitted.find_one({"_id": ObjectId(fullclb[2])})
+    db_entry = await col_submitted.find_one({"_id": ObjectId(fullcallback[2])})
 
     try:
-        submission = await app.submit_photo(fullclb[2])
+        submission = await app.submit_media(
+            fullcallback[2],
+            purge_caption=("caption" not in fullcallback),
+        )
     except SubmissionUnavailableError:
-        await clb.answer(
+        await callback.answer(
-            text=app._("sub_msg_unavail", "callback", locale=user_locale),
+            text=app._("sub_msg_unavail", "callback", locale=user.locale),
             show_alert=True,
         )
         return
     except SubmissionUnsupportedError:
-        await clb.answer(
+        await callback.answer(
-            text=app._("mime_not_allowed", "message", locale=user_locale).format(
+            text=app._("mime_not_allowed", "message", locale=user.locale).format(
                 ", ".join(app.config["submission"]["mime_types"]), quote=True
             ),
             show_alert=True,
         )
         return
-    except SubmissionDuplicatesError as exp:
+    except SubmissionDuplicatesError as exc:
-        await clb.answer(
+        await callback.answer(
-            text=app._("sub_duplicates_found", "callback", locale=user_locale),
+            text=app._("sub_duplicates_found", "callback", locale=user.locale),
             show_alert=True,
         )
-        await clb.message.reply_text(
+        await callback.message.reply_text(
-            app._("sub_media_duplicates_list", "message", locale=user_locale).format(
+            app._("sub_media_duplicates_list", "message", locale=user.locale).format(
-                "\n • ".join(exp.duplicates)
+                "\n • ".join(exc.duplicates)
             ),
             quote=True,
         )
         logger.info(
-            app._(
+            "Submission with ID '%s' could not be accepted because of the duplicates: %s",
-                "submission_duplicate",
+            fullcallback[2],
-                "console",
+            str(exc.duplicates),
-                locale=app.config["locale_log"],
-            ).format(
-                fullclb[2],
-                str(exp.duplicates),
-            ),
         )
         return
 
     if submission[0] is not None:
         await submission[0].reply_text(
-            app._("sub_yes", "message", locale=submission[0].from_user.language_code),
+            app._(
+                "sub_yes",
+                "message",
+                locale=(await app.find_user(submission[0].from_user)).locale,
+            ),
             quote=True,
         )
     elif db_entry is not None:
-        await app.send_message(db_entry["user"], app._("sub_yes", "message"))
+        await app.send_message(
+            db_entry["user"],
+            app._(
+                "sub_yes",
+                "message",
+                locale=(await app.find_user(db_entry["user"])).locale,
+            ),
+        )
 
-    await clb.answer(
+    await callback.answer(
-        text=app._("sub_yes", "callback", locale=user_locale).format(fullclb[2]),
+        text=app._("sub_yes", "callback", locale=user.locale).format(fullcallback[2]),
         show_alert=True,
     )
 
@@ -84,17 +92,17 @@ async def callback_query_yes(app: PyroClient, clb: CallbackQuery):
         [
             [
                 InlineKeyboardButton(
-                    text=str(app._("accepted", "button", locale=user_locale)),
+                    text=str(app._("accepted", "button", locale=user.locale)),
                     callback_data="nothing",
                 )
             ],
-            clb.message.reply_markup.inline_keyboard[1],
+            callback.message.reply_markup.inline_keyboard[1],
         ]
-        if len(clb.message.reply_markup.inline_keyboard) > 1
+        if len(callback.message.reply_markup.inline_keyboard) > 1
         else [
             [
                 InlineKeyboardButton(
-                    text=str(app._("accepted", "button", locale=user_locale)),
+                    text=str(app._("accepted", "button", locale=user.locale)),
                     callback_data="nothing",
                 )
             ]
@@ -102,32 +110,44 @@ async def callback_query_yes(app: PyroClient, clb: CallbackQuery):
     )
 
     if await config_get("send_uploaded_id", "submission"):
-        await clb.message.edit_caption(
+        await callback.message.edit_caption(
-            clb.message.caption + f"\n\nID: `{submission[1]}`"
+            f"{callback.message.caption}\n\nID: `{submission[1]}`"
         )
 
-    await clb.message.edit_reply_markup(
+    await callback.message.edit_reply_markup(
         reply_markup=InlineKeyboardMarkup(edited_markup)
     )
 
     logger.info(
-        app._(
+        "Submission with ID '%s' accepted and uploaded with ID '%s'",
-            "submission_accepted",
+        fullcallback[2],
-            "console",
+        submission[1],
-            locale=app.config["locale_log"],
+    )
-        ).format(fullclb[2], submission[1]),
+    logger.info(
+        "Submission with ID '%s' accepted and uploaded with ID '%s'",
+        fullcallback[2],
+        submission[1],
     )
 
 
 @Client.on_callback_query(filters.regex("sub_no_[\s\S]*"))
-async def callback_query_no(app: PyroClient, clb: CallbackQuery):
+async def callback_query_no(app: PyroClient, callback: CallbackQuery):
-    fullclb = str(clb.data).split("_")
+    user = await app.find_user(callback.from_user)
-    user_locale = clb.from_user.language_code
+    fullcallback = str(callback.data).split("_")
 
-    db_entry = col_submitted.find_one_and_delete({"_id": ObjectId(fullclb[2])})
+    db_entry = await col_submitted.delete_one({"_id": ObjectId(fullcallback[2])})
+
+    if db_entry.deleted_count == 0:
+        await callback.answer(
+            text=app._("sub_deleted", "callback", locale=user.locale).format(
+                fullcallback[2]
+            ),
+            show_alert=True,
+        )
+        return
 
     if (
-        db_entry["temp"]["uuid"] is not None
+        db_entry.raw_result["temp"]["uuid"] is not None
         and Path(
             f"{app.config['locations']['data']}/submissions/{db_entry['temp']['uuid']}"
         ).exists()
@@ -143,19 +163,23 @@ async def callback_query_no(app: PyroClient, clb: CallbackQuery):
         submission = await app.get_messages(
             db_entry["user"], db_entry["telegram"]["msg_id"]
         )
-    except Exception as exp:
+    except Exception as exc:
-        await clb.answer(
+        await callback.answer(
-            text=app._("sub_msg_unavail", "message", locale=user_locale),
+            text=app._("sub_msg_unavail", "message", locale=user.locale),
             show_alert=True,
         )
         return
 
     await submission.reply_text(
-        app._("sub_no", "message", locale=submission.from_user.language_code),
+        app._(
+            "sub_no",
+            "message",
+            locale=(await app.find_user(submission.from_user)).locale,
+        ),
         quote=True,
     )
-    await clb.answer(
+    await callback.answer(
-        text=app._("sub_no", "callback", locale=user_locale).format(fullclb[2]),
+        text=app._("sub_no", "callback", locale=user.locale).format(fullcallback[2]),
         show_alert=True,
     )
 
@@ -163,101 +187,99 @@ async def callback_query_no(app: PyroClient, clb: CallbackQuery):
         [
             [
                 InlineKeyboardButton(
-                    text=str(app._("declined", "button", locale=user_locale)),
+                    text=str(app._("declined", "button", locale=user.locale)),
                     callback_data="nothing",
                 )
             ],
-            clb.message.reply_markup.inline_keyboard[1],
+            callback.message.reply_markup.inline_keyboard[1],
         ]
-        if len(clb.message.reply_markup.inline_keyboard) > 1
+        if len(callback.message.reply_markup.inline_keyboard) > 1
         else [
             [
                 InlineKeyboardButton(
-                    text=str(app._("declined", "button", locale=user_locale)),
+                    text=str(app._("declined", "button", locale=user.locale)),
                     callback_data="nothing",
                 )
             ]
         ]
     )
-    await clb.message.edit_reply_markup(
+    await callback.message.edit_reply_markup(
         reply_markup=InlineKeyboardMarkup(edited_markup)
     )
     logger.info(
-        app._(
+        "Submission with ID '%s' rejected",
-            "submission_rejected",
+        fullcallback[2],
-            "console",
-            locale=app.config["locale_log"],
-        ).format(fullclb[2]),
     )
 
 
 @Client.on_callback_query(filters.regex("sub_block_[\s\S]*"))
-async def callback_query_block(app: PyroClient, clb: CallbackQuery):
+async def callback_query_block(app: PyroClient, callback: CallbackQuery):
-    fullclb = str(clb.data).split("_")
+    user = await app.find_user(callback.from_user)
-    user_locale = clb.from_user.language_code
+    fullcallback = str(callback.data).split("_")
 
     await app.send_message(
-        int(fullclb[2]),
+        int(fullcallback[2]),
-        app._("sub_blocked", "message"),
+        app._(
+            "sub_blocked",
+            "message",
+            locale=(await app.find_user(int(fullcallback[2]))).locale,
+        ),
     )
-    PosterUser(int(fullclb[2])).block()
+    await user.block()
 
-    await clb.answer(
+    await callback.answer(
-        text=app._("sub_block", "callback", locale=user_locale).format(fullclb[2]),
+        text=app._("sub_block", "callback", locale=user.locale).format(fullcallback[2]),
         show_alert=True,
     )
 
     edited_markup = [
-        clb.message.reply_markup.inline_keyboard[0],
+        callback.message.reply_markup.inline_keyboard[0],
         [
             InlineKeyboardButton(
-                text=str(app._("sub_unblock", "button", locale=user_locale)),
+                text=str(app._("sub_unblock", "button", locale=user.locale)),
-                callback_data=f"sub_unblock_{fullclb[2]}",
+                callback_data=f"sub_unblock_{fullcallback[2]}",
             )
         ],
     ]
-    await clb.message.edit_reply_markup(
+    await callback.message.edit_reply_markup(
         reply_markup=InlineKeyboardMarkup(edited_markup)
     )
-    logger.info(
+    logger.info("User %s has been blocked", fullcallback[2])
-        app._(
-            "user_blocked",
-            "console",
-            locale=app.config["locale_log"],
-        ).format(fullclb[2]),
-    )
 
 
 @Client.on_callback_query(filters.regex("sub_unblock_[\s\S]*"))
-async def callback_query_unblock(app: PyroClient, clb: CallbackQuery):
+async def callback_query_unblock(app: PyroClient, callback: CallbackQuery):
-    fullclb = str(clb.data).split("_")
+    user = await app.find_user(callback.from_user)
-    user_locale = clb.from_user.language_code
+    fullcallback = str(callback.data).split("_")
 
-    await app.send_message(int(fullclb[2]), app._("sub_unblocked", "message"))
+    await app.send_message(
+        int(fullcallback[2]),
+        app._(
+            "sub_unblocked",
+            "message",
+            locale=(await app.find_user(int(fullcallback[2]))).locale,
+        ),
+    )
 
-    PosterUser(int(fullclb[2])).unblock()
+    await user.unblock()
 
-    await clb.answer(
+    await callback.answer(
-        text=app._("sub_unblock", "callback", locale=user_locale).format(fullclb[2]),
+        text=app._("sub_unblock", "callback", locale=user.locale).format(
+            fullcallback[2]
+        ),
         show_alert=True,
     )
 
     edited_markup = [
-        clb.message.reply_markup.inline_keyboard[0],
+        callback.message.reply_markup.inline_keyboard[0],
         [
             InlineKeyboardButton(
-                text=str(app._("sub_block", "button", locale=user_locale)),
+                text=str(app._("sub_block", "button", locale=user.locale)),
-                callback_data=f"sub_block_{fullclb[2]}",
+                callback_data=f"sub_block_{fullcallback[2]}",
             )
         ],
     ]
-    await clb.message.edit_reply_markup(
+    await callback.message.edit_reply_markup(
         reply_markup=InlineKeyboardMarkup(edited_markup)
     )
-    logger.info(
+    logger.info("User %s has been unblocked", fullcallback[2])
-        app._(
-            "user_unblocked",
-            "console",
-            locale=app.config["locale_log"],
-        ).format(fullclb[2]),
-    )

plugins/commands/general.py

@@ -1,3 +1,4 @@
+import asyncio
 from os import makedirs
 from pathlib import Path
 from time import time
@@ -14,20 +15,22 @@ from modules.utils import USERS_WITH_CONTEXT
 @Client.on_message(
     ~filters.scheduled & filters.command(["shutdown"], prefixes=["", "/"])
 )
-async def cmd_kill(app: PyroClient, msg: Message):
+async def cmd_kill(app: PyroClient, message: Message):
-    if msg.from_user.id not in app.admins:
+    if message.from_user.id not in app.admins:
         return
 
+    user = await app.find_user(message.from_user)
+
     if len(USERS_WITH_CONTEXT) > 0:
-        await msg.reply_text(
+        await message.reply_text(
-            app._("shutdown_confirm", "message").format(len(USERS_WITH_CONTEXT)),
+            app._("shutdown_confirm", "message", locale=user.locale).format(
+                len(USERS_WITH_CONTEXT)
+            ),
             reply_markup=InlineKeyboardMarkup(
                 [
                     [
                         InlineKeyboardButton(
-                            app._(
+                            app._("shutdown", "button", locale=user.locale),
-                                "shutdown", "button", locale=msg.from_user.language_code
-                            ),
                             callback_data="shutdown",
                         )
                     ]
@@ -42,4 +45,4 @@ async def cmd_kill(app: PyroClient, msg: Message):
         Path(f"{app.config['locations']['cache']}/shutdown_time"),
     )
 
-    exit()
+    asyncio.get_event_loop().create_task(app.stop())

plugins/commands/mode_submit.py

@@ -3,22 +3,32 @@ from pyrogram.client import Client
 from pyrogram.types import Message
 
 from classes.pyroclient import PyroClient
-from classes.user import PosterUser
+from modules import custom_filters
-
-
-@Client.on_message(~filters.scheduled & filters.command(["start"], prefixes="/"))
-async def cmd_start(app: PyroClient, msg: Message):
-    if PosterUser(msg.from_user.id).is_blocked():
-        return
-
-    await msg.reply_text(app._("start", "message", locale=msg.from_user.language_code))
 
 
 @Client.on_message(
-    ~filters.scheduled & filters.command(["rules", "help"], prefixes="/")
+    custom_filters.mode_submit
+    & ~filters.scheduled
+    & filters.command(["start"], prefixes="/")
 )
-async def cmd_rules(app: PyroClient, msg: Message):
+async def cmd_start(app: PyroClient, message: Message):
-    if PosterUser(msg.from_user.id).is_blocked():
+    user = await app.find_user(message.from_user)
+
+    if user.banned:
         return
 
-    await msg.reply_text(app._("rules", "message", locale=msg.from_user.language_code))
+    await message.reply_text(app._("start", "message", locale=user.locale))
+
+
+@Client.on_message(
+    custom_filters.mode_submit
+    & ~filters.scheduled
+    & filters.command(["rules", "help"], prefixes="/")
+)
+async def cmd_rules(app: PyroClient, message: Message):
+    user = await app.find_user(message.from_user)
+
+    if user.banned:
+        return
+
+    await message.reply_text(app._("rules", "message", locale=user.locale))

plugins/commands/photos.py

@@ -37,36 +37,34 @@ logger = logging.getLogger(__name__)
 
 
 @Client.on_message(~filters.scheduled & filters.command(["import"], prefixes=["", "/"]))
-async def cmd_import(app: PyroClient, msg: Message):
+async def cmd_import(app: PyroClient, message: Message):
-    if msg.from_user.id not in app.admins:
+    if message.from_user.id not in app.admins:
         return
 
     global USERS_WITH_CONTEXT
 
-    if msg.from_user.id not in USERS_WITH_CONTEXT:
+    if message.from_user.id not in USERS_WITH_CONTEXT:
-        USERS_WITH_CONTEXT.append(msg.from_user.id)
+        USERS_WITH_CONTEXT.append(message.from_user.id)
     else:
         return
 
-    await msg.reply_text(
+    user = await app.find_user(message.from_user)
-        app._("import_request", "message", locale=msg.from_user.language_code)
-    )
 
-    answer = await listen_message(app, msg.chat.id, timeout=600)
+    await message.reply_text(app._("import_request", "message", locale=user.locale))
 
-    USERS_WITH_CONTEXT.remove(msg.from_user.id)
+    answer = await listen_message(app, message.chat.id, timeout=600)
+
+    USERS_WITH_CONTEXT.remove(message.from_user.id)
 
     if answer is None:
-        await msg.reply_text(
+        await message.reply_text(
-            app._("import_ignored", "message", locale=msg.from_user.language_code),
+            app._("import_ignored", "message", locale=user.locale),
             quote=True,
         )
         return
 
     if answer.text == "/cancel":
-        await answer.reply_text(
+        await answer.reply_text(app._("import_abort", "message", locale=user.locale))
-            app._("import_abort", "message", locale=msg.from_user.language_code)
-        )
         return
 
     if answer.document is None:
@@ -74,7 +72,7 @@ async def cmd_import(app: PyroClient, msg: Message):
             app._(
                 "import_invalid_media",
                 "message",
-                locale=msg.from_user.language_code,
+                locale=user.locale,
             ),
             quote=True,
         )
@@ -82,16 +80,14 @@ async def cmd_import(app: PyroClient, msg: Message):
 
     if answer.document.mime_type != "application/zip":
         await answer.reply_text(
-            app._("import_invalid_mime", "message", locale=msg.from_user.language_code),
+            app._("import_invalid_mime", "message", locale=user.locale),
             quote=True,
         )
         return
 
     if disk_usage(getcwd())[2] < (answer.document.file_size) * 3:
-        await msg.reply_text(
+        await message.reply_text(
-            app._(
+            app._("import_too_big", "message", locale=user.locale).format(
-                "import_too_big", "message", locale=msg.from_user.language_code
-            ).format(
                 answer.document.file_size // (2**30),
                 disk_usage(getcwd())[2] // (2**30),
             )
@@ -111,14 +107,12 @@ async def cmd_import(app: PyroClient, msg: Message):
     tmp_path = Path(f"{app.config['locations']['tmp']}/{answer.document.file_id}")
 
     downloading = await answer.reply_text(
-        app._("import_downloading", "message", locale=msg.from_user.language_code),
+        app._("import_downloading", "message", locale=user.locale),
         quote=True,
     )
 
     await app.download_media(answer, file_name=str(tmp_path))
-    await downloading.edit(
+    await downloading.edit(app._("import_unpacking", "message", locale=user.locale))
-        app._("import_unpacking", "message", locale=msg.from_user.language_code)
-    )
 
     try:
         with ZipFile(tmp_path, "r") as handle:
@@ -129,25 +123,23 @@ async def cmd_import(app: PyroClient, msg: Message):
                 for name in handle.namelist()
             ]
             _ = await asyncio.gather(*tasks)
-    except Exception as exp:
+    except Exception as exc:
         logger.error(
             "Could not import '%s' due to %s: %s",
             answer.document.file_name,
-            exp,
+            exc,
             format_exc(),
         )
         await answer.reply_text(
-            app._(
+            app._("import_unpack_error", "message", locale=user.locale).format(
-                "import_unpack_error", "message", locale=msg.from_user.language_code
+                exc, format_exc()
-            ).format(exp, format_exc())
+            )
         )
         return
 
     logger.info("Downloaded '%s' - awaiting upload", answer.document.file_name)
 
-    await downloading.edit(
+    await downloading.edit(app._("import_uploading", "message", locale=user.locale))
-        app._("import_uploading", "message", locale=msg.from_user.language_code)
-    )
 
     remove(tmp_path)
 
@@ -166,25 +158,25 @@ async def cmd_import(app: PyroClient, msg: Message):
             uploaded = await photo_upload(
                 app.config["posting"]["api"]["album"],
                 client=client,
-                multipart_data=BodyPhotoUpload(
+                body=BodyPhotoUpload(
                     File(photo_bytes, Path(filename).name, "image/jpeg")
                 ),
                 ignore_duplicates=app.config["submission"]["allow_duplicates"],
                 compress=False,
                 caption="queue",
             )
-        except UnexpectedStatus as exp:
+        except UnexpectedStatus as exc:
             logger.error(
                 "Could not upload '%s' from '%s': %s",
                 filename,
                 Path(f"{app.config['locations']['tmp']}/{tmp_dir}"),
-                exp,
+                exc,
             )
-            await msg.reply_text(
+            await message.reply_text(
                 app._(
                     "import_upload_error_other",
                     "message",
-                    locale=msg.from_user.language_code,
+                    locale=user.locale,
                 ).format(path.basename(filename)),
                 disable_notification=True,
             )
@@ -201,20 +193,20 @@ async def cmd_import(app: PyroClient, msg: Message):
             )
 
             if len(uploaded_dict["duplicates"]) > 0:
-                await msg.reply_text(
+                await message.reply_text(
                     app._(
                         "import_upload_error_duplicate",
                         "message",
-                        locale=msg.from_user.language_code,
+                        locale=user.locale,
                     ).format(path.basename(filename)),
                     disable_notification=True,
                 )
             else:
-                await msg.reply_text(
+                await message.reply_text(
                     app._(
                         "import_upload_error_other",
                         "message",
-                        locale=msg.from_user.language_code,
+                        locale=user.locale,
                     ).format(path.basename(filename)),
                     disable_notification=True,
                 )
@@ -235,7 +227,7 @@ async def cmd_import(app: PyroClient, msg: Message):
     rmtree(Path(f"{app.config['locations']['tmp']}/{tmp_dir}"), ignore_errors=True)
 
     await answer.reply_text(
-        app._("import_finished", "message", locale=msg.from_user.language_code),
+        app._("import_finished", "message", locale=user.locale),
         quote=True,
     )
 
@@ -243,55 +235,51 @@ async def cmd_import(app: PyroClient, msg: Message):
 
 
 @Client.on_message(~filters.scheduled & filters.command(["export"], prefixes=["", "/"]))
-async def cmd_export(app: PyroClient, msg: Message):
+async def cmd_export(app: PyroClient, message: Message):
-    if msg.from_user.id not in app.admins:
+    if message.from_user.id not in app.admins:
         return
 
 
 @Client.on_message(~filters.scheduled & filters.command(["remove"], prefixes=["", "/"]))
-async def cmd_remove(app: PyroClient, msg: Message):
+async def cmd_remove(app: PyroClient, message: Message):
-    if msg.from_user.id not in app.admins:
+    if message.from_user.id not in app.admins:
         return
 
     global USERS_WITH_CONTEXT
 
-    if msg.from_user.id not in USERS_WITH_CONTEXT:
+    if message.from_user.id not in USERS_WITH_CONTEXT:
-        USERS_WITH_CONTEXT.append(msg.from_user.id)
+        USERS_WITH_CONTEXT.append(message.from_user.id)
     else:
         return
 
-    await msg.reply_text(
+    user = await app.find_user(message.from_user)
-        app._("remove_request", "message", locale=msg.from_user.language_code)
+
+    await message.reply_text(app._("remove_request", "message", locale=user.locale))
+
+    answer_id = await app.listen.Message(
+        filters.text & ~filters.me, id=filters.user(message.from_user.id), timeout=600
     )
 
-    answer_id = await listen_message(app, msg.chat.id, timeout=600)
+    USERS_WITH_CONTEXT.remove(message.from_user.id)
-
-    USERS_WITH_CONTEXT.remove(msg.from_user.id)
 
     if answer_id is None:
-        await msg.reply_text(
+        await message.reply_text(
-            app._("remove_ignored", "message", locale=msg.from_user.language_code),
+            app._("remove_ignored", "message", locale=user.locale),
             quote=True,
         )
         return
 
     if answer_id.text == "/cancel":
-        await answer_id.reply_text(
+        await answer_id.reply_text(app._("remove_abort", "message", locale=user.locale))
-            app._("remove_abort", "message", locale=msg.from_user.language_code)
-        )
         return
 
-    await msg.reply_text(
+    await message.reply_text(
-        app._("remove_kind", "message", locale=msg.from_user.language_code),
+        app._("remove_kind", "message", locale=user.locale),
         reply_markup=ReplyKeyboardMarkup(
             [
                 [
-                    KeyboardButton(
+                    KeyboardButton(app._("photo", "button", locale=user.locale)),
-                        app._("photo", "button", locale=msg.from_user.language_code)
+                    KeyboardButton(app._("video", "button", locale=user.locale)),
-                    ),
-                    KeyboardButton(
-                        app._("video", "button", locale=msg.from_user.language_code)
-                    ),
                 ]
             ],
             resize_keyboard=True,
@@ -299,15 +287,17 @@ async def cmd_remove(app: PyroClient, msg: Message):
         ),
     )
 
-    USERS_WITH_CONTEXT.append(msg.from_user.id)
+    USERS_WITH_CONTEXT.append(message.from_user.id)
 
-    answer_kind = await listen_message(app, msg.chat.id, timeout=600)
+    answer_kind = await app.listen.Message(
+        filters.text & ~filters.me, id=filters.user(message.from_user.id), timeout=600
+    )
 
-    USERS_WITH_CONTEXT.remove(msg.from_user.id)
+    USERS_WITH_CONTEXT.remove(message.from_user.id)
 
     if answer_kind is None:
-        await msg.reply_text(
+        await message.reply_text(
-            app._("remove_ignored", "message", locale=msg.from_user.language_code),
+            app._("remove_ignored", "message", locale=user.locale),
             quote=True,
             reply_markup=ReplyKeyboardRemove(),
         )
@@ -315,7 +305,7 @@ async def cmd_remove(app: PyroClient, msg: Message):
 
     if answer_kind.text == "/cancel":
         await answer_kind.reply_text(
-            app._("remove_abort", "message", locale=msg.from_user.language_code),
+            app._("remove_abort", "message", locale=user.locale),
             reply_markup=ReplyKeyboardRemove(),
         )
         return
@@ -326,11 +316,9 @@ async def cmd_remove(app: PyroClient, msg: Message):
         func = video_delete
     else:
         await answer_kind.reply_text(
-            app._(
+            app._("remove_unknown", "message", locale=user.locale).format(
-                "remove_unknown", "message", locale=msg.from_user.language_code
+                app._("photo", "button", locale=user.locale),
-            ).format(
+                app._("video", "button", locale=user.locale),
-                app._("photo", "button", locale=msg.from_user.language_code),
-                app._("video", "button", locale=msg.from_user.language_code),
             ),
             reply_markup=ReplyKeyboardRemove(),
         )
@@ -346,9 +334,9 @@ async def cmd_remove(app: PyroClient, msg: Message):
             answer_id.from_user.id,
         )
         await answer_kind.reply_text(
-            app._(
+            app._("remove_success", "message", locale=user.locale).format(
-                "remove_success", "message", locale=msg.from_user.language_code
+                answer_id.text
-            ).format(answer_id.text),
+            ),
             reply_markup=ReplyKeyboardRemove(),
         )
     else:
@@ -359,14 +347,14 @@ async def cmd_remove(app: PyroClient, msg: Message):
             answer_id.from_user.id,
         )
         await answer_kind.reply_text(
-            app._(
+            app._("remove_failure", "message", locale=user.locale).format(
-                "remove_failure", "message", locale=msg.from_user.language_code
+                answer_id.text
-            ).format(answer_id.text),
+            ),
             reply_markup=ReplyKeyboardRemove(),
         )
 
 
 @Client.on_message(~filters.scheduled & filters.command(["purge"], prefixes=["", "/"]))
-async def cmd_purge(app: PyroClient, msg: Message):
+async def cmd_purge(app: PyroClient, message: Message):
-    if msg.from_user.id not in app.admins:
+    if message.from_user.id not in app.admins:
         return

plugins/commands/report.py

@@ -1,41 +1,43 @@
-from pyrogram.client import Client
-from pyrogram import filters
-from pyrogram.types import Message, User
 from libbot import sync
+from pyrogram import filters
+from pyrogram.client import Client
+from pyrogram.types import Message, User
+
 from classes.pyroclient import PyroClient
+from modules import custom_filters
 
 
 @Client.on_message(
-    ~filters.scheduled
+    custom_filters.mode_post
+    & ~filters.scheduled
     & filters.chat(sync.config_get("comments", "posting"))
     & filters.reply
     & filters.command(["report"], prefixes=["", "/"])
 )
-async def command_report(app: PyroClient, msg: Message):
+async def command_report(app: PyroClient, message: Message):
-    if msg.reply_to_message.forward_from_chat.id == app.config["posting"]["channel"]:
+    if (
-        await msg.reply_text(
+        message.reply_to_message.forward_from_chat.id
+        != app.config["posting"]["channel"]
+    ):
+        return
+
+    user = await app.find_user(message.from_user)
+
+    await message.reply_text(
         app._(
             "report_sent",
             "message",
-                locale=msg.from_user.language_code
+            locale=user.locale if message.from_user is not None else None,
-                if msg.from_user is not None
-                else None,
         )
     )
 
-        print(msg)
+    report_sent = await message.reply_to_message.forward(app.owner)
+    sender = message.from_user if message.from_user is not None else message.sender_chat
 
-        report_sent = await msg.reply_to_message.forward(app.owner)
+    sender_name = sender.first_name if isinstance(sender, User) else sender.title
-        sender = msg.from_user if msg.from_user is not None else msg.sender_chat
 
-        sender_name = (
-            sender.first_name if isinstance(sender, User) else sender.title
-        )
-
-        # ACTION NEEDED
-        # Name and username are somehow None
     await report_sent.reply_text(
-            app._("report_received", "message").format(
+        app._("report_received", "message", locale=user.locale).format(
             sender_name, sender.username, sender.id
         ),
         quote=True,

plugins/handlers/submission.py

@@ -13,126 +13,134 @@ from pyrogram.types import InlineKeyboardButton, InlineKeyboardMarkup, Message
 from classes.enums.submission_types import SubmissionType
 from classes.exceptions import SubmissionDuplicatesError, SubmissionUnsupportedError
 from classes.pyroclient import PyroClient
-from classes.user import PosterUser
+from modules import custom_filters
-from modules.database import col_banned, col_submitted
+from modules.database import col_submitted
 from modules.utils import USERS_WITH_CONTEXT
 
 logger = logging.getLogger(__name__)
 
 
 @Client.on_message(
-    ~filters.scheduled & filters.private & filters.photo
+    custom_filters.mode_submit & ~filters.scheduled & filters.private & filters.photo
     | filters.video
     # | filters.animation
     | filters.document
 )
-async def get_submission(app: PyroClient, msg: Message):
+async def get_submission(app: PyroClient, message: Message):
     global USERS_WITH_CONTEXT
 
-    if not hasattr(msg.from_user, "id"):
+    if not hasattr(message.from_user, "id"):
         return
 
-    if msg.from_user.id in USERS_WITH_CONTEXT:
+    if message.from_user.id in USERS_WITH_CONTEXT:
         return
 
+    user = await app.find_user(message.from_user)
+    user_owner = await app.find_user(app.owner)
+
     try:
-        if col_banned.find_one({"user": msg.from_user.id}) is not None:
+        if user.banned:
             return
 
-        await app.send_chat_action(msg.chat.id, ChatAction.TYPING)
+        await app.send_chat_action(message.chat.id, ChatAction.TYPING)
 
-        user_locale = msg.from_user.language_code
         save_tmp = True
         contents = None
 
-        if PosterUser(msg.from_user.id).is_limited():
+        if await user.is_limited():
-            await msg.reply_text(
+            await message.reply_text(
-                app._("sub_cooldown", "message", locale=user_locale).format(
+                app._("sub_cooldown", "message", locale=user.locale).format(
-                    str(app.config["submission"]["timeout"])
+                    app.config["submission"]["timeout"]
                 )
             )
             return
 
-        if msg.document is not None:
+        if message.document is not None:
             logger.info(
                 "User %s is trying to submit a file of type '%s' with name '%s' and size of %s MB",
-                msg.from_user.id,
+                message.from_user.id,
-                msg.document.mime_type,
+                message.document.mime_type,
-                msg.document.file_name,
+                message.document.file_name,
-                msg.document.file_size / 1024 / 1024,
+                message.document.file_size / 1024 / 1024,
             )
-            if msg.document.mime_type not in app.config["submission"]["mime_types"]:
+            if message.document.mime_type not in app.config["submission"]["mime_types"]:
-                await msg.reply_text(
+                await message.reply_text(
-                    app._("mime_not_allowed", "message", locale=user_locale).format(
+                    app._("mime_not_allowed", "message", locale=user.locale).format(
                         ", ".join(app.config["submission"]["mime_types"])
                     ),
                     quote=True,
                 )
                 return
-            if msg.document.file_size > app.config["submission"]["file_size"]:
+            if message.document.file_size > app.config["submission"]["file_size"]:
-                await msg.reply_text(
+                await message.reply_text(
-                    app._("document_too_large", "message", locale=user_locale).format(
+                    app._("document_too_large", "message", locale=user.locale).format(
-                        str(app.config["submission"]["file_size"] / 1024 / 1024)
+                        app.config["submission"]["file_size"] / 1024 / 1024
                     ),
                     quote=True,
                 )
                 return
-            if msg.document.file_size > app.config["submission"]["tmp_size"]:
+            if message.document.file_size > app.config["submission"]["tmp_size"]:
                 save_tmp = False
             contents = (
-                msg.document.file_id,
+                message.document.file_id,
                 SubmissionType.DOCUMENT,
-            )  # , msg.document.file_name
+            )  # , message.document.file_name
 
-        if msg.video is not None:
+        if message.video is not None:
             logger.info(
                 "User %s is trying to submit a video with name '%s' and size of %s MB",
-                msg.from_user.id,
+                message.from_user.id,
-                msg.video.file_name,
+                message.video.file_name,
-                msg.video.file_size / 1024 / 1024,
+                message.video.file_size / 1024 / 1024,
             )
-            if msg.video.file_size > app.config["submission"]["file_size"]:
+            if message.video.file_size > app.config["submission"]["file_size"]:
-                await msg.reply_text(
+                await message.reply_text(
-                    app._("document_too_large", "message", locale=user_locale).format(
+                    app._("document_too_large", "message", locale=user.locale).format(
-                        str(app.config["submission"]["file_size"] / 1024 / 1024)
+                        app.config["submission"]["file_size"] / 1024 / 1024
                     ),
                     quote=True,
                 )
                 return
-            if msg.video.file_size > app.config["submission"]["tmp_size"]:
+            if message.video.file_size > app.config["submission"]["tmp_size"]:
                 save_tmp = False
-            contents = msg.video.file_id, SubmissionType.VIDEO  # , msg.video.file_name
+            contents = (
+                message.video.file_id,
+                SubmissionType.VIDEO,
+            )  # , message.video.file_name
 
-        # if msg.animation is not None:
+        # if message.animation is not None:
         #     logger.info(
         #         "User %s is trying to submit an animation with name '%s' and size of %s MB",
-        #         msg.from_user.id,
+        #         message.from_user.id,
-        #         msg.animation.file_name,
+        #         message.animation.file_name,
-        #         msg.animation.file_size / 1024 / 1024,
+        #         message.animation.file_size / 1024 / 1024,
         #     )
-        #     if msg.animation.file_size > app.config["submission"]["file_size"]:
+        #     if message.animation.file_size > app.config["submission"]["file_size"]:
-        #         await msg.reply_text(
+        #         await message.reply_text(
-        #             app._("document_too_large", "message", locale=user_locale).format(
+        #             app._("document_too_large", "message", locale=user.locale).format(
         #                 str(app.config["submission"]["file_size"] / 1024 / 1024)
         #             ),
         #             quote=True,
         #         )
         #         return
-        #     if msg.animation.file_size > app.config["submission"]["tmp_size"]:
+        #     if message.animation.file_size > app.config["submission"]["tmp_size"]:
         #         save_tmp = False
         #     contents = (
-        #         msg.animation.file_id,
+        #         message.animation.file_id,
         #         SubmissionType.ANIMATION,
-        #     )  # , msg.animation.file_name
+        #     )  # , message.animation.file_name
 
-        if msg.photo is not None:
+        if message.photo is not None:
             logger.info(
                 "User %s is trying to submit a photo with ID '%s' and size of %s MB",
-                msg.from_user.id,
+                message.from_user.id,
-                msg.photo.file_id,
+                message.photo.file_id,
-                msg.photo.file_size / 1024 / 1024,
+                message.photo.file_size / 1024 / 1024,
             )
-            contents = msg.photo.file_id, SubmissionType.PHOTO  # , "please_generate"
+            contents = (
+                message.photo.file_id,
+                SubmissionType.PHOTO,
+            )  # , "please_generate"
 
         if contents is None:
             return
@@ -146,50 +154,54 @@ async def get_submission(app: PyroClient, msg: Message):
                 exist_ok=True,
             )
             downloaded = await app.download_media(
-                msg,
+                message,
                 str(Path(f"{app.config['locations']['data']}/submissions/{tmp_id}"))
                 + sep,
             )
 
-            inserted = col_submitted.insert_one(
+            inserted = await col_submitted.insert_one(
                 {
-                    "user": msg.from_user.id,
+                    "user": message.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]},
+                    "telegram": {"msg_id": message.id, "file_id": contents[0]},
-                    "caption": str(msg.caption) if msg.caption is not None else None,
+                    "caption": str(message.caption)
+                    if message.caption is not None
+                    else None,
                 }
             )
 
         else:
-            inserted = col_submitted.insert_one(
+            inserted = await col_submitted.insert_one(
                 {
-                    "user": msg.from_user.id,
+                    "user": message.from_user.id,
                     "date": datetime.now(),
                     "done": False,
                     "type": contents[1].value,
                     "temp": {"uuid": None, "file": None},
-                    "telegram": {"msg_id": msg.id, "file_id": contents[0]},
+                    "telegram": {"msg_id": message.id, "file_id": contents[0]},
-                    "caption": str(msg.caption) if msg.caption is not None else None,
+                    "caption": str(message.caption)
+                    if message.caption is not None
+                    else None,
                 }
             )
 
         buttons = [
             [
                 InlineKeyboardButton(
-                    text=app._("sub_yes", "button"),
+                    text=app._("sub_yes", "button", locale=user_owner.locale),
                     callback_data=f"sub_yes_{str(inserted.inserted_id)}",
                 )
             ]
         ]
 
-        if msg.caption is not None:
+        if message.caption is not None:
-            caption = str(msg.caption)
+            caption = str(message.caption)
             buttons[0].append(
                 InlineKeyboardButton(
-                    text=app._("sub_yes_caption", "button"),
+                    text=app._("sub_yes_caption", "button", locale=user_owner.locale),
                     callback_data=f"sub_yes_{str(inserted.inserted_id)}_caption",
                 )
             )
@@ -198,112 +210,114 @@ async def get_submission(app: PyroClient, msg: Message):
 
         buttons[0].append(
             InlineKeyboardButton(
-                text=app._("sub_no", "button"),
+                text=app._("sub_no", "button", locale=user_owner.locale),
                 callback_data=f"sub_no_{str(inserted.inserted_id)}",
             )
         )
-        caption += app._("sub_by", "message")
+        caption += app._("sub_by", "message", locale=user_owner.locale)
 
-        if msg.from_user.first_name is not None:
+        if message.from_user.first_name is not None:
-            caption += f" {msg.from_user.first_name}"
+            caption += f" {message.from_user.first_name}"
-        if msg.from_user.last_name is not None:
+        if message.from_user.last_name is not None:
-            caption += f" {msg.from_user.last_name}"
+            caption += f" {message.from_user.last_name}"
-        if msg.from_user.username is not None:
+        if message.from_user.username is not None:
-            caption += f" (@{msg.from_user.username})"
+            caption += f" (@{message.from_user.username})"
-        if msg.from_user.phone_number is not None:
+        if message.from_user.phone_number is not None:
-            caption += f" ({msg.from_user.phone_number})"
+            caption += f" ({message.from_user.phone_number})"
 
         if (
-            msg.from_user.id in app.admins
+            message.from_user.id in app.admins
             and app.config["submission"]["require_confirmation"]["admins"] is False
         ):
             try:
                 submitted = await app.submit_media(str(inserted.inserted_id))
-                await msg.reply_text(
+                await message.reply_text(
-                    app._("sub_yes_auto", "message", locale=user_locale),
+                    app._("sub_yes_auto", "message", locale=user.locale),
                     disable_notification=True,
                     quote=True,
                 )
                 if app.config["submission"]["send_uploaded_id"]:
                     caption += f"\n\nID: `{submitted[1]}`"
-                await msg.copy(app.owner, caption=caption, disable_notification=True)
+                await message.copy(
+                    app.owner, caption=caption, disable_notification=True
+                )
                 return
             except SubmissionUnsupportedError:
-                await msg.reply_text(
+                await message.reply_text(
-                    app._("mime_not_allowed", "message", locale=user_locale).format(
+                    app._("mime_not_allowed", "message", locale=user.locale).format(
                         ", ".join(app.config["submission"]["mime_types"]), quote=True
                     ),
                     quote=True,
                 )
                 return
-            except SubmissionDuplicatesError as exp:
+            except SubmissionDuplicatesError as exc:
-                await msg.reply_text(
+                await message.reply_text(
                     app._(
-                        "sub_media_duplicates_list", "message", locale=user_locale
+                        "sub_media_duplicates_list", "message", locale=user.locale
-                    ).format("\n • ".join(exp.duplicates)),
+                    ).format("\n • ".join(exc.duplicates)),
                     quote=True,
                 )
                 return
-            except Exception as exp:
+            except Exception as exc:
-                await msg.reply_text(format_exc(), quote=True)
+                await message.reply_text(exc, quote=True)
                 return
         elif (
-            msg.from_user.id not in app.admins
+            message.from_user.id not in app.admins
             and app.config["submission"]["require_confirmation"]["users"] is False
         ):
             try:
                 submitted = await app.submit_photo(str(inserted.inserted_id))
-                await msg.reply_text(
+                await message.reply_text(
-                    app._("sub_yes_auto", "message", locale=user_locale),
+                    app._("sub_yes_auto", "message", locale=user.locale),
                     disable_notification=True,
                     quote=True,
                 )
                 if app.config["submission"]["send_uploaded_id"]:
                     caption += f"\n\nID: `{submitted[1]}`"
-                await msg.copy(app.owner, caption=caption)
+                await message.copy(app.owner, caption=caption)
                 return
             except SubmissionUnsupportedError:
-                await msg.reply_text(
+                await message.reply_text(
-                    app._("mime_not_allowed", "message", locale=user_locale).format(
+                    app._("mime_not_allowed", "message", locale=user.locale).format(
                         ", ".join(app.config["submission"]["mime_types"]), quote=True
                     )
                 )
                 return
-            except SubmissionDuplicatesError as exp:
+            except SubmissionDuplicatesError as exc:
-                await msg.reply_text(
+                await message.reply_text(
-                    app._("sub_dup", "message", locale=user_locale), quote=True
+                    app._("sub_dup", "message", locale=user.locale), quote=True
                 )
                 return
-            except Exception as exp:
+            except Exception as exc:
                 await app.send_message(
                     app.owner,
-                    app._("sub_error_admin", "message").format(
+                    app._(
-                        msg.from_user.id, format_exc()
+                        "sub_error_admin", "message", locale=user_owner.locale
-                    ),
+                    ).format(message.from_user.id, format_exc()),
                 )
-                await msg.reply_text("sub_error", quote=True)
+                await message.reply_text("sub_error", quote=True)
                 return
 
-        if msg.from_user.id not in app.admins:
+        if message.from_user.id not in app.admins:
             buttons += [
                 [
                     InlineKeyboardButton(
-                        text=app._("sub_block", "button"),
+                        text=app._("sub_block", "button", locale=user_owner.locale),
-                        callback_data=f"sub_block_{msg.from_user.id}",
+                        callback_data=f"sub_block_{message.from_user.id}",
                     )
                 ]
             ]
 
-            PosterUser(msg.from_user.id).limit()
+            await user.update_cooldown()
 
-        if msg.from_user.id != app.owner:
+        if message.from_user.id != app.owner:
-            await msg.reply_text(
+            await message.reply_text(
-                app._("sub_sent", "message", locale=user_locale),
+                app._("sub_sent", "message", locale=user.locale),
                 disable_notification=True,
                 quote=True,
             )
 
-        await msg.copy(
+        await message.copy(
             app.owner, caption=caption, reply_markup=InlineKeyboardMarkup(buttons)
         )
 

plugins/language.py

@@ -0,0 +1,42 @@
+from pykeyboard import InlineButton, InlineKeyboard
+from pyrogram import filters
+from pyrogram.client import Client
+from pyrogram.types import CallbackQuery, Message
+
+from classes.pyroclient import PyroClient
+
+
+@Client.on_message(
+    ~filters.scheduled & filters.private & filters.command(["language"], prefixes=["/"])  # type: ignore
+)
+async def command_language(app: PyroClient, message: Message):
+    user = await app.find_user(message.from_user)
+    keyboard = InlineKeyboard(row_width=2)
+    buttons = []
+
+    for locale, data in app.in_every_locale("metadata").items():
+        buttons.append(
+            InlineButton(f"{data['flag']} {data['name']}", f"language:{locale}")
+        )
+
+    keyboard.add(*buttons)
+
+    await message.reply_text(
+        app._("locale_choice", "message", locale=user.locale),
+        reply_markup=keyboard,
+    )
+
+
+@Client.on_callback_query(filters.regex(r"language:[\s\S]*"))  # type: ignore
+async def callback_language(app: PyroClient, callback: CallbackQuery):
+    user = await app.find_user(callback.from_user)
+    language = str(callback.data).split(":")[1]
+
+    await user.update_locale(language)
+
+    await callback.answer(
+        app._("locale_set", "callback", locale=language).format(
+            locale=app._("name", "metadata", locale=language)
+        ),
+        show_alert=True,
+    )

plugins/remove_commands.py

@@ -8,6 +8,6 @@ from classes.pyroclient import PyroClient
 @Client.on_message(
     ~filters.scheduled & filters.private & filters.command(["remove_commands"], prefixes=["/"])  # type: ignore
 )
-async def command_remove_commands(app: PyroClient, msg: Message):
+async def command_remove_commands(app: PyroClient, message: Message):
-    await msg.reply_text("Okay.")
+    await message.reply_text("Okay.")
     await app.remove_commands(command_sets=await app.collect_commands())

requirements.txt

@@ -1,14 +1,11 @@
-aiohttp~=3.8.4
+aiohttp~=3.10.2
-black~=23.3.0
+async_pymongo==0.1.6
 convopyro==0.5
-pillow~=9.4.0
+pillow~=10.4.0
-psutil~=5.9.4
+pykeyboard==0.1.7
-pymongo~=4.4.0
-pyrogram==2.0.106
-python_dateutil==2.8.2
 pytimeparse~=1.1.8
 tgcrypto==1.2.5
-uvloop==0.17.0
+#uvloop==0.19.0
 --extra-index-url https://git.end-play.xyz/api/packages/profitroll/pypi/simple
-libbot[speed,pyrogram]==1.5
+libbot[speed,pyrogram]==3.2.3
-photosapi_client==0.5.0
+photosapi_client==0.6.0