_

akn/manage/approve_params.py

@@ -38,129 +38,43 @@ async def stopv_client(bot: Client, cb: CallbackQuery):
 @ren.on_callback_query(filters.regex(r"^(rejected_ub|pending_ub|approved_ub)_(\d+)$"))
 async def ubadmin_action(client: Client, callback: CallbackQuery):
     global storage_running
-    action, user_id = callback.matches[0].groups()
-    action_type = action.split('_')[0]
-    admin_id = callback.from_user.id
-    admin_mention = callback.from_user.mention
-
+    
     try:
+        action, user_id = callback.matches[0].groups()
+        action_type = action.split('_')[0]
+        admin_id = callback.from_user.id
+        admin_mention = callback.from_user.mention
+
         request = await db_client.session.find_one({"user_id": int(user_id)})
         if not request:
             await callback.answer("❌ User request not found!", show_alert=True)
-            return await callback.message.edit_text(
-                f"{callback.message.text}\n\n⚠️ Failed: Request not found in database"
-            )
-
+            await callback.message.edit_text(f"{callback.message.text}\n\n⚠️ Failed: Request not found")
+            return
 
         update_data = {
             "user_client.$.status": action_type,
+            "last_updated": dt.now().isoformat(),
             "user_client.$.admin_action": {
                 "by": admin_id,
-                "at": dt.now().strftime("%Y-%m-%d %H:%M:%S"),
+                "at": dt.now().isoformat(),
                 "username": callback.from_user.username
-            },
-            "last_updated": dt.now().strftime("%Y-%m-%d %H:%M:%S")
+            }
         }
 
         if action_type == "rejected":
             update_data["user_client.$.admin_action"]["reason"] = "No reason provided"
 
         update_result = await db_client.session.update_one(
-            {
-                "user_id": int(user_id)
-            },
+            {"user_id": int(user_id)},
             {"$set": update_data}
         )
+
         if not update_result.modified_count:
             await callback.answer("❌ Update failed!", show_alert=True)
-            return await callback.message.edit_text(
-                f"{callback.message.text}\n\n⚠️ Failed: update unsuccessful"
-            )
-        string_session = request["user_client"][0]["session_string"]
-        if action_type == "approved":
-            try:
-                user_bots = initial_client_user(string_session)
-                await user_bots.start()
-
-                storage_running[user_id] = user_bots
-                bot_user = await user_bots.get_me()
-                bot_username = f"@{bot_user.username if bot_user.username else 'N/A'}"
-            
-                await db_client.session.update_one(
-                    {
-                        "user_id": int(user_id)
-                    },
-                    {
-                        "$set": {
-                            "user_client.$.user_id": bot_user.id,
-                            "user_client.$.status": "approved",
-                            "user_client.$.is_active": True,
-                            "user_client.$.created_at": dt.now().strftime("%Y-%m-%d %H:%M:%S"),
-                            "user_client.$.start_time": dt.now(),
-                            "user_client.$.username": bot_user.username or "N/A",
-                            "user_client.$.started_at": dt.now().strftime("%Y-%m-%d %H:%M:%S"),
-                            "user_client.$.admin_action": {
-                                "by": admin_id,
-                                "at": dt.now().strftime("%Y-%m-%d %H:%M:%S")
-                            }
-                        }
-                    }
-                )
-                caption = (
-                    "🎉 **Your Userbot Has Been Approved!**\n\n"
-                    f"🔱 Name: {bot_user.first_name}\n"
-                    f"✔ Username: {bot_username}\n"
-                    f"🆔 User ID: `{bot_user.id}`\n\n"
-                    "You can now userbot try `.ping`\n\n"
-                    "Akeno Userbot By akn-dev"
-                )
-
-                keyboard_start_now = InlineKeyboardMarkup([
-                    [InlineKeyboardButton("Channel", url="https://t.me/RendyProjects")]
-                ])
-
-                await client.send_photo(
-                    user_id,
-                    photo="https://telegra.ph//file/586a3867c3e16ca6bb4fa.jpg",
-                    caption=caption,
-                    reply_markup=keyboard_start_now
-                )
-
-                await client.send_message(
-                    PRIVATE_LOGS,
-                    f"✅ Userbot Approved Successfully\n\n"
-                    f"👤 User: {request.get('username', 'N/A')} ({user_id})\n"
-                    f"✔ Username: {bot_username}\n"
-                    f"🛠 Approved by: {admin_mention}\n"
-                    f"⏰ Time: {dt.now().strftime('%Y-%m-%d %H:%M:%S')}"
-                )
+            return
 
