+
-
-## ⚠️ Українська версія 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 за замовчуванням у своїй
-> системі і PATH Вашої системи містить його. Якщо Ваш python за замовчуванням
-> є `python3` або, наприклад, `/home/user/.local/bin/python3.9` - використовуйте його натомість.
-> Якщо це нестандартний шлях до виконуваного файлу - Вам також слід змінити
-> це у скриптах, які Ви використовуватимете (`loop.sh`, `loop.bat`, `start.sh` та `start.bat`).
+Зверніть увагу, що Photos API також потребує MongoDB, тому має сенс спочатку встановити й налаштувати Mongo.
-1. Завантажте бота:
- 1. `git clone https://git.end-play.xyz/profitroll/TelegramSender.git` (якщо хочете використовувати git)
- 2. `cd ./TelegramSender`
+## Встановлення
-2. Встановіть залежності:
- `python -m pip install -r requirements.txt`
- Без їх установки бот не зможе працювати взагалі
+Щоб запустити бота, вам потрібно мати інтерпретатор Python, Photos API, MongoDB і, за бажанням, git (якщо ви хочете оновлювати за допомогою `git pull`). Ви також можете проігнорувати git і просто завантажити вихідний код, це також повинно спрацювати. Після цього ви готові до роботи.
-3. Встановіть додаткові залежності [Не обов'язково]:
- `python -m pip install -r requirements-optional.txt`
- Вони не є обов’язковими, але можуть прискорити роботу бота
+> У цьому README я припускаю, що ви використовуєте python за замовчуванням у вашій
+> системі, і він міститься у вашому системному PATH. Якщо ваш python за замовчуванням
+> це `python3` або, наприклад, `/home/user/.local/bin/python3.9` - використовуйте його.
+> Якщо це нестандартний шлях до виконуваного файлу - вам також слід змінити
+> його у скриптах, які ви будете використовувати (`loop.sh`, `loop.bat`, `start.sh` та `start.bat`).
-4. Налаштуйте свого бота за допомогою текстового редактора:
- `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`.
+1. Встановіть MongoDB та Photos API:
-5. Додайте бота на канал:
- Звичайно, щоб використовувати свого бота, Вам потрібно мати канал або групу, інакше немає сенсу мати такого бота. [Тут](https://stackoverflow.com/a/33497769) Ви можете знайти короткий гайд, як додати свого бота до каналу.
+ 1. Встановіть MongoDB, дотримуючись [офіційного посібника зі встановлення](https://www.mongodb.com/docs/manual/installation)
+ 2. Встановіть Photos API, дотримуючись [README Photos API](https://git.end-play.xyz/profitroll/PhotosAPI/src/branch/master/README.md)
-6. Заповніть папку вмістом:
- Звичайно, бот не може опублікувати щось із нічого. Налаштуйте свій `config.json`, які медіа-типи бот повинен публікувати (`"posting", "extensions"`), коли їх публікувати (`"posting", "time"`), а також де їх знайти (`"locations"`). Ви також можете переміщати їх після надсилання, встановивши для `"posting", "move_sent"` значення `true`.
+2. Завантажте бота:
-6. Готово, запускайте!
- `python ./main.py`
- Або ви також можете використовувати `.\start.bat` на Windows і `bash ./start.sh` на Linux.
- Крім того, доступні `loop.sh` і `loop.bat`, якщо ви хочете, щоб ваш бот запускався знову після зупинки або після використання команди `/reboot`.
+ 1. `git clone https://git.end-play.xyz/profitroll/TelegramPoster.git` (якщо ви використовуєте git)
+ 2. `cd TelegramPoster`
-## Аргументи командного рядка
+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` - дозволяє перемістити всі надіслані файли з черги до папки надісланих
-* `--cleanup` - очистити файли в папках `queue` і `sent`, якщо вони вже надіслані. Потрібен аргумент `--confirm`
-* `--cleanup-index` - видалити всі надіслані записи з індексу. Потрібен аргумент `--confirm`
-* `--norun` - дозволяє виконувати наведені вище аргументи, не запускаючи самого бота
+4. Встановіть залежності проекту:
+
+ `python -m pip install -r requirements.txt`.
+ Без їх встановлення бот не зможе працювати взагалі.
+
+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`
-* `python3 ./main.py --cleanup --confirm`
+* `python main.py --create-user`
+* `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` як запасний варіант.
diff --git a/classes/enums/submission_types.py b/classes/enums/submission_types.py
index 265ce7a..2bd043f 100644
--- a/classes/enums/submission_types.py
+++ b/classes/enums/submission_types.py
@@ -4,5 +4,5 @@ from enum import Enum
class SubmissionType(Enum):
DOCUMENT = "document"
VIDEO = "video"
- ANIMATION = "animation"
+ # ANIMATION = "animation"
PHOTO = "photo"
diff --git a/classes/exceptions.py b/classes/exceptions.py
index 4ca8e58..b1a6d06 100644
--- a/classes/exceptions.py
+++ b/classes/exceptions.py
@@ -22,6 +22,11 @@ class SubmissionDuplicatesError(Exception):
)
+class SubmissionUnsupportedError(Exception):
+ def __init__(self, file_path: str) -> None:
+ super().__init__(f"Type of file does not seem to be supported: '{file_path}'")
+
+
class UserCreationError(Exception):
def __init__(self, code: int, data: str) -> None:
self.code = code
diff --git a/classes/poster_client.py b/classes/poster_client.py
deleted file mode 100644
index ba0aace..0000000
--- a/classes/poster_client.py
+++ /dev/null
@@ -1,98 +0,0 @@
-from os import path, remove, sep
-from shutil import rmtree
-from typing import Tuple, Union
-from pyrogram.client import Client
-from pyrogram.types import Message
-from classes.exceptions import SubmissionDuplicatesError, SubmissionUnavailableError
-from modules.api_client import upload_pic
-from modules.database import col_submitted
-from bson import ObjectId
-from modules.logger import logWrite
-
-from modules.utils import configGet
-
-
-class PosterClient(Client):
- def __init__(self, name: str, **kwargs): # type: ignore
- super().__init__(name, **kwargs)
- self.owner = configGet("owner")
- self.admins = configGet("admins") + [configGet("owner")]
-
- async def submit_photo(
- self, id: str
- ) -> Tuple[Union[Message, None], Union[str, None]]:
- db_entry = col_submitted.find_one({"_id": ObjectId(id)})
- submission = None
-
- if db_entry is None:
- raise SubmissionUnavailableError()
- else:
- if db_entry["temp"]["uuid"] is not None:
- if not path.exists(
- path.join(
- configGet("data", "locations"),
- "submissions",
- db_entry["temp"]["uuid"],
- db_entry["temp"]["file"],
- )
- ):
- raise SubmissionUnavailableError()
- else:
- filepath = path.join(
- configGet("data", "locations"),
- "submissions",
- db_entry["temp"]["uuid"],
- db_entry["temp"]["file"],
- )
- try:
- submission = await self.get_messages(
- db_entry["user"], db_entry["telegram"]["msg_id"]
- )
- except:
- pass
- else:
- try:
- submission = await self.get_messages(
- db_entry["user"], db_entry["telegram"]["msg_id"]
- )
- filepath = await self.download_media(
- submission, file_name=configGet("tmp", "locations") + sep
- )
- except:
- raise SubmissionUnavailableError()
-
- response = await upload_pic(
- str(filepath), allow_duplicates=configGet("allow_duplicates", "submission")
- )
-
- if len(response[1]) > 0:
- raise SubmissionDuplicatesError(str(filepath), response[1])
-
- col_submitted.find_one_and_update(
- {"_id": ObjectId(id)}, {"$set": {"done": True}}
- )
-
- try:
- if db_entry["temp"]["uuid"] is not None:
- rmtree(
- path.join(
- configGet("data", "locations"),
- "submissions",
- db_entry["temp"]["uuid"],
- ),
- ignore_errors=True,
- )
- else:
- remove(str(filepath))
- except (FileNotFoundError, NotADirectoryError):
- logWrite(
- f"Could not delete '{filepath}' on submission accepted", debug=True
- )
-
- return submission, response[2]
-
- async def ban_user(self, id: int) -> None:
- pass
-
- async def unban_user(self, id: int) -> None:
- pass
diff --git a/classes/pyroclient.py b/classes/pyroclient.py
new file mode 100644
index 0000000..52dd38a
--- /dev/null
+++ b/classes/pyroclient.py
@@ -0,0 +1,280 @@
+import contextlib
+import logging
+from datetime import datetime
+from io import BytesIO
+from os import makedirs, remove, sep
+from pathlib import Path
+from shutil import rmtree
+from time import time
+from traceback import format_exc
+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, User
+from pytimeparse.timeparse import timeparse
+from ujson import dumps, loads
+
+from classes.enums.submission_types import SubmissionType
+from classes.exceptions import (
+ SubmissionDuplicatesError,
+ SubmissionUnavailableError,
+ SubmissionUnsupportedError,
+)
+from classes.pyrouser import PyroUser
+from modules.api_client import (
+ BodyPhotoUpload,
+ BodyVideoUpload,
+ File,
+ Photo,
+ Video,
+ client,
+ photo_upload,
+ video_upload,
+)
+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__)
+
+
+class PyroClient(PyroClient):
+ def __init__(self, scheduler: AsyncIOScheduler):
+ super().__init__(locales_root=Path("locale"), scheduler=scheduler)
+
+ self.version: float = 0.2
+
+ self.owner: int = self.config["bot"]["owner"]
+ self.admins: List[int] = self.config["bot"]["admins"] + [
+ self.config["bot"]["owner"]
+ ]
+
+ self.sender_session = ClientSession()
+
+ self.scopes_placeholders: Dict[str, int] = {
+ "owner": self.owner,
+ "comments": self.config["posting"]["comments"],
+ }
+
+ async def start(self):
+ await super().start()
+
+ if self.config["reports"]["update"]:
+ try:
+ async with ClientSession(
+ json_serialize=dumps,
+ ) as http_session:
+ check_update = await http_session.get(
+ "https://git.end-play.xyz/api/v1/repos/profitroll/TelegramPoster/releases?page=1&limit=1"
+ )
+
+ response = await check_update.json()
+
+ if len(response) == 0:
+ raise ValueError("No bot releases on git found.")
+
+ if float(response[0]["tag_name"].replace("v", "")) > self.version:
+ logger.info(
+ "New version %s found (current %s)",
+ response[0]["tag_name"].replace("v", ""),
+ self.version,
+ )
+ await self.send_message(
+ self.owner,
+ self._(
+ "update_available",
+ "message",
+ ).format(
+ response[0]["tag_name"],
+ response[0]["html_url"],
+ response[0]["body"],
+ ),
+ )
+ else:
+ logger.info("No updates found, bot is up to date.")
+ except bad_request_400.PeerIdInvalid:
+ logger.warning(
+ "Could not send startup message to bot owner. Perhaps user has not started the bot yet."
+ )
+ except Exception as exp:
+ logger.exception("Update check failed due to %s: %s", exp, format_exc())
+
+ if self.config["mode"]["post"]:
+ if self.config["posting"]["use_interval"]:
+ self.scheduler.add_job(
+ send_content,
+ "interval",
+ seconds=timeparse(self.config["posting"]["interval"]),
+ args=[self, self.sender_session],
+ )
+ else:
+ for entry in self.config["posting"]["time"]:
+ dt_obj = datetime.strptime(entry, "%H:%M")
+ self.scheduler.add_job(
+ send_content,
+ "cron",
+ hour=dt_obj.hour,
+ minute=dt_obj.minute,
+ args=[self, self.sender_session],
+ )
+
+ async def stop(self):
+ makedirs(self.config["locations"]["cache"], exist_ok=True)
+ await json_write(
+ {"timestamp": time()},
+ Path(f"{self.config['locations']['cache']}/shutdown_time"),
+ )
+
+ await http_session.close()
+ await self.sender_session.close()
+
+ await super().stop()
+
+ async def submit_media(
+ self, id: str
+ ) -> Tuple[Union[Message, None], Union[str, None]]:
+ db_entry = col_submitted.find_one({"_id": ObjectId(id)})
+ submission = None
+
+ if db_entry is None:
+ raise SubmissionUnavailableError()
+
+ if db_entry["temp"]["uuid"] is None:
+ try:
+ submission = await self.get_messages(
+ db_entry["user"], db_entry["telegram"]["msg_id"]
+ )
+ filepath = await self.download_media(
+ submission, file_name=self.config["locations"]["tmp"] + sep
+ )
+ except Exception as exp:
+ raise SubmissionUnavailableError() from exp
+
+ elif not Path(
+ f"{self.config['locations']['data']}/submissions/{db_entry['temp']['uuid']}/{db_entry['temp']['file']}",
+ ).exists():
+ raise SubmissionUnavailableError()
+ else:
+ filepath = Path(
+ f"{self.config['locations']['data']}/submissions/{db_entry['temp']['uuid']}/{db_entry['temp']['file']}",
+ )
+ with contextlib.suppress(Exception):
+ submission = await self.get_messages(
+ db_entry["user"], db_entry["telegram"]["msg_id"]
+ )
+
+ async with aiofiles.open(str(filepath), "rb") as fh:
+ media_bytes = BytesIO(await fh.read())
+
+ try:
+ if db_entry["type"] == SubmissionType.PHOTO.value:
+ response = await photo_upload(
+ self.config["posting"]["api"]["album"],
+ client=client,
+ multipart_data=BodyPhotoUpload(
+ File(media_bytes, filepath.name, "image/jpeg")
+ ),
+ ignore_duplicates=self.config["submission"]["allow_duplicates"],
+ compress=False,
+ caption="queue",
+ )
+ elif db_entry["type"] == SubmissionType.VIDEO.value:
+ response = await video_upload(
+ self.config["posting"]["api"]["album"],
+ client=client,
+ multipart_data=BodyVideoUpload(
+ 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(
+ # File(media_bytes, filepath.name, "video/*")
+ # ),
+ # caption="queue",
+ # )
+ except UnexpectedStatus as exp:
+ raise SubmissionUnsupportedError(str(filepath)) from exp
+
+ response_dict = (
+ {}
+ if not hasattr(response, "content")
+ else loads(response.content.decode("utf-8"))
+ )
+
+ if "duplicates" in response_dict and len(response_dict["duplicates"]) > 0:
+ duplicates = []
+ for index, duplicate in enumerate(response_dict["duplicates"]): # type: ignore
+ if response_dict["access_token"] is None:
+ duplicates.append(
+ f"`{duplicate['id']}`:\n{self.config['posting']['api']['address_external']}/photos/{duplicate['id']}"
+ )
+ else:
+ duplicates.append(
+ f"`{duplicate['id']}`:\n{self.config['posting']['api']['address_external']}/token/photo/{response_dict['access_token']}?id={index}"
+ )
+ raise SubmissionDuplicatesError(str(filepath), duplicates)
+
+ col_submitted.find_one_and_update(
+ {"_id": ObjectId(id)}, {"$set": {"done": True}}
+ )
+
+ try:
+ if db_entry["temp"]["uuid"] is not None:
+ rmtree(
+ Path(
+ f"{self.config['locations']['data']}/submissions/{db_entry['temp']['uuid']}",
+ ),
+ ignore_errors=True,
+ )
+ else:
+ remove(str(filepath))
+ except (FileNotFoundError, NotADirectoryError):
+ logger.error("Could not delete '%s' on submission accepted", filepath)
+
+ return (
+ submission,
+ response.parsed.id if hasattr(response, "parsed") else response.id,
+ )
+
+ async def find_user(self, user: Union[int, User]) -> PyroUser:
+ """Find User by it's ID or User object
+
+ ### Args:
+ * user (`Union[int, User]`): ID or User object to extract ID from
+
+ ### Returns:
+ * `PyroUser`: PyroUser object
+ """
+ if (
+ col_users.find_one(
+ {"id": user.id if isinstance(user, User) else user}
+ ) # type: ignore
+ is None
+ ):
+ 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 = col_users.find_one(
+ {"id": user.id if isinstance(user, User) else user}
+ ) # type: ignore
+
+ return PyroUser(**db_record)
diff --git a/classes/pyrouser.py b/classes/pyrouser.py
new file mode 100644
index 0000000..6f77db6
--- /dev/null
+++ b/classes/pyrouser.py
@@ -0,0 +1,55 @@
+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):
+ col_users.update_one({"_id": self._id}, {"$set": {"locale": locale}})
+
+ async def update_cooldown(self, time: datetime = datetime.now()):
+ col_users.update_one({"_id": self._id}, {"$set": {"cooldown": time}})
+
+ async def block(self) -> None:
+ """Ban user from using command and submitting content."""
+ col_users.update_one({"_id": self._id}, {"$set": {"banned": True}})
+
+ async def unblock(self) -> None:
+ """Allow user to use command and submit posts again."""
+ 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 = (
+ app.admins
+ if app is not None
+ else (
+ await config_get("admins", "bot") + [await config_get("owner", "bot")]
+ )
+ )
+
+ return (datetime.now() - self.cooldown).total_seconds() < (
+ app.config["submission"]["timeout"]
+ if app is not None
+ else await config_get("timeout", "submission")
+ )
diff --git a/classes/user.py b/classes/user.py
deleted file mode 100644
index 8042908..0000000
--- a/classes/user.py
+++ /dev/null
@@ -1,55 +0,0 @@
-from modules.app import app
-from datetime import datetime
-from modules.database import col_banned, col_users
-from modules.utils import configGet
-
-
-class PosterUser:
- def __init__(self, id: int):
- self.id = id
-
- def is_blocked(self) -> bool:
- """Check if user is banned from submitting content.
-
- ### Returns:
- `bool`: Must be `True` if banned and `False` if not
- """
- return False if col_banned.find_one({"user": self.id}) is None else True
-
- def block(self) -> None:
- """Ban user from using command and submitting content."""
- if col_banned.find_one({"user": self.id}) is None:
- col_banned.insert_one({"user": self.id, "date": datetime.now()})
-
- def unblock(self) -> None:
- """Allow user to use command and submit posts again."""
- col_banned.find_one_and_delete({"user": self.id})
-
- def is_limited(self) -> bool:
- """Check if user is on a cooldown after submitting something.
-
- ### Returns:
- `bool`: Must be `True` if on the cooldown and `False` if not
- """
- if self.id in app.admins:
- return False
- else:
- db_record = col_users.find_one({"user": self.id})
- if db_record is None:
- return False
- return (
- True
- if (datetime.now() - db_record["cooldown"]).total_seconds()
- < configGet("timeout", "submission")
- else False
- )
-
- def limit(self) -> None:
- """Restart user's cooldown. Used after post has been submitted."""
- if (
- col_users.find_one_and_update(
- {"user": self.id}, {"$set": {"cooldown": datetime.now()}}
- )
- is None
- ):
- col_users.insert_one({"user": self.id, "cooldown": datetime.now()})
diff --git a/config_example.json b/config_example.json
index 473f439..1f9671f 100644
--- a/config_example.json
+++ b/config_example.json
@@ -1,13 +1,13 @@
{
"locale": "en",
- "locale_log": "en",
- "locale_fallback": "en",
- "owner": 0,
- "admins": [],
"bot": {
+ "owner": 0,
+ "admins": [],
"api_id": 0,
"api_hash": "",
- "bot_token": ""
+ "bot_token": "",
+ "max_concurrent_transmissions": 3,
+ "scoped_commands": true
},
"database": {
"user": null,
@@ -16,17 +16,18 @@
"port": 27017,
"name": "tgposter"
},
- "mode": {
- "post": true,
- "submit": true
- },
"reports": {
+ "chat_id": "owner",
"sent": false,
"error": true,
"update": true,
"startup": true,
"shutdown": true
},
+ "mode": {
+ "post": true,
+ "submit": true
+ },
"logging": {
"size": 512,
"location": "logs"
@@ -34,29 +35,29 @@
"locations": {
"tmp": "tmp",
"data": "data",
- "cache": "cache",
- "sent": "data/sent",
- "queue": "data/queue",
- "index": "data/index.json",
- "locale": "locale"
+ "cache": "cache"
},
+ "disabled_plugins": [],
"posting": {
"channel": 0,
+ "comments": 0,
"silent": false,
"move_sent": false,
"use_interval": false,
"interval": "1h30m",
- "page_size": 300,
"submitted_caption": {
"enabled": true,
"ignore_admins": true,
"text": "#submitted"
},
+ "types": {
+ "photo": true,
+ "video": false
+ },
"extensions": {
"photo": [
"jpg",
"png",
- "gif",
"jpeg"
],
"video": [
@@ -104,20 +105,100 @@
},
"mime_types": [
"image/png",
- "image/gif",
"image/jpeg",
"video/mp4",
"video/quicktime"
]
},
- "commands": [
- "start",
- "rules"
- ],
- "commands_admin": [
- "import",
- "export",
- "remove",
- "shutdown"
- ]
+ "commands": {
+ "start": {
+ "scopes": [
+ {
+ "name": "BotCommandScopeDefault"
+ },
+ {
+ "name": "BotCommandScopeChat",
+ "chat_id": "owner"
+ }
+ ]
+ },
+ "rules": {
+ "scopes": [
+ {
+ "name": "BotCommandScopeDefault"
+ },
+ {
+ "name": "BotCommandScopeChat",
+ "chat_id": "owner"
+ }
+ ]
+ },
+ "language": {
+ "scopes": [
+ {
+ "name": "BotCommandScopeDefault"
+ },
+ {
+ "name": "BotCommandScopeChat",
+ "chat_id": "owner"
+ }
+ ]
+ },
+ "report": {
+ "scopes": [
+ {
+ "name": "BotCommandScopeChat",
+ "chat_id": "comments"
+ }
+ ]
+ },
+ "forwards": {
+ "scopes": [
+ {
+ "name": "BotCommandScopeChat",
+ "chat_id": "owner"
+ }
+ ]
+ },
+ "import": {
+ "scopes": [
+ {
+ "name": "BotCommandScopeChat",
+ "chat_id": "owner"
+ }
+ ]
+ },
+ "export": {
+ "scopes": [
+ {
+ "name": "BotCommandScopeChat",
+ "chat_id": "owner"
+ }
+ ]
+ },
+ "remove": {
+ "scopes": [
+ {
+ "name": "BotCommandScopeChat",
+ "chat_id": "owner"
+ }
+ ]
+ },
+ "purge": {
+ "scopes": [
+ {
+ "name": "BotCommandScopeChat",
+ "chat_id": "owner"
+ }
+ ]
+ },
+ "shutdown": {
+ "scopes": [
+ {
+ "name": "BotCommandScopeChat",
+ "chat_id": "owner"
+ }
+ ]
+ }
+ }
}
\ No newline at end of file
diff --git a/locale/en.json b/locale/en.json
index 3a23761..cb1c080 100644
--- a/locale/en.json
+++ b/locale/en.json
@@ -1,9 +1,18 @@
{
+ "metadata": {
+ "flag": "🇬🇧",
+ "name": "English",
+ "codes": [
+ "en",
+ "en-US",
+ "en-GB"
+ ]
+ },
"commands": {
"start": "Start using the bot",
- "rules": "Photos submission rules"
- },
- "commands_admin": {
+ "rules": "Photos submission rules",
+ "language": "Change bot's language",
+ "report": "Report this post",
"forwards": "Check post forwards",
"import": "Submit .zip archive with photos",
"export": "Get .zip archive with all photos",
@@ -55,12 +64,18 @@
"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.",
"remove_success": "Removed media with ID `{0}`.",
"remove_failure": "Could not remove media with ID `{0}`. Check if provided ID is correct and if it is - you can also check bot's log for details.",
- "update_available": "**New version found**\nThere's a newer version of a bot found. You can update your bot to [{0}]({1}) using command line of your host.\n\n**Release notes**\n{2}\n\nRead more about updating you bot on the [wiki page](https://git.end-play.xyz/profitroll/TelegramPoster/wiki/Updating-Instance).\n\nPlease not that you can also disable this notification by editing `reports.update` key of the config."
+ "remove_kind": "Please choose the type of media to delete. Use /cancel if you want to abort this operation.",
+ "remove_unknown": "Unknown media type. It can only be \"{0}\" or \"{1}\".",
+ "update_available": "**New version found**\nThere's a newer version of a bot found. You can update your bot to [{0}]({1}) using command line of your host.\n\n**Release notes**\n{2}\n\nRead more about updating you bot on the [wiki page](https://git.end-play.xyz/profitroll/TelegramPoster/wiki/Updating-Instance).\n\nPlease not that you can also disable this notification by editing `reports.update` key of the config.",
+ "shutdown_confirm": "There are {0} unfinished users' contexts. If you turn off the bot, those will be lost. Please confirm shutdown using a button below.",
+ "report_sent": "We've notified admins about presumable violation. Thank you for cooperation.",
+ "report_received": "This message has been reported by **{0}** (@{1}, `{2}`)"
},
"button": {
"sub_yes": "✅ Accept",
@@ -70,7 +85,10 @@
"sub_unblock": "🏳️ Unblock sender",
"post_view": "View in channel",
"accepted": "✅ Accepted",
- "declined": "❌ Declined"
+ "declined": "❌ Declined",
+ "shutdown": "Confirm shutdown",
+ "photo": "Photo",
+ "video": "Video"
},
"callback": {
"sub_yes": "✅ Submission approved",
@@ -81,50 +99,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}"
}
}
\ No newline at end of file
diff --git a/locale/uk.json b/locale/uk.json
index 0696eb3..4ea1778 100644
--- a/locale/uk.json
+++ b/locale/uk.json
@@ -1,9 +1,17 @@
{
+ "metadata": {
+ "flag": "🇺🇦",
+ "name": "Українська",
+ "codes": [
+ "uk",
+ "uk-UA"
+ ]
+ },
"commands": {
"start": "Почати користуватись ботом",
- "rules": "Правила пропонування фото"
- },
- "commands_admin": {
+ "rules": "Правила пропонування фото",
+ "language": "Змінити мову бота",
+ "report": "Поскаржитись на цей пост",
"forwards": "Переглянути репости",
"import": "Надати боту .zip архів з фотографіями",
"export": "Отримати .zip архів з усіма фотографіями",
@@ -55,12 +63,18 @@
"import_upload_error_duplicate": "Не вдалося завантажити `{0}`, оскільки на сервері є дублікати.",
"import_upload_error_other": "Не вдалося завантажити `{0}`. Ймовірно, заборонений тип файлу.",
"import_finished": "Імпорт завершено.",
+ "locale_choice": "Гаразд. Будь ласка, оберіть мову за допомогою клавіатури нижче.",
"remove_request": "Будь ласка, надішліть мені ID для видалення. Ви могли отримати його з діалогу завантаження. Використовуйте /cancel, якщо ви хочете перервати цю операцію.",
"remove_ignored": "Немає відповіді, перериваємо видалення.",
"remove_abort": "Видалення перервано.",
"remove_success": "Видалено медіа з ID `{0}`.",
"remove_failure": "Не вдалося видалити медіа з ID `{0}`. Перевірте, чи вказано правильний ID, і якщо він правильний, ви також можете переглянути логи бота для отримання більш детальної інформації.",
- "update_available": "**Знайдено нову версію**\nЗнайдено нову версію бота. Ви можете оновити бота до [{0}]({1}) за допомогою командного рядка вашого хосту.\n\n**Примітки до релізу**\n{2}\n\nДетальніше про оновлення бота можна знайти на [вікі-сторінці](https://git.end-play.xyz/profitroll/TelegramPoster/wiki/Updating-Instance).\n\nЗверніть увагу, що ви також можете вимкнути це сповіщення, відредагувавши ключ `reports.update` у конфігурації."
+ "remove_kind": "Будь ласка, оберіть тип контенту для видалення. Використовуйте /cancel, якщо ви хочете перервати цю операцію.",
+ "remove_unknown": "Невідомий тип контенту. Може бути тільки \"{0}\" або \"{1}\".",
+ "update_available": "**Знайдено нову версію**\nЗнайдено нову версію бота. Ви можете оновити бота до [{0}]({1}) за допомогою командного рядка вашого хосту.\n\n**Примітки до релізу**\n{2}\n\nДетальніше про оновлення бота можна знайти на [вікі-сторінці](https://git.end-play.xyz/profitroll/TelegramPoster/wiki/Updating-Instance).\n\nЗверніть увагу, що ви також можете вимкнути це сповіщення, відредагувавши ключ `reports.update` у конфігурації.",
+ "shutdown_confirm": "Існує {0} незавершених контекстів користувачів. Якщо ви вимкнете бота, вони будуть втрачені. Будь ласка, підтвердіть вимкнення за допомогою кнопки нижче.",
+ "report_sent": "Ми повідомили адміністрацію про потенційне порушення. Дякую за співпрацю.",
+ "report_received": "На це повідомлення було отримано скаргу від **{0}** (@{1}, `{2}`)"
},
"button": {
"sub_yes": "✅ Прийняти",
@@ -70,7 +84,10 @@
"sub_unblock": "🏳️ Розблокувати відправника",
"post_view": "Переглянути на каналі",
"accepted": "✅ Прийнято",
- "declined": "❌ Відхилено"
+ "declined": "❌ Відхилено",
+ "shutdown": "Підтвердити вимкнення",
+ "photo": "Фото",
+ "video": "Відео"
},
"callback": {
"sub_yes": "✅ Подання схвалено",
@@ -81,50 +98,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}"
}
}
\ No newline at end of file
diff --git a/loop.bat b/loop.bat
index 20b4b75..260cdf5 100644
--- a/loop.bat
+++ b/loop.bat
@@ -4,7 +4,7 @@ REM You can cd to your directory here, if you want
REM cd C:\Users\user\TelegramPoster
:start
-python poster.py
+python main.py
echo To completely stop TelegramPoster now, please press Ctrl+C during the countdown!
echo Restarting in 5 seconds...
Timeout /t 5
diff --git a/loop.sh b/loop.sh
index 8ec2365..44a2f41 100644
--- a/loop.sh
+++ b/loop.sh
@@ -5,7 +5,7 @@
while true
do
- python poster.py
+ python main.py
echo "To completely stop TelegramPoster now, please press Ctrl+C during the countdown!"
echo "Restarting in:"
for i in 5 4 3 2 1
diff --git a/main.py b/main.py
new file mode 100644
index 0000000..f350574
--- /dev/null
+++ b/main.py
@@ -0,0 +1,43 @@
+import contextlib
+import logging
+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
+
+logging.basicConfig(
+ level=logging.INFO,
+ format="%(name)s.%(funcName)s | %(levelname)s | %(message)s",
+ datefmt="[%X]",
+)
+
+logger = logging.getLogger(__name__)
+
+with contextlib.suppress(ImportError):
+ import uvloop
+
+ uvloop.install()
+
+
+def main():
+ client = PyroClient(scheduler=scheduler)
+ Conversation(client)
+
+ try:
+ client.run()
+ except KeyboardInterrupt:
+ logger.warning("Forcefully shutting down with PID %s...", getpid())
+ finally:
+ if client.scheduler is not None:
+ client.scheduler.shutdown()
+ exit()
+
+
+if __name__ == "__main__":
+ main()
diff --git a/modules/api_client.py b/modules/api_client.py
index af0507a..ca08626 100644
--- a/modules/api_client.py
+++ b/modules/api_client.py
@@ -1,38 +1,90 @@
-"""This is only a temporary solution. Complete Photos API client is yet to be developed."""
-
import asyncio
+import logging
from base64 import b64decode, b64encode
from os import makedirs, path, sep
-from random import choice
-from traceback import print_exc
-from typing import Tuple, Union
+from pathlib import Path
+from typing import Union
import aiofiles
-from aiohttp import FormData
-
-from classes.exceptions import (
- AlbumCreationDuplicateError,
- AlbumCreationError,
- AlbumCreationNameError,
- SubmissionUploadError,
- UserCreationDuplicateError,
- UserCreationError,
+from aiohttp import ClientSession
+from libbot import config_get, i18n, sync
+from photosapi_client import AuthenticatedClient, Client
+from photosapi_client.api.default.album_create_albums_post import (
+ asyncio as album_create,
)
-from modules.logger import logWrite
-from modules.utils import configGet, locale
+from photosapi_client.api.default.album_delete_album_id_delete import (
+ asyncio as album_delete,
+)
+from photosapi_client.api.default.album_find_albums_get import asyncio as album_find
+from photosapi_client.api.default.login_for_access_token_token_post import sync as login
+from photosapi_client.api.default.photo_delete_photos_id_delete import (
+ asyncio as photo_delete,
+)
+from photosapi_client.api.default.photo_find_albums_album_photos_get import (
+ asyncio as photo_find,
+)
+from photosapi_client.api.default.photo_get_photos_id_get import asyncio as photo_get
+from photosapi_client.api.default.photo_patch_photos_id_patch import (
+ asyncio as photo_patch,
+)
+from photosapi_client.api.default.photo_random_albums_album_photos_random_get import (
+ asyncio as photo_random,
+)
+from photosapi_client.api.default.photo_upload_albums_album_photos_post import (
+ asyncio_detailed as photo_upload,
+)
+from photosapi_client.api.default.user_create_users_post import asyncio as user_create
+from photosapi_client.api.default.user_me_users_me_get import sync as user_me
+from photosapi_client.api.default.video_delete_videos_id_delete import (
+ asyncio as video_delete,
+)
+from photosapi_client.api.default.video_find_albums_album_videos_get import (
+ asyncio as video_find,
+)
+from photosapi_client.api.default.video_get_videos_id_get import asyncio as video_get
+from photosapi_client.api.default.video_patch_videos_id_patch import (
+ asyncio as video_patch,
+)
+from photosapi_client.api.default.video_random_albums_album_videos_random_get import (
+ asyncio as video_random,
+)
+from photosapi_client.api.default.video_upload_albums_album_videos_post import (
+ asyncio as video_upload,
+)
+from photosapi_client.models.body_login_for_access_token_token_post import (
+ BodyLoginForAccessTokenTokenPost,
+)
+from photosapi_client.models.body_photo_upload_albums_album_photos_post import (
+ BodyPhotoUploadAlbumsAlbumPhotosPost as BodyPhotoUpload,
+)
+from photosapi_client.models.body_video_upload_albums_album_videos_post import (
+ BodyVideoUploadAlbumsAlbumVideosPost as BodyVideoUpload,
+)
+from photosapi_client.models.http_validation_error import HTTPValidationError
+from photosapi_client.models.photo import Photo
+from photosapi_client.models.photo_search import PhotoSearch
+from photosapi_client.models.token import Token
+from photosapi_client.models.video import Video
+from photosapi_client.models.video_search import VideoSearch
+from photosapi_client.types import File
+
from modules.http_client import http_session
+logger = logging.getLogger(__name__)
-async def authorize() -> str:
- makedirs(configGet("cache", "locations"), exist_ok=True)
- if path.exists(configGet("cache", "locations") + sep + "api_access") is True:
+
+async def authorize(custom_session: Union[ClientSession, None] = None) -> str:
+ makedirs(await config_get("cache", "locations"), exist_ok=True)
+ session = http_session if custom_session is None else custom_session
+
+ if path.exists(await config_get("cache", "locations") + sep + "api_access") is True:
async with aiofiles.open(
- configGet("cache", "locations") + sep + "api_access", "rb"
+ await config_get("cache", "locations") + sep + "api_access", "rb"
) as file:
token = b64decode(await file.read()).decode("utf-8")
if (
- await http_session.get(
- configGet("address", "posting", "api") + "/users/me/",
+ await session.get(
+ await config_get("address", "posting", "api") + "/users/me/",
headers={"Authorization": f"Bearer {token}"},
)
).status == 200:
@@ -40,27 +92,23 @@ async def authorize() -> str:
payload = {
"grant_type": "password",
"scope": "me albums.list albums.read albums.write photos.list photos.read photos.write videos.list videos.read videos.write",
- "username": configGet("username", "posting", "api"),
- "password": configGet("password", "posting", "api"),
+ "username": await config_get("username", "posting", "api"),
+ "password": await config_get("password", "posting", "api"),
}
- response = await http_session.post(
- configGet("address", "posting", "api") + "/token", data=payload
+ response = await session.post(
+ await config_get("address", "posting", "api") + "/token", data=payload
)
if not response.ok:
- logWrite(
- locale(
- "api_creds_invalid",
- "console",
- locale=configGet("locale_log").format(
- configGet("address", "posting", "api"),
- configGet("username", "posting", "api"),
- response.status,
- ),
- )
+ logger.warning(
+ "Incorrect API credentials! Could not login into '%s' using login '%s': HTTP %s",
+ await config_get("address", "posting", "api"),
+ await config_get("username", "posting", "api"),
+ response.status,
)
raise ValueError
async with aiofiles.open(
- configGet("cache", "locations") + sep + "api_access", "wb"
+ str(Path(f"{await config_get('cache', 'locations')}/api_access")),
+ "wb",
) as file:
await file.write(
b64encode((await response.json())["access_token"].encode("utf-8"))
@@ -68,196 +116,38 @@ async def authorize() -> str:
return (await response.json())["access_token"]
-async def random_pic(token: Union[str, None] = None) -> Tuple[str, str]:
- """Returns random image id and filename from the queue.
+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,
+)
- ### Returns:
- * `Tuple[str, str]`: First value is an ID and the filename in the filesystem to be indexed.
- """
- token = await authorize() if token is None else token
- logWrite(
- f'{configGet("address", "posting", "api")}/albums/{configGet("album", "posting", "api")}/photos?q=&page_size={configGet("page_size", "posting")}&caption=queue'
+login_token = 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=sync.config_get("username", "posting", "api"),
+ password=sync.config_get("password", "posting", "api"),
+ ),
+)
+
+if not isinstance(login_token, Token):
+ logger.warning(
+ "Could not initialize connection due to invalid token: %s", login_token
)
- resp = await http_session.get(
- f'{configGet("address", "posting", "api")}/albums/{configGet("album", "posting", "api")}/photos?q=&page_size={configGet("page_size", "posting")}&caption=queue',
- headers={"Authorization": f"Bearer {token}"},
- )
- # logWrite(
- # locale("random_pic_response", "console", locale=configGet("locale_log")).format(
- # await resp.json()
- # ),
- # debug=True,
- # )
- if resp.status != 200:
- logWrite(
- locale(
- "random_pic_error_code",
- "console",
- locale=configGet("locale_log").format(
- configGet("album", "posting", "api"), resp.status
- ),
- ),
- )
- logWrite(
- locale(
- "random_pic_error_debug",
- "console",
- locale=configGet("locale_log").format(
- configGet("address", "posting", "api"),
- configGet("album", "posting", "api"),
- configGet("page_size", "posting"),
- token,
- resp.status,
- ),
- ),
- debug=True,
- )
- raise ValueError
- if len((await resp.json())["results"]) == 0:
- raise KeyError
- pic = choice((await resp.json())["results"])
- return pic["id"], pic["filename"]
-
-
-async def upload_pic(
- filepath: str, allow_duplicates: bool = False, token: Union[str, None] = None
-) -> Tuple[bool, list, Union[str, None]]:
- token = await authorize() if token is None else token
- try:
- pic_name = path.basename(filepath)
- logWrite(f"Uploading {pic_name} to the API...", debug=True)
- async with aiofiles.open(filepath, "rb") as f:
- file_bytes = await f.read()
- formdata = FormData()
- formdata.add_field(
- "file", file_bytes, filename=pic_name, content_type="image/jpeg"
- )
- response = await http_session.post(
- f'{configGet("address", "posting", "api")}/albums/{configGet("album", "posting", "api")}/photos',
- params={
- "caption": "queue",
- "compress": "false",
- "ignore_duplicates": str(allow_duplicates).lower(),
- },
- headers={"Authorization": f"Bearer {token}"},
- data=formdata,
- )
- response_json = await response.json()
- if response.status != 200 and response.status != 409:
- logWrite(
- locale(
- "pic_upload_error",
- "console",
- locale=configGet("locale_log").format(
- filepath, response.status, response.content
- ),
- ),
- )
- raise SubmissionUploadError(
- str(filepath), response.status, response.content
- )
- id = response_json["id"] if "id" in await response.json() else None
- duplicates = []
- if "duplicates" in response_json:
- for index, duplicate in enumerate(response_json["duplicates"]): # type: ignore
- if response_json["access_token"] is None:
- duplicates.append(
- f'`{duplicate["id"]}`:\n{configGet("address_external", "posting", "api")}/photos/{duplicate["id"]}'
- )
- else:
- duplicates.append(
- f'`{duplicate["id"]}`:\n{configGet("address_external", "posting", "api")}/token/photo/{response_json["access_token"]}?id={index}'
- )
- return True, duplicates, id
- except Exception as exp:
- print_exc()
- return False, [], None
-
-
-async def find_pic(
- name: str, caption: Union[str, None] = None, token: Union[str, None] = None
-) -> Union[dict, None]:
- token = await authorize() if token is None else token
- try:
- response = await http_session.get(
- f'{configGet("address", "posting", "api")}/albums/{configGet("album", "posting", "api")}/photos',
- params={"q": name, "caption": caption},
- headers={"Authorization": f"Bearer {token}"},
- )
- # logWrite(response.json())
- if response.status != 200:
- return None
- if len((await response.json())["results"]) == 0:
- return None
- return (await response.json())["results"]
- except Exception as exp:
- logWrite(
- locale(
- "find_pic_error",
- "console",
- locale=configGet("locale_log").format(name, caption, exp),
- ),
- )
- return None
-
-
-async def move_pic(id: str, token: Union[str, None] = None) -> bool:
- token = await authorize() if token is None else token
- try:
- response = await http_session.patch(
- f'{configGet("address", "posting", "api")}/photos/{id}?caption=sent',
- headers={"Authorization": f"Bearer {token}"},
- )
- if response.status != 200:
- logWrite(f"Media moving failed with HTTP {response.status}", debug=True)
- return False
- return True
- except:
- return False
-
-
-async def remove_pic(id: str, token: Union[str, None] = None) -> bool:
- token = await authorize() if token is None else token
- try:
- response = await http_session.delete(
- f'{configGet("address", "posting", "api")}/photos/{id}',
- headers={"Authorization": f"Bearer {token}"},
- )
- if response.status != 204:
- logWrite(f"Media removal failed with HTTP {response.status}", debug=True)
- return False
- return True
- except:
- return False
-
-
-async def create_user(username: str, email: str, password: str) -> None:
- response = await http_session.post(
- f'{configGet("address", "posting", "api")}/users',
- data={"user": username, "email": email, "password": password},
- )
- if response.status == 409:
- raise UserCreationDuplicateError(username)
- elif response.status != 204:
- raise UserCreationError(response.status, await response.text(encoding="utf-8"))
- return None
-
-
-async def create_album(name: str, title: str) -> None:
- token = await authorize()
- response = await http_session.post(
- f'{configGet("address", "posting", "api")}/albums',
- params={"name": name, "title": title},
- headers={"Authorization": f"Bearer {token}"},
- )
- if response.status == 409:
- raise AlbumCreationDuplicateError(name)
- elif response.status == 406:
- raise AlbumCreationNameError(await response.json())
- elif response.status != 200:
- raise AlbumCreationError(response.status, await response.text(encoding="utf-8"))
- return None
+ exit()
+client = AuthenticatedClient(
+ base_url=sync.config_get("address", "posting", "api"),
+ timeout=5.0,
+ verify_ssl=True,
+ raise_on_unexpected_status=True,
+ token=login_token.access_token,
+ follow_redirects=False,
+)
if __name__ == "__main__":
print(asyncio.run(authorize()))
diff --git a/modules/app.py b/modules/app.py
deleted file mode 100644
index 2724747..0000000
--- a/modules/app.py
+++ /dev/null
@@ -1,14 +0,0 @@
-from modules.utils import configGet
-from classes.poster_client import PosterClient
-from convopyro import Conversation
-
-app = PosterClient(
- "duptsiaposter",
- bot_token=configGet("bot_token", "bot"),
- api_id=configGet("api_id", "bot"),
- api_hash=configGet("api_hash", "bot"),
-)
-
-Conversation(app)
-
-users_with_context = []
diff --git a/modules/cli.py b/modules/cli.py
index 0e4768e..e21ee0e 100644
--- a/modules/cli.py
+++ b/modules/cli.py
@@ -1,10 +1,21 @@
import asyncio
+from argparse import ArgumentParser
from sys import exit
from traceback import print_exc
-from modules.api_client import create_album, create_user, http_session
-from argparse import ArgumentParser
-from modules.utils import configSet
+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",
@@ -16,6 +27,14 @@ parser.add_argument("--create-album", action="store_true")
args = parser.parse_args()
+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(
@@ -26,10 +45,15 @@ async def cli_create_user() -> None:
email = input(f"Choose email for user '{username}': ").strip()
password = input(f"Choose password for user '{username}': ").strip()
try:
- result_1 = await create_user(username, email, password)
+ result_1 = await user_create(
+ client=unauthorized_client,
+ form_data=BodyUserCreateUsersPost(
+ user=username, email=email, password=password
+ ),
+ )
# asyncio.run(create_user(username, email, password))
- configSet("username", username, "posting", "api")
- configSet("password", password, "posting", "api")
+ 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."
)
@@ -39,7 +63,6 @@ async def cli_create_user() -> None:
exit()
if not args.create_album:
print("You're done!", flush=True)
- await http_session.close()
exit()
return None
@@ -52,17 +75,33 @@ async def cli_create_album() -> None:
name = input("Choose a name for your album: ").strip()
title = input(f"Choose a title for album '{name}': ").strip()
try:
- result_2 = await create_album(name, title)
+ 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))
- configSet("album", name, "posting", "api")
+ await config_set("album", name, "posting", "api")
except Exception as exp:
print(f"Could not create an album due to {exp}", flush=True)
print_exc()
exit()
print("You're done!", flush=True)
- await http_session.close()
exit()
- return None
if args.create_user or args.create_album:
diff --git a/modules/commands_register.py b/modules/commands_register.py
deleted file mode 100644
index de1bcbe..0000000
--- a/modules/commands_register.py
+++ /dev/null
@@ -1,57 +0,0 @@
-from os import listdir
-from classes.poster_client import PosterClient
-from pyrogram.types import BotCommand, BotCommandScopeChat
-from modules.utils import configGet, locale
-
-
-async def register_commands(app: PosterClient) -> None:
- if configGet("submit", "mode"):
- # Registering user commands
- for entry in listdir(configGet("locale", "locations")):
- if entry.endswith(".json"):
- commands_list = []
- for command in configGet("commands"):
- commands_list.append(
- BotCommand(
- command,
- locale(
- command, "commands", locale=entry.replace(".json", "")
- ),
- )
- )
- await app.set_bot_commands(
- commands_list, language_code=entry.replace(".json", "")
- )
-
- # Registering user commands for fallback locale
- commands_list = []
- for command in configGet("commands"):
- commands_list.append(
- BotCommand(
- command,
- locale(command, "commands", locale=configGet("locale_fallback")),
- )
- )
- await app.set_bot_commands(commands_list)
-
- # Registering admin commands
- commands_admin_list = []
-
- if configGet("submit", "mode"):
- for command in configGet("commands"):
- commands_admin_list.append(
- BotCommand(
- command, locale(command, "commands", locale=configGet("locale"))
- )
- )
- for command in configGet("commands_admin"):
- commands_admin_list.append(
- BotCommand(
- command, locale(command, "commands_admin", locale=configGet("locale"))
- )
- )
-
- for admin in app.admins:
- await app.set_bot_commands(
- commands_admin_list, scope=BotCommandScopeChat(chat_id=admin)
- )
diff --git a/modules/database.py b/modules/database.py
index dbfa7df..acdb504 100644
--- a/modules/database.py
+++ b/modules/database.py
@@ -25,11 +25,10 @@ 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:
+for collection in ["sent", "users", "submitted"]:
+ if collection not 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")
diff --git a/modules/logger.py b/modules/logger.py
deleted file mode 100644
index 0f32b14..0000000
--- a/modules/logger.py
+++ /dev/null
@@ -1,67 +0,0 @@
-from datetime import datetime
-from gzip import open as gzipopen
-from os import getcwd, makedirs, path, stat
-from shutil import copyfileobj
-
-from ujson import loads
-
-with open(getcwd() + path.sep + "config.json", "r", encoding="utf8") as file:
- json_contents = loads(file.read())
- log_size = json_contents["logging"]["size"]
- log_folder = json_contents["logging"]["location"]
- file.close()
-
-
-# Check latest log size
-def checkSize(debug=False) -> None:
- global log_folder
-
- if debug:
- log_file = "debug.log"
- else:
- log_file = "latest.log"
-
- try:
- makedirs(log_folder, exist_ok=True)
- log = stat(path.join(log_folder, log_file))
- if (log.st_size / 1024) > log_size:
- with open(path.join(log_folder, log_file), "rb") as f_in:
- with gzipopen(
- path.join(
- log_folder,
- f'{datetime.now().strftime("%d.%m.%Y_%H:%M:%S")}.log.gz',
- ),
- "wb",
- ) as f_out:
- copyfileobj(f_in, f_out)
- print(
- f'Copied {path.join(log_folder, datetime.now().strftime("%d.%m.%Y_%H:%M:%S"))}.log.gz'
- )
- open(path.join(log_folder, log_file), "w").close()
- except FileNotFoundError:
- print(f"Log file {path.join(log_folder, log_file)} does not exist")
- pass
-
-
-# Append string to log
-def logAppend(message, debug=False) -> None:
- global log_folder
-
- message_formatted = f'[{datetime.now().strftime("%d.%m.%Y")}] [{datetime.now().strftime("%H:%M:%S")}] {message}'
- checkSize(debug=debug)
-
- if debug:
- log_file = "debug.log"
- else:
- log_file = "latest.log"
-
- log = open(path.join(log_folder, log_file), "a")
- log.write(f"{message_formatted}\n")
- log.close()
-
-
-# Print to stdout and then to log
-def logWrite(message, debug=False) -> None:
- # save to log file and rotation is to be done
- logAppend(f"{message}", debug=debug)
- print(f"{message}", flush=True)
diff --git a/modules/scheduler.py b/modules/scheduler.py
index ba8fe06..a5eb79d 100644
--- a/modules/scheduler.py
+++ b/modules/scheduler.py
@@ -1,31 +1,3 @@
-from datetime import datetime, timedelta
from apscheduler.schedulers.asyncio import AsyncIOScheduler
-from pytimeparse.timeparse import timeparse
-from modules.utils import configGet
-from modules.sender import send_content
-from modules.commands_register import register_commands
-from modules.app import app
scheduler = AsyncIOScheduler()
-
-if configGet("post", "mode"):
- if configGet("use_interval", "posting"):
- scheduler.add_job(
- send_content,
- "interval",
- seconds=timeparse(configGet("interval", "posting")),
- args=[app],
- )
- else:
- for entry in configGet("time", "posting"):
- dt_obj = datetime.strptime(entry, "%H:%M")
- scheduler.add_job(
- send_content, "cron", hour=dt_obj.hour, minute=dt_obj.minute, args=[app]
- )
-
-scheduler.add_job(
- register_commands,
- "date",
- run_date=datetime.now() + timedelta(seconds=10),
- args=[app],
-)
diff --git a/modules/sender.py b/modules/sender.py
index ed4de5a..0d9af0a 100644
--- a/modules/sender.py
+++ b/modules/sender.py
@@ -1,113 +1,185 @@
+import logging
from datetime import datetime
from os import makedirs, path
-from random import choice
+from random import choice, sample
from shutil import rmtree
-from traceback import format_exc
+from traceback import format_exc, print_exc
+from typing import Union
from uuid import uuid4
-from PIL import Image
+
import aiofiles
+from aiohttp import ClientSession
+from libbot.pyrogram.classes import PyroClient
+from photosapi_client.errors import UnexpectedStatus
+from PIL import Image
-from classes.poster_client import PosterClient
-
-from modules.api_client import authorize, move_pic, random_pic, http_session
+from modules.api_client import (
+ File,
+ PhotoSearch,
+ VideoSearch,
+ authorize,
+ client,
+ photo_get,
+ photo_patch,
+ photo_random,
+ video_get,
+ video_patch,
+ video_random,
+)
from modules.database import col_sent, col_submitted
-from modules.logger import logWrite
-from modules.utils import configGet, locale
+
+logger = logging.getLogger(__name__)
-async def send_content(app: PosterClient) -> None:
+async def send_content(app: PyroClient, http_session: ClientSession) -> None:
try:
try:
- token = await authorize()
+ token = await authorize(http_session)
except ValueError:
await app.send_message(
app.owner,
- locale("api_creds_invalid", "message", locale=configGet("locale")),
+ app._("api_creds_invalid", "message"),
)
return
try:
- pic = await random_pic()
- except KeyError:
- logWrite(locale("post_empty", "console", locale=configGet("locale")))
- if configGet("error", "reports"):
- await app.send_message(
- app.owner,
- locale("api_queue_empty", "message", locale=configGet("locale")),
- )
- return
- except ValueError:
- if configGet("error", "reports"):
- await app.send_message(
- app.owner,
- locale("api_queue_error", "message", locale=configGet("locale")),
- )
- return
+ funcs = []
- response = await http_session.get(
- f'{configGet("address", "posting", "api")}/photos/{pic[0]}',
- headers={"Authorization": f"Bearer {token}"},
- )
+ if app.config["posting"]["types"]["photo"]:
+ funcs.append((photo_random, photo_get, app.send_photo, photo_patch))
- if response.status != 200:
- logWrite(
- locale(
- "post_invalid_pic", "console", locale=configGet("locale")
- ).format(response.status, str(response.json()))
+ if app.config["posting"]["types"]["video"]:
+ funcs.append((video_random, video_get, app.send_video, video_patch))
+
+ if not funcs:
+ raise KeyError(
+ "No media source provided: all seem to be disabled in config"
+ )
+
+ if len(funcs) > 1:
+ found = False
+ for func_iter in sample(funcs, len(funcs)):
+ func = func_iter
+
+ random_results = (
+ await func_iter[0](
+ album=app.config["posting"]["api"]["album"],
+ caption="queue",
+ client=client,
+ limit=1,
+ )
+ ).results
+
+ if not random_results:
+ continue
+
+ media: Union[PhotoSearch, VideoSearch] = random_results[0]
+
+ try:
+ response: File = await func_iter[1](id=media.id, client=client)
+ except Exception as exp:
+ print_exc()
+ logger.error("Media is invalid: %s", exp)
+ if app.config["reports"]["error"]:
+ await app.send_message(
+ app.owner, f"Media is invalid: {exp}"
+ )
+ return
+
+ found = True
+ break
+
+ if not found:
+ raise KeyError("No media found")
+ else:
+ func = funcs[0]
+ media: Union[PhotoSearch, VideoSearch] = (
+ await func[0](
+ album=app.config["posting"]["api"]["album"],
+ caption="queue",
+ client=client,
+ limit=1,
+ )
+ ).results[0]
+ try:
+ response: File = await func[1](id=media.id, client=client)
+ except Exception as exp:
+ print_exc()
+ logger.error("Media is invalid: %s", exp)
+ if app.config["reports"]["error"]:
+ await app.send_message(app.owner, f"Media is invalid: {exp}")
+ return
+
+ except (KeyError, AttributeError, TypeError, IndexError):
+ logger.info(
+ "Could not send content due to queue empty or contains only forbidden extensions"
)
- if configGet("error", "reports"):
+ if app.config["reports"]["error"]:
await app.send_message(
app.owner,
- locale(
- "post_invalid_pic", "message", locale=configGet("locale")
- ).format(response.status, response.json()),
+ app._("api_queue_empty", "message"),
)
+ return
+
+ except (ValueError, UnexpectedStatus):
+ if app.config["reports"]["error"]:
+ await app.send_message(
+ app.owner,
+ app._("api_queue_error", "message"),
+ )
+ return
tmp_dir = str(uuid4())
- makedirs(path.join(configGet("tmp", "locations"), tmp_dir), exist_ok=True)
+ makedirs(path.join(app.config["locations"]["tmp"], tmp_dir), exist_ok=True)
- tmp_path = path.join(tmp_dir, pic[1])
+ tmp_path = path.join(tmp_dir, media.filename)
async with aiofiles.open(
- path.join(configGet("tmp", "locations"), tmp_path), "wb"
+ path.join(app.config["locations"]["tmp"], tmp_path), "wb"
) as out_file:
- await out_file.write(await response.read())
+ await out_file.write(response.payload.read())
- logWrite(
- f'Candidate {pic[1]} ({pic[0]}) is {path.getsize(path.join(configGet("tmp", "locations"), tmp_path))} bytes big',
- debug=True,
+ logger.info(
+ "Candidate %s (%s) is %s bytes big",
+ media.filename,
+ media.id,
+ path.getsize(path.join(app.config["locations"]["tmp"], tmp_path)),
)
- if path.getsize(path.join(configGet("tmp", "locations"), tmp_path)) > 5242880:
- image = Image.open(path.join(configGet("tmp", "locations"), tmp_path))
+ if (
+ path.getsize(path.join(app.config["locations"]["tmp"], tmp_path)) > 5242880
+ ) 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)
if tmp_path.lower().endswith(".jpeg") or tmp_path.lower().endswith(".jpg"):
image.save(
- path.join(configGet("tmp", "locations"), tmp_path),
+ path.join(app.config["locations"]["tmp"], tmp_path),
"JPEG",
optimize=True,
quality=50,
)
elif tmp_path.lower().endswith(".png"):
image.save(
- path.join(configGet("tmp", "locations"), tmp_path),
+ path.join(app.config["locations"]["tmp"], tmp_path),
"PNG",
optimize=True,
compress_level=8,
)
image.close()
- if path.getsize(path.join(configGet("tmp", "locations"), tmp_path)) > 5242880:
+ if (
+ path.getsize(path.join(app.config["locations"]["tmp"], tmp_path)) > 5242880
+ ) and func[0] is photo_random:
rmtree(
- path.join(configGet("tmp", "locations"), tmp_dir), ignore_errors=True
+ path.join(app.config["locations"]["tmp"], tmp_dir), ignore_errors=True
)
raise BytesWarning
del response
- submitted = col_submitted.find_one({"temp.file": pic[1]})
+ submitted = col_submitted.find_one({"temp.file": media.filename})
if submitted is not None and submitted["caption"] is not None:
caption = submitted["caption"].strip()
@@ -116,86 +188,83 @@ async def send_content(app: PosterClient) -> None:
if (
submitted is not None
- and configGet("enabled", "posting", "submitted_caption")
+ and app.config["posting"]["submitted_caption"]["enabled"]
and (
(submitted["user"] not in app.admins)
- or (configGet("ignore_admins", "posting", "submitted_caption") is False)
+ or (
+ app.config["posting"]["submitted_caption"]["ignore_admins"] is False
+ )
)
):
caption = (
- f"{caption}\n\n{configGet('text', 'posting', 'submitted_caption')}\n"
+ f"{caption}\n\n{app.config['posting']['submitted_caption']['text']}\n"
)
else:
caption = f"{caption}\n\n"
- if configGet("enabled", "caption"):
- if configGet("link", "caption") != None:
- caption = f"{caption}[{choice(configGet('text', 'caption'))}]({configGet('link', 'caption')})"
+ if app.config["caption"]["enabled"]:
+ if app.config["caption"]["link"] is not None:
+ caption = f"{caption}[{choice(app.config['caption']['text'])}]({app.config['caption']['link']})"
else:
- caption = f"{caption}{choice(configGet('text', 'caption'))}"
+ caption = f"{caption}{choice(app.config['caption']['text'])}"
else:
caption = caption
try:
- sent = await app.send_photo(
- configGet("channel", "posting"),
- path.join(configGet("tmp", "locations"), tmp_path),
+ sent = await func[2](
+ app.config["posting"]["channel"],
+ path.join(app.config["locations"]["tmp"], tmp_path),
caption=caption,
- disable_notification=configGet("silent", "posting"),
+ disable_notification=app.config["posting"]["silent"],
)
except Exception as exp:
- logWrite(f"Could not send image {pic[1]} ({pic[0]}) due to {exp}")
- if configGet("error", "reports"):
+ logger.error(
+ "Could not send media %s (%s) due to %s", media.filename, media.id, exp
+ )
+ if app.config["reports"]["error"]:
await app.send_message(
app.owner,
- locale(
- "post_exception", "message", locale=configGet("locale")
- ).format(exp, format_exc()),
+ app._("post_exception", "message").format(exp, format_exc()),
)
- # rmtree(path.join(configGet("tmp", "locations"), tmp_dir), ignore_errors=True)
+ # rmtree(path.join(app.config['locations']['tmp'], tmp_dir), ignore_errors=True)
return
col_sent.insert_one(
{
"date": datetime.now(),
- "image": pic[0],
- "filename": pic[1],
- "channel": configGet("channel", "posting"),
+ "image": media.id,
+ "filename": media.filename,
+ "channel": app.config["posting"]["channel"],
"caption": None
if (submitted is None or submitted["caption"] is None)
else submitted["caption"].strip(),
}
)
- await move_pic(pic[0])
+ await func[3](id=media.id, client=client, caption="sent")
- rmtree(path.join(configGet("tmp", "locations"), tmp_dir), ignore_errors=True)
+ rmtree(path.join(app.config["locations"]["tmp"], tmp_dir), ignore_errors=True)
- logWrite(
- locale("post_sent", "console", locale=configGet("locale")).format(
- pic[0],
- str(configGet("channel", "posting")),
- caption.replace("\n", "%n"),
- str(configGet("silent", "posting")),
- )
+ logger.info(
+ "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:
- logWrite(
- locale("post_exception", "console", locale=configGet("locale")).format(
- str(exp), format_exc()
- )
+ logger.error(
+ "Could not send content due to %s. Traceback: %s", exp, format_exc()
)
- if configGet("error", "reports"):
+ if app.config["reports"]["error"]:
await app.send_message(
app.owner,
- locale("post_exception", "message", locale=configGet("locale")).format(
- exp, format_exc()
- ),
+ app._("post_exception", "message").format(exp, format_exc()),
)
try:
rmtree(
- path.join(configGet("tmp", "locations"), tmp_dir), ignore_errors=True
+ path.join(app.config["locations"]["tmp"], tmp_dir), ignore_errors=True
)
except:
pass
diff --git a/modules/utils.py b/modules/utils.py
index 0256377..df017b9 100644
--- a/modules/utils.py
+++ b/modules/utils.py
@@ -1,252 +1,33 @@
-from os import kill, makedirs
-from os import name as osname
-from os import path, sep
-from sys import exit
-from traceback import print_exc
-from typing import Any
+import logging
+from os import makedirs, path
+from pathlib import Path
+from typing import List, Union
from zipfile import ZipFile
import aiofiles
-from ujson import JSONDecodeError, dumps, loads
-from modules.logger import logWrite
+logger = logging.getLogger(__name__)
-default_config = {
- "locale": "en",
- "locale_log": "en",
- "locale_fallback": "en",
- "owner": 0,
- "admins": [],
- "bot": {"api_id": 0, "api_hash": "", "bot_token": ""},
- "database": {
- "user": None,
- "password": None,
- "host": "127.0.0.1",
- "port": 27017,
- "name": "tgposter",
- },
- "mode": {"post": True, "submit": True},
- "reports": {"sent": False, "error": True, "startup": True, "shutdown": True},
- "logging": {"size": 512, "location": "logs"},
- "locations": {
- "tmp": "tmp",
- "data": "data",
- "cache": "cache",
- "sent": "data/sent",
- "queue": "data/queue",
- "index": "data/index.json",
- "locale": "locale",
- },
- "posting": {
- "channel": 0,
- "silent": False,
- "move_sent": False,
- "use_interval": False,
- "interval": "1h30m",
- "page_size": 300,
- "submitted_caption": {
- "enabled": True,
- "ignore_admins": True,
- "text": "#submitted",
- },
- "extensions": {
- "photo": ["jpg", "png", "gif", "jpeg"],
- "video": ["mp4", "avi", "mkv", "webm", "mov"],
- },
- "time": [
- "08:00",
- "10:00",
- "12:00",
- "14:00",
- "16:00",
- "18:00",
- "20:00",
- "22:00",
- ],
- "api": {
- "address": "http://localhost:8054",
- "address_external": "https://photos.domain.com",
- "username": "",
- "password": "",
- "album": "",
- },
- },
- "caption": {"enabled": False, "link": None, "text": ["sample text"]},
- "submission": {
- "timeout": 30,
- "file_size": 15728640,
- "tmp_size": 15728640,
- "allow_duplicates": False,
- "send_uploaded_id": False,
- "require_confirmation": {"users": True, "admins": True},
- "mime_types": [
- "image/png",
- "image/gif",
- "image/jpeg",
- "video/mp4",
- "video/quicktime",
- ],
- },
- "commands": ["start", "rules"],
- "commands_admin": ["import", "export", "shutdown"],
-}
+USERS_WITH_CONTEXT: List[int] = []
-def jsonLoad(filename: str) -> Any:
- """Loads arg1 as json and returns its contents"""
- with open(filename, "r", encoding="utf8") as file:
- try:
- output = loads(file.read())
- except JSONDecodeError:
- logWrite(
- f"Could not load json file {filename}: file seems to be incorrect!\n{print_exc()}"
- )
- raise
- except FileNotFoundError:
- logWrite(
- f"Could not load json file {filename}: file does not seem to exist!\n{print_exc()}"
- )
- raise
- file.close()
- return output
-
-
-def jsonSave(contents: Any, filename: str) -> None:
- """Dumps dict/list arg1 to file arg2"""
- try:
- with open(filename, "w", encoding="utf8") as file:
- file.write(
- dumps(
- contents, ensure_ascii=False, indent=4, escape_forward_slashes=False
- )
- )
- file.close()
- except Exception as exp:
- logWrite(f"Could not save json file {filename}: {exp}\n{print_exc()}")
- return
-
-
-def configSet(key: str, value, *args: str):
- """Set key to a value
- Args:
- * key (str): The last key of the keys path.
- * value (str/int/float/list/dict/None): Some needed value.
- * *args (str): Path to key like: dict[args][key].
- """
- this_dict = jsonLoad("config.json")
- string = "this_dict"
- for arg in args:
- string += f'["{arg}"]'
- if type(value) in [str]:
- string += f'["{key}"] = "{value}"'
- else:
- string += f'["{key}"] = {value}'
- exec(string)
- jsonSave(this_dict, "config.json")
- return
-
-
-def configGet(key: str, *args: str):
- """Get value of the config key
- Args:
- * key (str): The last key of the keys path.
- * *args (str): Path to key like: dict[args][key].
- Returns:
- * any: Value of provided key
- """
- this_dict = jsonLoad("config.json")
- try:
- this_key = this_dict
- for dict_key in args:
- this_key = this_key[dict_key]
- this_key[key]
- except KeyError:
- print(
- f"Could not find config key '{key}' under path {args}: falling back to default config",
- flush=True,
- )
- this_key = default_config
- for dict_key in args:
- this_key = this_key[dict_key]
- configSet(key, this_key[key], *args)
- return this_key[key]
-
-
-def locale(key: str, *args: str, locale=configGet("locale")):
- """Get value of locale string
- Args:
- * key (str): The last key of the locale's keys path.
- * *args (list): Path to key like: dict[args][key].
- * locale (str): Locale to looked up in. Defaults to config's locale value.
- Returns:
- * any: Value of provided locale key
- """
- if locale == None:
- locale = configGet("locale")
-
- try:
- this_dict = jsonLoad(f'{configGet("locale", "locations")}{sep}{locale}.json')
- except FileNotFoundError:
- try:
- this_dict = jsonLoad(
- f'{configGet("locale", "locations")}{sep}{configGet("locale")}.json'
- )
- except FileNotFoundError:
- try:
- this_dict = jsonLoad(
- f'{configGet("locale_fallback", "locations")}{sep}{configGet("locale")}.json'
- )
- except:
- return f'⚠️ Locale in config is invalid: could not get "{key}" in {str(args)} from locale "{locale}"'
-
- this_key = this_dict
- for dict_key in args:
- this_key = this_key[dict_key]
-
- try:
- return this_key[key]
- except KeyError:
- return f'⚠️ Locale in config is invalid: could not get "{key}" in {str(args)} from locale "{locale}"'
-
-
-async def extract_and_save(handle: ZipFile, filename: str, destpath: str):
+async def extract_and_save(handle: ZipFile, filename: str, destpath: Union[str, Path]):
"""Extract and save file from archive
- Args:
- * handle (ZipFile): ZipFile handler
- * filename (str): File base name
- * path (str): Path where to store
+ ### Args:
+ * handle (`ZipFile`): ZipFile handler
+ * filename (`str`): File base name
+ * path (`Union[str, Path]`): Path where to store
"""
data = handle.read(filename)
- filepath = path.join(destpath, filename)
+ filepath = path.join(str(destpath), filename)
try:
makedirs(path.dirname(filepath), exist_ok=True)
async with aiofiles.open(filepath, "wb") as fd:
await fd.write(data)
- logWrite(f"Unzipped {filename}", debug=True)
+ logger.debug("Unzipped %s", filename)
except IsADirectoryError:
makedirs(filepath, exist_ok=True)
except FileNotFoundError:
pass
return
-
-
-try:
- from psutil import Process
-except ModuleNotFoundError:
- print(locale("deps_missing", "console", locale=configGet("locale")), flush=True)
- exit()
-
-
-def killProc(pid: int) -> None:
- """Kill process by its PID. Meant to be used to kill the main process of bot itself.
-
- ### Args:
- * pid (`int`): PID of the target
- """
- if osname == "posix":
- from signal import SIGKILL
-
- kill(pid, SIGKILL)
- else:
- Process(pid).kill()
diff --git a/plugins/callbacks/nothing.py b/plugins/callbacks/nothing.py
index a2ccaa0..b8baca7 100644
--- a/plugins/callbacks/nothing.py
+++ b/plugins/callbacks/nothing.py
@@ -1,12 +1,12 @@
-from modules.app import app
from pyrogram import filters
+from pyrogram.client import Client
from pyrogram.types import CallbackQuery
-from classes.poster_client import PosterClient
-from modules.utils import locale
+
+from classes.pyroclient import PyroClient
-@app.on_callback_query(filters.regex("nothing"))
-async def callback_query_nothing(app: PosterClient, clb: CallbackQuery):
- await clb.answer(
- text=locale("nothing", "callback", locale=clb.from_user.language_code)
- )
+@Client.on_callback_query(filters.regex("nothing"))
+async def callback_query_nothing(app: PyroClient, clb: CallbackQuery):
+ user = await app.find_user(clb.from_user)
+
+ await clb.answer(text=app._("nothing", "callback", locale=user.locale))
diff --git a/plugins/callbacks/shutdown.py b/plugins/callbacks/shutdown.py
index 595471a..197a0d8 100644
--- a/plugins/callbacks/shutdown.py
+++ b/plugins/callbacks/shutdown.py
@@ -1,29 +1,25 @@
-from os import getpid, makedirs, path
+from os import makedirs, path
from time import time
-from modules.app import app
+
+from libbot import config_get, json_write
from pyrogram import filters
+from pyrogram.client import Client
from pyrogram.types import CallbackQuery
-from classes.poster_client import PosterClient
-from modules.scheduler import scheduler
-from modules.logger import logWrite
-from modules.utils import configGet, jsonSave, locale
+
+from classes.pyroclient import PyroClient
-@app.on_callback_query(filters.regex("shutdown"))
-async def callback_query_nothing(app: PosterClient, clb: CallbackQuery):
- if clb.from_user.id in app.admins:
- pid = getpid()
- logWrite(f"Shutting down bot with pid {pid}")
- await clb.answer()
- await clb.message.reply_text(
- locale("shutdown", "message", locale=clb.from_user.language_code).format(
- pid
- ),
- )
- scheduler.shutdown()
- makedirs(configGet("cache", "locations"), exist_ok=True)
- jsonSave(
- {"timestamp": time()},
- path.join(configGet("cache", "locations"), "shutdown_time"),
- )
- exit()
+@Client.on_callback_query(filters.regex("shutdown"))
+async def callback_query_nothing(app: PyroClient, clb: CallbackQuery):
+ if clb.from_user.id not in app.admins:
+ return
+
+ await clb.answer()
+
+ makedirs(await config_get("cache", "locations"), exist_ok=True)
+ await json_write(
+ {"timestamp": time()},
+ path.join(await config_get("cache", "locations"), "shutdown_time"),
+ )
+
+ exit()
diff --git a/plugins/callbacks/submission.py b/plugins/callbacks/submission.py
index 33178b1..47f70a0 100644
--- a/plugins/callbacks/submission.py
+++ b/plugins/callbacks/submission.py
@@ -1,67 +1,87 @@
+import logging
from os import path
+from pathlib import Path
from shutil import rmtree
-from pyrogram import filters
-from pyrogram.types import CallbackQuery, InlineKeyboardMarkup, InlineKeyboardButton
-from classes.exceptions import SubmissionDuplicatesError, SubmissionUnavailableError
-from classes.poster_client import PosterClient
-from classes.user import PosterUser
-from modules.app import app
-from modules.logger import logWrite
-from modules.utils import configGet, locale
-from modules.database import col_submitted
from bson import ObjectId
+from libbot import config_get
+from pyrogram import filters
+from pyrogram.client import Client
+from pyrogram.types import CallbackQuery, InlineKeyboardButton, InlineKeyboardMarkup
+
+from classes.exceptions import (
+ SubmissionDuplicatesError,
+ SubmissionUnavailableError,
+ SubmissionUnsupportedError,
+)
+from classes.pyroclient import PyroClient
+from modules.database import col_submitted
+
+logger = logging.getLogger(__name__)
-@app.on_callback_query(filters.regex("sub_yes_[\s\S]*"))
-async def callback_query_yes(app: PosterClient, clb: CallbackQuery):
+@Client.on_callback_query(filters.regex("sub_yes_[\s\S]*"))
+async def callback_query_yes(app: PyroClient, clb: CallbackQuery):
+ user = await app.find_user(clb.from_user)
fullclb = str(clb.data).split("_")
- user_locale = clb.from_user.language_code
db_entry = col_submitted.find_one({"_id": ObjectId(fullclb[2])})
try:
- submission = await app.submit_photo(fullclb[2])
+ submission = await app.submit_media(fullclb[2])
except SubmissionUnavailableError:
await clb.answer(
- text=locale("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(
+ 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:
await clb.answer(
- text=locale("sub_duplicates_found", "callback", locale=user_locale),
+ text=app._("sub_duplicates_found", "callback", locale=user.locale),
show_alert=True,
)
await clb.message.reply_text(
- locale("sub_media_duplicates_list", "message", locale=user_locale).format(
+ app._("sub_media_duplicates_list", "message", locale=user.locale).format(
"\n • ".join(exp.duplicates)
),
quote=True,
)
- logWrite(
- locale(
- "submission_duplicate",
- "console",
- locale=configGet("locale_log").format(
- fullclb[2],
- str(exp.duplicates),
- ),
- ),
- debug=True,
+ logger.info(
+ "Submission with ID '%s' could not be accepted because of the duplicates: %s",
+ fullclb[2],
+ str(exp.duplicates),
)
return
if submission[0] is not None:
await submission[0].reply_text(
- locale("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"], locale("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(
- text=locale("sub_yes", "callback", locale=user_locale).format(fullclb[2]),
+ text=app._("sub_yes", "callback", locale=user.locale).format(fullclb[2]),
show_alert=True,
)
@@ -69,7 +89,7 @@ async def callback_query_yes(app: PosterClient, clb: CallbackQuery):
[
[
InlineKeyboardButton(
- text=str(locale("accepted", "button", locale=user_locale)),
+ text=str(app._("accepted", "button", locale=user.locale)),
callback_data="nothing",
)
],
@@ -79,95 +99,70 @@ async def callback_query_yes(app: PosterClient, clb: CallbackQuery):
else [
[
InlineKeyboardButton(
- text=str(locale("accepted", "button", locale=user_locale)),
+ text=str(app._("accepted", "button", locale=user.locale)),
callback_data="nothing",
)
]
]
)
- if configGet("send_uploaded_id", "submission"):
+ if await config_get("send_uploaded_id", "submission"):
await clb.message.edit_caption(
- clb.message.caption + f"\n\nID: `{submission[1]}`"
+ f"{clb.message.caption}\n\nID: `{submission[1]}`"
)
await clb.message.edit_reply_markup(
reply_markup=InlineKeyboardMarkup(edited_markup)
)
- logWrite(
- locale(
- "submission_accepted",
- "console",
- locale=configGet("locale_log").format(fullclb[2], submission[1]),
- ),
- debug=True,
+ logger.info(
+ "Submission with ID '%s' accepted and uploaded with ID '%s'",
+ fullclb[2],
+ submission[1],
)
- # try:
- # if configGet("api_based", "mode") is True:
- # media = await app.download_media(submission, file_name=configGet("tmp", "locations")+sep)
- # upload = upload_pic(media)
- # if upload[0] is False:
- # await clb.answer(text=locale("sub_media_failed", "message", locale=user_locale), show_alert=True)
- # elif len(upload[1]) > 0:
- # await clb.answer(text=locale("sub_media_duplicates", "message", locale=user_locale))
- # await clb.message.reply_text(locale("sub_media_duplicates_list", "message", locale=user_locale).format("\n • ".join(upload[1])))
- # else:
- # if clb.data.endswith("_caption"):
- # index = jsonLoad(configGet("index", "locations"))
- # index["captions"][Path(media).name] = submission.caption
- # jsonSave(index, configGet("index", "locations"))
- # else:
- # media = await app.download_media(submission, file_name=configGet("queue", "locations")+sep)
- # if clb.data.endswith("_caption"):
- # index = jsonLoad(configGet("index", "locations"))
- # index["captions"][Path(media).name] = submission.caption
- # jsonSave(index, configGet("index", "locations"))
- # except:
- # await clb.answer(text=locale("sub_media_unavail", "message", locale=user_locale), show_alert=True)
- # return
-
-@app.on_callback_query(filters.regex("sub_no_[\s\S]*"))
-async def callback_query_no(app: PosterClient, clb: CallbackQuery):
+@Client.on_callback_query(filters.regex("sub_no_[\s\S]*"))
+async def callback_query_no(app: PyroClient, clb: CallbackQuery):
+ user = await app.find_user(clb.from_user)
fullclb = str(clb.data).split("_")
- user_locale = clb.from_user.language_code
db_entry = col_submitted.find_one_and_delete({"_id": ObjectId(fullclb[2])})
- if db_entry["temp"]["uuid"] is not None:
- if path.exists(
- path.join(
- configGet("data", "locations"), "submissions", db_entry["temp"]["uuid"]
- )
- ):
- rmtree(
- path.join(
- configGet("data", "locations"),
- "submissions",
- db_entry["temp"]["uuid"],
- ),
- ignore_errors=True,
- )
+ if (
+ db_entry["temp"]["uuid"] is not None
+ and Path(
+ f"{app.config['locations']['data']}/submissions/{db_entry['temp']['uuid']}"
+ ).exists()
+ ):
+ rmtree(
+ Path(
+ f"{app.config['locations']['data']}/submissions/{db_entry['temp']['uuid']}"
+ ),
+ ignore_errors=True,
+ )
try:
submission = await app.get_messages(
db_entry["user"], db_entry["telegram"]["msg_id"]
)
- except:
+ except Exception as exp:
await clb.answer(
- text=locale("sub_msg_unavail", "message", locale=user_locale),
+ text=app._("sub_msg_unavail", "message", locale=user.locale),
show_alert=True,
)
return
await submission.reply_text(
- locale("sub_no", "message", locale=submission.from_user.language_code),
+ app._(
+ "sub_no",
+ "message",
+ locale=(await app.find_user(submission.from_user)).locale,
+ ),
quote=True,
)
await clb.answer(
- text=locale("sub_no", "callback", locale=user_locale).format(fullclb[2]),
+ text=app._("sub_no", "callback", locale=user.locale).format(fullclb[2]),
show_alert=True,
)
@@ -175,7 +170,7 @@ async def callback_query_no(app: PosterClient, clb: CallbackQuery):
[
[
InlineKeyboardButton(
- text=str(locale("declined", "button", locale=user_locale)),
+ text=str(app._("declined", "button", locale=user.locale)),
callback_data="nothing",
)
],
@@ -185,7 +180,7 @@ async def callback_query_no(app: PosterClient, clb: CallbackQuery):
else [
[
InlineKeyboardButton(
- text=str(locale("declined", "button", locale=user_locale)),
+ text=str(app._("declined", "button", locale=user.locale)),
callback_data="nothing",
)
]
@@ -194,26 +189,29 @@ async def callback_query_no(app: PosterClient, clb: CallbackQuery):
await clb.message.edit_reply_markup(
reply_markup=InlineKeyboardMarkup(edited_markup)
)
- logWrite(
- locale(
- "submission_rejected",
- "console",
- locale=configGet("locale_log").format(fullclb[2]),
- ),
- debug=True,
+ logger.info(
+ "Submission with ID '%s' rejected",
+ fullclb[2],
)
-@app.on_callback_query(filters.regex("sub_block_[\s\S]*"))
-async def callback_query_block(app: PosterClient, clb: CallbackQuery):
+@Client.on_callback_query(filters.regex("sub_block_[\s\S]*"))
+async def callback_query_block(app: PyroClient, clb: CallbackQuery):
+ user = await app.find_user(clb.from_user)
fullclb = str(clb.data).split("_")
- user_locale = clb.from_user.language_code
+
await app.send_message(
- int(fullclb[2]), locale("sub_blocked", "message", locale=configGet("locale"))
+ int(fullclb[2]),
+ app._(
+ "sub_blocked",
+ "message",
+ locale=(await app.find_user(int(fullclb[2]))).locale,
+ ),
)
- PosterUser(int(fullclb[2])).block()
+ await user.block()
+
await clb.answer(
- text=locale("sub_block", "callback", locale=user_locale).format(fullclb[2]),
+ text=app._("sub_block", "callback", locale=user.locale).format(fullclb[2]),
show_alert=True,
)
@@ -221,7 +219,7 @@ async def callback_query_block(app: PosterClient, clb: CallbackQuery):
clb.message.reply_markup.inline_keyboard[0],
[
InlineKeyboardButton(
- text=str(locale("sub_unblock", "button", locale=user_locale)),
+ text=str(app._("sub_unblock", "button", locale=user.locale)),
callback_data=f"sub_unblock_{fullclb[2]}",
)
],
@@ -229,26 +227,27 @@ async def callback_query_block(app: PosterClient, clb: CallbackQuery):
await clb.message.edit_reply_markup(
reply_markup=InlineKeyboardMarkup(edited_markup)
)
- logWrite(
- locale(
- "user_blocked",
- "console",
- locale=configGet("locale_log").format(fullclb[2]),
- ),
- debug=True,
- )
+ logger.info("User %s has been blocked", fullclb[2])
-@app.on_callback_query(filters.regex("sub_unblock_[\s\S]*"))
-async def callback_query_unblock(app: PosterClient, clb: CallbackQuery):
+@Client.on_callback_query(filters.regex("sub_unblock_[\s\S]*"))
+async def callback_query_unblock(app: PyroClient, clb: CallbackQuery):
+ user = await app.find_user(clb.from_user)
fullclb = str(clb.data).split("_")
- user_locale = clb.from_user.language_code
+
await app.send_message(
- int(fullclb[2]), locale("sub_unblocked", "message", locale=configGet("locale"))
+ int(fullclb[2]),
+ app._(
+ "sub_unblocked",
+ "message",
+ locale=(await app.find_user(int(fullclb[2]))).locale,
+ ),
)
- PosterUser(int(fullclb[2])).unblock()
+
+ await user.unblock()
+
await clb.answer(
- text=locale("sub_unblock", "callback", locale=user_locale).format(fullclb[2]),
+ text=app._("sub_unblock", "callback", locale=user.locale).format(fullclb[2]),
show_alert=True,
)
@@ -256,7 +255,7 @@ async def callback_query_unblock(app: PosterClient, clb: CallbackQuery):
clb.message.reply_markup.inline_keyboard[0],
[
InlineKeyboardButton(
- text=str(locale("sub_block", "button", locale=user_locale)),
+ text=str(app._("sub_block", "button", locale=user.locale)),
callback_data=f"sub_block_{fullclb[2]}",
)
],
@@ -264,11 +263,4 @@ async def callback_query_unblock(app: PosterClient, clb: CallbackQuery):
await clb.message.edit_reply_markup(
reply_markup=InlineKeyboardMarkup(edited_markup)
)
- logWrite(
- locale(
- "user_unblocked",
- "console",
- locale=configGet("locale_log").format(fullclb[2]),
- ),
- debug=True,
- )
+ logger.info("User %s has been unblocked", fullclb[2])
diff --git a/plugins/commands/general.py b/plugins/commands/general.py
index e839482..a33182a 100644
--- a/plugins/commands/general.py
+++ b/plugins/commands/general.py
@@ -1,45 +1,48 @@
-from os import getpid, makedirs, path
+import asyncio
+from os import makedirs
+from pathlib import Path
from time import time
+from libbot import json_write
from pyrogram import filters
-from pyrogram.types import Message, InlineKeyboardMarkup, InlineKeyboardButton
+from pyrogram.client import Client
+from pyrogram.types import InlineKeyboardButton, InlineKeyboardMarkup, Message
-from classes.poster_client import PosterClient
-from modules.app import app, users_with_context
-from modules.logger import logWrite
-from modules.scheduler import scheduler
-from modules.utils import configGet, jsonSave, locale
+from classes.pyroclient import PyroClient
+from modules.utils import USERS_WITH_CONTEXT
-@app.on_message(~filters.scheduled & filters.command(["shutdown"], prefixes=["", "/"]))
-async def cmd_kill(app: PosterClient, msg: Message):
- if msg.from_user.id in app.admins:
- global users_with_context
- if len(users_with_context) > 0:
- await msg.reply_text(
- f"There're {len(users_with_context)} unfinished users' contexts. If you turn off the bot, those will be lost. Please confirm shutdown using a button below.",
- reply_markup=InlineKeyboardMarkup(
- [
- [
- InlineKeyboardButton(
- "Confirm shutdown", callback_data="shutdown"
- )
- ]
- ]
- ),
- )
- return
- pid = getpid()
- logWrite(f"Shutting down bot with pid {pid}")
+@Client.on_message(
+ ~filters.scheduled & filters.command(["shutdown"], prefixes=["", "/"])
+)
+async def cmd_kill(app: PyroClient, msg: Message):
+ if msg.from_user.id not in app.admins:
+ return
+
+ user = await app.find_user(msg.from_user)
+
+ if len(USERS_WITH_CONTEXT) > 0:
await msg.reply_text(
- locale("shutdown", "message", locale=msg.from_user.language_code).format(
- pid
+ app._("shutdown_confirm", "message", locale=user.locale).format(
+ len(USERS_WITH_CONTEXT)
+ ),
+ reply_markup=InlineKeyboardMarkup(
+ [
+ [
+ InlineKeyboardButton(
+ app._("shutdown", "button", locale=user.locale),
+ callback_data="shutdown",
+ )
+ ]
+ ]
),
)
- scheduler.shutdown()
- makedirs(configGet("cache", "locations"), exist_ok=True)
- jsonSave(
- {"timestamp": time()},
- path.join(configGet("cache", "locations"), "shutdown_time"),
- )
- exit()
+ return
+
+ makedirs(app.config["locations"]["cache"], exist_ok=True)
+ await json_write(
+ {"timestamp": time()},
+ Path(f"{app.config['locations']['cache']}/shutdown_time"),
+ )
+
+ asyncio.get_event_loop().create_task(app.stop())
diff --git a/plugins/commands/mode_submit.py b/plugins/commands/mode_submit.py
index 016801d..649e4ac 100644
--- a/plugins/commands/mode_submit.py
+++ b/plugins/commands/mode_submit.py
@@ -1,23 +1,27 @@
from pyrogram import filters
+from pyrogram.client import Client
from pyrogram.types import Message
-from modules.app import app
-from modules.utils import locale
-from classes.user import PosterUser
-from classes.poster_client import PosterClient
+from classes.pyroclient import PyroClient
-@app.on_message(~filters.scheduled & filters.command(["start"], prefixes="/"))
-async def cmd_start(app: PosterClient, msg: Message):
- if PosterUser(msg.from_user.id).is_blocked() is False:
- await msg.reply_text(
- locale("start", "message", locale=msg.from_user.language_code)
- )
+@Client.on_message(~filters.scheduled & filters.command(["start"], prefixes="/"))
+async def cmd_start(app: PyroClient, msg: Message):
+ user = await app.find_user(msg.from_user)
+
+ if user.banned:
+ return
+
+ await msg.reply_text(app._("start", "message", locale=user.locale))
-@app.on_message(~filters.scheduled & filters.command(["rules", "help"], prefixes="/"))
-async def cmd_rules(app: PosterClient, msg: Message):
- if PosterUser(msg.from_user.id).is_blocked() is False:
- await msg.reply_text(
- locale("rules", "message", locale=msg.from_user.language_code)
- )
+@Client.on_message(
+ ~filters.scheduled & filters.command(["rules", "help"], prefixes="/")
+)
+async def cmd_rules(app: PyroClient, msg: Message):
+ user = await app.find_user(msg.from_user)
+
+ if user.banned:
+ return
+
+ await msg.reply_text(app._("rules", "message", locale=user.locale))
diff --git a/plugins/commands/photos.py b/plugins/commands/photos.py
index e56a798..77d4433 100644
--- a/plugins/commands/photos.py
+++ b/plugins/commands/photos.py
@@ -1,214 +1,356 @@
import asyncio
+import logging
from glob import iglob
+from io import BytesIO
from os import getcwd, makedirs, path, remove
+from pathlib import Path
from shutil import disk_usage, rmtree
from traceback import format_exc
from uuid import uuid4
from zipfile import ZipFile
from convopyro import listen_message
+from photosapi_client.errors import UnexpectedStatus
from pyrogram import filters
-from pyrogram.types import Message
+from pyrogram.client import Client
+from pyrogram.types import (
+ KeyboardButton,
+ Message,
+ ReplyKeyboardMarkup,
+ ReplyKeyboardRemove,
+)
+from ujson import loads
-from classes.poster_client import PosterClient
-from modules.api_client import remove_pic, upload_pic
-from modules.app import app, users_with_context
-from modules.logger import logWrite
-from modules.utils import configGet, extract_and_save, locale
+from classes.pyroclient import PyroClient
+from modules.api_client import (
+ BodyPhotoUpload,
+ File,
+ client,
+ photo_delete,
+ photo_upload,
+ video_delete,
+ video_upload,
+)
+from modules.utils import USERS_WITH_CONTEXT, extract_and_save
+
+logger = logging.getLogger(__name__)
-@app.on_message(~filters.scheduled & filters.command(["import"], prefixes=["", "/"]))
-async def cmd_import(app: PosterClient, msg: Message):
- if msg.from_user.id in app.admins:
- global users_with_context
- if msg.from_user.id not in users_with_context:
- users_with_context.append(msg.from_user.id)
- else:
- return
+@Client.on_message(~filters.scheduled & filters.command(["import"], prefixes=["", "/"]))
+async def cmd_import(app: PyroClient, msg: Message):
+ if msg.from_user.id not in app.admins:
+ return
+
+ global USERS_WITH_CONTEXT
+
+ if msg.from_user.id not in USERS_WITH_CONTEXT:
+ USERS_WITH_CONTEXT.append(msg.from_user.id)
+ else:
+ return
+
+ user = await app.find_user(msg.from_user)
+
+ await msg.reply_text(app._("import_request", "message", locale=user.locale))
+
+ answer = await listen_message(app, msg.chat.id, timeout=600)
+
+ USERS_WITH_CONTEXT.remove(msg.from_user.id)
+
+ if answer is None:
await msg.reply_text(
- locale("import_request", "message", locale=msg.from_user.language_code)
- )
- answer = await listen_message(app, msg.chat.id, timeout=600)
- users_with_context.remove(msg.from_user.id)
- if answer is None:
- await msg.reply_text(
- locale("import_ignored", "message", locale=msg.from_user.language_code),
- quote=True,
- )
- return
- if answer.text == "/cancel":
- await answer.reply_text(
- locale("import_abort", "message", locale=msg.from_user.language_code)
- )
- return
- if answer.document is None:
- await answer.reply_text(
- locale(
- "import_invalid_media",
- "message",
- locale=msg.from_user.language_code,
- ),
- quote=True,
- )
- return
- if answer.document.mime_type != "application/zip":
- await answer.reply_text(
- locale(
- "import_invalid_mime", "message", locale=msg.from_user.language_code
- ),
- quote=True,
- )
- return
- if disk_usage(getcwd())[2] < (answer.document.file_size) * 3:
- await msg.reply_text(
- locale(
- "import_too_big", "message", locale=msg.from_user.language_code
- ).format(
- answer.document.file_size // (2**30),
- disk_usage(getcwd())[2] // (2**30),
- )
- )
- return
- tmp_dir = str(uuid4())
- logWrite(
- f"Importing '{answer.document.file_name}' file {answer.document.file_size} bytes big (TMP ID {tmp_dir})"
- )
- makedirs(path.join(configGet("tmp", "locations"), tmp_dir), exist_ok=True)
- tmp_path = path.join(configGet("tmp", "locations"), answer.document.file_id)
- downloading = await answer.reply_text(
- locale("import_downloading", "message", locale=msg.from_user.language_code),
- quote=True,
- )
- await app.download_media(answer, file_name=tmp_path)
- await downloading.edit(
- locale("import_unpacking", "message", locale=msg.from_user.language_code)
- )
- try:
- with ZipFile(tmp_path, "r") as handle:
- tasks = [
- extract_and_save(
- handle, name, path.join(configGet("tmp", "locations"), tmp_dir)
- )
- for name in handle.namelist()
- ]
- _ = await asyncio.gather(*tasks)
- except Exception as exp:
- logWrite(
- f"Could not import '{answer.document.file_name}' due to {exp}: {format_exc}"
- )
- await answer.reply_text(
- locale(
- "import_unpack_error", "message", locale=msg.from_user.language_code
- ).format(exp, format_exc())
- )
- return
- logWrite(f"Downloaded '{answer.document.file_name}' - awaiting upload")
- await downloading.edit(
- locale("import_uploading", "message", locale=msg.from_user.language_code)
- )
- remove(tmp_path)
-
- for filename in iglob(
- path.join(configGet("tmp", "locations"), tmp_dir) + "**/**", recursive=True
- ):
- if not path.isfile(filename):
- continue
- # upload filename
- uploaded = await upload_pic(filename)
- if uploaded[0] is False:
- logWrite(
- f"Could not upload '{filename}' from '{path.join(configGet('tmp', 'locations'), tmp_dir)}'. Duplicates: {str(uploaded[1])}",
- debug=True,
- )
- if len(uploaded[1]) > 0:
- await msg.reply_text(
- locale(
- "import_upload_error_duplicate",
- "message",
- locale=msg.from_user.language_code,
- ).format(path.basename(filename)),
- disable_notification=True,
- )
- else:
- await msg.reply_text(
- locale(
- "import_upload_error_other",
- "message",
- locale=msg.from_user.language_code,
- ).format(path.basename(filename)),
- disable_notification=True,
- )
- else:
- logWrite(
- f"Uploaded '{filename}' from '{path.join(configGet('tmp', 'locations'), tmp_dir)}' and got ID {uploaded[2]}",
- debug=True,
- )
-
- await downloading.delete()
- logWrite(
- f"Removing '{path.join(configGet('tmp', 'locations'), tmp_dir)}' after uploading",
- debug=True,
- )
- rmtree(path.join(configGet("tmp", "locations"), tmp_dir), ignore_errors=True)
- await answer.reply_text(
- locale("import_finished", "message", locale=msg.from_user.language_code),
+ app._("import_ignored", "message", locale=user.locale),
quote=True,
)
return
+ if answer.text == "/cancel":
+ await answer.reply_text(app._("import_abort", "message", locale=user.locale))
+ return
-@app.on_message(~filters.scheduled & filters.command(["export"], prefixes=["", "/"]))
-async def cmd_export(app: PosterClient, msg: Message):
- if msg.from_user.id in app.admins:
- pass
-
-
-@app.on_message(~filters.scheduled & filters.command(["remove"], prefixes=["", "/"]))
-async def cmd_remove(app: PosterClient, msg: Message):
- if msg.from_user.id in app.admins:
- global users_with_context
- if msg.from_user.id not in users_with_context:
- users_with_context.append(msg.from_user.id)
- else:
- return
- await msg.reply_text(
- locale("remove_request", "message", locale=msg.from_user.language_code)
+ if answer.document is None:
+ await answer.reply_text(
+ app._(
+ "import_invalid_media",
+ "message",
+ locale=user.locale,
+ ),
+ quote=True,
)
- answer = await listen_message(app, msg.chat.id, timeout=600)
- users_with_context.remove(msg.from_user.id)
- if answer is None:
+ return
+
+ if answer.document.mime_type != "application/zip":
+ await answer.reply_text(
+ 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(
+ app._("import_too_big", "message", locale=user.locale).format(
+ answer.document.file_size // (2**30),
+ disk_usage(getcwd())[2] // (2**30),
+ )
+ )
+ return
+
+ tmp_dir = str(uuid4())
+
+ logging.info(
+ "Importing '%s' file %s bytes big (TMP ID %s)",
+ answer.document.file_name,
+ answer.document.file_size,
+ tmp_dir,
+ )
+
+ makedirs(Path(f"{app.config['locations']['tmp']}/{tmp_dir}"), exist_ok=True)
+ tmp_path = Path(f"{app.config['locations']['tmp']}/{answer.document.file_id}")
+
+ downloading = await answer.reply_text(
+ app._("import_downloading", "message", locale=user.locale),
+ quote=True,
+ )
+
+ await app.download_media(answer, file_name=str(tmp_path))
+ await downloading.edit(app._("import_unpacking", "message", locale=user.locale))
+
+ try:
+ with ZipFile(tmp_path, "r") as handle:
+ tasks = [
+ extract_and_save(
+ handle, name, Path(f"{app.config['locations']['tmp']}/{tmp_dir}")
+ )
+ for name in handle.namelist()
+ ]
+ _ = await asyncio.gather(*tasks)
+ except Exception as exp:
+ logger.error(
+ "Could not import '%s' due to %s: %s",
+ answer.document.file_name,
+ exp,
+ format_exc(),
+ )
+ await answer.reply_text(
+ app._("import_unpack_error", "message", locale=user.locale).format(
+ exp, format_exc()
+ )
+ )
+ return
+
+ logger.info("Downloaded '%s' - awaiting upload", answer.document.file_name)
+
+ await downloading.edit(app._("import_uploading", "message", locale=user.locale))
+
+ remove(tmp_path)
+
+ for filename in iglob(
+ str(Path(f"{app.config['locations']['tmp']}/{tmp_dir}")) + "**/**",
+ recursive=True,
+ ):
+ if not path.isfile(filename):
+ continue
+
+ with open(str(filename), "rb") as fh:
+ photo_bytes = BytesIO(fh.read())
+
+ try:
+ # VIDEO SUPPORT IS PLANNED HERE TOO
+ uploaded = await photo_upload(
+ app.config["posting"]["api"]["album"],
+ client=client,
+ multipart_data=BodyPhotoUpload(
+ File(photo_bytes, Path(filename).name, "image/jpeg")
+ ),
+ ignore_duplicates=app.config["submission"]["allow_duplicates"],
+ compress=False,
+ caption="queue",
+ )
+ except UnexpectedStatus as exp:
+ logger.error(
+ "Could not upload '%s' from '%s': %s",
+ filename,
+ Path(f"{app.config['locations']['tmp']}/{tmp_dir}"),
+ exp,
+ )
await msg.reply_text(
- locale("remove_ignored", "message", locale=msg.from_user.language_code),
- quote=True,
+ app._(
+ "import_upload_error_other",
+ "message",
+ locale=user.locale,
+ ).format(path.basename(filename)),
+ disable_notification=True,
)
- return
- if answer.text == "/cancel":
- await answer.reply_text(
- locale("remove_abort", "message", locale=msg.from_user.language_code)
- )
- return
- response = await remove_pic(answer.text)
- if response:
- logWrite(
- f"Removed '{answer.text}' by request of user {answer.from_user.id}"
- )
- await answer.reply_text(
- locale(
- "remove_success", "message", locale=msg.from_user.language_code
- ).format(answer.text)
+ continue
+
+ uploaded_dict = loads(uploaded.content.decode("utf-8"))
+
+ if "duplicates" in uploaded_dict:
+ logger.warning(
+ "Could not upload '%s' from '%s'. Duplicates: %s",
+ filename,
+ Path(f"{app.config['locations']['tmp']}/{tmp_dir}"),
+ str(uploaded_dict["duplicates"]),
)
+
+ if len(uploaded_dict["duplicates"]) > 0:
+ await msg.reply_text(
+ app._(
+ "import_upload_error_duplicate",
+ "message",
+ locale=user.locale,
+ ).format(path.basename(filename)),
+ disable_notification=True,
+ )
+ else:
+ await msg.reply_text(
+ app._(
+ "import_upload_error_other",
+ "message",
+ locale=user.locale,
+ ).format(path.basename(filename)),
+ disable_notification=True,
+ )
else:
- logWrite(
- f"Could not remove '{answer.text}' by request of user {answer.from_user.id}"
- )
- await answer.reply_text(
- locale(
- "remove_failure", "message", locale=msg.from_user.language_code
- ).format(answer.text)
+ logger.info(
+ "Uploaded '%s' from '%s' and got ID %s",
+ filename,
+ Path(f"{app.config['locations']['tmp']}/{tmp_dir}"),
+ uploaded.parsed.id,
)
+ await downloading.delete()
-@app.on_message(~filters.scheduled & filters.command(["purge"], prefixes=["", "/"]))
-async def cmd_purge(app: PosterClient, msg: Message):
- if msg.from_user.id in app.admins:
- pass
+ logger.info(
+ "Removing '%s' after uploading",
+ Path(f"{app.config['locations']['tmp']}/{tmp_dir}"),
+ )
+ rmtree(Path(f"{app.config['locations']['tmp']}/{tmp_dir}"), ignore_errors=True)
+
+ await answer.reply_text(
+ app._("import_finished", "message", locale=user.locale),
+ quote=True,
+ )
+
+ return
+
+
+@Client.on_message(~filters.scheduled & filters.command(["export"], prefixes=["", "/"]))
+async def cmd_export(app: PyroClient, msg: Message):
+ if msg.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):
+ if msg.from_user.id not in app.admins:
+ return
+
+ global USERS_WITH_CONTEXT
+
+ if msg.from_user.id not in USERS_WITH_CONTEXT:
+ USERS_WITH_CONTEXT.append(msg.from_user.id)
+ else:
+ return
+
+ user = await app.find_user(msg.from_user)
+
+ await msg.reply_text(app._("remove_request", "message", locale=user.locale))
+
+ answer_id = await listen_message(app, msg.chat.id, timeout=600)
+
+ USERS_WITH_CONTEXT.remove(msg.from_user.id)
+
+ if answer_id is None:
+ await msg.reply_text(
+ app._("remove_ignored", "message", locale=user.locale),
+ quote=True,
+ )
+ return
+
+ if answer_id.text == "/cancel":
+ await answer_id.reply_text(app._("remove_abort", "message", locale=user.locale))
+ return
+
+ await msg.reply_text(
+ app._("remove_kind", "message", locale=user.locale),
+ reply_markup=ReplyKeyboardMarkup(
+ [
+ [
+ KeyboardButton(app._("photo", "button", locale=user.locale)),
+ KeyboardButton(app._("video", "button", locale=user.locale)),
+ ]
+ ],
+ resize_keyboard=True,
+ one_time_keyboard=True,
+ ),
+ )
+
+ USERS_WITH_CONTEXT.append(msg.from_user.id)
+
+ answer_kind = await listen_message(app, msg.chat.id, timeout=600)
+
+ USERS_WITH_CONTEXT.remove(msg.from_user.id)
+
+ if answer_kind is None:
+ await msg.reply_text(
+ app._("remove_ignored", "message", locale=user.locale),
+ quote=True,
+ reply_markup=ReplyKeyboardRemove(),
+ )
+ return
+
+ if answer_kind.text == "/cancel":
+ await answer_kind.reply_text(
+ app._("remove_abort", "message", locale=user.locale),
+ reply_markup=ReplyKeyboardRemove(),
+ )
+ return
+
+ if answer_kind.text in app.in_all_locales("photo", "button"):
+ func = photo_delete
+ elif answer_kind.text in app.in_all_locales("video", "button"):
+ func = video_delete
+ else:
+ await answer_kind.reply_text(
+ app._("remove_unknown", "message", locale=user.locale).format(
+ app._("photo", "button", locale=user.locale),
+ app._("video", "button", locale=user.locale),
+ ),
+ reply_markup=ReplyKeyboardRemove(),
+ )
+ return
+
+ response = await func(id=answer_id.text, client=client)
+
+ if response is None:
+ logger.info(
+ "Removed %s '%s' by request of user %s",
+ answer_kind.text,
+ answer_id.text,
+ answer_id.from_user.id,
+ )
+ await answer_kind.reply_text(
+ app._("remove_success", "message", locale=user.locale).format(
+ answer_id.text
+ ),
+ reply_markup=ReplyKeyboardRemove(),
+ )
+ else:
+ logger.warning(
+ "Could not remove %s '%s' by request of user %s",
+ answer_kind.text,
+ answer_id.text,
+ answer_id.from_user.id,
+ )
+ await answer_kind.reply_text(
+ app._("remove_failure", "message", locale=user.locale).format(
+ answer_id.text
+ ),
+ reply_markup=ReplyKeyboardRemove(),
+ )
+
+
+@Client.on_message(~filters.scheduled & filters.command(["purge"], prefixes=["", "/"]))
+async def cmd_purge(app: PyroClient, msg: Message):
+ if msg.from_user.id not in app.admins:
+ return
diff --git a/plugins/commands/report.py b/plugins/commands/report.py
new file mode 100644
index 0000000..09f0513
--- /dev/null
+++ b/plugins/commands/report.py
@@ -0,0 +1,41 @@
+from libbot import sync
+from pyrogram import filters
+from pyrogram.client import Client
+from pyrogram.types import Message, User
+
+from classes.pyroclient import PyroClient
+
+
+@Client.on_message(
+ ~filters.scheduled
+ & filters.chat(sync.config_get("comments", "posting"))
+ & filters.reply
+ & filters.command(["report"], prefixes=["", "/"])
+)
+async def command_report(app: PyroClient, msg: Message):
+ if msg.reply_to_message.forward_from_chat.id != app.config["posting"]["channel"]:
+ return
+
+ user = await app.find_user(msg.from_user)
+
+ await msg.reply_text(
+ app._(
+ "report_sent",
+ "message",
+ locale=user.locale if msg.from_user is not None else None,
+ )
+ )
+
+ print(msg)
+
+ report_sent = await msg.reply_to_message.forward(app.owner)
+ 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
+
+ await report_sent.reply_text(
+ app._("report_received", "message", locale=user.locale).format(
+ sender_name, sender.username, sender.id
+ ),
+ quote=True,
+ )
diff --git a/plugins/handlers/submission.py b/plugins/handlers/submission.py
index c28c67d..3206c85 100644
--- a/plugins/handlers/submission.py
+++ b/plugins/handlers/submission.py
@@ -1,72 +1,84 @@
+import logging
from datetime import datetime
from os import makedirs, path, sep
+from pathlib import Path
from traceback import format_exc
from uuid import uuid4
from pyrogram import filters
+from pyrogram.client import Client
from pyrogram.enums.chat_action import ChatAction
from pyrogram.types import InlineKeyboardButton, InlineKeyboardMarkup, Message
from classes.enums.submission_types import SubmissionType
-from classes.exceptions import SubmissionDuplicatesError
-from classes.poster_client import PosterClient
-from classes.user import PosterUser
-from modules.app import app, users_with_context
-from modules.database import col_banned, col_submitted
-from modules.logger import logWrite
-from modules.utils import configGet, locale
+from classes.exceptions import SubmissionDuplicatesError, SubmissionUnsupportedError
+from classes.pyroclient import PyroClient
+from modules.database import col_submitted
+from modules.utils import USERS_WITH_CONTEXT
+
+logger = logging.getLogger(__name__)
-@app.on_message(
+@Client.on_message(
~filters.scheduled & filters.private & filters.photo
| filters.video
- | filters.animation
+ # | filters.animation
| filters.document
)
-async def get_submission(app: PosterClient, msg: Message):
- global users_with_context
- if msg.from_user.id in users_with_context:
+async def get_submission(app: PyroClient, msg: Message):
+ global USERS_WITH_CONTEXT
+
+ if not hasattr(msg.from_user, "id"):
return
+
+ if msg.from_user.id in USERS_WITH_CONTEXT:
+ return
+
+ user = await app.find_user(msg.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)
- 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(
- locale("sub_cooldown", "message", locale=user_locale).format(
- str(configGet("timeout", "submission"))
+ app._("sub_cooldown", "message", locale=user.locale).format(
+ app.config["submission"]["timeout"]
)
)
return
if msg.document is not None:
- logWrite(
- f"User {msg.from_user.id} is trying to submit a file of type '{msg.document.mime_type}' with name '{msg.document.file_name}' and size of {msg.document.file_size / 1024 / 1024} MB",
- debug=True,
+ 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,
+ msg.document.mime_type,
+ msg.document.file_name,
+ msg.document.file_size / 1024 / 1024,
)
- if msg.document.mime_type not in configGet("mime_types", "submission"):
+ if msg.document.mime_type not in app.config["submission"]["mime_types"]:
await msg.reply_text(
- locale("mime_not_allowed", "message", locale=user_locale).format(
- ", ".join(configGet("mime_types", "submission"))
+ app._("mime_not_allowed", "message", locale=user.locale).format(
+ ", ".join(app.config["submission"]["mime_types"])
),
quote=True,
)
return
- if msg.document.file_size > configGet("file_size", "submission"):
+ if msg.document.file_size > app.config["submission"]["file_size"]:
await msg.reply_text(
- locale("document_too_large", "message", locale=user_locale).format(
- str(configGet("file_size", "submission") / 1024 / 1024)
+ app._("document_too_large", "message", locale=user.locale).format(
+ app.config["submission"]["file_size"] / 1024 / 1024
),
quote=True,
)
return
- if msg.document.file_size > configGet("tmp_size", "submission"):
+ if msg.document.file_size > app.config["submission"]["tmp_size"]:
save_tmp = False
contents = (
msg.document.file_id,
@@ -74,63 +86,72 @@ async def get_submission(app: PosterClient, msg: Message):
) # , msg.document.file_name
if msg.video is not None:
- logWrite(
- f"User {msg.from_user.id} is trying to submit a video with name '{msg.video.file_name}' and size of {msg.video.file_size / 1024 / 1024} MB",
- debug=True,
+ logger.info(
+ "User %s is trying to submit a video with name '%s' and size of %s MB",
+ msg.from_user.id,
+ msg.video.file_name,
+ msg.video.file_size / 1024 / 1024,
)
- if msg.video.file_size > configGet("file_size", "submission"):
+ if msg.video.file_size > app.config["submission"]["file_size"]:
await msg.reply_text(
- locale("document_too_large", "message", locale=user_locale).format(
- str(configGet("file_size", "submission") / 1024 / 1024)
+ app._("document_too_large", "message", locale=user.locale).format(
+ app.config["submission"]["file_size"] / 1024 / 1024
),
quote=True,
)
return
- if msg.video.file_size > configGet("tmp_size", "submission"):
+ if msg.video.file_size > app.config["submission"]["tmp_size"]:
save_tmp = False
contents = msg.video.file_id, SubmissionType.VIDEO # , msg.video.file_name
- if msg.animation is not None:
- logWrite(
- f"User {msg.from_user.id} is trying to submit an animation with name '{msg.animation.file_name}' and size of {msg.animation.file_size / 1024 / 1024} MB",
- debug=True,
- )
- if msg.animation.file_size > configGet("file_size", "submission"):
- await msg.reply_text(
- locale("document_too_large", "message", locale=user_locale).format(
- str(configGet("file_size", "submission") / 1024 / 1024)
- ),
- quote=True,
- )
- return
- if msg.animation.file_size > configGet("tmp_size", "submission"):
- save_tmp = False
- contents = (
- msg.animation.file_id,
- SubmissionType.ANIMATION,
- ) # , msg.animation.file_name
+ # if msg.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,
+ # msg.animation.file_name,
+ # msg.animation.file_size / 1024 / 1024,
+ # )
+ # if msg.animation.file_size > app.config["submission"]["file_size"]:
+ # await msg.reply_text(
+ # 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"]:
+ # save_tmp = False
+ # contents = (
+ # msg.animation.file_id,
+ # SubmissionType.ANIMATION,
+ # ) # , msg.animation.file_name
if msg.photo is not None:
- logWrite(
- f"User {msg.from_user.id} is trying to submit a photo with ID '{msg.photo.file_id}' and size of {msg.photo.file_size / 1024 / 1024} MB",
- debug=True,
+ logger.info(
+ "User %s is trying to submit a photo with ID '%s' and size of %s MB",
+ msg.from_user.id,
+ msg.photo.file_id,
+ msg.photo.file_size / 1024 / 1024,
)
contents = msg.photo.file_id, SubmissionType.PHOTO # , "please_generate"
- if save_tmp is not None:
- if contents is None:
- return
+ if contents is None:
+ return
+ if save_tmp is not None:
tmp_id = str(uuid4())
+
# filename = tmp_id if contents[1] == "please_generate" else contents[1]
makedirs(
- path.join(configGet("data", "locations"), "submissions", tmp_id),
+ Path(f"{app.config['locations']['data']}/submissions/{tmp_id}"),
exist_ok=True,
)
downloaded = await app.download_media(
msg,
- path.join(configGet("data", "locations"), "submissions", tmp_id) + sep,
+ str(Path(f"{app.config['locations']['data']}/submissions/{tmp_id}"))
+ + sep,
)
+
inserted = col_submitted.insert_one(
{
"user": msg.from_user.id,
@@ -144,9 +165,6 @@ async def get_submission(app: PosterClient, msg: Message):
)
else:
- if contents is None:
- return
-
inserted = col_submitted.insert_one(
{
"user": msg.from_user.id,
@@ -162,7 +180,7 @@ async def get_submission(app: PosterClient, msg: Message):
buttons = [
[
InlineKeyboardButton(
- text=locale("sub_yes", "button", locale=configGet("locale")),
+ text=app._("sub_yes", "button", locale=user_owner.locale),
callback_data=f"sub_yes_{str(inserted.inserted_id)}",
)
]
@@ -172,28 +190,20 @@ async def get_submission(app: PosterClient, msg: Message):
caption = str(msg.caption)
buttons[0].append(
InlineKeyboardButton(
- text=locale(
- "sub_yes_caption", "button", locale=configGet("locale")
- ),
+ text=app._("sub_yes_caption", "button", locale=user_owner.locale),
callback_data=f"sub_yes_{str(inserted.inserted_id)}_caption",
)
)
- buttons[0].append(
- InlineKeyboardButton(
- text=locale("sub_no", "button", locale=configGet("locale")),
- callback_data=f"sub_no_{str(inserted.inserted_id)}",
- )
- )
else:
caption = ""
- buttons[0].append(
- InlineKeyboardButton(
- text=locale("sub_no", "button", locale=configGet("locale")),
- callback_data=f"sub_no_{str(inserted.inserted_id)}",
- )
- )
- caption += locale("sub_by", "message", locale=locale(configGet("locale")))
+ buttons[0].append(
+ InlineKeyboardButton(
+ text=app._("sub_no", "button", locale=user_owner.locale),
+ callback_data=f"sub_no_{str(inserted.inserted_id)}",
+ )
+ )
+ caption += app._("sub_by", "message", locale=user_owner.locale)
if msg.from_user.first_name is not None:
caption += f" {msg.from_user.first_name}"
@@ -206,23 +216,31 @@ async def get_submission(app: PosterClient, msg: Message):
if (
msg.from_user.id in app.admins
- and configGet("admins", "submission", "require_confirmation") is False
+ and app.config["submission"]["require_confirmation"]["admins"] is False
):
try:
- submitted = await app.submit_photo(str(inserted.inserted_id))
+ submitted = await app.submit_media(str(inserted.inserted_id))
await msg.reply_text(
- locale("sub_yes_auto", "message", locale=user_locale),
+ app._("sub_yes_auto", "message", locale=user.locale),
disable_notification=True,
quote=True,
)
- if configGet("send_uploaded_id", "submission"):
+ if app.config["submission"]["send_uploaded_id"]:
caption += f"\n\nID: `{submitted[1]}`"
await msg.copy(app.owner, caption=caption, disable_notification=True)
return
+ except SubmissionUnsupportedError:
+ await msg.reply_text(
+ app._("mime_not_allowed", "message", locale=user.locale).format(
+ ", ".join(app.config["submission"]["mime_types"]), quote=True
+ ),
+ quote=True,
+ )
+ return
except SubmissionDuplicatesError as exp:
await msg.reply_text(
- locale(
- "sub_media_duplicates_list", "message", locale=user_locale
+ app._(
+ "sub_media_duplicates_list", "message", locale=user.locale
).format("\n • ".join(exp.duplicates)),
quote=True,
)
@@ -232,30 +250,37 @@ async def get_submission(app: PosterClient, msg: Message):
return
elif (
msg.from_user.id not in app.admins
- and configGet("users", "submission", "require_confirmation") is False
+ and app.config["submission"]["require_confirmation"]["users"] is False
):
try:
submitted = await app.submit_photo(str(inserted.inserted_id))
await msg.reply_text(
- locale("sub_yes_auto", "message", locale=user_locale),
+ app._("sub_yes_auto", "message", locale=user.locale),
disable_notification=True,
quote=True,
)
- if configGet("send_uploaded_id", "submission"):
+ if app.config["submission"]["send_uploaded_id"]:
caption += f"\n\nID: `{submitted[1]}`"
await msg.copy(app.owner, caption=caption)
return
+ except SubmissionUnsupportedError:
+ await msg.reply_text(
+ app._("mime_not_allowed", "message", locale=user.locale).format(
+ ", ".join(app.config["submission"]["mime_types"]), quote=True
+ )
+ )
+ return
except SubmissionDuplicatesError as exp:
await msg.reply_text(
- locale("sub_dup", "message", locale=user_locale), quote=True
+ app._("sub_dup", "message", locale=user.locale), quote=True
)
return
except Exception as exp:
await app.send_message(
app.owner,
- locale("sub_error_admin", "message").format(
- msg.from_user.id, format_exc()
- ),
+ app._(
+ "sub_error_admin", "message", locale=user_owner.locale
+ ).format(msg.from_user.id, format_exc()),
)
await msg.reply_text("sub_error", quote=True)
return
@@ -264,17 +289,17 @@ async def get_submission(app: PosterClient, msg: Message):
buttons += [
[
InlineKeyboardButton(
- text=locale("sub_block", "button", locale=configGet("locale")),
+ text=app._("sub_block", "button", locale=user_owner.locale),
callback_data=f"sub_block_{msg.from_user.id}",
)
]
]
- PosterUser(msg.from_user.id).limit()
+ await user.update_cooldown()
if msg.from_user.id != app.owner:
await msg.reply_text(
- locale("sub_sent", "message", locale=user_locale),
+ app._("sub_sent", "message", locale=user.locale),
disable_notification=True,
quote=True,
)
@@ -284,4 +309,4 @@ async def get_submission(app: PosterClient, msg: Message):
)
except AttributeError:
- logWrite(f"from_user in function get_submission does not seem to contain id")
+ logger.error("'from_user' does not seem to contain 'id'")
diff --git a/plugins/language.py b/plugins/language.py
new file mode 100644
index 0000000..b9d6658
--- /dev/null
+++ b/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,
+ )
diff --git a/plugins/remove_commands.py b/plugins/remove_commands.py
new file mode 100644
index 0000000..939dab5
--- /dev/null
+++ b/plugins/remove_commands.py
@@ -0,0 +1,13 @@
+from pyrogram import filters
+from pyrogram.client import Client
+from pyrogram.types import Message
+
+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):
+ await msg.reply_text("Okay.")
+ await app.remove_commands(command_sets=await app.collect_commands())
diff --git a/poster.py b/poster.py
deleted file mode 100644
index b570fba..0000000
--- a/poster.py
+++ /dev/null
@@ -1,266 +0,0 @@
-from datetime import datetime
-from os import getpid, path
-from sys import exit
-from time import time
-from traceback import format_exc
-from modules.api_client import authorize
-
-from modules.cli import *
-from modules.http_client import http_session
-from modules.logger import logWrite
-from modules.scheduler import scheduler
-from modules.utils import configGet, jsonLoad, jsonSave, locale
-
-# Import ===================================================================================================================================
-try:
- from dateutil.relativedelta import relativedelta
- from pyrogram.errors import bad_request_400
- from pyrogram.sync import idle
-
- from modules.app import app
-except ModuleNotFoundError:
- print(locale("deps_missing", "console", locale=configGet("locale")), flush=True)
- exit()
-# ===========================================================================================================================================
-
-
-pid = getpid()
-version = 0.1
-
-# Work in progress
-# def check_forwards(app):
-
-# try:
-
-# index = jsonLoad(configGet("index", "locations"))
-# channel = app.get_chat(configGet("channel", "posting"))
-
-# peer = app.resolve_peer(configGet("channel", "posting"))
-# print(peer, flush=True)
-
-# posts_list = [i for i in range(index["last_id"]-100,index["last_id"])]
-# last_posts = app.get_messages(configGet("channel", "posting"), message_ids=posts_list)
-
-# for post in last_posts:
-# post_forwards = GetMessagePublicForwards(channel=peer, msg_id=post.id, offset_peer=peer, offset_rate=0, offset_id=0, limit=100)
-# print(post_forwards, flush=True)
-# for forward in post_forwards:
-# print(forward, flush=True)
-
-# except Exception as exp:
-
-# logWrite("Could not get last posts forwards due to {0} with traceback {1}".format(str(exp), traceback.format_exc()), debug=True)
-
-# if configGet("error", "reports"):
-# app.send_message(configGet("admin"), traceback.format_exc())
-
-# pass
-
-
-# Work in progress
-# @app.on_message(~ filters.scheduled & filters.command(["forwards"], prefixes="/"))
-# def cmd_forwards(app, msg):
-# check_forwards(app)
-
-
-from plugins.callbacks.shutdown import *
-
-# Imports ==================================================================================================================================
-from plugins.commands.general import *
-
-if configGet("submit", "mode"):
- from plugins.callbacks.nothing import *
- from plugins.callbacks.submission import *
- from plugins.commands.mode_submit import *
- from plugins.handlers.submission import *
-
-if configGet("post", "mode"):
- from plugins.commands.photos import *
-
-# if configGet("api_based", "mode"):
-# from modules.api_client import authorize
-# ===========================================================================================================================================
-
-# Work in progress
-# Handle new forwards
-# @app.on_raw_update()
-# def fwd_got(app, update, users, chats):
-# if isinstance(update, UpdateChannelMessageForwards):
-# logWrite(f'Forward count increased to {update["forwards"]} on post {update["id"]} in channel {update["channel_id"]}')
-# logWrite(str(users), debug=True)
-# logWrite(str(chats), debug=True)
-# # else:
-# # logWrite(f"Got raw update of type {type(update)} with contents {update}", debug=True)
-
-# async def main():
-
-# await app.start()
-
-# logWrite(locale("startup", "console", locale=configGet("locale")).format(str(pid)))
-
-# if configGet("startup", "reports"):
-# await app.send_message(configGet("admin"), locale("startup", "message", locale=configGet("locale")).format(str(pid)))
-
-# if configGet("post", "mode"):
-# scheduler.start()
-
-# if configGet("api_based", "mode"):
-# token = authorize()
-# if len(get(f'{configGet("address", "posting", "api")}/albums?q={configGet("queue", "posting", "api", "albums")}', headers={"Authorization": f"Bearer {token}"}).json()["results"]) == 0:
-# post(f'{configGet("address", "posting", "api")}/albums?name={configGet("queue", "posting", "api", "albums")}&title={configGet("queue", "posting", "api", "albums")}', headers={"Authorization": f"Bearer {token}"})
-
-# await idle()
-
-# await app.send_message(configGet("admin"), locale("shutdown", "message", locale=configGet("locale")).format(str(pid)))
-# logWrite(locale("shutdown", "console", locale=configGet("locale")).format(str(pid)))
-
-# killProc(pid)
-
-# if __name__ == "__main__":
-# if find_spec("uvloop") is not None:
-# uvloop.install()
-# asyncio.run(main())
-
-
-async def main():
- logWrite(locale("startup", "console").format(str(pid)))
-
- await app.start()
-
- if configGet("startup", "reports"):
- try:
- if path.exists(path.join(configGet("cache", "locations"), "shutdown_time")):
- downtime = relativedelta(
- datetime.now(),
- datetime.fromtimestamp(
- jsonLoad(
- path.join(configGet("cache", "locations"), "shutdown_time")
- )["timestamp"]
- ),
- )
- if downtime.days >= 1:
- await app.send_message(
- configGet("owner"),
- locale(
- "startup_downtime_days",
- "message",
- ).format(pid, downtime.days),
- )
- elif downtime.hours >= 1:
- await app.send_message(
- configGet("owner"),
- locale(
- "startup_downtime_hours",
- "message",
- ).format(pid, downtime.hours),
- )
- else:
- await app.send_message(
- configGet("owner"),
- locale(
- "startup_downtime_minutes",
- "message",
- locale=configGet("locale"),
- ).format(pid, downtime.minutes),
- )
- else:
- await app.send_message(
- configGet("owner"),
- locale("startup", "message").format(pid),
- )
- except bad_request_400.PeerIdInvalid:
- logWrite(
- f"Could not send startup message to bot owner. Perhaps user has not started the bot yet."
- )
-
- if configGet("update", "reports"):
- try:
- check_update = await http_session.get(
- "https://git.end-play.xyz/api/v1/repos/profitroll/TelegramPoster/releases?page=1&limit=1"
- )
- response = await check_update.json()
- if len(response) == 0:
- raise ValueError("No bot releases on git found.")
- if float(response[0]["tag_name"].replace("v", "")) > version:
- logWrite(
- f'New version {response[0]["tag_name"].replace("v", "")} found (current {version})'
- )
- await app.send_message(
- configGet("owner"),
- locale(
- "update_available",
- "message",
- ).format(
- response[0]["tag_name"],
- response[0]["html_url"],
- response[0]["body"],
- ),
- )
- else:
- logWrite(f"No updates found, bot is up to date.")
- except bad_request_400.PeerIdInvalid:
- logWrite(
- f"Could not send startup message to bot owner. Perhaps user has not started the bot yet."
- )
- except Exception as exp:
- logWrite(f"Update check failed due to {exp}: {format_exc()}")
-
- if configGet("post", "mode"):
- scheduler.start()
-
- try:
- token = await authorize()
-
- if (
- len(
- (
- await (
- await http_session.get(
- f'{configGet("address", "posting", "api")}/albums?q={configGet("album", "posting", "api")}',
- headers={"Authorization": f"Bearer {token}"},
- )
- ).json()
- )["results"]
- )
- == 0
- ):
- logWrite("Media album does not exist on API server. Trying to create it...")
- try:
- await http_session.post(
- f'{configGet("address", "posting", "api")}/albums?name={configGet("album", "posting", "api")}&title={configGet("album", "posting", "api")}',
- headers={"Authorization": f"Bearer {token}"},
- )
- logWrite("Created media album on API server.")
- except Exception as exp:
- logWrite(
- f"Could not create media album on API server due to {exp}: {format_exc()}"
- )
- except Exception as exp:
- logWrite(f"Could not check if API album exists due to {exp}: {format_exc()}")
-
- await idle()
-
- try:
- await app.send_message(
- configGet("owner"),
- locale("shutdown", "message").format(pid),
- )
- except bad_request_400.PeerIdInvalid:
- logWrite(
- f"Could not send shutdown message to bot owner. Perhaps user has not started the bot yet."
- )
-
- makedirs(configGet("cache", "locations"), exist_ok=True)
- jsonSave(
- {"timestamp": time()},
- path.join(configGet("cache", "locations"), "shutdown_time"),
- )
-
- logWrite(locale("shutdown", "console").format(str(pid)))
-
- scheduler.shutdown()
-
-
-if __name__ == "__main__":
- loop = asyncio.get_event_loop()
- loop.run_until_complete(main())
diff --git a/requirements-optional.txt b/requirements-optional.txt
deleted file mode 100644
index e69de29..0000000
diff --git a/requirements.txt b/requirements.txt
index bba88b7..5b5c163 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,12 +1,15 @@
-python_dateutil==2.8.2
-apscheduler==3.10.1
-pytimeparse==1.1.8
-convopyro==0.5
-pyrogram==2.0.104
-aiofiles~=23.1.0
-tgcrypto==1.2.5
aiohttp~=3.8.4
-psutil==5.9.5
-pymongo==4.3.3
-pillow~=9.5.0
-ujson==5.7.0
\ No newline at end of file
+black~=23.3.0
+convopyro==0.5
+pillow~=10.0.0
+psutil~=5.9.4
+pykeyboard==0.1.5
+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
+--extra-index-url https://git.end-play.xyz/api/packages/profitroll/pypi/simple
+libbot[speed,pyrogram]==1.8
+photosapi_client==0.5.0
\ No newline at end of file
diff --git a/start.bat b/start.bat
index 00f036e..e9a42b4 100644
--- a/start.bat
+++ b/start.bat
@@ -3,4 +3,4 @@
REM You can cd to your directory here, if you want
REM cd C:\Users\user\TelegramPoster
-python poster.py
\ No newline at end of file
+python main.py
\ No newline at end of file
diff --git a/start.sh b/start.sh
index b5f9ff9..a3494da 100644
--- a/start.sh
+++ b/start.sh
@@ -3,4 +3,4 @@
# You can cd to your directory here, if you want
# cd /home/user/TelegramPoster
-python poster.py
\ No newline at end of file
+python main.py
\ No newline at end of file