Improved naming

2023-10-15 18:14:22 +02:00
parent c4d31c955f
commit a0616ff285
9 changed files with 201 additions and 184 deletions
--- a/plugins/callbacks/nothing.py
+++ b/plugins/callbacks/nothing.py
@@ -6,7 +6,7 @@ from classes.pyroclient import PyroClient


@Client.on_callback_query(filters.regex("nothing"))
-async def callback_query_nothing(app: PyroClient, clb: CallbackQuery):
-    user = await app.find_user(clb.from_user)
+async def callback_query_nothing(app: PyroClient, callback: CallbackQuery):
+    user = await app.find_user(callback.from_user)

-    await clb.answer(text=app._("nothing", "callback", locale=user.locale))
+    await callback.answer(text=app._("nothing", "callback", locale=user.locale))
--- a/plugins/callbacks/shutdown.py
+++ b/plugins/callbacks/shutdown.py
@@ -10,11 +10,11 @@ from classes.pyroclient import PyroClient


@Client.on_callback_query(filters.regex("shutdown"))
-async def callback_query_nothing(app: PyroClient, clb: CallbackQuery):
-    if clb.from_user.id not in app.admins:
+async def callback_query_nothing(app: PyroClient, callback: CallbackQuery):
+    if callback.from_user.id not in app.admins:
        return

-    await clb.answer()
+    await callback.answer()

    makedirs(await config_get("cache", "locations"), exist_ok=True)
    await json_write(
--- a/plugins/callbacks/submission.py
+++ b/plugins/callbacks/submission.py
@@ -21,22 +21,22 @@ logger = logging.getLogger(__name__)


@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("_")
+async def callback_query_yes(app: PyroClient, callback: CallbackQuery):
+    user = await app.find_user(callback.from_user)
+    fullcallback = str(callback.data).split("_")

-    db_entry = await col_submitted.find_one({"_id": ObjectId(fullclb[2])})
+    db_entry = await col_submitted.find_one({"_id": ObjectId(fullcallback[2])})

    try:
-        submission = await app.submit_media(fullclb[2])
+        submission = await app.submit_media(fullcallback[2])
    except SubmissionUnavailableError:
-        await clb.answer(
+        await callback.answer(
            text=app._("sub_msg_unavail", "callback", locale=user.locale),
            show_alert=True,
        )
        return
    except SubmissionUnsupportedError:
-        await clb.answer(
+        await callback.answer(
            text=app._("mime_not_allowed", "message", locale=user.locale).format(
                ", ".join(app.config["submission"]["mime_types"]), quote=True
            ),
@@ -44,11 +44,11 @@ async def callback_query_yes(app: PyroClient, clb: CallbackQuery):
        )
        return
    except SubmissionDuplicatesError as exc:
-        await clb.answer(
+        await callback.answer(
            text=app._("sub_duplicates_found", "callback", locale=user.locale),
            show_alert=True,
        )
-        await clb.message.reply_text(
+        await callback.message.reply_text(
            app._("sub_media_duplicates_list", "message", locale=user.locale).format(
                "\n • ".join(exc.duplicates)
            ),
@@ -56,7 +56,7 @@ async def callback_query_yes(app: PyroClient, clb: CallbackQuery):
        )
        logger.info(
            "Submission with ID '%s' could not be accepted because of the duplicates: %s",
-            fullclb[2],
+            fullcallback[2],
            str(exc.duplicates),
        )
        return
@@ -80,8 +80,8 @@ async def callback_query_yes(app: PyroClient, clb: CallbackQuery):
            ),
        )

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

@@ -93,9 +93,9 @@ async def callback_query_yes(app: PyroClient, clb: CallbackQuery):
                    callback_data="nothing",
                )
            ],
-            clb.message.reply_markup.inline_keyboard[1],
+            callback.message.reply_markup.inline_keyboard[1],
        ]
