Reapply migrated to DB/OOP

classes/holo_user.py

@@ -1,10 +1,13 @@
+from datetime import datetime
+from requests import get
 from traceback import print_exc
 from app import app, isAnAdmin
-from typing import Any, List, Union
-from pyrogram.types import User, ChatMember, ChatPrivileges, Chat, Message, Photo, Video, Document, Animation, Voice
+from typing import Any, List, Literal, Union
+from pyrogram.types import User, ChatMember, ChatPrivileges, Chat, Message, Photo, Video, Document, Animation, Voice, ForceReply, ReplyKeyboardMarkup
 from pyrogram.client import Client
 from pyrogram.errors import bad_request_400
-from modules.database import col_users, col_context, col_warnings, col_applications, col_sponsorships, col_messages
+from dateutil.relativedelta import relativedelta
+from modules.database import col_tmp, col_users, col_context, col_warnings, col_applications, col_sponsorships, col_messages
 from modules.logging import logWrite
 from modules.utils import configGet, locale, should_quote
 
@@ -97,7 +100,7 @@ class HoloUser():
         voice: Union[str, Voice, None] = None,
         adm_origin: bool = False,
         adm_context: bool = False
-    ):
+    ) -> None:
         """Send a message to user
 
         ### Args:
@@ -207,7 +210,7 @@ class HoloUser():
                 logWrite(f"Could not notify admin about failure when sending message! Admin has never interacted with bot!")
             await context.reply_text(locale("message_error", "message"), quote=should_quote(context))
 
-    async def set_label(self, chat: Chat, label: str):
+    async def set_label(self, chat: Chat, label: str) -> None:
         """Set label in destination group
 
         ### Args:
@@ -220,7 +223,7 @@ class HoloUser():
         if (not await isAnAdmin(self.id)) and (chat.id == configGet("admin_group")):
             await app.set_administrator_title(configGet("destination_group"), self.id, label)
 
