invalid id error handle for promote & demote func

saharshpand3y · Apr 12, 2020 · 400877d · 400877d
1 parent c389b93
commit 400877d
Showing 1 changed file with 37 additions and 19 deletions.
diff --git a/userge/plugins/admin/gadmin.py b/userge/plugins/admin/gadmin.py
@@ -39,9 +39,10 @@ async def promote_usr(message: Message):
 
     if promote_perm:
 
-        if message.input_str:
+        user_id = message.input_str
+
+        if user_id:
 
-            user_id = message.input_str
             get_mem = await userge.get_chat_member(chat_id, user_id)
 
             try:
@@ -57,19 +58,19 @@ async def promote_usr(message: Message):
                 await CHANNEL.log(
                     f"#PROMOTE\n\n"
                     f"USER: [{get_mem.user.first_name}](tg://user?id={get_mem.user.id})\n"
-                    f"CHAT: {get_group.title} (`{chat_id}`)")
+                    f"CHAT: `{get_group.title}` (`{chat_id}`)")
 
             except:
                 await message.edit(
-                    text="`something went wrong 🤔, do .help promote for more info`", del_in=5)
+                    text="`something went wrong 🤔,`"
+                    "`do .help promote for more info`", del_in=5)
 
-        else:
+        elif message.reply_to_message:
 
-            user_id = message.reply_to_message.from_user.id
-            get_mem = await userge.get_chat_member(chat_id, user_id)
+            get_mem = await userge.get_chat_member(chat_id, message.reply_to_message.from_user.id)
 
             try:
-                await userge.promote_chat_member(chat_id, user_id,
+                await userge.promote_chat_member(chat_id, message.reply_to_message.from_user.id,
                                                  can_change_info=True,
                                                  can_delete_messages=True,
                                                  can_restrict_members=True,
@@ -81,11 +82,19 @@ async def promote_usr(message: Message):
                 await CHANNEL.log(
                     f"#PROMOTE\n\n"
                     f"USER: [{get_mem.user.first_name}](tg://user?id={get_mem.user.id})\n"
-                    f"CHAT: {get_group.title} (`{chat_id}`)")
+                    f"CHAT: `{get_group.title}` (`{chat_id}`)")
 
             except:
                 await message.edit(
-                    text="`something went wrong 🤔, do .help promote for more info`", del_in=5)
+                    text="`something went wrong 🤔,`"
+                    "`do .help promote for more info`", del_in=5)
+
+        else:
+            await message.edit(
+                text="`no valid user_id or message specified,`"
+                "`do .help promote for more info`", del_in=5)
+
+            return
 
     else:
         await message.edit(
@@ -119,9 +128,10 @@ async def demote_usr(message: Message):
 
     if demote_perm:
 
-        if message.input_str:
+        user_id = message.input_str
+
+        if user_id:
 
-            user_id = message.input_str
             get_mem = await userge.get_chat_member(chat_id, user_id)
 
             try:
@@ -136,19 +146,19 @@ async def demote_usr(message: Message):
                 await CHANNEL.log(
                     f"#DEMOTE\n\n"
                     f"USER: [{get_mem.user.first_name}](tg://user?id={get_mem.user.id})\n"
-                    f"CHAT: {get_group.title} (`{chat_id}`)")
+                    f"CHAT: `{get_group.title}` (`{chat_id}`)")
 
             except:
                 await message.edit(
-                    text="`something went wrong 🤔, do .help demoted for more info`", del_in=5)
+                    text="`something went wrong 🤔,`"
+                    "`do .help demote for more info`", del_in=5)
 
-        else:
+        elif message.reply_to_message:
 
-            user_id = message.reply_to_message.from_user.id
-            get_mem = await userge.get_chat_member(chat_id, user_id)
+            get_mem = await userge.get_chat_member(chat_id, message.reply_to_message.from_user.id)
 
             try:
-                await userge.promote_chat_member(chat_id, user_id,
+                await userge.promote_chat_member(chat_id, message.reply_to_message.from_user.id,
                                                  can_change_info=False,
                                                  can_delete_messages=False,
                                                  can_restrict_members=False,
@@ -163,7 +173,15 @@ async def demote_usr(message: Message):
 
             except:
                 await message.edit(
-                    text="`something went wrong 🤔, do .help demote for more info`", del_in=5)
+                    text="`something went wrong 🤔,`"
+                    "`do .help demote for more info`", del_in=5)
+
+        else:
+            await message.edit(
+                text="`no valid user_id or message specified,`"
+                "`do .help demote for more info`", del_in=5)
+
+            return
 
     else:
         await message.edit(