-        if len(clb.message.reply_markup.inline_keyboard) > 1
+        if len(callback.message.reply_markup.inline_keyboard) > 1
        else [
            [
                InlineKeyboardButton(
@@ -107,27 +107,29 @@ async def callback_query_yes(app: PyroClient, clb: CallbackQuery):
    )

    if await config_get("send_uploaded_id", "submission"):
-        await clb.message.edit_caption(
-            f"{clb.message.caption}\n\nID: `{submission[1]}`"
+        await callback.message.edit_caption(
+            f"{callback.message.caption}\n\nID: `{submission[1]}`"
        )

-    await clb.message.edit_reply_markup(
+    await callback.message.edit_reply_markup(
        reply_markup=InlineKeyboardMarkup(edited_markup)
    )

    logger.info(
        "Submission with ID '%s' accepted and uploaded with ID '%s'",
-        fullclb[2],
+        fullcallback[2],
        submission[1],
    )


@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("_")
+async def callback_query_no(app: PyroClient, callback: CallbackQuery):
+    user = await app.find_user(callback.from_user)
+    fullcallback = str(callback.data).split("_")

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

    if (
        db_entry["temp"]["uuid"] is not None
@@ -147,7 +149,7 @@ async def callback_query_no(app: PyroClient, clb: CallbackQuery):
            db_entry["user"], db_entry["telegram"]["msg_id"]
        )
    except Exception as exc:
-        await clb.answer(
+        await callback.answer(
            text=app._("sub_msg_unavail", "message", locale=user.locale),
            show_alert=True,
        )
@@ -161,8 +163,8 @@ async def callback_query_no(app: PyroClient, clb: CallbackQuery):
        ),
        quote=True,
    )
-    await clb.answer(
-        text=app._("sub_no", "callback", locale=user.locale).format(fullclb[2]),
+    await callback.answer(
+        text=app._("sub_no", "callback", locale=user.locale).format(fullcallback[2]),
        show_alert=True,
    )

@@ -174,9 +176,9 @@ async def callback_query_no(app: PyroClient, clb: CallbackQuery):
                    callback_data="nothing",
                )
            ],
-            clb.message.reply_markup.inline_keyboard[1],
+            callback.message.reply_markup.inline_keyboard[1],
        ]
-        if len(clb.message.reply_markup.inline_keyboard) > 1
+        if len(callback.message.reply_markup.inline_keyboard) > 1
        else [
            [
                InlineKeyboardButton(
@@ -186,81 +188,83 @@ async def callback_query_no(app: PyroClient, clb: CallbackQuery):
            ]
        ]
    )
-    await clb.message.edit_reply_markup(
+    await callback.message.edit_reply_markup(
        reply_markup=InlineKeyboardMarkup(edited_markup)
    )
    logger.info(
        "Submission with ID '%s' rejected",
-        fullclb[2],
+        fullcallback[2],
    )


@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("_")
+async def callback_query_block(app: PyroClient, callback: CallbackQuery):
+    user = await app.find_user(callback.from_user)
+    fullcallback = str(callback.data).split("_")

    await app.send_message(
-        int(fullclb[2]),
+        int(fullcallback[2]),
        app._(
            "sub_blocked",
            "message",
-            locale=(await app.find_user(int(fullclb[2]))).locale,
+            locale=(await app.find_user(int(fullcallback[2]))).locale,
        ),
    )
    await user.block()

-    await clb.answer(
-        text=app._("sub_block", "callback", locale=user.locale).format(fullclb[2]),
+    await callback.answer(
+        text=app._("sub_block", "callback", locale=user.locale).format(fullcallback[2]),
        show_alert=True,
    )

    edited_markup = [
-        clb.message.reply_markup.inline_keyboard[0],
+        callback.message.reply_markup.inline_keyboard[0],
        [
            InlineKeyboardButton(
                text=str(app._("sub_unblock", "button", locale=user.locale)),
-                callback_data=f"sub_unblock_{fullclb[2]}",
+                callback_data=f"sub_unblock_{fullcallback[2]}",
            )
        ],
    ]
-    await clb.message.edit_reply_markup(
+    await callback.message.edit_reply_markup(
        reply_markup=InlineKeyboardMarkup(edited_markup)
    )
-    logger.info("User %s has been blocked", fullclb[2])
+    logger.info("User %s has been blocked", fullcallback[2])


@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("_")
+async def callback_query_unblock(app: PyroClient, callback: CallbackQuery):
+    user = await app.find_user(callback.from_user)
+    fullcallback = str(callback.data).split("_")

    await app.send_message(
-        int(fullclb[2]),
+        int(fullcallback[2]),
        app._(
            "sub_unblocked",
            "message",
-            locale=(await app.find_user(int(fullclb[2]))).locale,
+            locale=(await app.find_user(int(fullcallback[2]))).locale,
        ),
    )

    await user.unblock()

-    await clb.answer(
-        text=app._("sub_unblock", "callback", locale=user.locale).format(fullclb[2]),
+    await callback.answer(
+        text=app._("sub_unblock", "callback", locale=user.locale).format(
+            fullcallback[2]
+        ),
        show_alert=True,
    )

    edited_markup = [
-        clb.message.reply_markup.inline_keyboard[0],
+        callback.message.reply_markup.inline_keyboard[0],
        [
            InlineKeyboardButton(
                text=str(app._("sub_block", "button", locale=user.locale)),
-                callback_data=f"sub_block_{fullclb[2]}",
+                callback_data=f"sub_block_{fullcallback[2]}",
            )
        ],
    ]
-    await clb.message.edit_reply_markup(
+    await callback.message.edit_reply_markup(
        reply_markup=InlineKeyboardMarkup(edited_markup)
    )
-    logger.info("User %s has been unblocked", fullclb[2])
+    logger.info("User %s has been unblocked", fullcallback[2])