From 6cf1b925a43ce810071a41bee4ac918af81e0709 Mon Sep 17 00:00:00 2001
From: levina <82658782+levina-lab@users.noreply.github.com>
Date: Mon, 25 Oct 2021 16:10:11 +0700
Subject: [PATCH] some fixes

---
 program/userbotjoin.py | 47 ++++++++++++++++++++----------------------
 1 file changed, 22 insertions(+), 25 deletions(-)

diff --git a/program/userbotjoin.py b/program/userbotjoin.py
index e1152a7..acfe81c 100644
--- a/program/userbotjoin.py
+++ b/program/userbotjoin.py
@@ -1,69 +1,66 @@
 import asyncio
-from helpers.filters import command
-from pyrogram import Client, filters
 from config import BOT_USERNAME, SUDO_USERS
+from driver.decorators import authorized_users_only, sudo_users_only, errors
+from driver.filters import command
+from driver.veez import call_py as USER
+from pyrogram import Client, filters
 from pyrogram.errors import UserAlreadyParticipant
-from helpers.decorators import authorized_users_only, errors
+
 
 @Client.on_message(
     command(["userbotjoin", f"userbotjoin@{BOT_USERNAME}"]) & ~filters.private & ~filters.bot
 )
 @authorized_users_only
 @errors
-async def addchannel(client, message):
+async def join_group(client, message):
     chid = message.chat.id
     try:
         invitelink = await client.export_chat_invite_link(chid)
-    except:
+    except BaseException:
         await message.reply_text(
-            "<b>• **i'm not have permission:**\n\n» ❌ __Add Users__</b>",
+            "• **i'm not have permission:**\n\n» ❌ __Add Users__",
         )
         return
 
     try:
         user = await USER.get_me()
-    except:
+    except BaseException:
         user.first_name = "music assistant"
 
     try:
         await USER.join_chat(invitelink)
-        await USER.send_message(
-            message.chat.id, "🤖: i'm joined here for playing music on voice chat"
-        )
     except UserAlreadyParticipant:
-        await message.reply_text(
-            f"<b>✅ userbot already joined chat</b>",
-        )
+        pass
     except Exception as e:
         print(e)
         await message.reply_text(
-            f"<b>🛑 Flood Wait Error 🛑 \n\n User {user.first_name} couldn't join your group due to heavy join requests for userbot."
-            "\n\nor manually add assistant to your Group and try again</b>",
+            f"🛑 Flood Wait Error 🛑 \n\n**userbot couldn't join your group due to heavy join requests for userbot**"
+            "\n\n**or add assistant manually to your Group and try again**",
         )
         return
     await message.reply_text(
-        f"<b>✅ userbot successfully joined chat</b>",
+        f"✅ **userbot succesfully entered chat**",
     )
 
 
-@Client.on_message(
-    command(["userbotleave", f"userbotleave@{BOT_USERNAME}"]) & filters.group & ~filters.edited
-)
+@Client.on_message(command(["userbotleave",
+                            f"leave@{BOT_USERNAME}"]) & filters.group & ~filters.edited)
 @authorized_users_only
-async def rem(client, message):
+async def leave_one(client, message):
     try:
         await USER.send_message(message.chat.id, "✅ userbot successfully left chat")
         await USER.leave_chat(message.chat.id)
-    except:
+    except BaseException:
         await message.reply_text(
-            "<b>user couldn't leave your group, may be floodwaits.\n\nor manually kick me from your group</b>"
+            "❌ **userbot couldn't leave your group, may be floodwaits.**\n\n**» or manually kick userbot from your group**"
         )
 
         return
 
 
 @Client.on_message(command(["leaveall", f"leaveall@{BOT_USERNAME}"]))
-async def bye(client, message):
+@sudo_users_only
+async def leave_all(client, message):
     if message.from_user.id not in SUDO_USERS:
         return
 
@@ -77,12 +74,12 @@ async def bye(client, message):
             await lol.edit(
                 f"Userbot leaving all group...\n\nLeft: {left} chats.\nFailed: {failed} chats."
             )
-        except:
+        except BaseException:
             failed += 1
             await lol.edit(
                 f"Userbot leaving...\n\nLeft: {left} chats.\nFailed: {failed} chats."
             )
         await asyncio.sleep(0.7)
     await client.send_message(
-        message.chat.id, f"Left {left} chats.\nFailed {failed} chats."
+        message.chat.id, f"✅ Left from: {left} chats.\n❌ Failed in: {failed} chats."
     )