-    async def reset_label(self, chat: Chat):
+    async def reset_label(self, chat: Chat) -> None:
         """Reset label in destination group
 
         ### Args:
@@ -232,4 +235,154 @@ class HoloUser():
         if (not await isAnAdmin(self.id)) and (chat.id == configGet("admin_group")):
             await app.promote_chat_member(configGet("destination_group"), self.id, privileges=ChatPrivileges(
                 can_manage_chat=False
-            ))
+            ))
+
+    def application_state(self) -> tuple[Literal["none", "fill", "approved", "rejected"], bool]:
+        """Check the current state of application in tmp collection
+
+        ### Returns:
+            * `tuple[Literal["none", "fill", "approved", "rejected"], bool]`: First element is an enum of a state and the second one is whether application is complete.
+        """        
+        tmp_application = col_tmp.find_one({"user": self.id, "type": "application"})
+        if tmp_application is None:
+            return "none", False
+        else:
+            return tmp_application["state"], tmp_application["complete"]
+
+    def application_restart(self) -> None:
+        """Reset application of a user in tmp collection and replace it with an empty one
+        """        
+        doc = {
+            "user": self.id,
+            "type": "application",
+            "complete": False,
+            "sent": False,
+            "state": "fill",
+            "reapply": False,
+            "stage": 1,
+            "application": {
+                "1": None,
+                "2": None,
+                "3": None,
+                "4": None,
+                "5": None,
+                "6": None,
+                "7": None,
+                "8": None,
+                "9": None,
+                "10": None
+            }
+        }
+        if col_tmp.find_one({"user": self.id, "type": "application"}) is None:
+            col_tmp.insert_one(document=doc)
+        else:
+            col_tmp.delete_one({"user": self.id, "type": "application"})
+            col_tmp.insert_one(document=doc)
+
+    async def application_next(self, query: str, msg: Message) -> None:
+        """Move on filling application of user
+
+        ### Args:
+            * query (`str`): Some kind of input
+            * msg (`Message`): Message that should receive replies
+        """           
+
+        if col_tmp.find_one({"user": self.id, "type": "application"}) is None:
+
+            col_tmp.insert_one(
+                document={
+                    "user": self.id,
+                    "type": "application",
+                    "complete": False,
+                    "sent": False,
+                    "state": "fill",
+                    "reapply": False,
+                    "stage": 1,
+                    "application": {
+                        "1": None,
+                        "2": None,
+                        "3": None,
+                        "4": None,
+                        "5": None,
+                        "6": None,
+                        "7": None,
+                        "8": None,
+                        "9": None,
+                        "10": None
+                    }
+                }
+            )
+
+        progress = col_tmp.find_one({"user": self.id, "type": "application"})
+        stage = progress["stage"]
+
+        if progress["state"] == "fill":
+
+            if stage == 2:
+
+                try:
+                    input_dt = datetime.strptime(query, "%d.%m.%Y")
+                except ValueError:
+                    logWrite(f"User {msg.from_user.id} failed stage {stage} due to sending invalid date format")
+                    await msg.reply_text(locale(f"question2_invalid", "message"), reply_markup=ForceReply(placeholder=str(locale(f"question{stage}", "force_reply"))))
+                    return
+
+                if datetime.now() <= input_dt:
+                    logWrite(f"User {msg.from_user.id} failed stage {stage} due to joking")
+                    await msg.reply_text(locale("question2_joke", "message"), reply_markup=ForceReply(placeholder=str(locale("question2", "force_reply"))))
+                    return
+
+                elif ((datetime.now() - input_dt).days) < ((datetime.now() - datetime.now().replace(year=datetime.now().year - configGet("age_allowed"))).days):
+                    logWrite(f"User {msg.from_user.id} failed stage {stage} due to being underage")
+                    await msg.reply_text(locale("question2_underage", "message").format(str(configGet("age_allowed"))), reply_markup=ForceReply(placeholder=str(locale("question2", "force_reply"))))
+                    return
+
+                else:
+                    print(f'Look: {((datetime.now() - input_dt).days)} > {(datetime.now() - datetime.now().replace(year=datetime.now().year - configGet("age_allowed"))).days}')
+                    progress["application"][str(stage)] = input_dt
+                    col_tmp.update_one({"user": {"$eq": self.id}, "type": {"$eq": "application"}}, {"$set": {"application": progress["application"], "stage": progress["stage"]+1}})
+                    await msg.reply_text(locale(f"question{stage+1}", "message"), reply_markup=ForceReply(placeholder=str(locale(f"question{stage+1}", "force_reply"))))
+
+            elif stage == 3:
+                try:
+                    result = (get(f"http://api.geonames.org/searchJSON?q={query}&maxRows=1&countryBias=UA&lang=uk&orderby=relevance&featureClass=P&featureClass=A&username={configGet('username', 'geocoding')}")).json()
+                    progress["application"][str(stage)] = result["geonames"][0]
+                    col_tmp.update_one({"user": {"$eq": self.id}, "type": {"$eq": "application"}}, {"$set": {"application": progress["application"], "stage": progress["stage"]+1}})
+                    await msg.reply_text(locale(f"question3_found", "message").format(result["geonames"][0]["name"], result["geonames"][0]["adminName1"]))
+                    await msg.reply_text(locale(f"question{stage+1}", "message"), reply_markup=ForceReply(placeholder=str(locale(f"question{stage+1}", "force_reply"))))
+                except (ValueError, KeyError, IndexError):
+                    await msg.reply_text(locale(f"question3_invalid", "message"), reply_markup=ForceReply(placeholder=str(locale(f"question{stage}", "force_reply"))))
+                    return
+                except Exception as exp:
+                    await msg.reply_text(locale("question3_error", "message"), reply_markup=ForceReply(placeholder=str(locale(f"question{stage}", "force_reply"))))
+                    try:
+                        await app.send_message(configGet("owner"), locale("question3_traceback", "message").format(query, exp, print_exc()))
+                    except bad_request_400.PeerIdInvalid:
+                        logWrite(f"Could not notify admin about failure when sending message! Admin has never interacted with bot!")
+                    return
+
+            elif stage == 10:
+                progress["application"][str(stage)] = query
+                col_tmp.update_one({"user": {"$eq": self.id}, "type": {"$eq": "application"}}, {"$set": {"application": progress["application"], "complete": True}})
+                application_content = []
+                i = 1
+                for question in progress["application"]:
+                    if i == 2:
+                        age = relativedelta(datetime.now(), progress['application']['2'])
+                        application_content.append(f"{locale('question'+str(i), 'message', 'question_titles')} {progress['application']['2'].strftime('%d.%m.%Y')} ({age.years} р.)")
+                    elif i == 3:
+                        if progress['application']['3']['countryCode'] == "UA":
+                            application_content.append(f"{locale('question'+str(i), 'message', 'question_titles')} {progress['application']['3']['name']} ({progress['application']['3']['adminName1']})")
+                        else:
+                            application_content.append(f"{locale('question'+str(i), 'message', 'question_titles')} {progress['application']['3']['name']} ({progress['application']['3']['adminName1']}, {progress['application']['3']['countryName']})")
+                    else:
+                        application_content.append(f"{locale('question'+str(i), 'message', 'question_titles')} {progress['application'][question]}")
+                    i += 1
+                await msg.reply_text(locale("confirm", "message").format("\n".join(application_content)), reply_markup=ReplyKeyboardMarkup(locale("confirm", "keyboard"), resize_keyboard=True))
+
+            else:
+                progress["application"][str(stage)] = query
+                col_tmp.update_one({"user": {"$eq": self.id}, "type": {"$eq": "application"}}, {"$set": {"application": progress["application"], "stage": progress["stage"]+1}})
+                await msg.reply_text(locale(f"question{stage+1}", "message"), reply_markup=ForceReply(placeholder=str(locale(f"question{stage+1}", "force_reply"))))
+
+            logWrite(f"User {self.id} completed stage {stage} of application")

config_example.json

@@ -22,6 +22,9 @@
         "port": 27017,
         "name": "holochecker"
     },
+    "geocoding": {
+        "username": "demo"
+    },
     "logging": {
         "size": 512,
         "location": "logs"

locale/uk.json

@@ -5,7 +5,7 @@
         "privacy_notice": "Раді це чути!\n\nДля продовження треба буде заповнити невеличку анкетку. Будь ласка, віднесись до цього серйозно. Ми відповідально ставимось до персональних даних, тому ця анкета не буде передана третім особам, а буде використана лише для проходження до спільноти.",
         "question1": "Як до тебе можна звертатись?",
         "question2": "Коли в тебе день народження?",
-        "question3": "З якого ти міста та де проживаєш зараз?\n\n⚠️ Будь ласка, не вказуйте точних адрес! \"Київщина\" може бути достатньою конкретизацією.",
+        "question3": "З якого ти міста або де проживаєш зараз?\n\n⚠️ Будь ласка, не вказуйте точних адрес! \"Київ\" або \"Київська Область\" є достатньою конкретизацією.\n\nПриклади:\n• Київ\n• Одеська область\n• Макіївка (Луганська область)",
         "question4": "Коли вперше довелось дізнатись про Хололайв?",
         "question5": "Чим тебе зацікавив Хололайв?",
         "question6": "Контент якої дівчини тобі подобається найбільше?",
@@ -16,6 +16,10 @@
         "question2_underage": "Вибач, але треба досягти віку {0} років, щоб приєднатись до нас. Такі обмеження існують для того, щоб всім у спільноті було цікаво одне з одним.",
         "question2_invalid": "Будь ласка, введи дату формату `ДД.ММ.РРРР`",
         "question2_joke": "Шутнік, ми так і поняли. Але будь ласка, введи реальне значення.",
+        "question3_invalid": "Місто/населений пункт не знайдено. Користуйтесь прикладами нижче щоб вказати де ви проживаєте та спробуйте ще раз:\n\n• Київ\n• Одеська область\n• Макіївка (Луганська область)",
+        "question3_found": "Використовую наступний результат:\n• {0} ({1})",
+        "question3_error": "⚠️ **Сталась помилка**\nНе вдалось отримати географічну мітку. Розробника повідомлено про цю помилку. Будь ласка, спробуйте ще раз.",
+        "question3_traceback": "⚠️ **Сталась помилка**\nПомилка отримання геокодингу для `{0}`\nПомилка: `{1}`\n\nTraceback:\n```\n{2}\n```",
         "confirm": "Супер, дякуємо!\n\nБудь ласка, перевір правильність даних:\n{0}\n\nВсе правильно?",
         "application_sent": "Дякуємо! Ми надіслали твою анкетку на перевірку. Ти отримаєш повідомлення як тільки її перевірять та приймуть рішення. До тих пір від тебе більше нічого не потребується. Гарного дня! :)",
         "application_got": "Отримано анкету від `{0}`\n\nІм'я тг: `{1}`, `{2}`\nЮзернейм: @{3}\n\n**Дані анкети:**\n{4}",

modules/callbacks/reapply.py

@@ -1,80 +1,73 @@
+from datetime import datetime
 from os import sep
 from time import time
 from app import app
 from pyrogram.types import InlineKeyboardMarkup, InlineKeyboardButton, ReplyKeyboardRemove
 from pyrogram import filters
+from classes.holo_user import HoloUser
 from modules.utils import configGet, configSet, jsonLoad, jsonSave, locale, logWrite
 from modules.handlers.confirmation import confirm_yes
 from modules.handlers.welcome import welcome_pass
+from modules.database import col_tmp, col_applications
 
 # Callbacks reapply ============================================================================================================
 @app.on_callback_query(filters.regex("reapply_yes_[\s\S]*"))
 async def callback_reapply_query_accept(app, clb):
 
     fullclb = clb.data.split("_")
+    holo_user = HoloUser(int(fullclb[2]))
 
-    await app.send_message(configGet("admin_group"), locale("approved_by", "message").format(clb.from_user.first_name, fullclb[2]), disable_notification=True)
-    logWrite(f"User {fullclb[2]} got their reapplication approved by {clb.from_user.id}")
+    await app.send_message(configGet("admin_group"), locale("approved_by", "message").format(clb.from_user.first_name, holo_user.id), disable_notification=True)
+    logWrite(f"User {holo_user.id} got their reapplication approved by {clb.from_user.id}")
 
-    await app.send_message(int(fullclb[2]), locale("approved_joined", "message"))
+    await app.send_message(holo_user.id, locale("approved_joined", "message"))
 
-    configSet(["approved"], True, file=fullclb[2])
-    configSet(["sent"], False, file=fullclb[2])
-
-    application = jsonLoad(f"{configGet('data', 'locations')}{sep}applications.json")
-    application[fullclb[2]]["approved"] = True
-    application[fullclb[2]]["approved_by"] = clb.from_user.id
-    application[fullclb[2]]["approval_date"] = int(time())
-    jsonSave(application, f"{configGet('data', 'locations')}{sep}applications.json")
+    col_applications.delete_one({"user": {"$eq": holo_user.id}})
+    col_applications.insert_one({"user": holo_user.id, "date": datetime.now(), "admin": clb.from_user.id, "application": col_tmp.find_one({"user": {"$eq": holo_user.id}, "type": {"$eq": "application"}})["application"]})
+    col_tmp.update_one({"user": {"$eq": holo_user.id}, "type": {"$eq": "application"}}, {"$set": {"state": "approved", "sent": False}})
 
     edited_markup = [[InlineKeyboardButton(text=str(locale("accepted", "button")), callback_data="nothing")]]
 
     await clb.message.edit(text=clb.message.text, reply_markup=InlineKeyboardMarkup(edited_markup))
-    await clb.answer(text=locale("sub_accepted", "callback").format(fullclb[2]), show_alert=True)
+    await clb.answer(text=locale("sub_accepted", "callback").format(holo_user.id), show_alert=True)
 
     need_link = True
 
     async for member in app.get_chat_members(configGet("destination_group")):
-        if member.user.id == int(fullclb[2]):
+        if member.user.id == holo_user.id:
             need_link = False
             
     if need_link:
-        link = await app.create_chat_invite_link(configGet("destination_group"), name=f"Invite for {fullclb[2]}", member_limit=1) #, expire_date=datetime.now()+timedelta(days=1))
+        link = await app.create_chat_invite_link(configGet("destination_group"), name=f"Invite for {holo_user.id}", member_limit=1) #, expire_date=datetime.now()+timedelta(days=1))
 
-        await app.send_message(int(fullclb[2]), locale("read_rules", "message"))
+        await app.send_message(holo_user.id, locale("read_rules", "message"))
 
         for rule_msg in locale("rules"):
-            await app.send_message(int(fullclb[2]), rule_msg)
+            await app.send_message(holo_user.id, rule_msg)
 
-        await app.send_message(int(fullclb[2]), locale("approved", "message"), reply_markup=InlineKeyboardMarkup(
+        await app.send_message(holo_user.id, locale("approved", "message"), reply_markup=InlineKeyboardMarkup(
             [[
                 InlineKeyboardButton(str(locale("join", "button")), url=link.invite_link)
             ]]
         ))
 
-        configSet(["link"], link.invite_link, file=fullclb[2])
-        logWrite(f"User {fullclb[2]} got an invite link {link.invite_link}")
+        holo_user.set("link", link.invite_link)
+        logWrite(f"User {holo_user.id} got an invite link {link.invite_link}")
 
     else:
-        await app.send_message(int(fullclb[2]), locale("approved_joined", "message"))
+        await app.send_message(holo_user.id, locale("approved_joined", "message"))
 
 @app.on_callback_query(filters.regex("reapply_no_[\s\S]*"))
 async def callback_query_reapply_refuse(app, clb):
 
     fullclb = clb.data.split("_")
+    holo_user = HoloUser(int(fullclb[2]))
 
     await app.send_message(configGet("admin_group"), locale("refused_by", "message").format(clb.from_user.first_name, fullclb[2]), disable_notification=True)
-    await app.send_message(int(fullclb[2]), locale("refused", "message"))
+    await app.send_message(holo_user.id, locale("refused", "message"))
     logWrite(f"User {fullclb[2]} got their reapplication refused by {clb.from_user.id}")
 
-    configSet(["refused"], True, file=fullclb[2])
-    configSet(["sent"], False, file=fullclb[2])
-
-    application = jsonLoad(f"{configGet('data', 'locations')}{sep}applications.json")
-    application[fullclb[2]]["refused"] = True
-    application[fullclb[2]]["refused_by"] = clb.from_user.id
-    application[fullclb[2]]["refusal_date"] = int(time())
-    jsonSave(application, f"{configGet('data', 'locations')}{sep}applications.json")
+    col_tmp.update_one({"user": {"$eq": holo_user.id}, "type": {"$eq": "application"}}, {"$set": {"state": "rejected", "sent": False}})
 
     edited_markup = [[InlineKeyboardButton(text=str(locale("declined", "button")), callback_data="nothing")]]
 
@@ -86,8 +79,6 @@ async def callback_query_reapply_refuse(app, clb):
 async def callback_query_reapply_old(app, clb):
     fullclb = clb.data.split("_")
     message = await app.get_messages(clb.from_user.id, int(fullclb[2]))
-    configSet(["approved"], False, file=str(clb.from_user.id))
-    configSet(["refused"], False, file=str(clb.from_user.id))
     await confirm_yes(app, message)
     await clb.message.edit(clb.message.text, reply_markup=InlineKeyboardMarkup([[InlineKeyboardButton(locale("done", "button"), "nothing")]]))
 
@@ -97,11 +88,6 @@ async def callback_query_reapply_new(app, clb):
 
     fullclb = clb.data.split("_")
 
-    jsonSave(jsonLoad(f"{configGet('data', 'locations')}{sep}user_default.json"), f"{configGet('data', 'locations')}{sep}users{sep}{clb.from_user.id}.json")
-    configSet(["telegram_id"], str(clb.from_user.username), file=str(clb.from_user.id))
-    configSet(["telegram_name"], f"{clb.from_user.first_name} {clb.from_user.last_name}", file=str(clb.from_user.id))
-    configSet(["telegram_phone"], str(clb.from_user.phone_number), file=str(clb.from_user.id))
-    configSet(["telegram_locale"], str(clb.from_user.language_code), file=str(clb.from_user.id))
     await clb.answer(locale("reapply_stopped", "callback"))
     message = await app.get_messages(clb.from_user.id, int(fullclb[2]))
     await welcome_pass(app, message, once_again=True)
@@ -113,12 +99,9 @@ async def callback_query_reapply_new(app, clb):
 async def callback_query_reapply_stop(app, clb):
 
     fullclb = clb.data.split("_")
+    holo_user = HoloUser(clb.from_user)
 
-    jsonSave(jsonLoad(f"{configGet('data', 'locations')}{sep}user_default.json"), f"{configGet('data', 'locations')}{sep}users{sep}{clb.from_user.id}.json")
-    configSet(["telegram_id"], str(clb.from_user.username), file=str(clb.from_user.id))
-    configSet(["telegram_name"], f"{clb.from_user.first_name} {clb.from_user.last_name}", file=str(clb.from_user.id))
-    configSet(["telegram_phone"], str(clb.from_user.phone_number), file=str(clb.from_user.id))
-    configSet(["telegram_locale"], str(clb.from_user.language_code), file=str(clb.from_user.id))
+    holo_user.application_restart()
     await clb.answer(locale("reapply_stopped", "callback"))
     message = await app.get_messages(clb.from_user.id, int(fullclb[2]))
     await welcome_pass(app, message, once_again=True)

modules/commands/reapply.py

@@ -1,22 +1,25 @@
 from app import app
 from pyrogram import filters
 from pyrogram.types import InlineKeyboardMarkup, InlineKeyboardButton
-from modules.utils import configGet, configSet, locale
+from classes.holo_user import HoloUser
+from modules.utils import configGet, locale
 from modules.handlers.welcome import welcome_pass
+from modules.database import col_tmp
 
 # Reapply command ==============================================================================================================
 @app.on_message(~ filters.scheduled & filters.private & filters.command(["reapply"], prefixes=["/"]))
 async def cmd_reapply(app, msg):
 
-    if configGet("approved", file=str(msg.from_user.id)) or configGet("refused", file=str(msg.from_user.id)):
-        if (configGet("stage", file=str(msg.from_user.id)) == 10) and not (configGet("sent", file=str(msg.from_user.id))):
+    holo_user = HoloUser(msg.from_user)
+
+    if holo_user.application_state()[0] in ["approved", "rejected"]:
+        if (holo_user.application_state()[1] is True) and (not col_tmp.find_one({"user": holo_user.id, "type": "application"})["sent"]):
             left_chat = True
             async for member in app.get_chat_members(configGet("destination_group")):
                 if member.user.id == msg.from_user.id:
                     left_chat = False
             if not left_chat:
-                configSet(["reapply"], True, file=str(msg.from_user.id))
-                configSet(["confirmed"], False, file=str(msg.from_user.id))
+                holo_user.application_restart()
                 await welcome_pass(app, msg, once_again=True)
             else:
                 await msg.reply_text(locale("reapply_left_chat", "message"), reply_markup=InlineKeyboardMarkup([
@@ -34,7 +37,7 @@ async def cmd_reapply(app, msg):
                 ]
             ]))
     else:
-        if configGet("sent", file=str(msg.from_user.id)):
+        if (holo_user.application_state()[0] == "fill") and (col_tmp.find_one({"user": holo_user.id, "type": "application"})["sent"] is True):
             await msg.reply_text(locale("reapply_forbidden", "message"))
         else:
             await msg.reply_text(locale("reapply_in_progress", "message").format(locale("confirm", "keyboard")[1][0]), reply_markup=InlineKeyboardMarkup([

modules/database.py

@@ -25,10 +25,11 @@ db = db_client.get_database(name=db_config["name"])
 
 collections = db.list_collection_names()
 
-for collection in ["users", "context", "messages", "warnings", "applications", "sponsorships"]:
+for collection in ["tmp", "users", "context", "messages", "warnings", "applications", "sponsorships"]:
     if not collection in collections:
         db.create_collection(collection)
 
+col_tmp = db.get_collection("tmp")
 col_users = db.get_collection("users")
 col_context = db.get_collection("context")
 col_messages = db.get_collection("messages")

modules/handlers/confirmation.py

@@ -1,99 +1,93 @@
-from os import sep
-from time import time
 from dateutil.relativedelta import relativedelta
 from datetime import datetime
 from app import app
 from pyrogram import filters
 from pyrogram.types import ReplyKeyboardRemove, InlineKeyboardMarkup, InlineKeyboardButton
 from pyrogram.enums.parse_mode import ParseMode
-from modules.utils import configGet, configSet, jsonLoad, jsonSave, locale, logWrite
+from classes.holo_user import HoloUser
+from modules.utils import configGet, locale, logWrite
 from modules.handlers.welcome import welcome_pass
+from modules.database import col_tmp
 
 # Confirmation =================================================================================================================
 @app.on_message(~ filters.scheduled & filters.private & (filters.regex(locale("confirm", "keyboard")[0][0])))
 async def confirm_yes(app, msg):
 
-    user_stage = configGet("stage", file=str(msg.from_user.id))
+    holo_user = HoloUser(msg.from_user)
 
-    if user_stage == 10:
+    if (holo_user.application_state()[0] == "fill") and (holo_user.application_state()[1] is True):
 
-        if not configGet("sent", file=str(msg.from_user.id)):
+        await msg.reply_text(locale("application_sent", "message"), reply_markup=ReplyKeyboardRemove())
 
-            await msg.reply_text(locale("application_sent", "message"), reply_markup=ReplyKeyboardRemove())
+        tmp_application = col_tmp.find_one({"user": holo_user.id, "type": "application"})
 
-            applications = jsonLoad(f"{configGet('data', 'locations')}{sep}applications.json")
+        if tmp_application is None:
+            logWrite(f"Application of {holo_user.id} is nowhere to be found.")
+            return
 
-            applications[str(msg.from_user.id)] = {
-                "approved": False,
-                "approved_by": None,
-                "approval_date": None,
-                "refused": False,
-                "refused_by": False,
-                "refusal_date": False,
-                "application_date": int(time()),
-                "application": configGet("application", file=str(msg.from_user.id))
-            }
+        application_content = []
+        i = 1
 
-            jsonSave(applications, f"{configGet('data', 'locations')}{sep}applications.json")
+        for question in tmp_application['application']:
 
-            application_content = []
-            i = 1
-
-            for question in configGet("application", file=str(msg.from_user.id)):
-                if i == 2:
-                    age = relativedelta(datetime.now(), datetime.strptime(configGet('application', file=str(msg.from_user.id))['2'], '%d.%m.%Y'))
-                    application_content.append(f"{locale('question'+str(i), 'message', 'question_titles')} {configGet('application', file=str(msg.from_user.id))['2']} ({age.years} р.)")
+            if i == 2:
+                age = relativedelta(datetime.now(), tmp_application['application']['2'])
+                application_content.append(f"{locale(f'question{i}', 'message', 'question_titles')} {tmp_application['application']['2'].strftime('%d.%m.%Y')} ({age.years} р.)")
+            elif i == 3:
+                if tmp_application['application']['3']['countryCode'] == "UA":
+                    application_content.append(f"{locale(f'question{i}', 'message', 'question_titles')} {tmp_application['application']['3']['name']}")
                 else:
-                    application_content.append(f"{locale('question'+str(i), 'message', 'question_titles')} {configGet('application', file=str(msg.from_user.id))[question]}")
-                i += 1
-
-            if configGet("reapply", file=str(msg.from_user.id)):
-                await app.send_message(chat_id=configGet("admin_group"), text=(locale("reapply_got", "message")).format(str(msg.from_user.id), msg.from_user.first_name, msg.from_user.last_name, msg.from_user.username, "\n".join(application_content)), parse_mode=ParseMode.MARKDOWN, reply_markup=InlineKeyboardMarkup(
-                        [
-                            [
-                                InlineKeyboardButton(text=str(locale("reapply_yes", "button")), callback_data=f"reapply_yes_{msg.from_user.id}")
-                            ],
-                            [
-                                InlineKeyboardButton(text=str(locale("reapply_no", "button")), callback_data=f"reapply_no_{msg.from_user.id}")
-                            ]
-                        ]
-                    )
-                )
+                    application_content.append(f"{locale(f'question{i}', 'message', 'question_titles')} {tmp_application['application']['3']['name']} ({tmp_application['application']['3']['adminName1']}, {tmp_application['application']['3']['countryName']})")
             else:
-                await app.send_message(chat_id=configGet("admin_group"), text=(locale("application_got", "message")).format(str(msg.from_user.id), msg.from_user.first_name, msg.from_user.last_name, msg.from_user.username, "\n".join(application_content)), parse_mode=ParseMode.MARKDOWN, reply_markup=InlineKeyboardMarkup(
+                application_content.append(f"{locale(f'question{i}', 'message', 'question_titles')} {tmp_application['application'][question]}")
+            
+            i += 1
+
+        if tmp_application["reapply"]:
+            await app.send_message(chat_id=configGet("admin_group"), text=(locale("reapply_got", "message")).format(str(holo_user.id), msg.from_user.first_name, msg.from_user.last_name, msg.from_user.username, "\n".join(application_content)), parse_mode=ParseMode.MARKDOWN, reply_markup=InlineKeyboardMarkup(
+                    [
                         [
-                            [
-                                InlineKeyboardButton(text=str(locale("sub_yes", "button")), callback_data=f"sub_yes_{msg.from_user.id}")
-                            ],
-                            [
-                                InlineKeyboardButton(text=str(locale("sub_no", "button")), callback_data=f"sub_no_{msg.from_user.id}")
-                            ],
-                            [
-                                InlineKeyboardButton(text=str(locale("sub_no_aggressive", "button")), callback_data=f"sub_no_aggresive_{msg.from_user.id}")
-                            ],
-                            [
-                                InlineKeyboardButton(text=str(locale("sub_no_russian", "button")), callback_data=f"sub_no_russian_{msg.from_user.id}")
-                            ]
+                            InlineKeyboardButton(text=str(locale("reapply_yes", "button")), callback_data=f"reapply_yes_{holo_user.id}")
+                        ],
+                        [
+                            InlineKeyboardButton(text=str(locale("reapply_no", "button")), callback_data=f"reapply_no_{holo_user.id}")
                         ]
-                    )
+                    ]
                 )
+            )
+        else:
+            await app.send_message(chat_id=configGet("admin_group"), text=(locale("application_got", "message")).format(str(holo_user.id), msg.from_user.first_name, msg.from_user.last_name, msg.from_user.username, "\n".join(application_content)), parse_mode=ParseMode.MARKDOWN, reply_markup=InlineKeyboardMarkup(
+                    [
+                        [
+                            InlineKeyboardButton(text=str(locale("sub_yes", "button")), callback_data=f"sub_yes_{holo_user.id}")
+                        ],
+                        [
+                            InlineKeyboardButton(text=str(locale("sub_no", "button")), callback_data=f"sub_no_{holo_user.id}")
+                        ],
+                        [
+                            InlineKeyboardButton(text=str(locale("sub_no_aggressive", "button")), callback_data=f"sub_no_aggresive_{holo_user.id}")
+                        ],
+                        [
+                            InlineKeyboardButton(text=str(locale("sub_no_russian", "button")), callback_data=f"sub_no_russian_{holo_user.id}")
+                        ]
+                    ]
+                )
+            )
 
-            logWrite(f"User {msg.from_user.id} sent his application and it will now be reviewed")
+        logWrite(f"User {holo_user.id} sent his application and it will now be reviewed")
 
-            configSet(["sent"], True, file=str(msg.from_user.id))
-            configSet(["confirmed"], True, file=str(msg.from_user.id))
+        col_tmp.update_one({"user": holo_user.id, "type": "application"}, {"$set": {"sent": True}})
+
+        # configSet(["sent"], True, file=str(holo_user.id))
+        # configSet(["confirmed"], True, file=str(holo_user.id))
 
 @app.on_message(~ filters.scheduled & filters.private & (filters.regex(locale("confirm", "keyboard")[1][0])))
 async def confirm_no(app, msg):
 
-    user_stage = configGet("stage", file=str(msg.from_user.id))
+    holo_user = HoloUser(msg.from_user)
 
-    if user_stage == 10:
-        jsonSave(jsonLoad(f"{configGet('data', 'locations')}{sep}user_default.json"), f"{configGet('data', 'locations')}{sep}users{sep}{msg.from_user.id}.json")
-        configSet(["telegram_id"], str(msg.from_user.username), file=str(msg.from_user.id))
-        configSet(["telegram_name"], f"{msg.from_user.first_name} {msg.from_user.last_name}", file=str(msg.from_user.id))
-        configSet(["telegram_phone"], str(msg.from_user.phone_number), file=str(msg.from_user.id))
-        configSet(["telegram_locale"], str(msg.from_user.language_code), file=str(msg.from_user.id))
+    if (holo_user.application_state()[0] == "fill") and (holo_user.application_state()[1] is True):
+        holo_user.application_restart()
         await welcome_pass(app, msg, once_again=True)
         logWrite(f"User {msg.from_user.id} restarted the application due to typo in it")
 # ==============================================================================================================================

modules/handlers/everything.py

@@ -26,12 +26,13 @@ async def any_stage(app, msg):
 
     if msg.via_bot is None:
 
-        if (msg.reply_to_message != None) and (await message_involved(msg)):
+        holo_user = HoloUser(msg.from_user)
+
+        if (msg.reply_to_message is not None) and (await message_involved(msg)):
 
             context = await message_context(msg)
             context_message = await app.get_messages(context[0], context[1])
 
-            holo_user = HoloUser(msg.from_user)
             destination_user = HoloUser(context_message.from_user)
 
             await destination_user.message(
@@ -51,63 +52,65 @@ async def any_stage(app, msg):
 
             return
 
-#         user_stage = configGet("stage", file=str(msg.from_user.id))
+        await holo_user.application_next(msg.text, msg=msg)
+
+        # user_stage = configGet("stage", file=str(msg.from_user.id))
         
-#         if user_stage == 1:
-#             await msg.reply_text(locale(f"question{user_stage+1}", "message"), reply_markup=ForceReply(placeholder=str(locale(f"question{user_stage+1}", "force_reply"))))
-#             logWrite(f"User {msg.from_user.id} completed stage {user_stage} of application")
-#             configSet(["application", str(user_stage)], str(msg.text), file=str(msg.from_user.id))
-#             configSet(["stage"], user_stage+1, file=str(msg.from_user.id))
+        # if user_stage == 1:
+        #     await msg.reply_text(locale(f"question{user_stage+1}", "message"), reply_markup=ForceReply(placeholder=str(locale(f"question{user_stage+1}", "force_reply"))))
+        #     logWrite(f"User {msg.from_user.id} completed stage {user_stage} of application")
+        #     configSet(["application", str(user_stage)], str(msg.text), file=str(msg.from_user.id))
+        #     configSet(["stage"], user_stage+1, file=str(msg.from_user.id))
 
-#         elif user_stage == 2:
+        # elif user_stage == 2:
 
-#             try:
+        #     try:
 
-#                 configSet(["application", str(user_stage)], str(msg.text), file=str(msg.from_user.id))
+        #         configSet(["application", str(user_stage)], str(msg.text), file=str(msg.from_user.id))
 
-#                 input_dt = datetime.strptime(msg.text, "%d.%m.%Y")
+        #         input_dt = datetime.strptime(msg.text, "%d.%m.%Y")
 
-#                 if datetime.now() <= input_dt:
-#                     logWrite(f"User {msg.from_user.id} failed stage {user_stage} due to joking")
-#                     await msg.reply_text(locale("question2_joke", "message"), reply_markup=ForceReply(placeholder=str(locale("question2", "force_reply"))))
+        #         if datetime.now() <= input_dt:
+        #             logWrite(f"User {msg.from_user.id} failed stage {user_stage} due to joking")
+        #             await msg.reply_text(locale("question2_joke", "message"), reply_markup=ForceReply(placeholder=str(locale("question2", "force_reply"))))
 
-#                 elif ((datetime.now() - input_dt).days) < ((datetime.now() - datetime.now().replace(year=datetime.now().year - configGet("age_allowed"))).days):
-#                     logWrite(f"User {msg.from_user.id} failed stage {user_stage} due to being underage")
-#                     await msg.reply_text(locale("question2_underage", "message").format(str(configGet("age_allowed"))), reply_markup=ForceReply(placeholder=str(locale("question2", "force_reply"))))
+        #         elif ((datetime.now() - input_dt).days) < ((datetime.now() - datetime.now().replace(year=datetime.now().year - configGet("age_allowed"))).days):
+        #             logWrite(f"User {msg.from_user.id} failed stage {user_stage} due to being underage")
+        #             await msg.reply_text(locale("question2_underage", "message").format(str(configGet("age_allowed"))), reply_markup=ForceReply(placeholder=str(locale("question2", "force_reply"))))
 
-#                 else:
-#                     logWrite(f"User {msg.from_user.id} completed stage {user_stage} of application")
-#                     await msg.reply_text(locale(f"question{user_stage+1}", "message"), reply_markup=ForceReply(placeholder=str(locale(f"question{user_stage+1}", "force_reply"))))
-#                     configSet(["stage"], user_stage+1, file=str(msg.from_user.id))
+        #         else:
+        #             logWrite(f"User {msg.from_user.id} completed stage {user_stage} of application")
+        #             await msg.reply_text(locale(f"question{user_stage+1}", "message"), reply_markup=ForceReply(placeholder=str(locale(f"question{user_stage+1}", "force_reply"))))
+        #             configSet(["stage"], user_stage+1, file=str(msg.from_user.id))
 
-#             except ValueError:
-#                 logWrite(f"User {msg.from_user.id} failed stage {user_stage} due to sending invalid date format")
-#                 await msg.reply_text(locale(f"question2_invalid", "message"), reply_markup=ForceReply(placeholder=str(locale(f"question{user_stage}", "force_reply"))))
+        #     except ValueError:
+        #         logWrite(f"User {msg.from_user.id} failed stage {user_stage} due to sending invalid date format")
+        #         await msg.reply_text(locale(f"question2_invalid", "message"), reply_markup=ForceReply(placeholder=str(locale(f"question{user_stage}", "force_reply"))))
 
-#         else:
-#             if user_stage <= 9:
-#                 logWrite(f"User {msg.from_user.id} completed stage {user_stage} of application")
-#                 await msg.reply_text(locale(f"question{user_stage+1}", "message"), reply_markup=ForceReply(placeholder=str(locale(f"question{user_stage+1}", "force_reply"))))
-#                 configSet(["application", str(user_stage)], str(msg.text), file=str(msg.from_user.id))
-#                 configSet(["stage"], user_stage+1, file=str(msg.from_user.id))
-#             else:
-#                 if not configGet("sent", file=str(msg.from_user.id)):
-#                     if not configGet("confirmed", file=str(msg.from_user.id)):
-#                         configSet(["application", str(user_stage)], str(msg.text), file=str(msg.from_user.id))
-#                         application_content = []
-#                         i = 1
-#                         for question in configGet("application", file=str(msg.from_user.id)):
-#                             application_content.append(f"{locale('question'+str(i), 'message', 'question_titles')} {configGet('application', file=str(msg.from_user.id))[question]}")
-#                             i += 1
-#                         await msg.reply_text(locale("confirm", "message").format("\n".join(application_content)), reply_markup=ReplyKeyboardMarkup(locale("confirm", "keyboard"), resize_keyboard=True))
-#                         #configSet("sent", True, file=str(msg.from_user.id))
-#                         #configSet("application_date", int(time()), file=str(msg.from_user.id))
-#                     else:
-#                         if not configGet("approved", file=str(msg.from_user.id)) and not configGet("refused", file=str(msg.from_user.id)):
-#                             await msg.reply_text(locale("already_sent", "message"))
-#                 else:
-#                     if not configGet("approved", file=str(msg.from_user.id)) and not configGet("refused", file=str(msg.from_user.id)):
-#                         await msg.reply_text(locale("already_sent", "message"))
+        # else:
+        #     if user_stage <= 9:
+        #         logWrite(f"User {msg.from_user.id} completed stage {user_stage} of application")
+        #         await msg.reply_text(locale(f"question{user_stage+1}", "message"), reply_markup=ForceReply(placeholder=str(locale(f"question{user_stage+1}", "force_reply"))))
+        #         configSet(["application", str(user_stage)], str(msg.text), file=str(msg.from_user.id))
+        #         configSet(["stage"], user_stage+1, file=str(msg.from_user.id))
+        #     else:
+        #         if not configGet("sent", file=str(msg.from_user.id)):
+        #             if not configGet("confirmed", file=str(msg.from_user.id)):
+        #                 configSet(["application", str(user_stage)], str(msg.text), file=str(msg.from_user.id))
+        #                 application_content = []
+        #                 i = 1
+        #                 for question in configGet("application", file=str(msg.from_user.id)):
+        #                     application_content.append(f"{locale('question'+str(i), 'message', 'question_titles')} {configGet('application', file=str(msg.from_user.id))[question]}")
+        #                     i += 1
+        #                 await msg.reply_text(locale("confirm", "message").format("\n".join(application_content)), reply_markup=ReplyKeyboardMarkup(locale("confirm", "keyboard"), resize_keyboard=True))
+        #                 #configSet("sent", True, file=str(msg.from_user.id))
+        #                 #configSet("application_date", int(time()), file=str(msg.from_user.id))
+        #             else:
+        #                 if not configGet("approved", file=str(msg.from_user.id)) and not configGet("refused", file=str(msg.from_user.id)):
+        #                     await msg.reply_text(locale("already_sent", "message"))
+        #         else:
+        #             if not configGet("approved", file=str(msg.from_user.id)) and not configGet("refused", file=str(msg.from_user.id)):
+        #                 await msg.reply_text(locale("already_sent", "message"))
 
 @app.on_message(~ filters.scheduled & filters.group)
 async def message_in_group(app, msg):

modules/handlers/welcome.py

@@ -22,8 +22,8 @@ async def welcome_pass(app, msg, once_again: bool = True) -> None:
         
     logWrite(f"User {msg.from_user.id} confirmed starting the application")
     await msg.reply_text(locale("question1", "message"), reply_markup=ForceReply(placeholder=locale("question1", "force_reply")))
-    configSet(["stage"], 1, file=str(msg.from_user.id))
-    configSet(["sent"], False, file=str(msg.from_user.id))
+    # configSet(["stage"], 1, file=str(msg.from_user.id))
+    # configSet(["sent"], False, file=str(msg.from_user.id))
 
 @app.on_message(~ filters.scheduled & filters.private & (filters.regex(locale("welcome", "keyboard")[1][0])))
 async def welcome_reject(app, msg):

requirements.txt

@@ -3,6 +3,7 @@ fastapi==0.88.0
 psutil==5.9.4
 pymongo==4.3.3
 Pyrogram==2.0.69
+requests==2.28.1
 tgcrypto==1.2.5
 python_dateutil==2.8.2
 starlette==0.22.0