update

akn/manage/callback.py

@@ -66,7 +66,7 @@ Before making a fuss, make sure you understand the situation first. Answer prope
 CUSTOM_KEY = """
 Welcome to AkenoX API
 
-- You can use v1 free unlimited
+- You can use V1 free unlimited
 - Also V2 Premium 30 days Trial
 
 Below Click Button
@@ -274,25 +274,54 @@ async def cb_new_revokekey(client, query):
     user_id = query.from_user.id
     if not query.from_user.username:
         return await query.answer("Required username first", True)
-    url = "https://randydev-ryu-js.hf.space/api/v1/key/revoked-key"
-    response = requests.post(
-        url,
-        params={
-            "user_id": user_id,
-            "username": query.from_user.username
-        },
-        headers={"x-api-key": os.environ.get("AKENOX_KEY")}
-    )
-    if response.status_code != 200:
-        return await query.answer("Error api try again", True)
-    data_json = response.json()
+    try:
+        url = "https://randydev-ryu-js.hf.space/api/v1/key/revoked-key"
+        response = requests.post(
+            url,
+            params={
+                "user_id": user_id,
+                "username": query.from_user.username
+            },
+            headers={"x-api-key": os.environ.get("AKENOX_KEY")}
+        )
+        response.raise_for_status()
+        data_json = response.json()
+    except requests.exceptions.RequestException:
+        return await query.answer("API request failed, please try again.", True)
     if data_json.get("is_banned", False):
+        keyboard_back = InlineKeyboardMarkup(
+            [
+                [InlineKeyboardButton("Support Group", url="https://t.me/AkenoXDevSupport")],
+                [InlineKeyboardButton("🔙 Back", callback_data="custom_key")]
+            ]
+        )
+        return await query.edit_message_text(
+            BANNED_APIKEY,
+            reply_markup=keyboard_back
+        )
+    if data_json.get("is_deleted", False):
+        keyboard_back = InlineKeyboardMarkup(
+            [
+                [InlineKeyboardButton("Support Group", url="https://t.me/AkenoXDevSupport")],
+                [InlineKeyboardButton("🔙 Back", callback_data="custom_key")]
+            ]
+        )
+        return await query.edit_message_text(
+            data_json.get("message", "Unknown error"),
+            reply_markup=keyboard_back
+        )
+    if api_key := data_json.get("apiKey", False):
+        await query.answer(data_json["message"], True)
         keyboard_back = InlineKeyboardMarkup(
             [
                 [
                     InlineKeyboardButton(
-                        "Support Group",
-                        url="https://t.me/AkenoXDevSupport"
+                        "API Key",
+                        copy_text=api_key
+                    ),
+                    InlineKeyboardButton(
+                        "⚠️ Revoke Key",
+                        callback_data="revokedkey"
                     ),
                 ],
                 [
@@ -304,56 +333,31 @@ async def cb_new_revokekey(client, query):
             ]
         )
         return await query.edit_message_text(
-            BANNED_APIKEY,
+            YOU_KEY_TEXT.format(
+                api_key=api_key,
+                create_at=data_json.get("createdAt", ""),
+                type=data_json.get("type", "Free"),
+                ttn=data_json.get("expiresAt", "Unlimited")
+            ),
             reply_markup=keyboard_back
         )
-    else:
-        if data_json.get("apiKey", False):
-            await query.answer(data_json["message"], True)
-            keyboard_back = InlineKeyboardMarkup(
-                [
-                    [
-                        InlineKeyboardButton(
-                            "API Key",
-                            copy_text=data_json["apiKey"]
-                        ),
-                        InlineKeyboardButton(
-                            "⚠️ Revoke Key",
-                            callback_data="revokedkey"
-                        ),
-                    ],
-                    [
-                        InlineKeyboardButton(
-                            "🔙 Back",
-                            callback_data="contet"
-                        )
-                    ]
-                ]
-            )
-            return await query.edit_message_text(
-                YOU_KEY_TEXT.format(
-                    api_key=data_json["apiKey"],
-                    create_at=data_json.get("createdAt", ""),
-                    type=data_json.get("type", "Free"),
-                    ttn=data_json.get("expiresAt", "Unlimited")
-                ),
-                reply_markup=keyboard_back
-            )
-        else:
-            return await query.answer("Error api try again", True)
+    return await query.answer("Error api try again", True)
 
 @ren.on_callback_query(filters.regex("createkeyprem"))
 async def cb_new_keyprem(client, query):
     user_id = query.from_user.id
-    url = "https://randydev-ryu-js.hf.space/api/v2/key/generate-key"
-    response = requests.post(
-        url,
-        params={"user_id": user_id},
-        headers={"x-api-key": os.environ.get("AKENOX_KEY")}
-    )
-    if response.status_code != 200:
-        return await query.answer("Error api try again", True)
-    data_json = response.json()
+    try:
+        url = "https://randydev-ryu-js.hf.space/api/v2/key/generate-key"
+        response = requests.post(
+            url,
+            params={"user_id": user_id},
+            headers={"x-api-key": os.environ.get("AKENOX_KEY")}
+        )
+        response.raise_for_status()
+        data_json = response.json()
+    except requests.exceptions.RequestException:
+        return await query.answer("API request failed, please try again.", True)
+
     if data_json.get("is_banned", False):
         keyboard_back = InlineKeyboardMarkup(
             [
@@ -375,41 +379,39 @@ async def cb_new_keyprem(client, query):
             BANNED_APIKEY,
             reply_markup=keyboard_back
         )
-    else:
-        if data_json.get("apiKey", False):
-            keyboard_back = InlineKeyboardMarkup(
+    if api_key := data_json.get("apiKey", False):
+        keyboard_back = InlineKeyboardMarkup(
+            [
+                [
+                    InlineKeyboardButton(
+                        "API Key",
+                        copy_text=api_key
+                    )
+                ],
+                [
+                    InlineKeyboardButton(
+                        "Example Cohere",
+                        callback_data="example_cohere"
+                    )
+                ],
                 [
-                    [
-                        InlineKeyboardButton(
-                            "API Key",
-                            copy_text=data_json["apiKey"]
-                        )
-                    ],
-                    [
-                        InlineKeyboardButton(
-                            "Example Cohere",
-                            callback_data="example_cohere"
-                        )
-                    ],
-                    [
-                        InlineKeyboardButton(
-                            "🔙 Back",
-                            callback_data="custom_key"
-                        )
-                    ]
+                    InlineKeyboardButton(
+                        "🔙 Back",
+                        callback_data="custom_key"
+                    )
                 ]
-            )
-            return await query.edit_message_text(
-                YOU_KEY_TEXT.format(
-                    api_key=data_json["apiKey"],
-                    create_at=data_json.get("createdAt", ""),
-                    type=data_json.get("type", "No"),
-                    ttn=data_json.get("expiresAt", "No")
-                ),
-                reply_markup=keyboard_back
-            )
-        else:
-            return await query.answer("Error api try again", True)
+            ]
+        )
+        return await query.edit_message_text(
+            YOU_KEY_TEXT.format(
+                api_key=api_key,
+                create_at=data_json.get("createdAt", ""),
+                type=data_json.get("type", "No"),
+                ttn=data_json.get("expiresAt", "No")
+            ),
+            reply_markup=keyboard_back
+        )
+    return await query.answer("Error api try again", True)
 
 @ren.on_callback_query(filters.regex("createkey"))
 async def cb_new_key(client, query):