modules/commands/applications.py

@@ -1,10 +1,8 @@
-from os import sep, makedirs, remove
-from uuid import uuid1
+from os import sep
 from app import app, isAnAdmin
 from pyrogram import filters
 from pyrogram.enums.chat_action import ChatAction
-from modules.utils import configGet, should_quote, jsonSave
-from modules.database import col_applications
+from modules.utils import configGet, should_quote
 
 # Applications command =========================================================================================================
 @app.on_message(~ filters.scheduled & filters.command(["applications"], prefixes=["/"]))
@@ -12,12 +10,5 @@ async def cmd_applications(app, msg):
 
     if (await isAnAdmin(msg.from_user.id)) or (msg.chat.id == configGet("admin_group")):
         await app.send_chat_action(msg.chat.id, ChatAction.UPLOAD_DOCUMENT)
-        filename = uuid1()
-        output = []
-        for entry in col_applications.find():
-            output.append(entry)
-        makedirs("tmp", exist_ok=True)
-        jsonSave(output, f"tmp{sep}{filename}.json")
-        await msg.reply_document(document=f"tmp{sep}{filename}.json", file_name="applications", quote=should_quote(msg))
-        remove(f"tmp{sep}{filename}.json")
+        await msg.reply_document(document=f"{configGet('data', 'locations')}{sep}applications.json", quote=should_quote(msg))
 # ==============================================================================================================================

modules/handlers/everything.py

@@ -20,78 +20,78 @@ async def message_context(msg: Message) -> tuple:
     return 0, 0
 
 # Any other input ==============================================================================================================
-# @app.on_message(~ filters.scheduled & filters.private)
-# async def any_stage(app, msg):
+@app.on_message(~ filters.scheduled & filters.private)
+async def any_stage(app, msg):
 
-#     if msg.via_bot is None:
+    if msg.via_bot is None:
 
-#         if (msg.reply_to_message != None) and (await message_involved(msg)):
-#             context = await message_context(msg)
-#             if msg.chat.id == configGet("admin_group") or await isAnAdmin(msg.from_user.id):
-#                 new_message = await (await app.get_messages(context[0], context[1])).reply_text(msg.text+locale("message_reply_notice", "message"), quote=True)
-#             else:
-#                 new_message = await (await app.get_messages(context[0], context[1])).reply_text(locale("message_from", "message").format(msg.from_user.first_name, msg.from_user.id)+msg.text+locale("message_reply_notice", "message"), quote=True)
-#             await msg.reply_text(locale("message_sent", "message"), quote=should_quote(msg))
-#             col_messages.insert_one({"origin": {"chat": msg.chat.id, "id": msg.id}, "destination": {"chat": new_message.chat.id, "id": new_message.id}})
-#             return
+        if (msg.reply_to_message != None) and (await message_involved(msg)):
+            context = await message_context(msg)
+            if msg.chat.id == configGet("admin_group") or await isAnAdmin(msg.from_user.id):
+                new_message = await (await app.get_messages(context[0], context[1])).reply_text(msg.text+locale("message_reply_notice", "message"), quote=True)
+            else:
+                new_message = await (await app.get_messages(context[0], context[1])).reply_text(locale("message_from", "message").format(msg.from_user.first_name, msg.from_user.id)+msg.text+locale("message_reply_notice", "message"), quote=True)
+            await msg.reply_text(locale("message_sent", "message"), quote=should_quote(msg))
+            col_messages.insert_one({"origin": {"chat": msg.chat.id, "id": msg.id}, "destination": {"chat": new_message.chat.id, "id": new_message.id}})
+            return
 
-#         user_stage = configGet("stage", file=str(msg.from_user.id))
+        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):