Few things left

Powers/plugins/admin.py

@@ -81,25 +81,27 @@ async def adminlist_show(_, m: Message):
     return
 
 
+
 @Gojo.on_message(command("zombies") & admin_filter)
 async def zombie_clean(c: Gojo, m: Message):
     zombie = 0
     wait = await m.reply_text("Searching ... and banning ...")
+    failed = 0
     async for member in c.get_chat_members(m.chat.id):
         if member.user.is_deleted:
             zombie += 1
             try:
                 await c.ban_chat_member(m.chat.id, member.user.id)
             except UserAdminInvalid:
-                zombie -= 1
+                failed += 1
             except FloodWait as e:
                 await sleep(e.x)
     if zombie == 0:
         return await wait.edit_text("Group is clean!")
-    return await wait.edit_text(
-        text=f"<b>{zombie}</b> Zombies found and has been banned!",
-    )
-
+    await wait.delete()
+    txt=f"<b>{zombie}</b> Zombies found and {zombie - failed} has been banned!\n{failed} zombies' are immune to me",
+    await m.reply_animation("https://graph.org/file/02a1dcf7788186ffb36cb.mp4", caption=txt)
+    return
 
 @Gojo.on_message(command("admincache"))
 async def reload_admins(_, m: Message):
@@ -163,8 +165,8 @@ async def fullpromote_usr(c: Gojo, m: Message):
         user_id, user_first_name, user_name = await extract_user(c, m)
     except Exception:
         return
-    bot = await c.get_chat_member(m.chat.id, Config.BOT_ID)
-    if user_id == Config.BOT_ID:
+    bot = await c.get_chat_member(m.chat.id, c.me.id)
+    if user_id == c.me.id:
         await m.reply_text("Huh, how can I even promote myself?")
         return
     if not bot.privileges.can_promote_members:
@@ -259,8 +261,8 @@ async def promote_usr(c: Gojo, m: Message):
         user_id, user_first_name, user_name = await extract_user(c, m)
     except Exception:
         return
-    bot = await c.get_chat_member(m.chat.id, Config.BOT_ID)
-    if user_id == Config.BOT_ID:
+    bot = await c.get_chat_member(m.chat.id, c.me.id)
+    if user_id == c.me.id:
         await m.reply_text("Huh, how can I even promote myself?")
         return
     if not bot.privileges.can_promote_members:
@@ -290,6 +292,8 @@ async def promote_usr(c: Gojo, m: Message):
                 can_pin_messages=bot.privileges.can_pin_messages,
                 can_manage_chat=bot.privileges.can_manage_chat,
                 can_manage_video_chats=bot.privileges.can_manage_video_chats,
+                can_post_messages=bot.privileges.can_post_messages,
+                can_edit_messages=bot.privileges.can_edit_messages
             ),
         )
         title = ""
@@ -358,7 +362,7 @@ async def demote_usr(c: Gojo, m: Message):
         user_id, user_first_name, _ = await extract_user(c, m)
     except Exception:
         return
-    if user_id == Config.BOT_ID:
+    if user_id == c.me.id:
         await m.reply_text("Get an admin to demote me!")
         return
     # If user not already admin
@@ -511,7 +515,7 @@ async def set_user_title(c: Gojo, m: Message):
         return
     if not user_id:
         return await m.reply_text("Cannot find user!")
-    if user_id == Config.BOT_ID:
+    if user_id == c.me.id:
         return await m.reply_text("Huh, why ?")
     if not reason:
         return await m.reply_text("Read /help please!")

Powers/plugins/antispam.py

@@ -44,7 +44,7 @@ async def gban(c: Gojo, m: Message):
         await m.reply_text(text="This user is part of my Support!, Can't ban our own!")
         return
 
-    if user_id == Config.BOT_ID:
+    if user_id == c.me.id:
         await m.reply_text(
             text="You don't dare use that command on me again nigga! \n Go straight and fuck your self......"
         )
@@ -99,7 +99,7 @@ async def ungban(c: Gojo, m: Message):
         await m.reply_text(text="This user is part of my Support!, Can't ban our own!")
         return
 
