Small refactoring

main.py

@@ -1,4 +1,5 @@
-from datetime import datetime, timedelta
+from datetime import datetime
+from dateutil.relativedelta import relativedelta
 from time import time
 from os import getpid, path
 from modules.utils import *
@@ -6,6 +7,7 @@ from modules.utils import *
 from pyrogram.client import Client
 from pyrogram import filters
 from pyrogram.enums.parse_mode import ParseMode
+from pyrogram.enums.chat_action import ChatAction
 from pyrogram.types import InlineKeyboardMarkup, InlineKeyboardButton, BotCommand, BotCommandScopeChat, ReplyKeyboardMarkup, ForceReply, ReplyKeyboardRemove, ChatPermissions
 from pyrogram import idle # type: ignore
 from pyrogram.errors.exceptions import bad_request_400
@@ -15,6 +17,15 @@ pid = getpid()
 app = Client("holochecker", bot_token=configGet("bot_token", "bot"), api_id=configGet("api_id", "bot"), api_hash=configGet("api_hash", "bot"))
 
 
+async def isAnAdmin(admin_id):
+    if admin_id == configGet("owner") or admin_id in configGet("admins"):
+        return True
+    async for member in app.get_chat_members(configGet("admin_group")):
+        if member.user.id == admin_id:
+            return True
+    return False
+
+
 # Start command ================================================================================================================
 @app.on_message(~ filters.scheduled & filters.private & filters.command(["start"], prefixes=["/"]))
 async def cmd_start(app, msg):
@@ -40,13 +51,23 @@ async def cmd_start(app, msg):
 @app.on_message(~ filters.scheduled & filters.private & filters.command(["kill", "die", "reboot"], prefixes=["", "/"]))
 async def cmd_kill(app, msg):
 
-    if (msg.from_user.id == configGet("owner")) or (msg.from_user.id in configGet("admins")):
+    if await isAnAdmin(msg.from_user.id):
         logWrite(f"Shutting down bot with pid {pid}")
         await msg.reply_text(f"Вимкнення бота з підом `{pid}`")
         killProc(pid)
 # ==============================================================================================================================
 
 
+# Applications command =========================================================================================================
+@app.on_message(~ filters.scheduled & filters.private & filters.command(["applications"], prefixes=["", "/"]))
+async def cmd_applications(app, msg):
+
+    if await isAnAdmin(msg.from_user.id):
+        await app.send_chat_action(msg.chat.id, ChatAction.UPLOAD_DOCUMENT)
+        await msg.reply_document(document=f"{configGet('data', 'locations')}{sep}applications.json")
+# ==============================================================================================================================
+
+
 # Welcome check ================================================================================================================
 @app.on_message(~ filters.scheduled & filters.private & (filters.regex(locale("welcome", "keyboard")[0][0]) | filters.regex(locale("return", "keyboard")[0][0])))
 async def welcome_pass(app, msg, once_again: bool = True):
@@ -97,6 +118,10 @@ async def confirm_yes(app, msg):
             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} р.)")
+                else:
                     application_content.append(f"{locale('question'+str(i), 'message', 'question_titles')} {configGet('application', file=str(msg.from_user.id))[question]}")
                 i += 1
 
@@ -148,6 +173,13 @@ async def callback_query_accept(app, clb):
     await app.send_message(configGet("admin_group"), locale("approved_by", "message").format(clb.from_user.first_name, fullclb[2]), disable_notification=True) # type: ignore
     logWrite(f"User {fullclb[2]} got approved by {clb.from_user.id}")
 
+    need_link = True
+
+    async for member in app.get_chat_members(configGet("destination_group")):
+        if member.user.id == int(fullclb[2]):
+            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))
 
         await app.send_message(int(fullclb[2]), locale("approved", "message"), reply_markup=InlineKeyboardMarkup(
@@ -156,10 +188,12 @@ async def callback_query_accept(app, clb):
             ]]
         ))
 
-    configSet("approved", True, file=fullclb[2])
         configSet("link", link.invite_link, file=fullclb[2])
