Minor improvements

config_example.json

@@ -29,6 +29,7 @@
     },
     "commands_admin": {
         "reboot": "Restart the bot",
+        "application": "Check user's application",
         "applications": "Get all applications as JSON"
     }
 }

locale/uk.json

@@ -54,6 +54,7 @@
         "reapply_forbidden": "❌ **Дія неможлива**\nТвоя минула анкета ще не була схвалена або відхилена.",
         "reapply_in_progress": "❌ **Дія неможлива**\nТи прямо зараз вже заповнюєш анкету. Якщо в ній є помилка - після заповнення просто натисни **{0}** та почни знову.",
         "birthday": "У користувача **{0}** (@{1}) сьогодні день народження! Виповнилось {2} років",
+        "application_invalid_syntax": "Неправильний синтаксис!\nТреба: `/application ID/NAME/USERNAME`",
         "question_titles": {
             "question1": "Ім'я/звертання:",
             "question2": "День народження:",

main.py

@@ -78,6 +78,56 @@ async def cmd_applications(app, msg):
 # ==============================================================================================================================
 
 
+# Applications command =========================================================================================================
+@app.on_message(~ filters.scheduled & filters.private & filters.command(["application"], prefixes=["", "/"]))
+async def cmd_application(app, msg):
+
+    if await isAnAdmin(msg.from_user.id):
+        try:
+            if (path.exists(f"{configGet('data', 'locations')}{sep}users{sep}{msg.command[1]}.json") and jsonLoad(f"{configGet('data', 'locations')}{sep}users{sep}{msg.command[1]}.json")["approved"]):
+                user_id = int(msg.command[1])
+            else:
+                list_of_users = []
+                async for m in app.get_chat_members(configGet("destination_group"), filter=ChatMembersFilter.SEARCH, query=msg.command[1]):
+                    list_of_users.append(m)
+                user_id = list_of_users[0].user.id
+            try:
+                user_data = jsonLoad(f"{configGet('data', 'locations')}{sep}users{sep}{user_id.user.id}.json")
+                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(user_id.user.id))['2'], '%d.%m.%Y'))
+                        application_content.append(f"{locale('question'+str(i), 'message', 'question_titles')} {configGet('application', file=str(user_id.user.id))['2']} ({age.years} р.)")
+                    else:
+                        application_content.append(f"{locale('question'+str(i), 'message', 'question_titles')} {configGet('application', file=str(user_id.user.id))[question]}")
+                    i += 1
+                application = jsonLoad(f"{configGet('data', 'locations')}{sep}applications.json")[str(user_id.user.id)]
+                if user_data["sent"]:
+                    if user_data["approved"]:
+                        application_status = locale("application_status_accepted", "message").format((await app.get_users(application["approved_by"])).first_name, datetime.fromtimestamp(application["approval_date"]).strftime("%d.%m.%Y, %H:%M"))  # type: ignore
+                    elif application["refused"]:
+                        application_status = locale("application_status_refused", "message").format((await app.get_users(application["refused_by"])).first_name, datetime.fromtimestamp(application["refusal_date"]).strftime("%d.%m.%Y, %H:%M"))  # type: ignore
+                    else:
+                        application_status = locale("application_status_on_hold", "message")
+                else:
+                    if user_data["approved"]:
+                        application_status = locale("application_status_accepted", "message").format((await app.get_users(application["approved_by"])).first_name, datetime.fromtimestamp(application["approval_date"]).strftime("%d.%m.%Y, %H:%M"))  # type: ignore
+                    elif application["refused"]:
+                        application_status = locale("application_status_refused", "message").format((await app.get_users(application["refused_by"])).first_name, datetime.fromtimestamp(application["refusal_date"]).strftime("%d.%m.%Y, %H:%M"))  # type: ignore
+                    else:
+                        application_status = locale("application_status_not_send", "message")
+                logWrite(f"User {msg.from_user.id} requested application of {user_id.user.id}")
+                await msg.reply_text(locale("contact", "message").format(str(user_id.user.id), "\n".join(application_content), application_status))  # type: ignore
+            except FileNotFoundError:
+                logWrite(f"User {msg.from_user.id} requested application of {user_id.user.id} but user does not exists")
+                await msg.reply_text(locale("contact_invalid", "message"))
+                
+        except IndexError:
+            await msg.reply_text(locale("application_invalid_syntax", "message"))
+# ==============================================================================================================================
+
+
 # Reapply command ==============================================================================================================
 @app.on_message(~ filters.scheduled & filters.private & filters.command(["reapply"], prefixes=["", "/"]))
 async def cmd_reapply(app, msg):

modules/inline.py

@@ -28,7 +28,7 @@ async def inline_answer(client, inline_query):
     if (path.exists(f"{configGet('data', 'locations')}{sep}users{sep}{inline_query.from_user.id}.json") and jsonLoad(f"{configGet('data', 'locations')}{sep}users{sep}{inline_query.from_user.id}.json")["approved"]) or (await isAnAdmin(inline_query.from_user.id)):
 
         list_of_users = []
-        async for m in app.get_chat_members(configGet("admin_group"), filter=ChatMembersFilter.SEARCH, query=inline_query.query):
+        async for m in app.get_chat_members(configGet("destination_group"), filter=ChatMembersFilter.SEARCH, query=inline_query.query):
             list_of_users.append(m)
 
         results = []