-    if user_id == Config.BOT_ID:
+    if user_id == c.me.id:
         await m.reply_text(
             text="""You can't gban me nigga!
         Fuck yourself.......!"""
@@ -156,7 +156,8 @@ async def gban_list(_, m: Message):
 
     banfile = "Here are all the globally banned geys!\n\n"
     for user in banned_users:
-        banfile += f"[x] <b>{Users.get_user_info(user['_id'])['name']}</b> - <code>{user['_id']}</code>\n"
+        USER = Users.get_user_info(user['_id'])
+        banfile += f"[x] <b>{USER['name'] if USER else 'Name NA'}</b> - <code>{user['_id']}</code>\n"
         if user["reason"]:
             banfile += f"<b>Reason:</b> {user['reason']}\n"
 

Powers/plugins/bans.py

@@ -35,7 +35,7 @@ async def tban_usr(c: Gojo, m: Message):
     if not user_id:
         await m.reply_text("Cannot find user to ban")
         return
-    if user_id == Config.BOT_ID:
+    if user_id == c.me.id:
         await m.reply_text("WTF??  Why would I ban myself?")
         await m.stop_propagation()
 
@@ -171,7 +171,7 @@ async def stban_usr(c: Gojo, m: Message):
     if not user_id:
         await m.reply_text("Cannot find user to ban")
         return
-    if user_id == Config.BOT_ID:
+    if user_id == c.me.id:
         await m.reply_text("What the heck? Why would I ban myself?")
         await m.stop_propagation()
 
@@ -265,7 +265,7 @@ async def dtban_usr(c: Gojo, m: Message):
     if not user_id:
         await m.reply_text("Cannot find user to ban")
         return
-    if user_id == Config.BOT_ID:
+    if user_id == c.me.id:
         await m.reply_text("Huh, why would I ban myself?")
         await m.stop_propagation()
 
@@ -395,7 +395,7 @@ async def kick_usr(c: Gojo, m: Message):
         await m.reply_text("Cannot find user to kick")
         return
 
-    if user_id == Config.BOT_ID:
+    if user_id == c.me.id:
         await m.reply_text("Huh, why would I kick myself?")
         await m.stop_propagation()
 
@@ -486,7 +486,7 @@ async def skick_usr(c: Gojo, m: Message):
         await m.reply_text("Cannot find user to kick")
         return
 
-    if user_id == Config.BOT_ID:
+    if user_id == c.me.id:
         await m.reply_text("Nuh Hu, why would I kick myself?")
         await m.stop_propagation()
 
@@ -560,7 +560,7 @@ async def dkick_usr(c: Gojo, m: Message):
         await m.reply_text("Cannot find user to kick")
         return
 
-    if user_id == Config.BOT_ID:
+    if user_id == c.me.id:
         await m.reply_text("Huh, why would I kick myself?")
         await m.stop_propagation()
 
@@ -711,7 +711,7 @@ async def sban_usr(c: Gojo, m: Message):
     if user_id == m.chat.id:
         await m.reply_text("That's an admin!")
         await m.stop_propagation()
-    if user_id == Config.BOT_ID:
+    if user_id == c.me.id:
         await m.reply_text("Huh, why would I ban myself?")
         await m.stop_propagation()
 
@@ -792,7 +792,7 @@ async def dban_usr(c: Gojo, m: Message):
     if user_id == m.chat.id:
         await m.reply_text("That's an admin!")
         await m.stop_propagation()
-    if user_id == Config.BOT_ID:
+    if user_id == c.me.id:
         await m.reply_text("Huh, why would I ban myself?")
         await m.stop_propagation()
 
@@ -893,7 +893,7 @@ async def ban_usr(c: Gojo, m: Message):
     if user_id == m.chat.id:
         await m.reply_text("That's an admin!")
         await m.stop_propagation()
-    if user_id == Config.BOT_ID:
+    if user_id == c.me.id:
         await m.reply_text("Huh, why would I ban myself?")
         await m.stop_propagation()
 

Powers/plugins/clean_db.py

@@ -1,12 +1,10 @@
 import time
-from asyncio import sleep
 from traceback import format_exc
 
-from apscheduler.schedulers.asyncio import AsyncIOScheduler
 from pyrogram.enums import ChatMemberStatus as CMS
-from pyrogram.errors import PeerIdInvalid, UserNotParticipant
+from pyrogram.errors import UserNotParticipant
 
-from Powers import LOGGER, MESSAGE_DUMP, TIME_ZONE
+from Powers import LOGGER, MESSAGE_DUMP
 from Powers.bot_class import Gojo
 from Powers.database.approve_db import Approve
 from Powers.database.blacklist_db import Blacklist
@@ -20,18 +18,17 @@ from Powers.database.pins_db import Pins
 from Powers.database.reporting_db import Reporting
 # from Powers.database.users_db import Users
 from Powers.database.warns_db import Warns, WarnSettings
-from Powers.utils.custom_filters import command
 from Powers.vars import Config
 
 
-async def clean_my_db(c:Gojo,is_cmd=False, id=None):
+async def clean_my_db(c: Gojo, is_cmd=False, id=None):
     to_clean = list()
     chats_list = Chats.list_chats_by_id()
     to_clean.clear()
     start = time.time()
     for chats in chats_list:
         try:
-            stat = await c.get_chat_member(chat_id=chats,user_id=Config.BOT_ID)
+            stat = await c.get_chat_member(chat_id=chats, user_id=c.me.id)
             if stat.status not in [CMS.MEMBER, CMS.ADMINISTRATOR, CMS.OWNER]:
                 to_clean.append(chats)
         except UserNotParticipant:
@@ -64,12 +61,9 @@ async def clean_my_db(c:Gojo,is_cmd=False, id=None):
     if is_cmd:
         txt += f"\nClean type: Forced\nInitiated by: {(await c.get_users(user_ids=id)).mention}"
         txt += f"\nClean type: Manual\n\tTook {round(nums,2)} seconds to complete the process"
-        await c.send_message(chat_id=MESSAGE_DUMP,text=txt)
+        await c.send_message(chat_id=MESSAGE_DUMP, text=txt)
         return txt
     else:
         txt += f"\nClean type: Auto\n\tTook {round(nums,2)} seconds to complete the process"
-        await c.send_message(chat_id=MESSAGE_DUMP,text=txt)
+        await c.send_message(chat_id=MESSAGE_DUMP, text=txt)
         return txt
-    
-
-

Powers/plugins/dev.py

@@ -1,6 +1,7 @@
 import subprocess as subp
 import sys
 from asyncio import create_subprocess_shell, sleep, subprocess
+from importlib.metadata import PackageNotFoundError, metadata
 from io import BytesIO, StringIO
 from os import execvp
 from sys import executable
@@ -209,6 +210,52 @@ async def ping(_, m: Message):
     await replymsg.edit_text(f"<b>Pong!</b>\n{delta_ping * 1000:.3f} ms")
     return
 
+"""
+
+['Metadata-Version', 'Name', 'Version', 'Summary', 'Home-page', 'Author', 'Author-email', 'License', 'Download-URL', 'Project-URL', 'Project-URL', 'Project-URL', 'Project-URL', 'Keywords', 'Platform', 'Classifier', 'Classifier', 'Classifier', 'Classifier', 'Classifier', 'Classifier', 'Classifier', 'Classifier', 'Classifier', 'Classifier', 'Classifier', 'Classifier', 'Classifier', 'Classifier', 'Classifier', 'Classifier', 'Classifier', 'Classifier', 'Classifier', 'Classifier', 'Classifier', 'Requires-Python', 'Description-Content-Type', 'License-File', 'License-File', 'License-File', 'Requires-Dist', 'Requires-Dist', 'Description']
+
+"""
+
+@Gojo.on_message(command(["minfo", "moduleinfo"], dev_cmd=True))
+async def check_module_info(_, m: Message):
+    if len(m.command) != 2:
+        await m.reply_text("**USAGE**\n/minfo [module name]")
+        return
+    
+    module = m.command[-1]
+
+    try:
+        minfo = metadata(module)
+    except PackageNotFoundError:
+        await m.reply_text(f"No module found with name {module}")
+        return
+    
+    name = minfo["Name"]
+    version = minfo["Version"]
+    summary = minfo["Summary"]
+    home_page = minfo["Home-Page"]
+    author = minfo["Author"]
+    license = minfo["License"]
+    download = minfo["Download-URL"]
+
+    txt = f"""
+Here are the info about the module **{name}**
+• Version: {version}
+
+• Summary: {summary}
+
+• Home page: {home_page}
+
+• Author: {author}
+
+• License: {license}
+
+• Download: {download}
+"""
+    await m.reply_text(txt, disable_web_page_preview=True)
+    return
+
+    
 
 @Gojo.on_message(command("logs", dev_cmd=True))
 async def send_log(c: Gojo, m: Message):

Powers/plugins/filters.py

@@ -110,7 +110,7 @@ async def add_filter(_, m: Message):
 async def stop_filter(_, m: Message):
     args = m.command
 
-    if len(args) < 1:
+    if len(args) <= 1:
         return await m.reply_text("What should I stop replying to?")
 
     chat_filters = db.get_all_filters(m.chat.id)
@@ -283,7 +283,6 @@ async def filters_watcher(c: Gojo, m: Message):
         if match:
             try:
                 msgtype = await send_filter_reply(c, m, trigger)
-                LOGGER.info(f"Replied with {msgtype} to {trigger} in {m.chat.id}")
             except Exception as ef:
                 await m.reply_text(f"Error: {ef}")
                 LOGGER.error(ef)

Powers/plugins/flood.py

@@ -152,7 +152,7 @@ limit_kb = InlineKeyboardMarkup(
 @Gojo.on_message(command(['floodaction','actionflood']) & admin_filter)
 async def flood_action(c: Gojo, m: Message):
     Flood = Floods()
-    bot = await c.get_chat_member(m.chat.id, Config.BOT_ID)
+    bot = await c.get_chat_member(m.chat.id, c.me.id)
     status = bot.status
     if not status in [CMS.OWNER, CMS.ADMINISTRATOR]:
       if not bot.privileges.can_restrict_members:
@@ -189,7 +189,7 @@ async def flood_on_off(c: Gojo, m: Message):
 
 @Gojo.on_message(command(['setflood']) & ~filters.bot & admin_filter)
 async def flood_set(c: Gojo, m: Message):
-    bot = await c.get_chat_member(m.chat.id, Config.BOT_ID)
+    bot = await c.get_chat_member(m.chat.id, c.me.id)
     Flood = Floods()
     status = bot.status
     if not status in [CMS.OWNER, CMS.ADMINISTRATOR]:

Powers/plugins/greetings.py

@@ -4,7 +4,7 @@ from traceback import format_exc
 
 from pyrogram import emoji, enums, filters
 from pyrogram.enums import ChatMemberStatus as CMS
-from pyrogram.errors import ChatAdminRequired, RPCError
+from pyrogram.errors import ChannelPrivate, ChatAdminRequired, RPCError
 from pyrogram.types import ChatMemberUpdated, Message
 
 from Powers import LOGGER
@@ -257,7 +257,7 @@ async def member_has_joined(c: Gojo, member: ChatMemberUpdated):
     db = Greetings(member.chat.id)
     banned_users = gdb.check_gban(user.id)
     try:
-        if user.id == Config.BOT_ID:
+        if user.id == c.me.id:
             return
         if user.id in DEV_USERS:
             await c.send_animation(
@@ -332,6 +332,8 @@ async def member_has_joined(c: Gojo, member: ChatMemberUpdated):
 
             if jj:
                 db.set_cleanwlcm_id(int(jj.id))
+        except ChannelPrivate:
+            return
         except RPCError as e:
             LOGGER.error(e)
             LOGGER.error(format_exc(e))

Powers/plugins/info.py

@@ -96,17 +96,17 @@ async def user_info(c: Gojo, user, already=False):
     is_restricted = user.is_restricted
     photo_id = user.photo.big_file_id if user.photo else None
     is_support = True if user_id in SUPPORT_STAFF else False
-    if user_id == Config.BOT_ID:
+    if user_id == c.me.id:
         is_support = "A person is a great support to himself"
     omp = "Hmmm.......Who is that again?"
-    if is_support or Config.BOT_ID:
+    if is_support or c.me.id:
         if user_id in DEV_USERS:
             omp = "Dev"
         elif user_id in SUDO_USERS:
             omp = "Sudoer"
         elif user_id in WHITELIST_USERS:
             omp = "Whitelist"
-        elif user_id == Config.BOT_ID:
+        elif user_id == c.me.id:
             omp = "I am the targeted user"
         elif user_id == OWNER_ID:
             omp = "Owner of the bot"

Powers/plugins/locks.py

@@ -473,19 +473,19 @@ async def is_approved_user(c: Gojo, m: Message):
     SUDO_LEVEL = get_support_staff("sudo_level")
 
     if m.forward_from:
-        if m.from_user.id in ul or m.from_user.id in SUDO_LEVEL or m.from_user.id in admins_group or m.from_user.id == Config.BOT_ID:
+        if m.from_user and (m.from_user.id in ul or m.from_user.id in SUDO_LEVEL or m.from_user.id in admins_group or m.from_user.id == c.me.id):
             return True
         return False
     elif m.forward_from_chat:
         x_chat = (await c.get_chat(m.forward_from_chat.id)).linked_chat
-        if m.from_user.id in ul or m.from_user.id in SUDO_LEVEL or m.from_user.id in admins_group or m.from_user.id == Config.BOT_ID:
+        if m.from_user and (m.from_user.id in ul or m.from_user.id in SUDO_LEVEL or m.from_user.id in admins_group or m.from_user.id == c.me.id):
             return True
-        if not x_chat:
-            return False
         elif x_chat and x_chat.id == m.chat.id:
             return True
+        else:
+            return False
     elif m.from_user:
-        if m.from_user.id in ul or m.from_user.id in SUDO_LEVEL or m.from_user.id in admins_group or m.from_user.id == Config.BOT_ID:
+        if m.from_user.id in ul or m.from_user.id in SUDO_LEVEL or m.from_user.id in admins_group or m.from_user.id == c.me.id:
             return True
         return False
 

Powers/plugins/muting.py

@@ -35,7 +35,7 @@ async def tmute_usr(c: Gojo, m: Message):
     if not user_id:
         await m.reply_text("Cannot find user to mute !")
         return
-    if user_id == Config.BOT_ID:
+    if user_id == c.me.id:
         await m.reply_text("Huh, why would I mute myself?")
         return
 
@@ -149,7 +149,7 @@ async def dtmute_usr(c: Gojo, m: Message):
     if not user_id:
         await m.reply_text("Cannot find user to mute !")
         return
-    if user_id == Config.BOT_ID:
+    if user_id == c.me.id:
         await m.reply_text("Huh, why would I mute myself?")
         return
 
@@ -258,7 +258,7 @@ async def stmute_usr(c: Gojo, m: Message):
     if not user_id:
         await m.reply_text("Cannot find user to mute !")
         return
-    if user_id == Config.BOT_ID:
+    if user_id == c.me.id:
         await m.reply_text("Huh, why would I mute myself?")
         return
 
@@ -352,7 +352,7 @@ async def mute_usr(c: Gojo, m: Message):
     if not user_id:
         await m.reply_text("Cannot find user to mute")
         return
-    if user_id == Config.BOT_ID:
+    if user_id == c.me.id:
         await m.reply_text("Huh, why would I mute myself?")
         return
 
@@ -438,7 +438,7 @@ async def smute_usr(c: Gojo, m: Message):
     if not user_id:
         await m.reply_text("Cannot find user to mute")
         return
-    if user_id == Config.BOT_ID:
+    if user_id == c.me.id:
         await m.reply_text("Huh, why would I mute myself?")
         return
 
@@ -511,7 +511,7 @@ async def dmute_usr(c: Gojo, m: Message):
     if not user_id:
         await m.reply_text("Cannot find user to mute")
         return
-    if user_id == Config.BOT_ID:
+    if user_id == c.me.id:
         await m.reply_text("Huh, why would I mute myself?")
         return
 
@@ -595,7 +595,7 @@ async def unmute_usr(c: Gojo, m: Message):
     except Exception:
         return
 
-    if user_id == Config.BOT_ID:
+    if user_id == c.me.id:
         await m.reply_text("Huh, why would I unmute myself if you are using me?")
         return
     try:

Powers/plugins/notes.py

@@ -84,7 +84,7 @@ async def get_note_func(c: Gojo, m: Message, note_name, priv_notes_status):
                     [
                         (
                             "Click Me!",
-                            f"https://t.me/{Config.BOT_USERNAME}?start=note_{m.chat.id}_{note_hash}",
+                            f"https://t.me/{c.me.username}?start=note_{m.chat.id}_{note_hash}",
                             "url",
                         ),
                     ],
@@ -323,7 +323,7 @@ async def priv_notes(_, m: Message):
 
 
 @Gojo.on_message(command("notes") & filters.group & ~filters.bot)
-async def local_notes(_, m: Message):
+async def local_notes(c: Gojo, m: Message):
     LOGGER.info(f"{m.from_user.id} listed all notes in {m.chat.id}")
     getnotes = db.get_all_notes(m.chat.id)
 
@@ -341,7 +341,7 @@ async def local_notes(_, m: Message):
                 [
                     (
                         "All Notes",
-                        f"https://t.me/{Config.BOT_USERNAME}?start=notes_{m.chat.id}",
+                        f"https://t.me/{c.me.username}?start=notes_{m.chat.id}",
                         "url",
                     ),
                 ],

Powers/plugins/rules.py

@@ -11,7 +11,7 @@ from Powers.vars import Config
 
 
 @Gojo.on_message(command("rules") & filters.group)
-async def get_rules(_, m: Message):
+async def get_rules(c: Gojo, m: Message):
     db = Rules(m.chat.id)
     msg_id = m.reply_to_message.id if m.reply_to_message else m.id
 
@@ -35,7 +35,7 @@ async def get_rules(_, m: Message):
                 [
                     (
                         "Rules",
-                        f"https://t.me/{Config.BOT_USERNAME}?start=rules_{m.chat.id}",
+                        f"https://t.me/{c.me.username}?start=rules_{m.chat.id}",
                         "url",
                     ),
                 ],

Powers/plugins/scheduled_jobs.py

@@ -31,7 +31,7 @@ async def clean_my_db(c:Client,is_cmd=False, id=None):
     start = TIME.time()
     for chats in chats_list:
         try:
-            stat = await c.get_chat_member(chat_id=chats,user_id=Config.BOT_ID)
+            stat = await c.get_chat_member(chat_id=chats,user_id=c.me.id)
             if stat.status not in [CMS.MEMBER, CMS.ADMINISTRATOR, CMS.OWNER]:
                 to_clean.append(chats)
         except UserNotParticipant:

Powers/plugins/start.py

@@ -150,7 +150,7 @@ Join my [News Channel](https://t.me/gojo_bots_network) to get information on all
                 [
                     InlineKeyboardButton(
                         "Connect me to pm",
-                        url=f"https://{Config.BOT_USERNAME}.t.me/",
+                        url=f"https://{c.me.username}.t.me/",
                     ),
                 ],
             ],
@@ -253,7 +253,7 @@ async def help_menu(c: Gojo, m: Message):
                         [
                             InlineKeyboardButton(
                                 "Help",
-                                url=f"t.me/{Config.BOT_USERNAME}?start={help_option}",
+                                url=f"t.me/{c.me.username}?start={help_option}",
                             ),
                         ],
                     ],
@@ -276,7 +276,7 @@ Commands available:
                     [
                         InlineKeyboardButton(
                             "Help",
-                            url=f"t.me/{Config.BOT_USERNAME}?start=start_help",
+                            url=f"t.me/{c.me.username}?start=start_help",
                         ),
                     ],
                 ],

Powers/plugins/stickers.py

@@ -3,10 +3,12 @@ from asyncio import gather
 from random import choice
 from traceback import format_exc
 
+from pyrogram import filters
 from pyrogram.errors import (PeerIdInvalid, ShortnameOccupyFailed,
                              StickerEmojiInvalid, StickerPngDimensions,
                              StickerPngNopng, StickerTgsNotgs,
                              StickerVideoNowebm, UserIsBlocked)
+from pyrogram.types import CallbackQuery
 from pyrogram.types import InlineKeyboardButton as IKB
 from pyrogram.types import InlineKeyboardMarkup as IKM
 from pyrogram.types import Message
@@ -15,8 +17,8 @@ from Powers import LOGGER
 from Powers.bot_class import Gojo
 from Powers.utils.custom_filters import command
 from Powers.utils.sticker_help import *
+from Powers.utils.string import encode_decode
 from Powers.utils.web_helpers import get_file_size
-from Powers.vars import Config
 
 
 @Gojo.on_message(command(["stickerinfo","stinfo"]))
@@ -171,22 +173,25 @@ async def kang(c:Gojo, m: Message):
     
     try:
         while not packname_found:
-            packname = f"CE{str(m.from_user.id)}{st_type}{packnum}_by_{Config.BOT_USERNAME}"
-            kangpack = f"{('@'+m.from_user.username) if m.from_user.username else m.from_user.first_name[:10]} {st_type} {('vOl '+str(volume)) if volume else ''} by @{Config.BOT_USERNAME}"
+            packname = f"CE{str(m.from_user.id)}{st_type}{packnum}_by_{c.me.username}"
+            kangpack = f"{('@'+m.from_user.username) if m.from_user.username else m.from_user.first_name[:10]} {st_type} {('vOl '+str(volume)) if volume else ''} by @{c.me.username}"
             if limit >= 50: # To prevent this loop from running forever
                 await m.reply_text("Failed to kang\nMay be you have made more than 50 sticker packs with me try deleting some")
                 return
             sticker_set = await get_sticker_set_by_name(c,packname)
             if not sticker_set:
-                sticker_set = await create_sticker_set(
-                    client=c,
-                    owner=m.from_user.id,
-                    title=kangpack,
-                    short_name=packname,
-                    stickers=[sticker],
-                    animated=is_anim,
-                    video=is_vid
-                )
+                try:
+                    sticker_set = await create_sticker_set(
+                        client=c,
+                        owner=m.from_user.id,
+                        title=kangpack,
+                        short_name=packname,
+                        stickers=[sticker],
+                        animated=is_anim,
+                        video=is_vid
+                    )
+                except StickerEmojiInvalid:
+                    return await msg.edit("[ERROR]: INVALID_EMOJI_IN_ARGUMENT")
             elif sticker_set.set.count >= kang_lim:
                 packnum += 1
                 limit += 1
@@ -213,7 +218,7 @@ async def kang(c:Gojo, m: Message):
         )
     except (PeerIdInvalid, UserIsBlocked):
         keyboard = IKM(
-            [[IKB("Start me first", url=f"t.me/{Config.BOT_USERNAME}")]]
+            [[IKB("Start me first", url=f"t.me/{c.me.username}")]]
         )
         await msg.delete()
         await m.reply_text(
@@ -316,7 +321,7 @@ async def memify_it(c: Gojo, m: Message):
 
 @Gojo.on_message(command(["getsticker","getst"]))
 async def get_sticker_from_file(c: Gojo, m: Message):
-    Caption = f"Converted by:\n@{Config.BOT_USERNAME}"
+    Caption = f"Converted by:\n@{c.me.username}"
     repl = m.reply_to_message
     if not repl:
         await m.reply_text("Reply to a sticker or file")
@@ -365,6 +370,62 @@ async def get_sticker_from_file(c: Gojo, m: Message):
         os.remove(up)
         return
 
+@Gojo.on_message(command(["rmsticker", "rmst", "removesticker"]))
+async def remove_from_MY_pack(c: Gojo, m: Message):
+    if not m.reply_to_message or not m.reply_to_message.sticker:
+        await m.reply_text("Please reply to a sticker to remove it from your pack")
+        return
+    
+    sticker = m.reply_to_message.sticker
+    sticker_set = await get_sticker_set_by_name(c, sticker.set_name)
+
+    if not sticker_set:
+        await m.reply_text("This sticker is not part of your pack")
+        return
+
+    try:
+        await remove_sticker(c, sticker.file_id)
+        await m.reply_text(f"Deleted [this]({m.reply_to_message.link}) from pack: {sticker_set.et.title}")
+        return
+    except Exception as e:
+        await m.reply_text(f"Error\n{e}\nReport it using /bug")
+        LOGGER.error(e)
+        LOGGER.error(format_exc(e))
+        return
+
+@Gojo.on_message(command(["getmypacks", "mypacks", "mysets", "stickerset", "stset"]))
+async def get_my_sticker_sets(c: Gojo, m: Message):
+    to_del = await m.reply_text("Please wait while I fetch all the sticker set I have created for you.")
+    st_types = ["norm", "ani", "vid"]
+    
+    txt, kb = await get_all_sticker_packs(c, m.from_user.id, "norm")
+
+    await to_del.delete()
+    if not txt:
+        await m.reply_text("Looks like you haven't made any sticker using me...")
+        return
+    await m.reply_text(txt, reply_markup=kb)
+
+@Gojo.on_callback_query(filters.regex(r"^stickers_(norm|vid|ani)_.*"))
+async def sticker_callbacks(c: Gojo, q: CallbackQuery):
+    data = q.data.split("_")
+    st_type = data[1]
+    decoded = await encode_decode(data[-1], "decode")
+    user = int(decoded.split("_")[-1])
+    offset = int(decoded.split("_")[0])
+
+    if q.from_user.id != user:
+        await q.answer("This is not for you")
+        return
+    else:
+        txt, kb = await get_all_sticker_packs(c, q.from_user.id, st_type, offset)
+        if not txt:
+            await q.answer("No sticker pack found....")
+            return
+        else:
+            await q.answer(f"Showing your {st_type}")
+            await q.edit_message_text(txt, reply_markup=kb)
+            return
         
 __PLUGIN__ = "sticker"
 __alt_name__ = [
@@ -377,6 +438,7 @@ __HELP__ = """
 • /stickerinfo (/stinfo) : Reply to any sticker to get it's info
 • /getsticker (/getst) : Get sticker as photo, gif or vice versa.
 • /stickerid (/stid) : Reply to any sticker to get it's id
+• /mypacks : Get all of your current sticker pack you have made via me.
 • /mmf <your text>: Reply to a normal sticker or a photo or video file to memify it. If you want to right text at bottom use `;right your message`
     ■ For e.g. 
     ○ /mmf Hello freinds : this will add text to the top

Powers/plugins/warns.py

@@ -44,7 +44,7 @@ async def warn(c: Gojo, m: Message):
 
     user_id, user_first_name, _ = await extract_user(c, m)
 
-    if user_id == Config.BOT_ID:
+    if user_id == c.me.id:
         await m.reply_text("Huh, why would I warn myself?")
         return
 
@@ -102,7 +102,7 @@ async def warn(c: Gojo, m: Message):
     if rules:
         kb = InlineKeyboardButton(
             "Rules 📋",
-            url=f"https://t.me/{Config.BOT_USERNAME}?start=rules_{m.chat.id}",
+            url=f"https://t.me/{c.me.username}?start=rules_{m.chat.id}",
         )
     else:
         kb = InlineKeyboardButton(
@@ -147,7 +147,7 @@ async def reset_warn(c: Gojo, m: Message):
 
     user_id, user_first_name, _ = await extract_user(c, m)
 
-    if user_id == Config.BOT_ID:
+    if user_id == c.me.id:
         await m.reply_text("Huh, why would I warn myself?")
         return
 
@@ -183,7 +183,7 @@ async def list_warns(c: Gojo, m: Message):
 
     user_id, user_first_name, _ = await extract_user(c, m)
 
-    if user_id == Config.BOT_ID:
+    if user_id == c.me.id:
         await m.reply_text("Huh, why would I warn myself?")
         return
 
@@ -232,7 +232,7 @@ async def remove_warn(c: Gojo, m: Message):
 
     user_id, user_first_name, _ = await extract_user(c, m)
 
-    if user_id == Config.BOT_ID:
+    if user_id == c.me.id:
         await m.reply_text("Huh, why would I warn myself?")
         return
 

Powers/plugins/web_con.py

@@ -257,8 +257,7 @@ async def song_down_up(c: Gojo, m: Message):
         return
     _id = get_video_id(splited)
     if not _id:
-        await m.reply_text("Invalid youtube link")
-        return
+        query = splited
     else:
         query = _id
     XnX = await m.reply_text("⏳")
@@ -284,8 +283,7 @@ async def video_down_up(c: Gojo, m: Message):
         return
     _id = get_video_id(splited)
     if not _id:
-        await m.reply_text("Invalid youtube link")
-        return
+        query = splited
     else:
         query = _id
     XnX = await m.reply_text("⏳")

Powers/utils/custom_filters.py

@@ -9,14 +9,14 @@ from pyrogram.errors import RPCError, UserNotParticipant
 from pyrogram.filters import create
 from pyrogram.types import CallbackQuery, ChatJoinRequest, Message
 
-from Powers import DEV_USERS, OWNER_ID, SUDO_USERS
+from Powers import DEV_USERS, OWNER_ID, PREFIX_HANDLER, SUDO_USERS
+from Powers.bot_class import Gojo
 from Powers.database.afk_db import AFK
 from Powers.database.approve_db import Approve
 from Powers.database.autojoin_db import AUTOJOIN
 from Powers.database.disable_db import Disabling
 from Powers.database.flood_db import Floods
 from Powers.utils.caching import ADMIN_CACHE, admin_cache_reload
-from Powers.vars import Config
 
 
 def command(
@@ -26,7 +26,7 @@ def command(
     dev_cmd: bool = False,
     sudo_cmd: bool = False,
 ):
-    async def func(flt, _, m: Message):
+    async def func(flt, c: Gojo, m: Message):
         if not m:
             return
 
@@ -62,8 +62,8 @@ def command(
         if not text:
             return False
         regex = r"^[{prefix}](\w+)(@{bot_name})?(?: |$)(.*)".format(
-            prefix="|".join(escape(x) for x in Config.PREFIX_HANDLER),
-            bot_name=Config.BOT_USERNAME,
+            prefix="|".join(escape(x) for x in PREFIX_HANDLER),
+            bot_name=c.me.username,
         )
         matches = compile_re(regex).search(text)
         if matches:
@@ -111,7 +111,7 @@ def command(
     )
 
 
-async def bot_admin_check_func(_, __, m: Message or CallbackQuery):
+async def bot_admin_check_func(_, c: Gojo, m: Message or CallbackQuery):
     """Check if bot is Admin or not."""
 
     if isinstance(m, CallbackQuery):
@@ -135,7 +135,7 @@ async def bot_admin_check_func(_, __, m: Message or CallbackQuery):
         if ("The chat_id" and "belongs to a user") in ef:
             return True
 
-    if Config.BOT_ID in admin_group:
+    if c.me.id in admin_group:
         return True
 
     await m.reply_text(

Powers/utils/start_utils.py

@@ -5,7 +5,7 @@ from traceback import format_exc
 from pyrogram.errors import RPCError
 from pyrogram.types import CallbackQuery, Message
 
-from Powers import HELP_COMMANDS, LOGGER, SUPPORT_GROUP
+from Powers import HELP_COMMANDS, LOGGER, OWNER_ID, SUPPORT_CHANNEL
 from Powers.bot_class import Gojo
 from Powers.database.chats_db import Chats
 from Powers.database.notes_db import Notes
@@ -65,7 +65,7 @@ async def gen_start_kb(q: Message or CallbackQuery):
                 ),
                 (
                     "Owner ❤️",
-                    Config.OWNER_ID,
+                    OWNER_ID,
                     "user_id",
                 ),
             ],
@@ -77,7 +77,7 @@ async def gen_start_kb(q: Message or CallbackQuery):
                 ),
                 (
                     "Powered by ⚡️",
-                    f"https://{Config.SUPPORT_CHANNEL}.t.me",
+                    f"https://{SUPPORT_CHANNEL}.t.me",
                     "url",
                 ),
             ],
@@ -95,7 +95,7 @@ async def get_private_note(c: Gojo, m: Message, help_option: str):
         chat_title = Chats.get_chat_info(chat_id)["chat_name"]
         rply = f"Notes in {chat_title}:\n\n"
         note_list = [
-            f"- [{note[0]}](https://t.me/{Config.BOT_USERNAME}?start=note_{chat_id}_{note[1]})"
+            f"- [{note[0]}](https://t.me/{c.me.username}?start=note_{chat_id}_{note[1]})"
             for note in all_notes
         ]
         rply = f"Available notes in {chat_title}\n"

Powers/utils/sticker_help.py

@@ -9,10 +9,89 @@ from typing import List, Tuple
 from PIL import Image, ImageDraw, ImageFont
 from pyrogram import errors, raw
 from pyrogram.file_id import FileId
+from pyrogram.types import InlineKeyboardButton as ikb
+from pyrogram.types import InlineKeyboardMarkup as ikm
 from pyrogram.types import Message
 from unidecode import unidecode
 
 from Powers.bot_class import Gojo
+from Powers.utils.string import encode_decode
+
+
+async def get_all_sticker_packs(c: Gojo, user_id: int, st_type: str, offset: int = 1, limit: int = 25):
+    packnum = 25 * (offset - 1)
+    if st_type == "norm":
+        st_ = "Static"
+    elif st_type == "vid":
+        st_ = "Video"
+    else:
+        st_ = "Animated"
+    txt = f"Here is your {st_} stickers that I have created:\nPage: {offset}\n"
+    while True:
+        packname = f"CE{str(user_id)}{st_type}{packnum}_by_{c.me.username}"
+        sticker_set = await get_sticker_set_by_name(c,packname)
+        if not sticker_set and packnum == 0:
+            txt, kb = None, None
+            break
+        elif sticker_set and packnum <= (packnum + limit - 1):
+            base_ = f"t.me/addstickers/{packname}"
+            txt += f"`{packnum}`. [{sticker_set.set.name}]({base_})\n"
+            packnum += 1
+        else:
+            page = await encode_decode(f"1_{user_id}")
+            if st_type == "norm":
+                st_kb = [
+                    [
+                        ikb("Video stickers", f"stickers_vid_{page}"),
+                        ikb("Animated stickers", f"stickers_ani_{page}"),
+                    ]
+                ]
+            elif st_type == "vid":
+                st_kb = [
+                    [
+                        ikb("Static stickers", f"stickers_norm_{page}"),
+                        ikb("Animated stickers", f"stickers_ani_{page}"),
+                    ]
+                ]
+            else:
+                st_kb = [
+                    [
+                        ikb("Static stickers", f"stickers_norm_{page}"),
+                        ikb("Video stickers", f"stickers_vid_{page}"),
+                    ]
+                ]
+
+            b64_next = await encode_decode(f"{offset+1}_{user_id}")
+            b64_prev = await encode_decode(f"{offset-1}_{user_id}")
+
+            if (packnum > (packnum + limit - 1)) and offset >= 2:
+                kb = [
+                    [
+                        ikb("Previous", f"stickers_{st_type}_{b64_prev}"),
+                        ikb("Next", f"stickers_{st_type}_{b64_next}")
+                    ],
+                ]
+                kb.extend(st_kb)
+            elif offset >= 2 and (packnum <= (packnum + limit - 1)):
+                kb = [
+                    [
+                        ikb("Previous", f"stickers_{st_type}_{b64_prev}")
+                    ],
+                ]
+                kb.extend(st_kb)
+            elif packnum > (packnum + limit - 1) and offset == 1:
+                kb = [
+                    [
+                        ikb("Next", f"stickers_{st_type}_{b64_next}")
+                    ],
+                ]
+                kb.extend(st_kb)
+            else:
+                kb = st_kb
+            kb = ikm(kb)
+            break
+    
+    return txt, kb
 
 
 async def runcmd(cmd: str) -> Tuple[str, str, int, int]:

Powers/utils/web_helpers.py

@@ -118,7 +118,7 @@ async def youtube_downloader(c: Gojo, m: Message, query: str, is_direct: bool, t
         video = True
         song = False
     # ydl = yt_dlp.YoutubeDL(opts)
-    dicti = await song_search(query, is_direct, 1)
+    dicti = await song_search(query, 1)
     if not dicti and type(dicti) != str:
         await m.reply_text("File with duration less than or equals to 10 minutes is allowed only")
     elif type(dicti) == str:

Powers/vars.py

@@ -52,10 +52,9 @@ class Config:
     SUPPORT_CHANNEL = config("SUPPORT_CHANNEL", default="gojo_bots_network")
     WORKERS = int(config("WORKERS", default=16))
     TIME_ZONE = config("TIME_ZONE", default='Asia/Kolkata')
-    BOT_USERNAME = ""
-    BOT_ID = ""
-    BOT_NAME = ""
-    owner_username = ""
+    BOT_USERNAME = "" # Leave it as it is
+    BOT_ID = ""    # Leave it as it is
+    BOT_NAME = ""  # Leave it as it is
 
 
 class Development:

requirements.txt

@@ -1,41 +1,41 @@
-aiofiles==23.2.1; python_full_version >= "3.7"
-anyio==4.2.0; python_full_version >= "3.6.2" and python_version >= "3.6"
+aiofiles==23.2.1
+anyio==4.2.0
 apscheduler==3.10.4
 asyncio==3.4.3
-beautifulsoup4==4.12.2; python_full_version >= "3.6"
-cachetools==5.2.0; python_version >= "3.7" and python_version < "4.0"
+beautifulsoup4==4.12.2
+cachetools==5.2.0
 captcha==0.5.0
-certifi==2023.7.22; python_version >= "3.7" and python_version < "4"
-charset-normalizer==2.1.0; python_version >= "3.7" and python_version < "4" and python_full_version >= "3.6.0"
-dnspython==2.2.1; python_version >= "3.6" and python_version < "4.0"
+certifi==2023.7.22
+charset-normalizer==2.1.0
+dnspython==2.2.1
 google==3.0.0
-gpytranslate==1.5.1; python_version >= "3.6"
+gpytranslate==1.5.1
 lyricsgenius==3.0.1
-lxml==4.9.1; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.5.0"
+lxml==4.9.1
 pillow == 10.1.0
 prettyconf==2.2.1
-pyaes==1.6.1; python_version >= "3.6" and python_version < "4.0"
+pyaes==1.6.1
 pymongo==4.6.1
-pyrogram==2.0.106; python_version >= "3.8"
-pysocks==1.7.1; python_version >= "3.7" and python_full_version < "3.0.0" and python_version < "4.0" or python_version >= "3.7" and python_version < "4.0" and python_full_version >= "3.4.0"
-python-dateutil==2.8.2; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.3.0")
+git+https://github.com/KurimuzonAkuma/pyrogram.git@v2.1.22
+pysocks==1.7.1
+python-dateutil==2.8.2
 pytube==15.0.0
 pytz==2023.3
-pyyaml==6.0.1; python_version >= "3.6"
+pyyaml==6.0.1
 qrcode==7.4.2
-regex==2023.12.25; python_version >= "3.6"
+regex==2023.12.25
 requests==2.31.0
-rfc3986==1.5.0; python_version >= "3.7"
+rfc3986==1.5.0
 search-engine-parser==0.6.8
 selenium==4.18.1
-six==1.16.0; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.3.0"
-sniffio==1.3.0; python_full_version >= "3.6.2" and python_version >= "3.7"
-soupsieve==2.4; python_version >= "3.6" and python_full_version >= "3.6.0"
-tgcrypto==1.2.5; python_version >= "3.6" and python_version < "4.0"
+six==1.16.0
+sniffio==1.3.0
+soupsieve==2.4
+tgcrypto==1.2.5
 tswift==0.7.0
-typing-extensions==4.5.0; python_full_version >= "3.6.2" and python_version >= "3.7" and python_version < "3.8"
-ujson==5.8.0; python_version >= "3.7"
-urllib3==1.26.18; python_version >= "3.7" and python_full_version < "3.0.0" and python_version < "4" or python_full_version >= "3.6.0" and python_version < "4" and python_version >= "3.7"
+typing-extensions==4.5.0
+ujson==5.8.0
+urllib3==1.26.18
 uvloop==0.19.0
 wikipedia==1.4.0
 youtube-search-python==1.6.6