WIP: /language system

2023-06-28 10:37:18 +02:00
parent 6f8b560acc
commit 10c60ae932
9 changed files with 203 additions and 205 deletions
--- a/plugins/callbacks/nothing.py
+++ b/plugins/callbacks/nothing.py
@@ -7,6 +7,6 @@ from classes.pyroclient import PyroClient

@Client.on_callback_query(filters.regex("nothing"))
 async def callback_query_nothing(app: PyroClient, clb: CallbackQuery):
-    await clb.answer(
-        text=app._("nothing", "callback", locale=clb.from_user.language_code)
-    )
+    user = await app.find_user(clb.from_user)
+
+    await clb.answer(text=app._("nothing", "callback", locale=user.locale))
--- a/plugins/callbacks/submission.py
+++ b/plugins/callbacks/submission.py
@@ -15,7 +15,6 @@ from classes.exceptions import (
    SubmissionUnsupportedError,
 )
 from classes.pyroclient import PyroClient
-from classes.user import PosterUser
 from modules.database import col_submitted

 logger = logging.getLogger(__name__)
@@ -23,22 +22,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("_")
-    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=app._("sub_msg_unavail", "callback", locale=user_locale),
+            text=app._("sub_msg_unavail", "callback", locale=user.locale),
            show_alert=True,
        )
        return
    except SubmissionUnsupportedError:
        await clb.answer(
-            text=app._("mime_not_allowed", "message", locale=user_locale).format(
+            text=app._("mime_not_allowed", "message", locale=user.locale).format(
                ", ".join(app.config["submission"]["mime_types"]), quote=True
            ),
            show_alert=True,
@@ -46,11 +45,11 @@ async def callback_query_yes(app: PyroClient, clb: CallbackQuery):
        return
    except SubmissionDuplicatesError as exp:
        await clb.answer(
-            text=app._("sub_duplicates_found", "callback", locale=user_locale),
+            text=app._("sub_duplicates_found", "callback", locale=user.locale),
            show_alert=True,
        )
        await clb.message.reply_text(
-            app._("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,
@@ -69,14 +68,25 @@ async def callback_query_yes(app: PyroClient, clb: CallbackQuery):

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

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

@@ -84,7 +94,7 @@ async def callback_query_yes(app: PyroClient, clb: CallbackQuery):
        [
            [
                InlineKeyboardButton(
-                    text=str(app._("accepted", "button", locale=user_locale)),
+                    text=str(app._("accepted", "button", locale=user.locale)),
                    callback_data="nothing",
                )
            ],
@@ -94,7 +104,7 @@ async def callback_query_yes(app: PyroClient, clb: CallbackQuery):
        else [
            [
                InlineKeyboardButton(
-                    text=str(app._("accepted", "button", locale=user_locale)),
+                    text=str(app._("accepted", "button", locale=user.locale)),
                    callback_data="nothing",
                )
            ]
@@ -103,7 +113,7 @@ async def callback_query_yes(app: PyroClient, clb: CallbackQuery):

    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(
@@ -121,8 +131,8 @@ async def callback_query_yes(app: PyroClient, 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])})

@@ -145,17 +155,21 @@ async def callback_query_no(app: PyroClient, clb: CallbackQuery):
        )
    except Exception as exp:
        await clb.answer(
-            text=app._("sub_msg_unavail", "message", locale=user_locale),
+            text=app._("sub_msg_unavail", "message", locale=user.locale),
            show_alert=True,
        )
        return

    await submission.reply_text(
-        app._("sub_no", "message", locale=submission.from_user.language_code),
+        app._(
+            "sub_no",
+            "message",
+            locale=(await app.find_user(submission.from_user)).locale,
+        ),
        quote=True,
    )
    await clb.answer(
-        text=app._("sub_no", "callback", locale=user_locale).format(fullclb[2]),
+        text=app._("sub_no", "callback", locale=user.locale).format(fullclb[2]),
        show_alert=True,
    )

@@ -163,7 +177,7 @@ async def callback_query_no(app: PyroClient, clb: CallbackQuery):
        [
            [
                InlineKeyboardButton(
-                    text=str(app._("declined", "button", locale=user_locale)),
+                    text=str(app._("declined", "button", locale=user.locale)),
                    callback_data="nothing",
                )
            ],
@@ -173,7 +187,7 @@ async def callback_query_no(app: PyroClient, clb: CallbackQuery):
        else [
            [
                InlineKeyboardButton(
-                    text=str(app._("declined", "button", locale=user_locale)),
+                    text=str(app._("declined", "button", locale=user.locale)),
                    callback_data="nothing",
                )
            ]
@@ -193,17 +207,21 @@ async def callback_query_no(app: PyroClient, 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]),
-        app._("sub_blocked", "message"),
+        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=app._("sub_block", "callback", locale=user_locale).format(fullclb[2]),
+        text=app._("sub_block", "callback", locale=user.locale).format(fullclb[2]),
        show_alert=True,
    )

@@ -211,7 +229,7 @@ async def callback_query_block(app: PyroClient, clb: CallbackQuery):
        clb.message.reply_markup.inline_keyboard[0],
        [
            InlineKeyboardButton(
-                text=str(app._("sub_unblock", "button", locale=user_locale)),
+                text=str(app._("sub_unblock", "button", locale=user.locale)),
                callback_data=f"sub_unblock_{fullclb[2]}",
            )
        ],
@@ -230,15 +248,22 @@ async def callback_query_block(app: PyroClient, 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]), app._("sub_unblocked", "message"))
+    await app.send_message(
+        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=app._("sub_unblock", "callback", locale=user_locale).format(fullclb[2]),
+        text=app._("sub_unblock", "callback", locale=user.locale).format(fullclb[2]),
        show_alert=True,
    )

@@ -246,7 +271,7 @@ async def callback_query_unblock(app: PyroClient, clb: CallbackQuery):
        clb.message.reply_markup.inline_keyboard[0],
        [
            InlineKeyboardButton(
-                text=str(app._("sub_block", "button", locale=user_locale)),
+                text=str(app._("sub_block", "button", locale=user.locale)),
                callback_data=f"sub_block_{fullclb[2]}",
            )
        ],