fban module updated (#116)

* xiaomi plugin

* Improved

* Update fedutils.py

---------

Co-authored-by: Abhi <85984486+AbhiTheModder@users.noreply.github.com>

Author: ramanveerji

utils/fedutils.py

@@ -22,90 +22,147 @@
 from utils.scripts import format_exc
 from utils.misc import modules_help, prefix
 
+
 @Client.on_message(filters.command("fban", prefix) & filters.me)
 async def fban_cmd(client: Client, message: Message):
     try:
-        msg = await message.edit("🌙 Starting Federation Ban...")
+        msg = await message.edit("<b>🌙 Starting Federation Ban...</b>")
 
-        # Get target and reason
         args = message.text.split()
         if len(args) < 2 and not message.reply_to_message:
             return await msg.edit("❌ Reply to user or provide ID/username and reason")
 
         if message.reply_to_message:
-            target = message.reply_to_message.from_user.id
+            target_user = message.reply_to_message.from_user
+            target = target_user.id
             reason = " ".join(args[1:]) if len(args) > 1 else ""
         else:
-            target = args[1]
-            reason = " ".join(args[2:]) if len(args) > 2 else ""
+            try:
+                target_user = await client.get_users(args[1])
+                target = target_user.id
+                reason = " ".join(args[2:]) if len(args) > 2 else ""
+            except Exception:
+                target = args[1]
+                target_user = None
+                reason = " ".join(args[2:]) if len(args) > 2 else ""
 
-        # Get configuration
         fban_group = db.get("core.ats", "FBAN_GROUP_ID")
         fed_ids = db.get("core.ats", "FED_IDS", [])
-        
+
         if not fban_group:
             return await msg.edit("❌ FBAN group not set! Use `.set_fban_group` first")
-        
+
         if not fed_ids:
             return await msg.edit("❌ No federations added! Use `.addfed` first")
 
-        # Execute commands in FBAN group
         await client.send_message(fban_group, f"/fban {target} {reason}")
         await asyncio.sleep(2)
-        
+
         for fed_id in fed_ids:
             await client.send_message(fban_group, f"/joinfed {fed_id}")
             await asyncio.sleep(3)
             await client.send_message(fban_group, f"/fban {target} {reason}")
             await asyncio.sleep(3)
 
-        await msg.edit(f"✅ Successfully FBanned {target} in {len(fed_ids)} federations\n#MoonUB")
+        # Fetch user info for mention
+        try:
+            if not target_user:
+                target_user = await client.get_users(target)
+
+            user_name = target_user.first_name
+            if target_user.last_name:
+                user_name += f" {target_user.last_name}"
+            user_mention = f"<a href='tg://user?id={target_user.id}'>{user_name}</a>"
+            user_id_display = str(target_user.id)
+        except Exception:
+            user_mention = str(target)
+            user_id_display = str(target)
+
+        result_message = (
+            f"<b>New FedBan</b>\n"
+            f"<b>Fed:</b> Fbanned in {len(fed_ids)} feds\n"
+            f"<b>User:</b> {user_mention}\n"
+            f"<b>User ID:</b> {user_id_display}\n"
+            f"<b>Reason:</b> {reason if reason else 'Not specified'}\n"
+            f"#MoonUB"
+        )
+
+        await msg.edit(result_message, disable_web_page_preview=True)
 
     except Exception as e:
         await msg.edit(f"⚠️ Error: {format_exc(e)}")
 
+
 @Client.on_message(filters.command("unfban", prefix) & filters.me)
 async def unfban_cmd(client: Client, message: Message):
     try:
-        msg = await message.edit("🌙 Starting Federation Unban...")
+        msg = await message.edit("<b>🌙 Starting Federation Unban...</b>")
 
-        # Get target and reason
         args = message.text.split()
         if len(args) < 2 and not message.reply_to_message:
             return await msg.edit("❌ Reply to user or provide ID/username and reason")
-        
+
         if message.reply_to_message:
-            target = message.reply_to_message.from_user.id
+            target_user = message.reply_to_message.from_user
+            target = target_user.id
             reason = " ".join(args[1:]) if len(args) > 1 else ""
         else:
-            target = args[1]
-            reason = " ".join(args[2:]) if len(args) > 2 else ""
+            try:
+                target_user = await client.get_users(args[1])
+                target = target_user.id
+                reason = " ".join(args[2:]) if len(args) > 2 else ""
+            except Exception:
+                target = args[1]
+                target_user = None
+                reason = " ".join(args[2:]) if len(args) > 2 else ""
 
-        # Get configuration
         fban_group = db.get("core.ats", "FBAN_GROUP_ID")
         fed_ids = db.get("core.ats", "FED_IDS", [])
-        
+
         if not fban_group:
             return await msg.edit("❌ FBAN group not set! Use `.set_fban_group` first")
-        
+
         if not fed_ids:
             return await msg.edit("❌ No federations added! Use `.addfed` first")
 
-        # Execute commands in FBAN group
         await client.send_message(fban_group, f"/unfban {target} {reason}")
         await asyncio.sleep(2)
-        
+
         for fed_id in fed_ids:
             await client.send_message(fban_group, f"/joinfed {fed_id}")
             await asyncio.sleep(3)
             await client.send_message(fban_group, f"/unfban {target} {reason}")
             await asyncio.sleep(3)
 
-        await msg.edit(f"✅ Successfully UnFBanned {target} in {len(fed_ids)} federations\n#MoonUB")
+        # Fetch user info for mention
+        try:
+            if not target_user:
+                target_user = await client.get_users(target)
+
+            user_name = target_user.first_name
+            if target_user.last_name:
+                user_name += f" {target_user.last_name}"
+            user_mention = f"<a href='tg://user?id={target_user.id}'>{user_name}</a>"
+            user_id_display = str(target_user.id)
+        except Exception:
+            user_mention = str(target)
+            user_id_display = str(target)
+
+        result_message = (
+            f"<b>New FedUnban</b>\n"
+            f"<b>Fed:</b> Unbanned in {len(fed_ids)} feds\n"
+            f"<b>User:</b> {user_mention}\n"
+            f"<b>User ID:</b> {user_id_display}\n"
+            f"<b>Reason:</b> {reason if reason else 'Not specified'}\n"
+            f"#MoonUB"
+        )
+
+        await msg.edit(result_message, disable_web_page_preview=True)
 
     except Exception as e:
         await msg.edit(f"⚠️ Error: {format_exc(e)}")
 
+
 @Client.on_message(filters.command("set_fban_group", prefix) & filters.me)
 async def set_fban_group(_, message: Message):
     if len(message.command) < 2:
@@ -120,6 +177,7 @@ async def set_fban_group(_, message: Message):
     except Exception as e:
         await message.edit(f"⚠️ Error: {format_exc(e)}")
 
+
 @Client.on_message(filters.command("addfed", prefix) & filters.me)
 async def add_fed(_, message: Message):
     if len(message.command) < 2:
@@ -135,6 +193,7 @@ async def add_fed(_, message: Message):
         db.set("core.ats", "FED_IDS", current_feds)
         await message.edit(f"✅ Added federation: `{fed_id}`")
 
+
 @Client.on_message(filters.command("delfed", prefix) & filters.me)
 async def del_fed(_, message: Message):
     if len(message.command) < 2:
@@ -150,14 +209,16 @@ async def del_fed(_, message: Message):
         db.set("core.ats", "FED_IDS", current_feds)
         await message.edit(f"✅ Removed federation: `{fed_id}`")
 
+
 @Client.on_message(filters.command("listfed", prefix) & filters.me)
 async def list_fed(_, message: Message):
     current_feds = db.get("core.ats", "FED_IDS", [])
     if not current_feds:
         return await message.edit("❌ No federations in list")
 
     fed_list = "\n".join([f"• `{fed}`" for fed in current_feds])
-    await message.edit(f"📜 Federation List:\n{fed_list}")
+    await message.edit(f"<b>📜 Federation List:</b>\n{fed_list}")
+
 
 modules_help["fedutils"] = {
     "fban [reply]/[userid]* [reason]": "Ban user in multiple federations",
@@ -166,4 +227,4 @@ async def list_fed(_, message: Message):
     "addfed [fed_id]*": "Add federation to ban list",
     "delfed [fed_id]*": "Remove federation from ban list",
     "listfed": "Show current federation list"
-}
+}