-            except Exception as e:
-                LOGS.error(f"Userbot approval error: {str(e)}")
-                await db_client.session.update_one(
-                    {
-                        "user_id": int(user_id),
-                    },
-                    {
-                        "$set": {
-                            "user_client.$.is_active": False,
-                            "user_client.$.error": str(e),
-                            "user_client.$.status": "error"
-                        }
-                    }
-                )
-                await client.send_message(
-                    PRIVATE_LOGS,
-                    f"❌ Userbot Approval Failed\n\n"
-                    f"User ID: {user_id}\n"
-                    f"Error: {str(e)}"
-                )
-                await client.send_message(
-                    user_id,
-                    "⚠️ Userbot approval failed due to technical reasons.\n"
-                    "Our team has been notified. Please try again later."
-                )
-                return
+        if action_type == "approved":
+            await handle_approvalub(client, callback, request, user_id, admin_id, admin_mention)
 
         status_icon = {
             "approved": "✅",
@@ -178,19 +92,76 @@ async def ubadmin_action(client: Client, callback: CallbackQuery):
 
     except Exception as e:
         LOGS.error(f"Admin action error: {str(e)}")
-        await callback.answer("⚠️ error ", show_alert=True)
-        await callback.message.edit_text(
-            f"{callback.message.text}\n\n"
-            f"❌ Error: {str(e)}"
-        )
+        await handle_errorub(client, callback, e, action, admin_mention)
+
+async def handle_approvalub(client, callback, request, user_id, admin_id, admin_mention):
+    try:
+        string_session = request["user_client"][0]["session_string"]
+        user_bots = initial_client_user(string_session)
+        
+        await user_bots.start()
+        bot_user = await user_bots.get_me()
+        
+        global storage_running
+        storage_running[user_id] = user_bots
+
+        update = {
+            "$set": {
+                "user_client.$.user_id": bot_user.id,
+                "user_client.$.status": "approved",
+                "user_client.$.is_active": True,
+                "user_client.$.username": bot_user.username or "N/A",
+                "user_client.$.started_at": dt.now().isoformat(),
+                "user_client.$.admin_action": {
+                    "by": admin_id,
+                    "at": dt.now().isoformat()
+                }
+            }
+        }
+        
+        await db_client.session.update_one({"user_id": int(user_id)}, update)
+        await notify_userub(client, user_id, bot_user)
         await client.send_message(
             PRIVATE_LOGS,
-            f"🚨 Admin Action Error\n\n"
-            f"Action: {action}\n"
-            f"Admin: {admin_mention}\n"
-            f"Error: {str(e)}"
+            f"✅ Userbot Approved Successfully\n\n"
+            f"👤 User: {request.get('username', 'N/A')} ({user_id})\n"
+            f"⭐ Username: {bot_user.username}\n"
+            f"🛠 Approved by: {admin_mention}\n"
+            f"⏰ Time: {dt.now().strftime('%Y-%m-%d %H:%M:%S')}"
         )
+    except Exception as e:
+        LOGS.error(f"Approval error: {str(e)}")
+
+async def notify_userub(client, user_id, bot_user):
+    caption = (
+        "🎉 **Your Userbot Has Been Approved!**\n\n"
+        f"🔱 Name: {bot_user.first_name}\n"
+        f"✔ Username: @{bot_user.username or 'N/A'}\n"
+        f"🆔 User ID: `{bot_user.id}`\n\n"
+        "You can now userbot try `.ping`\n\n"
+        "Akeno Userbot By akn-dev"
+    )
+    await client.send_photo(
+        user_id,
+        photo="https://telegra.ph//file/586a3867c3e16ca6bb4fa.jpg",
+        caption=caption,
+        reply_markup=InlineKeyboardMarkup([
+            [InlineKeyboardButton("Channel", url="https://t.me/RendyProjects")]
+        ])
+    )
 
+async def handle_errorub(client, callback, error, action, admin_mention):
+    await callback.answer("⚠️ Error", show_alert=True)
+    await callback.message.edit_text(
+        f"{callback.message.text}\n\n❌ Error: {str(error)}"
+    )
+    await client.send_message(
+        PRIVATE_LOGS,
+        f"🚨 Admin Action Error\n\n"
+        f"Action: {action}\n"
+        f"Admin: {admin_mention}\n"
+        f"Error: {str(error)}"
+    )
 
 @ren.on_callback_query(filters.regex(r"^(rejected_alldl|pending_alldl|approved_alldl)_(\d+)_(\w+)$"))
 async def handle_admin_action(client: Client, callback: CallbackQuery):