-
         logWrite(f"User {fullclb[2]} got an invite link {link.invite_link}")
+    else:
+        await app.send_message(int(fullclb[2]), locale("approved_joined", "message"))
+
+    configSet("approved", True, file=fullclb[2])
 
     application = jsonLoad(f"{configGet('data', 'locations')}{sep}applications.json")
     application[fullclb[2]]["approved"] = True
@@ -295,13 +329,17 @@ async def callback_query_nothing(app, clb):
 # Contact getting ==============================================================================================================
 @app.on_message(~ filters.scheduled & filters.contact & filters.private)
 async def get_contact(app, msg):
-    if (path.exists(f"{configGet('data', 'locations')}{sep}users{sep}{msg.from_user.id}.json") and jsonLoad(f"{configGet('data', 'locations')}{sep}users{sep}{msg.from_user.id}.json")["approved"]) or (msg.from_user.id in configGet("admins")) or (msg.from_user.id == configGet("owner")):
+    if (path.exists(f"{configGet('data', 'locations')}{sep}users{sep}{msg.from_user.id}.json") and jsonLoad(f"{configGet('data', 'locations')}{sep}users{sep}{msg.from_user.id}.json")["approved"]) or (await isAnAdmin(msg.from_user.id)):
         if msg.contact.user_id != None:
             try:
                 user_data = jsonLoad(f"{configGet('data', 'locations')}{sep}users{sep}{msg.contact.user_id}.json")
                 application_content = []
                 i = 1
-                for question in configGet("application", file=str(msg.contact.user_id)):
+                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.contact.user_id))['2'], '%d.%m.%Y'))
+                        application_content.append(f"{locale('question'+str(i), 'message', 'question_titles')} {configGet('application', file=str(msg.contact.user_id))['2']} ({age.years} р.)")
+                    else:
                         application_content.append(f"{locale('question'+str(i), 'message', 'question_titles')} {configGet('application', file=str(msg.contact.user_id))[question]}")
                     i += 1
                 if user_data["sent"]:
@@ -336,22 +374,32 @@ async def any_stage(app, msg):
         logWrite(f"User {msg.from_user.id} completed stage {user_stage} of application")
         configSet(str(user_stage), str(msg.text), "application", file=str(msg.from_user.id))
         configSet("stage", user_stage+1, file=str(msg.from_user.id))
+
     elif user_stage == 2:
+
         try:
-            configSet(str(user_stage), int(msg.text), "application", file=str(msg.from_user.id))
+
-            if (int(msg.text) in [-1, 0, 128, 256, 512, 1024, 2048]) or (int(msg.text) >= 100):
+            configSet(str(user_stage), str(msg.text), "application", file=str(msg.from_user.id))
+
+            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"))))
-            elif int(msg.text) < configGet("age_allowed"):
+
+            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")))) # type: ignore
+
             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 not int")
+            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")
@@ -383,9 +431,11 @@ async def any_stage(app, msg):
 #@app.on_message(filters.new_chat_members, group=configGet("destination_group"))
 async def filter_join(app, member):
     if member.invite_link != None:
-        if (path.exists(f"{configGet('data', 'locations')}{sep}users{sep}{member.from_user.id}.json") and jsonLoad(f"{configGet('data', 'locations')}{sep}users{sep}{member.from_user.id}.json")["approved"]) or (member.from_user.id in configGet("admins")) or (member.from_user.id == configGet("owner")):
+        if (path.exists(f"{configGet('data', 'locations')}{sep}users{sep}{member.from_user.id}.json") and jsonLoad(f"{configGet('data', 'locations')}{sep}users{sep}{member.from_user.id}.json")["approved"]) or (await isAnAdmin(member.from_user.id)):
             if configGet("link", file=str(member.from_user.id)) == member.invite_link.invite_link:
                 return
+        if await isAnAdmin(member.invite_link.creator.id):
+            return
         await app.send_message(configGet("admin_group"), f"User **{member.from_user.first_name}** (`{member.from_user.id}`) joined the chat not with his personal link", reply_markup=InlineKeyboardMarkup(
             [
                 [