API usage overhaul (#27)

* `/report` command added
* Updated to libbot 1.5
* Moved to [PhotosAPI_Client](https://git.end-play.xyz/profitroll/PhotosAPI_Client) v0.5.0 from using self-made API client
* Video support (almost stable)
* Bug fixes and improvements

Co-authored-by: profitroll <vozhd.kk@gmail.com>
Reviewed-on: #27

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):
+@Client.on_callback_query(filters.regex("nothing"))
+async def callback_query_nothing(app: PyroClient, clb: CallbackQuery):
     await clb.answer(
-        text=locale("nothing", "callback", locale=clb.from_user.language_code)
+        text=app._("nothing", "callback", locale=clb.from_user.language_code)
     )

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()

plugins/callbacks/submission.py

@@ -1,20 +1,28 @@
+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 classes.user import PosterUser
+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):
     fullclb = str(clb.data).split("_")
     user_locale = clb.from_user.language_code
 
@@ -24,44 +32,51 @@ async def callback_query_yes(app: PosterClient, clb: CallbackQuery):
         submission = await app.submit_photo(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(
+        logger.info(
+            app._(
                 "submission_duplicate",
                 "console",
-                locale=configGet("locale_log").format(
-                    fullclb[2],
-                    str(exp.duplicates),
-                ),
+                locale=app.config["locale_log"],
+            ).format(
+                fullclb[2],
+                str(exp.duplicates),
             ),
-            debug=True,
         )
         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=submission[0].from_user.language_code),
             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"))
 
     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 +84,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,14 +94,14 @@ 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]}`"
         )
@@ -95,79 +110,52 @@ async def callback_query_yes(app: PosterClient, clb: CallbackQuery):
         reply_markup=InlineKeyboardMarkup(edited_markup)
     )
 
-    logWrite(
-        locale(
+    logger.info(
+        app._(
             "submission_accepted",
             "console",
-            locale=configGet("locale_log").format(fullclb[2], submission[1]),
-        ),
-        debug=True,
+            locale=app.config["locale_log"],
+        ).format(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):
     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=submission.from_user.language_code),
         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 +163,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 +173,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 +182,28 @@ async def callback_query_no(app: PosterClient, clb: CallbackQuery):
     await clb.message.edit_reply_markup(
         reply_markup=InlineKeyboardMarkup(edited_markup)
     )
-    logWrite(
-        locale(
+    logger.info(
+        app._(
             "submission_rejected",
             "console",
-            locale=configGet("locale_log").format(fullclb[2]),
-        ),
-        debug=True,
+            locale=app.config["locale_log"],
+        ).format(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):
     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"),
     )
     PosterUser(int(fullclb[2])).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 +211,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 +219,26 @@ async def callback_query_block(app: PosterClient, clb: CallbackQuery):
     await clb.message.edit_reply_markup(
         reply_markup=InlineKeyboardMarkup(edited_markup)
     )
-    logWrite(
-        locale(
+    logger.info(
+        app._(
             "user_blocked",
             "console",
-            locale=configGet("locale_log").format(fullclb[2]),
-        ),
-        debug=True,
+            locale=app.config["locale_log"],
+        ).format(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):
     fullclb = str(clb.data).split("_")
     user_locale = clb.from_user.language_code
-    await app.send_message(
-        int(fullclb[2]), locale("sub_unblocked", "message", locale=configGet("locale"))
-    )
+
+    await app.send_message(int(fullclb[2]), app._("sub_unblocked", "message"))
+
     PosterUser(int(fullclb[2])).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 +246,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 +254,10 @@ async def callback_query_unblock(app: PosterClient, clb: CallbackQuery):
     await clb.message.edit_reply_markup(
         reply_markup=InlineKeyboardMarkup(edited_markup)
     )
-    logWrite(
-        locale(
+    logger.info(
+        app._(
             "user_unblocked",
             "console",
-            locale=configGet("locale_log").format(fullclb[2]),
-        ),
-        debug=True,
+            locale=app.config["locale_log"],
+        ).format(fullclb[2]),
     )