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)):
+    holo_user = HoloUser(msg.from_user)
-        if (configGet("stage", file=str(msg.from_user.id)) == 10) and not (configGet("sent", file=str(msg.from_user.id))):
+
+    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))
+                holo_user.application_restart()
-                configSet(["confirmed"], False, file=str(msg.from_user.id))
                 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/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())
 
-            applications = jsonLoad(f"{configGet('data', 'locations')}{sep}applications.json")
+        tmp_application = col_tmp.find_one({"user": holo_user.id, "type": "application"})
 
-            applications[str(msg.from_user.id)] = {
+        if tmp_application is None:
-                "approved": False,
+            logWrite(f"Application of {holo_user.id} is nowhere to be found.")
-                "approved_by": None,
+            return
-                "approval_date": None,
-                "refused": False,
-                "refused_by": False,
-                "refusal_date": False,
-                "application_date": int(time()),
-                "application": configGet("application", file=str(msg.from_user.id))
-            }
-
-            jsonSave(applications, f"{configGet('data', 'locations')}{sep}applications.json")
 
         application_content = []
         i = 1
 
-            for question in configGet("application", file=str(msg.from_user.id)):
+        for question in tmp_application['application']:
+
             if i == 2:
-                    age = relativedelta(datetime.now(), datetime.strptime(configGet('application', file=str(msg.from_user.id))['2'], '%d.%m.%Y'))
+                age = relativedelta(datetime.now(), tmp_application['application']['2'])
-                    application_content.append(f"{locale('question'+str(i), 'message', 'question_titles')} {configGet('application', file=str(msg.from_user.id))['2']} ({age.years} р.)")
+                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]}")
+                    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:
+                application_content.append(f"{locale(f'question{i}', 'message', 'question_titles')} {tmp_application['application'][question]}")
+            
             i += 1
 
-            if configGet("reapply", file=str(msg.from_user.id)):
+        if tmp_application["reapply"]:
-                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(
+            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("reapply_yes", "button")), callback_data=f"reapply_yes_{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_{msg.from_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(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(
+            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_{msg.from_user.id}")
+                            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_{msg.from_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_{msg.from_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_{msg.from_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))
+        col_tmp.update_one({"user": holo_user.id, "type": "application"}, {"$set": {"sent": True}})
-            configSet(["confirmed"], True, file=str(msg.from_user.id))
+
+        # 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:
+    if (holo_user.application_state()[0] == "fill") and (holo_user.application_state()[1] is True):
-        jsonSave(jsonLoad(f"{configGet('data', 'locations')}{sep}user_default.json"), f"{configGet('data', 'locations')}{sep}users{sep}{msg.from_user.id}.json")
+        holo_user.application_restart()
-        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))
         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,6 +52,8 @@ async def any_stage(app, msg):
 
             return
 
+        await holo_user.application_next(msg.text, msg=msg)
+
         # user_stage = configGet("stage", file=str(msg.from_user.id))
         
         # if user_stage == 1:

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(["stage"], 1, file=str(msg.from_user.id))
-    configSet(["sent"], False, 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):