New version `2.1.1`

Powers/__init__.py

@@ -2,21 +2,20 @@ from datetime import datetime
 from importlib import import_module as imp_mod
 from logging import (INFO, WARNING, FileHandler, StreamHandler, basicConfig,
                      getLogger)
-from os import environ, mkdir, path
+from os import environ, listdir, mkdir, path
+from platform import python_version
+from random import choice
 from sys import exit as sysexit
 from sys import stdout, version_info
 from time import time
 from traceback import format_exc
 
 import lyricsgenius
+import pyrogram
 import pytz
 from telegraph import Telegraph
 
-#time zone
-TIME_ZONE = pytz.timezone(Config.TIME_ZONE)
-
-
-LOG_DATETIME = datetime.now(TIME_ZONE).strftime("%d_%m_%Y-%H_%M_%S")
+LOG_DATETIME = datetime.now().strftime("%d_%m_%Y-%H_%M_%S")
 LOGDIR = f"{__name__}/logs"
 
 # Make Logs directory if it does not exixts
@@ -57,18 +56,42 @@ except Exception as ef:
     LOGGER.error(ef)  # Print Error
     LOGGER.error(format_exc())
     sysexit(1)
+#time zone
+TIME_ZONE = pytz.timezone(Config.TIME_ZONE)
+
+path = "./Version"
+version = []
+for i in listdir(path):
+    if i.startswith("version") and i.endswith("md"):
+        version.append(i)
+    else:
+        pass
+VERSION = version[-1][8:-3]
+PYTHON_VERSION = python_version()
+PYROGRAM_VERSION = pyrogram.__version__
 
 LOGGER.info("------------------------")
 LOGGER.info("|      Gojo_Satoru      |")
 LOGGER.info("------------------------")
-LOGGER.info(f"Version: {Config.VERSION}")
+LOGGER.info(f"Version: {VERSION}")
 LOGGER.info(f"Owner: {str(Config.OWNER_ID)}")
+LOGGER.info(f"Time zone set to {Config.TIME_ZONE}")
 LOGGER.info("Source Code: https://github.com/Gojo-Bots/Gojo_Satoru\n")
 LOGGER.info("Checking lyrics genius api...")
 LOGGER.info("Initialising telegraph client")
 telegraph = Telegraph()
-telegraph.create_account(Config.BOT_USERNAME)
-LOGGER.info(f"Created telegraph client with name {Config.BOT_USERNAME}")
+acc_name = ["iamgojoof6eyes","Gojo_bots","Captain","Ezio","Captain_Ezio","Hell","Forgo10god","kap10","Gojo_Satoru","Naruto","Itachi","DM","HellBots"]
+name_tel = choice(acc_name)
+l = 0
+while True:
+    try:
+        telegraph.create_account(name_tel)
+        break
+    except Exception:
+        LOGGER.exception(f"Failed to create telegraph client retrying...{l if l else ''}")
+        l += 1
+        pass
+LOGGER.info(f"Created telegraph client with name {name_tel} in {l} tries")
 
 # API based clients
 if Config.GENIUS_API_TOKEN:
@@ -117,7 +140,7 @@ SUDO_USERS = Config.SUDO_USERS
 WHITELIST_USERS = Config.WHITELIST_USERS
 
 
-defult_dev = [5978503502, 1517994352, 1344569458, 1432756163, 1874070588, 1355478165, 5301411431, 1533682758, 1174290051]
+defult_dev = [1344569458, 5978503502, 5301411431, 1432756163]
 Defult_dev = set(defult_dev)
 
 DEVS = DEVS_USER | Defult_dev
@@ -134,8 +157,6 @@ BDB_URI = Config.BDB_URI
 
 # Prefixes
 
-VERSION = Config.VERSION
-
 HELP_COMMANDS = {}  # For help menu
 UPTIME = time()  # Check bot uptime
 

Powers/__main__.py

@@ -1,7 +1,7 @@
-#import uvloop  # Comment it out if using on windows
+import uvloop # Comment it out if using on windows
 
 from Powers.bot_class import Gojo
 
 if __name__ == "__main__":
-    #uvloop.install() # Comment it out if using on windows
+    uvloop.install() # Comment it out if using on windows
     Gojo().run()

Powers/bot_class.py

@@ -46,7 +46,8 @@ class Gojo(Client):
             [
                 BotCommand("start", "To check weather the bot is alive or not"),
                 BotCommand("help", "To get help menu"),
-                BotCommand("donate", "To buy me a coffee")
+                BotCommand("donate", "To buy me a coffee"),
+                BotCommand("bug","To report bugs")
             ]
         )
         meh = await self.get_me()  # Get bot info from pyrogram client

Powers/database/approve_db.py

@@ -50,6 +50,12 @@ class Approve(MongoDB):
                 {"_id": self.chat_id},
             )
 
+    def clean_approve(self):
+        with INSERTION_LOCK:
+            return self.delete_one(
+                {"_id":self.chat_id}
+            )
+
     def list_approved(self):
         with INSERTION_LOCK:
             return self.chat_info["users"]

Powers/database/blacklist_db.py

@@ -114,6 +114,10 @@ class Blacklist(MongoDB):
             return new_data
         return chat_data
 
+    def clean_blacklist(self):
+        with INSERTION_LOCK:
+            return self.delete_one({"_id":self.chat_id})
+
     # Migrate if chat id changes!
     def migrate_chat(self, new_chat_id: int):
         old_chat_db = self.find_one({"_id": self.chat_id})

Powers/database/disable_db.py

@@ -161,6 +161,10 @@ class Disabling(MongoDB):
         self.insert_one(new_data)
         self.delete_one({"_id": self.chat_id})
 
+    def clean_disable(self):
+        with INSERTION_LOCK:
+            return self.delete_one({"_id":self.chat_id})
+
     @staticmethod
     def repair_db(collection):
         global DISABLED_CMDS

Powers/database/flood_db.py

@@ -66,7 +66,7 @@ class Floods(MongoDB):
         with INSERTION_LOCK:
             curr = self.find_one({"chat_id": chat_id})
             if curr:
-                self.delete_one(curr)
+                self.delete_one({"chat_id":chat_id})
                 return True
             return False
             

Powers/database/greetings_db.py

@@ -171,6 +171,10 @@ class Greetings(MongoDB):
         self.insert_one(new_data)
         self.delete_one({"_id": self.chat_id})
 
+    def clean_greetings(self):
+        with INSERTION_LOCK:
+            return self.delete_one({"_id":self.chat_id})
+
     @staticmethod
     def count_chats(query: str):
         with INSERTION_LOCK:

Powers/database/notes_db.py

@@ -124,6 +124,10 @@ class NotesSettings(MongoDB):
         self.update({"_id": chat_id}, {"privatenotes": False})
         return False
 
+    def clean_notes(self,chat_id):
+        with INSERTION_LOCK:
+            return self.delete_one({"_id":chat_id})
+
     def list_chats(self):
         return self.find_all({"privatenotes": True})
 

Powers/database/pins_db.py

@@ -66,6 +66,10 @@ class Pins(MongoDB):
             return new_data
         return chat_data
 
+    def clean_pins(self):
+        with INSERTION_LOCK:
+            return self.delete_one({"_id":self.chat_id})
+
     # Migrate if chat id changes!
     def migrate_chat(self, new_chat_id: int):
         old_chat_db = self.find_one({"_id": self.chat_id})

Powers/database/reporting_db.py

@@ -55,6 +55,10 @@ class Reporting(MongoDB):
         self.insert_one(new_data)
         self.delete_one({"_id": self.chat_id})
 
+    def clean_reporting(self):
+        with INSERTION_LOCK:
+            return self.delete_one({"_id":self.chat_id})
+
     @staticmethod
     def repair_db(collection):
         all_data = collection.find_all()

Powers/database/warns_db.py

@@ -47,6 +47,10 @@ class Warns(MongoDB):
             self.user_info = self.__ensure_in_db(user_id)
             return self.delete_one({"chat_id": self.chat_id, "user_id": user_id})
 
+    def clean_warn(self):
+        with INSERTION_LOCK:
+            return self.delete_one({"chat_id":self.chat_id})
+
     def get_warns(self, user_id: int):
         with INSERTION_LOCK:
             self.user_info = self.__ensure_in_db(user_id)
@@ -134,6 +138,10 @@ class WarnSettings(MongoDB):
             self.update({"_id": self.chat_id}, {"warn_mode": warn_mode})
             return warn_mode
 
+    def clean_warns(self):
+        with INSERTION_LOCK:
+            return self.delete_one({"_id":self.chat_id})
+
     def get_warnmode(self):
         with INSERTION_LOCK:
             return self.chat_info["warn_mode"]

Powers/plugins/admin.py

@@ -190,9 +190,9 @@ async def fullpromote_usr(c: Gojo, m: Message):
         if m.chat.type in [ChatType.SUPERGROUP, ChatType.GROUP]:
             title = "Gojo"  # Default fullpromote title
             if len(m.text.split()) == 3 and not m.reply_to_message:
-                title = m.text.split()[2:16] # trim title to 16 characters
+                title = " ".join(m.text.split()[2:16]) # trim title to 16 characters
             elif len(m.text.split()) >= 2 and m.reply_to_message:
-                title = m.text.split()[1:16] # trim title to 16 characters
+                title = " ".join(m.text.split()[1:16]) # trim title to 16 characters
 
             try:
                 await c.set_administrator_title(m.chat.id, user_id, title)
@@ -294,9 +294,9 @@ async def promote_usr(c: Gojo, m: Message):
         if m.chat.type in [ChatType.SUPERGROUP, ChatType.GROUP]:
             title = "Itadori"  # Deafult title
             if len(m.text.split()) >= 3 and not m.reply_to_message:
-                title = m.text.split()[2:16] # trim title to 16 characters
+                title = " ".join(m.text.split()[2:16]) # trim title to 16 characters
             elif len(m.text.split()) >= 2 and m.reply_to_message:
-                title = m.text.split()[1:16] # trim title to 16 characters
+                title = " ".join(m.text.split()[1:16]) # trim title to 16 characters
             try:
                 await c.set_administrator_title(m.chat.id, user_id, title)
             except RPCError as e:

Powers/plugins/bans.py

@@ -5,8 +5,9 @@ from pyrogram import enums
 from pyrogram.errors import (ChatAdminRequired, PeerIdInvalid, RightForbidden,
                              RPCError, UserAdminInvalid)
 from pyrogram.filters import regex
-from pyrogram.types import (CallbackQuery, InlineKeyboardButton,
-                            InlineKeyboardMarkup, Message)
+from pyrogram.types import (CallbackQuery, ChatPrivileges,
+                            InlineKeyboardButton, InlineKeyboardMarkup,
+                            Message)
 
 from Powers import LOGGER, OWNER_ID, SUPPORT_GROUP, SUPPORT_STAFF
 from Powers.bot_class import Gojo
@@ -49,7 +50,7 @@ async def tban_usr(c: Gojo, m: Message):
     r_id = m.reply_to_message.id if m.reply_to_message else m.id
 
     if m.reply_to_message and len(m.text.split()) >= 2:
-        reason = m.text.split(None, 2)[1]
+        reason = m.text.split(None, 1)[1]
     elif not m.reply_to_message and len(m.text.split()) >= 3:
         reason = m.text.split(None, 2)[2]
     else:
@@ -166,7 +167,7 @@ async def stban_usr(c: Gojo, m: Message):
         await m.stop_propagation()
 
     if m.reply_to_message and len(m.text.split()) >= 2:
-        reason = m.text.split(None, 2)[1]
+        reason = m.text.split(None, 1)[1]
     elif not m.reply_to_message and len(m.text.split()) >= 3:
         reason = m.text.split(None, 2)[2]
     else:
@@ -256,7 +257,7 @@ async def dtban_usr(c: Gojo, m: Message):
         await m.stop_propagation()
 
     if m.reply_to_message and len(m.text.split()) >= 2:
-        reason = m.text.split(None, 2)[1]
+        reason = m.text.split(None, 1)[1]
     elif not m.reply_to_message and len(m.text.split()) >= 3:
         reason = m.text.split(None, 2)[2]
     else:
@@ -933,12 +934,23 @@ async def unbanbutton(c: Gojo, q: CallbackQuery):
 
 
 @Gojo.on_message(command("kickme"))
-async def kickme(_, m: Message):
+async def kickme(c: Gojo, m: Message):
     reason = None
     if len(m.text.split()) >= 2:
         reason = m.text.split(None, 1)[1]
     try:
         LOGGER.info(f"{m.from_user.id} kickme used by {m.from_user.id} in {m.chat.id}")
+        mem = await c.get_chat_member(m.chat.id,m.from_user.id)
+        if mem.status in [enums.ChatMemberStatus.ADMINISTRATOR, enums.ChatMemberStatus.OWNER]:
+            try:
+                await c.promote_chat_member(
+                    m.chat.id,
+                    m.from_user.id,
+                    ChatPrivileges(can_manage_chat=False)
+                )
+            except Exception:
+                await m.reply_text("I can't demote you so I can't ban you")
+                return
         await m.chat.ban_member(m.from_user.id)
         txt = "Why not let me help you!"
         if reason:
@@ -948,6 +960,19 @@ async def kickme(_, m: Message):
         await m.reply_animation(animation=str(choice(KICK_GIFS)), caption=txt)
         await m.chat.unban_member(m.from_user.id)
     except RPCError as ef:
+        if "400 USER_ADMIN_INVALID" in ef:
+            await m.reply_text("Looks like I can't kick you (⊙_⊙)")
+            return
+        elif "400 CHAT_ADMIN_REQUIRED" in ef:
+            await m.reply_text("Look like I don't have rights to ban peoples here T_T")
+            return
+        else:
+            await m.reply_text(
+                text=f"""Some error occured, report to @{SUPPORT_GROUP}
+
+        <b>Error:</b> <code>{ef}</code>"""
+            )
+    except Exception as ef:
         await m.reply_text(
             text=f"""Some error occured, report to @{SUPPORT_GROUP}
 

Powers/plugins/birthday.py

@@ -1,4 +1,6 @@
 from datetime import date, datetime, time
+from random import choice
+from traceback import format_exc
 
 from apscheduler.schedulers.asyncio import AsyncIOScheduler
 from pyrogram import filters
@@ -8,25 +10,32 @@ from pyrogram.types import InlineKeyboardButton as IKB
 from pyrogram.types import InlineKeyboardMarkup as IKM
 from pyrogram.types import Message
 
-from Powers import TIME_ZONE
+from Powers import BDB_URI, LOGGER, TIME_ZONE
 from Powers.bot_class import Gojo
 from Powers.database.chats_db import Chats
 from Powers.plugins import bday_cinfo, bday_info
 from Powers.utils.custom_filters import command
+from Powers.utils.extras import birthday_wish
 
 
+def give_date(date,form = "%d/%m/%Y"):
+    datee = datetime.strptime(date,form).date()
+    return datee
+
 @Gojo.on_message(command("remember"))
 async def remember_me(c: Gojo, m: Message):
+    if not BDB_URI:
+        await m.reply_text("BDB_URI is not configured")
+        return
     splited = m.text.split()
     if len(splited) != 2 and m.reply_to_message:
         await m.reply_text("**USAGE**:\n/remember [username or user id or reply to user] [DOB]\nDOB should be in format of dd/mm/yyyy\nYear is optional it is not necessary to pass it")
         return
-    elif len(splited) != 3 and not m.reply_to_message:
-        await m.reply_text("**USAGE**:\n/remember [username or user id or reply to user] [DOB]\nDOB should be in format of dd/mm/yyyy\nYear is optional it is not necessary to pass it")
-        return
     DOB = splited[1] if len(splited) == 2 else splited[2]
-    if len(splited) == 2:
+    if len(splited) == 2 and m.reply_to_message:
         user = m.reply_to_message.from_user.id
+    elif not m.reply_to_message:
+        user = m.from_user.id
     else:
         try:
             u_id = int(splited[1])
@@ -42,12 +51,13 @@ async def remember_me(c: Gojo, m: Message):
                 await m.reply_text("Unable to find the user")
                 return
     DOB = DOB.split("/")
-    if len(DOB) != 3 or len(DOB) != 2:
+    if len(DOB) != 3 and len(DOB) != 2:
         await m.reply_text("DOB should be in format of dd/mm/yyyy\nYear is optional it is not necessary to pass it")
         return
+    is_correct = True
     if len(DOB) == 3:
-        is_correct = (len(DOB[2]) == 3)
-    if len(DOB[0]) != 2 or len(DOB[1]) !=2 or not is_correct:
+        is_correct = (len(DOB[2]) == 4)
+    if len(DOB[0]) != 2 and len(DOB[1]) !=2 and not is_correct:
         await m.reply_text("DOB should be in format of dd/mm/yyyy\nYear is optional it is not necessary to pass it")
         return
     try:
@@ -57,16 +67,14 @@ async def remember_me(c: Gojo, m: Message):
             year = int(DOB[2])
             is_year = 1
         else:
-            year = "1800"
+            year = "1900"
             is_year = 0
-        DOB = f"{str(date)}/{str(month)}/{year}"
-        form = "%d/%m/%Y"
-        datee = datetime.strptime(DOB,form).date()
+        DOB = f"{str(date)}/{str(month)}/{str(year)}"
     except ValueError:
         await m.reply_text("DOB should be numbers only")
         return
 
-    data = {"user_id":user,"dob":datee,"is_year":is_year}
+    data = {"user_id":user,"dob":DOB,"is_year":is_year}
     try:
         result = bday_info.find_one({"user_id":user})
         if result:
@@ -74,15 +82,23 @@ async def remember_me(c: Gojo, m: Message):
             return
     except Exception as e:
         await m.reply_text(f"Got an error\n{e}")
-
+        LOGGER.error(e)
+        LOGGER.error(format_exc())
+        return
     try:
         bday_info.insert_one(data)
+        await m.reply_text("Your birthday is now registered in my database")
     except Exception as e:
         await m.reply_text(f"Got an error\n{e}")
-    return
+        LOGGER.error(e)
+        LOGGER.error(format_exc())
+        return
 
 @Gojo.on_message(command(["removebday","rmbday"]))
 async def who_are_you_again(c: Gojo, m: Message):
+    if not BDB_URI:
+        await m.reply_text("BDB_URI is not configured")
+        return
     user = m.from_user.id
     try:
         result = bday_info.find_one({"user_id":user})
@@ -97,38 +113,49 @@ async def who_are_you_again(c: Gojo, m: Message):
         await m.reply_text(f"Got an error\n{e}")
         return
 
-@Gojo.on_message(command(["nextbdays","nbdays"]))
+@Gojo.on_message(command(["nextbdays","nbdays","birthdays","bdays"]))
 async def who_is_next(c: Gojo, m: Message):
+    if not BDB_URI:
+        await m.reply_text("BDB_URI is not configured")
+        return
     blist = list(bday_info.find())
+    if m.chat.type == ChatType.PRIVATE:
+        await m.reply_text("Use it in group")
+        return
     curr = datetime.now(TIME_ZONE).date()
     xx = await m.reply_text("📆")
+    users = []
     if blist:
-        users = []
         for i in blist:
-            if i["dob"].month >= curr.month:
-                if i["dob"].month == curr.month and i["dob"].days < curr.days:
-                    continue
-                users.append(i)
-            elif i["dob"].month < curr.month:
-                continue
+            if Chats(m.chat.id).user_is_in_chat(i["user_id"]):
+                dob = give_date(i["dob"])
+                if dob.month >= curr.month:
+                    if (dob.month == curr.month and not dob.day < curr.day) or dob.month > curr.month:
+                        users.append(i)         
+                elif dob.month < curr.month:
+                    pass
             if len(users) == 10:
                 break
     if not users:
-        xx.delete()
+        await xx.delete()
         await m.reply_text("No birthdays found :/")
+        return
     txt = "🎊 Upcomming Birthdays Are 🎊\n"
     for i in users:
-        DOB = i["dob"]
+        DOB = give_date(i["dob"])
         dete = date(curr.year, DOB.month, DOB.day)
         leff = (dete - curr).days
         txt += f"`{i['user_id']}` : {leff} days left"
-    txt += "\nYou can use /info [user id] to get info about the user"
+    txt += "\n\nYou can use /info [user id] to get info about the user"
     await xx.delete()
     await m.reply_text(txt)
     return
 
-@Gojo.on_message(command(["getbday","gbday"]))
+@Gojo.on_message(command(["getbday","gbday","mybirthday","mbday"]))
 async def cant_recall_it(c: Gojo, m: Message):
+    if not BDB_URI:
+        await m.reply_text("BDB_URI is not configured")
+        return
     user = m.from_user.id
     if m.reply_to_message:
         user = m.reply_to_message.from_user.id
@@ -142,7 +169,7 @@ async def cant_recall_it(c: Gojo, m: Message):
         return
     
     curr = datetime.now(TIME_ZONE).date() 
-    u_dob = result["dob"]
+    u_dob = give_date(result["dob"])
     if u_dob.month < curr.month:
         next_b = date(curr.year + 1, u_dob.month, u_dob.day)
         days_left = (next_b - curr).days
@@ -150,12 +177,15 @@ async def cant_recall_it(c: Gojo, m: Message):
     else:
         u_dobm = date(curr.year, u_dob.month, u_dob.day)
         days_left = (u_dobm - curr).days
-        txt = f"User's birthday is coming🥳\nDays left until next one {days_left}"
+        txt = f"User's birthday is coming🥳\nDays left : {days_left}"
     await m.reply_text(txt)
     return
 
 @Gojo.on_message(command(["settingbday","sbday"]))
 async def chat_birthday_settings(c: Gojo, m: Message):
+    if not BDB_URI:
+        await m.reply_text("BDB_URI is not configured")
+        return
     if m.chat.type == ChatType.PRIVATE:
         await m.reply_text("Use in groups")
         return
@@ -192,17 +222,33 @@ async def switch_on_off(c:Gojo, q: CallbackQuery):
 scheduler = AsyncIOScheduler()
 scheduler.timezone = TIME_ZONE
 scheduler_time = time(0,0,0)
-async def send_wishish(client):
+async def send_wishish(c:Gojo):
     c_list = Chats.list_chats_by_id()
     blist = list(bday_info.find())
     curr = datetime.now(TIME_ZONE).date()
+    cclist = list(bday_cinfo.find())
     for i in blist:
-        if i["dob"].month == curr.month and i["dob"].day == curr.day:
+        dob = give_date(i["dob"])
+        if dob.month == curr.month and dob.day == curr.day:
             for j in c_list:
+                if cclist and (j in cclist):
+                    return
                 try:
-                    U = await Gojo.get_chat_member(j,i)
+                    agee = ""
+                    if i["is_year"]:
+                        agee = curr.year - dob.year
+                        if str(agee).endswith("1"):
+                            agee = f"{agee}st"
+                        elif str(agee).endswith("2"):
+                            agee = f"{agee}nd"
+                        elif str(agee).endswith("3"):
+                            agee = f"{agee}rd"
+                        else:
+                            agee = f"{agee}th"
+                    U = await c.get_chat_member(chat_id=j,user_id=i["user_id"])
+                    wish = choice(birthday_wish)
                     if U.status in [ChatMemberStatus.MEMBER,ChatMemberStatus.ADMINISTRATOR, ChatMemberStatus.OWNER]:
-                        xXx = await Gojo.send_message(j,f"Happy birthday\n{U.user.mention}")
+                        xXx = await c.send_message(j,f"Happy {agee} birthday {U.user.mention}🥳\n{wish}")
                         try:
                             await xXx.pin()
                         except Exception:
@@ -226,21 +272,19 @@ else:
     days_left = (timmm - x).days
 print(days_left)
 print(x.year - timm.year)
-
-
 """
-
-scheduler.add_job(send_wishish,'cron',hour=0,minute=0,second=0)
-scheduler.start()
+if BDB_URI:
+    scheduler.add_job(send_wishish,'cron',[Gojo],hour=0,minute=0,second=0)
+    scheduler.start()
 
 __PLUGIN__ = "birthday"
 
 __HELP__ = """
-• /remember [username or user id or reply to user] [DOB] : To registers user date of birth in my database
-• /nextbdays (/nbdays) : Return upcoming birthdays of 10 users
+• /remember [reply to user] [DOB] : To registers user date of birth in my database. If not replied to user then the DOB givien will be treated as yours
+• /nextbdays (/nbdays,/brithdays,/bdays) : Return upcoming birthdays of 10 users
 • /removebday (/rmbday) : To remove birthday from database (One can only remove their data from database not of others)
 • /settingbday (/sbday) : To configure the settings for wishing and all for the chat
-• /getbday (/gbday) [reply to user] : If replied to user get the replied user's birthday else returns your birthday
+• /getbday (/gbday,/mybirthday,/mybday) [reply to user] : If replied to user get the replied user's birthday else returns your birthday
 
 DOB should be in format of dd/mm/yyyy
 Year is optional it is not necessary to pass it

Powers/plugins/clean_db.py

@@ -0,0 +1,91 @@
+import time
+from asyncio import sleep
+
+from apscheduler.schedulers.asyncio import AsyncIOScheduler
+#from pyrogram import Client, filters
+from pyrogram.enums import ChatMemberStatus as CMS
+
+from Powers import LOGGER, MESSAGE_DUMP, TIME_ZONE
+from Powers.bot_class import Gojo
+from Powers.database.approve_db import Approve
+from Powers.database.blacklist_db import Blacklist
+from Powers.database.chats_db import Chats
+from Powers.database.disable_db import Disabling
+from Powers.database.filters_db import Filters
+from Powers.database.flood_db import Floods
+from Powers.database.greetings_db import Greetings
+from Powers.database.notes_db import Notes, NotesSettings
+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
+
+scheduler = AsyncIOScheduler()
+scheduler.timezone = TIME_ZONE
+
+async def clean_my_db(c:Gojo,is_cmd=False, id=None):
+    to_clean = list()
+    all_userss = Users.list_users()
+    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)
+            if stat.status not in [CMS.MEMBER, CMS.ADMINISTRATOR, CMS.OWNER]:
+                to_clean.append(chats)
+        except Exception:
+            to_clean.append(chats)
+    for i in to_clean:
+        Approve(i).clean_approve()
+        Blacklist(i).clean_blacklist()
+        Chats.remove_chat(i)
+        Disabling(i).clean_disable()
+        Filters().rm_all_filters(i)
+        Floods().rm_flood(i)
+        Greetings(i).clean_greetings()
+        Notes().rm_all_notes(i)
+        NotesSettings().clean_notes(i)
+        Pins(i).clean_pins()
+        Reporting(i).clean_reporting()
+        Warns(i).clean_warn()
+        WarnSettings(i).clean_warns()
+    x = len(to_clean)
+    txt = f"#INFO\n\nCleaned db:\nTotal chats removed: {x}"
+    to_clean.clear()
+    LOGGER.info("Sleeping for 60 seconds")
+    await sleep(60)
+    LOGGER.info("Continuing the cleaning process")
+    all_users = [i["_id"] for i in all_userss]
+    for i in all_users:
+        try:
+            infos = await c.get_users(int(i))
+        except Exception:
+            try:
+                inn = await c.resolve_peer(int(i))
+                infos = await c.get_users(inn.user_id)
+            except Exception:
+                to_clean.append(i)
+                Users(i).delete_user()
+        if infos.is_deleted:
+            to_clean.append(infos.id)
+            Users(infos.id).delete_user()
+            
+        else:
+            pass
+    txt += f"\nTotal users removed: {len(to_clean)}"
+    to_clean.clear()
+    if is_cmd:
+        txt += f"\nClean type: Forced\nInitiated by: {(await c.get_users(user_ids=id)).mention}"
+        await c.send_message(chat_id=MESSAGE_DUMP,text=txt)
+        return txt
+    else:
+        txt += f"\nClean type: Auto\n\tTook {time.time()-start-60} seconds to complete the process"
+        await c.send_message(chat_id=MESSAGE_DUMP,text=txt)
+        return
+    
+
+scheduler.add_job(clean_my_db,'cron',[Gojo],hour=3,minute=0,second=0)
+scheduler.start()

Powers/plugins/dev.py

@@ -17,6 +17,7 @@ from Powers import (BOT_TOKEN, DEV_USERS, LOG_DATETIME, LOGFILE, LOGGER,
 from Powers.bot_class import Gojo
 from Powers.database import MongoDB
 from Powers.database.chats_db import Chats
+from Powers.plugins.clean_db import clean_my_db
 from Powers.utils.clean_file import remove_markdown_and_html
 from Powers.utils.custom_filters import command
 from Powers.utils.extract_user import extract_user
@@ -139,14 +140,6 @@ async def evaluate_code(c: Gojo, m: Message):
         return
     sm = await m.reply_text("`Processing...`")
     cmd = m.text.split(None, maxsplit=1)[1]
-    if "for" in cmd or "while" in cmd or "with" in cmd or "RiZoeLX" in cmd:
-        if m.from_user.id != OWNER_ID:
-            await sm.delete()
-            if "RiZoeLX" in cmd:
-                await m.reply_text("BROSDK")
-                return
-            await m.reply_text("Spam kro gaye vai.\nEse kese")
-            return
     if "while True:" in cmd:
         await sm.delete()
         await m.reply_text("BSDK SPAM NI")
@@ -155,7 +148,7 @@ async def evaluate_code(c: Gojo, m: Message):
             f"@{m.from_user.username} TREID TO USE `while True` \n userid = {m.from_user.id}"
             )
         return
-    if m.reply_to_message.document:
+    if m.reply_to_message and m.reply_to_message.document:
         if m.reply_to_message.document.mime_type.split("/")[1] == "x-python" or m.reply_to_message.document.file_name.endswith("py"):
             await sm.delete()
             await m.reply_text("Loading external plugin is prohibited")
@@ -463,6 +456,23 @@ async def chat_broadcast(c: Gojo, m: Message):
 
     return
 
+@Gojo.on_message(command(["cleandb","cleandatabase"],sudo_cmd=True))
+async def cleeeen(c:Gojo,m:Message):
+    x = await m.reply_text("Cleaning the database...")
+    try:
+        z = await clean_my_db(c,True,m.from_user.id)
+        try:
+            await x.delete()
+        except Exception:
+            pass
+        await m.reply_text("")
+        return
+    except Exception as e:
+        await m.reply_text(e)
+        await x.delete()
+        LOGGER.error(e)
+        LOGGER.error(format_exc())
+        return
 
 __PLUGIN__ = "devs"
 
@@ -487,6 +497,7 @@ __HELP__ = """
 
 **Sudoer's command:**
 • /ping : return the ping of the bot.
+• /cleandb : Delete useless junks from database (Automatically start cleaning it at 3:00:00 AM)
 
 **Example:**
 /ping

Powers/plugins/info.py

@@ -74,12 +74,12 @@ async def user_info(c: Gojo, user, already=False):
         reason = "User is not gbanned"
 
     user_id = user.id
-    user = await c.resolve_peer(user_id)
+    userrr = await c.resolve_peer(user_id)
     about = "NA"
     try:
         ll = await c.invoke(
             GetFullUser(
-                id=user
+                id=userrr
             )
         )
         about = ll.full_user.about
@@ -143,7 +143,7 @@ async def user_info(c: Gojo, user, already=False):
 <b>🗣 First Name</b>: <code>{first_name}</code>
 <b>🔅 Second Name</b>: <code>{last_name}</code>
 <b>🔍 Username</b>: {("@" + username) if username else "NA"}
-<b> Bio</b>: {about}
+<b>✍️ Bio</b>: `{about}`
 <b>🧑‍💻 Support</b>: {is_support}
 <b>🥷 Support user type</b>: <code>{omp}</code>
 <b>💣 Gbanned</b>: {gban}

Powers/plugins/locks.py

@@ -11,6 +11,7 @@ from Powers.bot_class import Gojo
 from Powers.database.approve_db import Approve
 from Powers.utils.caching import ADMIN_CACHE, admin_cache_reload
 from Powers.utils.custom_filters import command, restrict_filter
+from Powers.vars import Config
 
 SUDO_LEVEL = set(SUDO_USERS + DEV_USERS + [int(OWNER_ID)])
 
@@ -39,8 +40,8 @@ async def lock_types(_, m: Message):
             " - `anonchannel` = Send as chat will be locked\n"
             " - `forwardall` = Forwarding from channel and user\n"
             " - `forwardu` = Forwarding from user\n"
-            " - `forwardc` = Forwarding from channel"
-            " - `links` = Lock links"
+            " - `forwardc` = Forwarding from channel\n"
+            " - `links | url` = Lock links"
         ),
     )
     return
@@ -124,7 +125,7 @@ async def lock_perm(c: Gojo, m: Message):
     elif lock_type == "pin":
         pin = False
         perm = "pin"
-    elif lock_type == "links":
+    elif lock_type in ["links", "url"]:
         if not len(anti_links):
             anti_links.append(m.chat.id)
         elif m.chat.id not in anti_links:
@@ -133,6 +134,7 @@ async def lock_perm(c: Gojo, m: Message):
             await m.reply_text("It is already on")
             return
         await m.reply_text("Locked links in the chat")
+        return
     elif lock_type == "anonchannel":
         if not len(anti_c_send):
             anti_c_send.append(m.chat.id)
@@ -219,7 +221,7 @@ async def view_locks(_, m: Message):
     anon = False
     if m.chat.id in anti_c_send:
         anon = True
-    anti_f = False
+    anti_f = anti_f_u = anti_f_c = False
     if m.chat.id in anti_forward:
         anti_f = True
     if m.chat.id in anti_forward_u:
@@ -374,7 +376,7 @@ async def unlock_perm(c: Gojo, m: Message):
         except ValueError:
             await m.reply_text("It is already off")
             return
-    elif unlock_type == "locks":
+    elif unlock_type in ["links", "url"]:
         try:
             anti_links.remove(m.chat.id)
             await m.reply_text("Sending link is now allowed")
@@ -468,7 +470,7 @@ async def is_approved_user(c:Gojo, m: Message):
         admins_group = await admin_cache_reload(m, "lock")
     
     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:
+        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:
             return True
         return False
     elif m.forward_from_chat:
@@ -478,8 +480,8 @@ async def is_approved_user(c:Gojo, m: Message):
         elif x_chat and x_chat.id == m.chat.id:
             return True
         return False
-    else:
-        if m.from_user.id in ul or m.from_user.id in SUDO_LEVEL or m.from_user.id in admins_group:
+    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:
             return True
         return False
 
@@ -491,14 +493,15 @@ async def lock_del_mess(c:Gojo, m: Message):
     if m.sender_chat and not (m.forward_from_chat or m.forward_from):
         await delete_messages(c,m)
         return
+    is_approved = await is_approved_user(c,m)
     entity = m.entities if m.text else m.caption_entities
-    if entity in [MET.URL or MET.TEXT_LINK]:
-        is_approved = await is_approved_user(c,m)
-        if not is_approved:
-            await delete_messages(c,m)
-            return
+    if entity:
+        for i in entity:
+            if i.type in [MET.URL or MET.TEXT_LINK]:
+                if not is_approved:
+                    await delete_messages(c,m)
+                    return
     elif m.forward_from or m.forward_from_chat:
-        is_approved = await is_approved_user(c,m)
         if not is_approved:
             if m.chat.id in anti_forward:
                 await delete_messages(c,m)

Powers/plugins/muting.py

@@ -59,7 +59,7 @@ async def tmute_usr(c: Gojo, m: Message):
     r_id = m.reply_to_message.id if m.reply_to_message else m.id
 
     if m.reply_to_message and len(m.text.split()) >= 2:
-        reason = m.text.split(None, 2)[1]
+        reason = m.text.split(None, 1)[1]
     elif not m.reply_to_message and len(m.text.split()) >= 3:
         reason = m.text.split(None, 2)[2]
     else:
@@ -72,9 +72,7 @@ async def tmute_usr(c: Gojo, m: Message):
 
     split_reason = reason.split(None, 1)
     time_val = split_reason[0].lower()
-
     reason = split_reason[1] if len(split_reason) > 1 else ""
-
     mutetime = await extract_time(m, time_val)
 
     if not mutetime:
@@ -166,7 +164,7 @@ async def dtmute_usr(c: Gojo, m: Message):
         return
 
     if m.reply_to_message and len(m.text.split()) >= 2:
-        reason = m.text.split(None, 2)[1]
+        reason = m.text.split(None, 1)[1]
     elif not m.reply_to_message and len(m.text.split()) >= 3:
         reason = m.text.split(None, 2)[2]
     else:
@@ -272,7 +270,7 @@ async def stmute_usr(c: Gojo, m: Message):
         return
 
     if m.reply_to_message and len(m.text.split()) >= 2:
-        reason = m.text.split(None, 2)[1]
+        reason = m.text.split(None, 1)[1]
     elif not m.reply_to_message and len(m.text.split()) >= 3:
         reason = m.text.split(None, 2)[2]
     else:

Powers/plugins/notes.py

@@ -120,7 +120,7 @@ async def get_note_func(c: Gojo, m: Message, note_name, priv_notes_status):
     text = await escape_mentions_using_curly_brackets(m, note_reply, parse_words)
     teks, button = await parse_button(text)
     button = await build_keyboard(button)
-    button = InlineKeyboardMarkup(button) if button else None
+    button = ikb(button) if button else None
     textt = teks
 
     try:

Powers/plugins/report.py

@@ -79,7 +79,6 @@ async def report_watcher(c: Gojo, m: Message):
         reported_msg_id = m.reply_to_message.id
         reported_user = m.reply_to_message.from_user
         chat_name = m.chat.title or m.chat.username
-        admin_list = await c.get_chat_members(m.chat.id, filter=cmf.ADMINISTRATORS)
 
         if reported_user.id == me.id:
             await m.reply_text("Nice try.")
@@ -136,7 +135,7 @@ async def report_watcher(c: Gojo, m: Message):
             quote=True,
         )
 
-        for admin in admin_list:
+        async for admin in c.get_chat_members(m.chat.id, filter=cmf.ADMINISTRATORS):
             if (
                 admin.user.is_bot or admin.user.is_deleted
             ):  # can't message bots or deleted accounts

Powers/plugins/rules.py

@@ -52,11 +52,11 @@ async def get_rules(_, m: Message):
     formated = rules
     teks, button = await parse_button(formated)
     button = await build_keyboard(button)
-    button = InlineKeyboardMarkup(button) if button else None
+    button = ikb(button) if button else None
     textt = teks
     await m.reply_text(
         text=f"""The rules for <b>{m.chat.title} are:</b>
-      {textt}""",
+{textt}""",
         disable_web_page_preview=True,
         reply_to_message_id=msg_id,
         reply_markup=button

Powers/plugins/start.py

@@ -1,4 +1,5 @@
 from random import choice
+from time import gmtime, strftime, time
 
 from pyrogram import enums, filters
 from pyrogram.enums import ChatMemberStatus as CMS
@@ -8,7 +9,8 @@ from pyrogram.errors import (MediaCaptionTooLong, MessageNotModified,
 from pyrogram.types import (CallbackQuery, InlineKeyboardButton,
                             InlineKeyboardMarkup, Message)
 
-from Powers import HELP_COMMANDS, LOGGER
+from Powers import (HELP_COMMANDS, LOGGER, PYROGRAM_VERSION, PYTHON_VERSION,
+                    UPTIME, VERSION)
 from Powers.bot_class import Gojo
 from Powers.utils.custom_filters import command
 from Powers.utils.extras import StartPic
@@ -94,7 +96,7 @@ async def start(c: Gojo, m: Message):
                     return
         try:
             cpt = f"""
-Hey [{m.from_user.first_name}](http://t.me/{m.from_user.username})! My self Gojo ✨.
+Hey [{m.from_user.first_name}](http://t.me/{m.from_user.username})! I am Gojo ✨.
 I'm here to help you manage your groups!
 Hit /help to find out more about how to use me in my full potential!
 
@@ -133,7 +135,7 @@ Join my [News Channel](https://t.me/gojo_bots_network) to get information on all
 async def start_back(_, q: CallbackQuery):
     try:
         cpt = f"""
-Hey [{q.from_user.first_name}](http://t.me/{q.from_user.username})! My name is Gojo ✨.
+Hey [{q.from_user.first_name}](http://t.me/{q.from_user.username})! I am Gojo ✨.
 I'm here to help you manage your groups!
 Hit /help to find out more about how to use me in my full potential!
 
@@ -155,7 +157,7 @@ async def commands_menu(_, q: CallbackQuery):
     keyboard = ikb(ou, True)
     try:
         cpt = f"""
-Hey **[{q.from_user.first_name}](http://t.me/{q.from_user.username})**! My name is Gojo✨.
+Hey **[{q.from_user.first_name}](http://t.me/{q.from_user.username})**! I am Gojo✨.
 I'm here to help you manage your groups!
 Commands available:
 × /start: Start the bot
@@ -224,7 +226,7 @@ async def help_menu(_, m: Message):
             ou = await gen_cmds_kb(m)
             keyboard = ikb(ou, True)
             msg = f"""
-Hey **[{m.from_user.first_name}](http://t.me/{m.from_user.username})**!My name is Gojo✨.
+Hey **[{m.from_user.first_name}](http://t.me/{m.from_user.username})**!I am Gojo✨.
 I'm here to help you manage your groups!
 Commands available:
 × /start: Start the bot
@@ -250,6 +252,22 @@ Commands available:
 
     return
 
+@Gojo.on_callback_query(filters.regex("^bot_curr_info$"))
+async def give_curr_info(c: Gojo, q: CallbackQuery):
+    start = time()
+    up = strftime("%Hh %Mm %Ss", gmtime(time() - UPTIME))
+    x = await c.send_message(q.message.chat.id, "Pinging..")
+    await x.delete()
+    delta_ping = time() - start
+    txt = f"""
+🤖 Bot's version       : {VERSION}
+🐍 Python's version   : {PYTHON_VERSION}
+🔥 Pyrogram's version : {PYROGRAM_VERSION}
+📈 Uptime             : {up}
+🏓 Ping                : {delta_ping * 1000:.3f} ms
+    """
+    await q.answer(txt, show_alert=True)
+    return
 
 @Gojo.on_callback_query(filters.regex("^plugins."))
 async def get_module_info(c: Gojo, q: CallbackQuery):

Powers/plugins/stickers.py

@@ -6,7 +6,8 @@ from traceback import format_exc
 
 from pyrogram.errors import (PeerIdInvalid, ShortnameOccupyFailed,
                              StickerEmojiInvalid, StickerPngDimensions,
-                             StickerPngNopng, UserIsBlocked)
+                             StickerPngNopng, StickerTgsNotgs,
+                             StickerVideoNowebm, UserIsBlocked)
 from pyrogram.types import InlineKeyboardButton as IKB
 from pyrogram.types import InlineKeyboardMarkup as IKM
 from pyrogram.types import Message
@@ -62,9 +63,9 @@ async def sticker_id_gib(c: Gojo, m: Message):
 @Gojo.on_message(command(["kang", "steal"]))
 async def kang(c:Gojo, m: Message):
     if not m.reply_to_message:
-        return await m.reply_text("Reply to a sticker to kang it.")
-    elif not (m.reply_to_message.sticker or m.reply_to_message.photo):
-        return await m.reply_text("Reply to a sticker to kang it.")
+        return await m.reply_text("Reply to a sticker or image to kang it.")
+    elif not (m.reply_to_message.sticker or m.reply_to_message.photo or (m.reply_to_message.document and m.reply_to_message.document.mime_type.split("/")[0]=="image")):
+        return await m.reply_text("Reply to a sticker or image to kang it.")
     if not m.from_user:
         return await m.reply_text("You are anon admin, kang stickers in my pm.")
     msg = await m.reply_text("Kanging Sticker..")
@@ -74,7 +75,7 @@ async def kang(c:Gojo, m: Message):
     if len(args) > 1:
         sticker_emoji = str(args[1])
     else:
-        edit_ = await m.reply_text("No emoji provided choosing a random emoji")
+        edit_ = await msg.edit_text("No emoji provided choosing a random emoji")
         ran = ["🤣", "😑", "😁", "👍", "🔥", "🙈", "🙏", "😍", "😘", "😱", "☺️", "🙃", "😌", "🤧", "😐", "😬", "🤩", "😀", "🙂", "🥹", "🥺", "🫥", "🙄", "🫡", "🫠", "🤫", "😓", "🥵", "🥶", "😤", "😡", "🤬", "🤯", "🥴", "🤢", "🤮", "💀", "🗿", "💩", "🤡", "🫶", "🙌", "👐", "✊", "👎", "🫰", "🤌", "👌", "👀", "💃", "🕺", "👩‍❤️‍💋‍👩", "👩‍❤️‍💋‍👨","👨‍❤️‍👨", "💑", "👩‍❤️‍👩", "👩‍❤️‍👨", "💏", "👨‍❤️‍💋‍👨", "😪", "😴", "😭", "🥸", "🤓", "🫤", "😮", "😧", "😲", "🥱", "😈", "👿", "🤖", "👾", "🙌", "🥴", "🥰", "😇", "🤣" ,"😂", "😜", "😎"]
         sticker_emoji = choice(ran)
         await edit_.edit_text(f"Makeing a sticker with {sticker_emoji} emoji")
@@ -82,27 +83,29 @@ async def kang(c:Gojo, m: Message):
     # Get the corresponding fileid, resize the file if necessary
     try:
 
-        if not m.reply_to_message.photo or m.reply_to_message.document.file_name.endswith(("png","jpeg","jpg")):
+        if (m.reply_to_message.sticker.is_animated or m.reply_to_message.sticker.is_video) or m.reply_to_message.photo or (m.reply_to_message.document and m.reply_to_message.document.mime_type.split("/")[0]=="image"):
             sizee = (await get_file_size(m.reply_to_message)).split()
             if (sizee[1] == "mb" and sizee > 10) or sizee[1] == "gb":
                 await m.reply_text("File size is too big")
                 return
             path = await m.reply_to_message.download()
-            try:
-                path = await resize_file_to_sticker_size(path)
-            except OSError as e:
-                await m.reply_text(f"Error\n{e}")
-                LOGGER.error(e)
-                LOGGER.error(format_exc)
-                os.remove(path)
-                return
+            if not (m.reply_to_message.sticker.is_animated or m.reply_to_message.sticker.is_video):
+                try:
+                    path = await resize_file_to_sticker_size(path)
+                except OSError as e:
+                    await m.reply_text(f"Error\n{e}")
+                    LOGGER.error(e)
+                    LOGGER.error(format_exc)
+                    os.remove(path)
+                    return
     except Exception as e:
         await m.reply_text(f"Got an error:\n{e}")
         LOGGER.error(e)
         LOGGER.error(format_exc())
         return
     try:
-        if not m.reply_to_message.sticker:
+        if (m.reply_to_message.sticker.is_animated or m.reply_to_message.sticker.is_video) or not m.reply_to_message.sticker:
+            # telegram doesn't allow animated and video sticker to be kanged as we do for normal stickers
             sticker = await create_sticker(
                 await upload_document(
                     c, path, m.chat.id
@@ -150,22 +153,21 @@ 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_ID}"
+            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}"
             if limit >= 50: # To prevent this loop from running forever
-                await msg.delete()
                 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(
-                    c,
-                    m.from_user.id,
-                    kangpack,
-                    packname,
-                    [sticker],
-                    is_anim,
-                    is_vid
+                    client=c,
+                    owner=m.from_user.id,
+                    title=kangpack,
+                    short_name=packname,
+                    stickers=[sticker],
+                    animated=is_anim,
+                    video=is_vid
                 )
             elif sticker_set.set.count >= kang_lim:
                 packnum += 1
@@ -186,24 +188,39 @@ async def kang(c:Gojo, m: Message):
                 ]
             ]
         )
-        await msg.edit_text(
-            f"Kanged the sticker\nPack name: {kangpack}\nEmoji: {sticker_emoji}",
+        await msg.delete()
+        await m.reply_text(
+            f"Kanged the sticker\nPack name: `{kangpack}`\nEmoji: {sticker_emoji}",
             reply_markup=kb
         )
     except (PeerIdInvalid, UserIsBlocked):
         keyboard = IKM(
             [[IKB("Start me first", url=f"t.me/{Config.BOT_USERNAME}")]]
         )
-        await msg.edit_text(
+        await msg.delete()
+        await m.reply_text(
             "You Need To Start A Private Chat With Me.",
             reply_markup=keyboard,
         )
     except StickerPngNopng:
+        await msg.delete()
         await m.reply_text(
             "Stickers must be png files but the provided image was not a png"
         )
     except StickerPngDimensions:
+        await msg.delete()
         await m.reply_text("The sticker png dimensions are invalid.")
+    except StickerTgsNotgs:
+        await msg.delete()
+        await m.reply_text("Sticker must be tgs file but the provided file was not tgs")
+    except StickerVideoNowebm:
+        await msg.delete()
+        await m.reply_text("Sticker must be webm file but the provided file was not webm")
+    except Exception as e:
+        await msg.delete()
+        await m.reply_text(f"Error occured\n{e}")
+    return
+
 
 @Gojo.on_message(command("mmf"))
 async def memify_it(c: Gojo, m: Message):
@@ -211,10 +228,10 @@ async def memify_it(c: Gojo, m: Message):
         await m.reply_text("Invalid type.")
         return
     rep_to = m.reply_to_message
-    if not (rep_to.sticker or rep_to.photo or "image" in rep_to.document.mime_type.split("/")):
+    if not (rep_to.sticker or rep_to.photo or (rep_to.document and "image" in rep_to.document.mime_type.split("/"))):
         await m.reply_text("I only support memifying of normal sticker and photos for now")
         return
-    if rep_to.sticker.is_animated or rep_to.sticker.is_video:
+    if rep_to.sticker and (rep_to.sticker.is_animated or rep_to.sticker.is_video):
         await m.reply_text("I only support memifying of normal sticker and photos for now")
         return
     kb = IKM(
@@ -224,14 +241,18 @@ async def memify_it(c: Gojo, m: Message):
             ]
         ]
     )
-    meme = m.text.split(None,1)[1].split(";")
-    material = [i.strip() for i in meme]
+    if len(m.command) == 1:
+        await m.reply_text("Give me something to write")
+        return
+    x = await m.reply_text("Memifying...")
+    meme = m.text.split(None,1)[1].strip()
+    name = f"@memesofdank_{m.id}.png"
+    path = await rep_to.download(name)
+    is_sticker = False
     if rep_to.sticker:
-        name = "@memesofdank.png"
-    else:
-        name = "@memesofdank.webp"
-    path = rep_to.download(name)
-    cheems,domge = await draw_meme(path,material)
+        is_sticker = True
+    cheems,domge = await draw_meme(path,meme,is_sticker)
+    await x.delete()
     xNx = await m.reply_photo(cheems,reply_markup=kb)
     await xNx.reply_sticker(domge,reply_markup=kb)
     try:
@@ -249,19 +270,24 @@ async def get_sticker_from_file(c: Gojo, m: Message):
         await m.reply_text("Reply to a sticker or file")
         return
     repl = m.reply_to_message
-    if not (repl.sticker or repl.photo or repl.document.mime_type.split("/")[0]=="image"):
+    if not (repl.sticker or repl.photo or (repl.document and repl.document.mime_type.split("/")[0]=="image")):
         await m.reply_text("I only support conversion of plain stickers and images for now")
         return
-    if repl.sticker.is_video or repl.sticker.is_animated:
+    if repl.sticker and (repl.sticker.is_video or repl.sticker.is_animated):
         await m.reply_text("I only support conversion of plain stickers for now")
         return
+    x = await m.reply_text("Converting...")
     if repl.sticker:
-        up = await repl.download(f"{repl.sticker.file_unique_id}.png")
+        upp = await repl.download()
+        up = toimage(upp)
+        await x.delete()
         await m.reply_photo(up,caption=Caption)
         os.remove(up)
         return
     elif repl.photo:
-        up = await repl.download(f"{repl.photo.file_unique_id}.webp")
+        upp = await repl.download()
+        up = tosticker(upp)
+        await x.delete()
         await m.reply_sticker(up,caption=Caption)
         os.remove(up)
         return

Powers/plugins/utils.py

@@ -141,15 +141,22 @@ async def get_lyrics(_, m: Message):
 async def id_info(c: Gojo, m: Message):
 
     ChatType = enums.ChatType
-    if m.chat.type in [ChatType.SUPERGROUP, ChatType.GROUP] and not m.reply_to_message:
-        await m.reply_text(text=f"This Group's ID is <code>{m.chat.id}</code>\nYour ID <code>{m.from_user.id}</code>")
-        return
+    user_id, _, _ = await extract_user(c, m)
+    try:
+        if user_id and len(m.text.split()) == 2:
+            txt = f"Given user's id: <code>{user_id}</code>"
+            await m.reply_text(txt, parse_mode=enums.ParseMode.HTML)
+            return
+        elif m.chat.type in [ChatType.SUPERGROUP, ChatType.GROUP] and not m.reply_to_message:
+            await m.reply_text(text=f"This Group's ID is <code>{m.chat.id}</code>\nYour ID <code>{m.from_user.id}</code>")
+            return
 
-    if m.chat.type == ChatType.PRIVATE and not m.reply_to_message:
-        await m.reply_text(text=f"Your ID is <code>{m.chat.id}</code>.")
+        elif m.chat.type == ChatType.PRIVATE and not m.reply_to_message:
+            await m.reply_text(text=f"Your ID is <code>{m.chat.id}</code>.")
+            return
+    except Exception as e:
+        await m.reply_text(e)
         return
-
-    user_id, _, _ = await extract_user(c, m)
     if user_id:
         if m.reply_to_message and m.reply_to_message.forward_from:
             user1 = m.reply_to_message.from_user
@@ -160,7 +167,7 @@ async def id_info(c: Gojo, m: Message):
             fwd_id = f"<code>{user1.id}</code>"
             await m.reply_text(
                 text=f"""Original Sender - {orig_sender} (<code>{orig_id}</code>)
-        Forwarder - {fwd_sender} (<code>{fwd_id}</code>)""",
+Forwarder - {fwd_sender} (<code>{fwd_id}</code>)""",
                 parse_mode=enums.ParseMode.HTML,
             )
         else:
@@ -184,13 +191,9 @@ async def id_info(c: Gojo, m: Message):
                 text+=f"Forwarded from user ID <code>{m.forward_from.id}</code>."
             elif m.forward_from_chat:
                 text+=f"Forwarded from user ID <code>{m.forward_from_chat.id}</code>."
-        if len(m.text.split()) > 1 and user_id:
-            text += f"\nGiven user's ID <code>{user_id}</code>"
         await m.reply_text(text)
     else:
         text=f"Chat ID <code>{m.chat.id}</code>\nYour ID <code>{m.from_user.id}</code>"
-        if len(m.text.split()) > 1 and user_id:
-            text += f"\nGiven user's ID <code>{user_id}</code>"
         await m.reply_text(text)
     return
 
@@ -288,7 +291,7 @@ BASE = "https://nekobin.com/"
 
 
 def paste(content: str):
-    resp = post(f"{BASE}api/documents", data=content)
+    resp = resp_post(f"{BASE}api/documents", data=content)
     if resp.status_code != 200:
         return
     return BASE + resp["result"]['key']
@@ -368,9 +371,32 @@ async def tr(_, message):
         f"<b>Translated:</b> from {detectlang} to {target_lang} \n<code>``{tekstr.text}``</code>",
     )
 
+@Gojo.on_message(command("bug"))
+async def reporting_query(c: Gojo, m: Message):
+    repl = m.reply_to_message
+    if not repl:
+        await m.reply_text("Please reply to a message to report it as bug")
+        return
+    if not repl.text:
+        await m.reply_text("Please reply to a text message.")
+        return
+    txt = "#BUG\n"
+    txt += repl.text.html
+    txt += f"\nReported by: {m.from_user.id} ({m.from_user.mention})"
+    kb = InlineKeyboardMarkup([[InlineKeyboardButton("Update channel",url=f"https://t.me/{SUPPORT_GROUP}")],[InlineKeyboardButton("Report on github",url="https://github.com/Gojo-Bots/Gojo_Satoru/issues/new/choose")]])
+    try:
+        z = await c.send_message(MESSAGE_DUMP,txt,parse_mode=enums.ParseMode.HTML)
+    except Exception:
+        txt = repl.text.html
+        z = await c.send_message(MESSAGE_DUMP,txt,parse_mode=enums.ParseMode.HTML)
+        await z.reply_text(f"#BUG\nReported by: {m.from_user.id} ({m.from_user.mention})")
+    await m.reply_text("Successfully reported your bug",reply_markup=kb)
+    ppost = z.link
+    await c.send_message(OWNER_ID,f"New bug report\n{ppost}",disable_web_page_preview=True)
+    return
 
 __PLUGIN__ = "utils"
-_DISABLE_CMDS_ = ["paste", "wiki", "id", "gifid", "tr", "github", "git"]
+_DISABLE_CMDS_ = ["paste", "wiki", "id", "gifid", "tr", "github", "git", "bug"]
 __alt_name__ = ["util", "misc", "tools"]
 
 __HELP__ = """
@@ -386,6 +412,7 @@ Some utils provided by bot to make your tasks easy!
 • /tr `<language>`: Translates the text and then replies to you with the language you have specifed, works as a reply to message.
 • /git `<username>`: Search for the user using github api!
 • /weebify `<text>` or `<reply to message>`: To weebify the text.
+• /bug <reply to text message> : To report a bug
 
 **Example:**
 `/git iamgojoof6eyes`: this fetches the information about a user from the database."""

Powers/plugins/watchers.py

@@ -5,7 +5,6 @@ from traceback import format_exc
 from pyrogram import filters
 from pyrogram.errors import ChatAdminRequired, RPCError, UserAdminInvalid
 from pyrogram.types import ChatPermissions, Message
-from RiZoeLX.functions import update_scanlist
 
 from Powers import LOGGER, MESSAGE_DUMP, SUPPORT_STAFF
 from Powers.bot_class import Gojo
@@ -167,8 +166,6 @@ async def bl_watcher(_, m: Message):
     return
 
 
-SCANLIST = []
-
 
 @Gojo.on_message(filters.user(list(ANTISPAM_BANNED)) & filters.group)
 async def gban_watcher(c: Gojo, m: Message):
@@ -210,20 +207,7 @@ async def gban_watcher(c: Gojo, m: Message):
         <b>Error:</b> <code>{ef}</code>""",
             )
 
-    elif m.from_user.id in SCANLIST:
-       msg = f"""
-** Alert ⚠️**
-User {m.from_user.mention} is officially
-Scanned by TeamRed7 | Phoenix API ;)
-Appeal [Here](https://t.me/Red7WatchSupport)
-       """
-       try:
-          await c.ban_chat_member(m.chat.id, m.from_user.id)
-          await c.send_message(m.chat.id, msg, disable_web_page_preview=True)
-       except Exception as a:
-          LOGGER.error(a)
-          LOGGER.error(format_exc())
-          return
+
 
 
 @Gojo.on_message(filters.chat(BLACKLIST_CHATS))

Powers/plugins/web_con.py

@@ -1,4 +1,6 @@
+import asyncio
 import os
+from traceback import format_exc
 
 from pyrogram import filters
 from pyrogram.types import CallbackQuery
@@ -10,7 +12,8 @@ from Powers import (LOGGER, RMBG, Audd, genius_lyrics, is_audd,
                     is_genius_lyrics, is_rmbg)
 from Powers.bot_class import Gojo
 from Powers.utils.custom_filters import command
-from Powers.utils.http_helper import post
+from Powers.utils.http_helper import *
+from Powers.utils.sticker_help import toimage
 from Powers.utils.web_helpers import *
 
 
@@ -19,6 +22,7 @@ async def telegraph_upload(c:Gojo,m:Message):
     if not m.reply_to_message:
         await m.reply_text("Reply to media/text to upload it to telegraph")
         return
+    XnX = await m.reply_text("⏳")
     file = m.reply_to_message
     if file.text:
         if len(m.command) == 1:
@@ -26,24 +30,27 @@ async def telegraph_upload(c:Gojo,m:Message):
         elif len(m.command) > 1:
             name = " ".join(m.command[1:5])
         try:
-            upload = telegraph_up(file,name)
+            upload = await telegraph_up(file,name)
         except Exception as e:
             await m.reply_text(f"Got an error\n{e}")
             return
         if upload:
-            kb = IKM([[IKB("Here is link to file",url=upload)]])
-            await m.reply_text("Here is your uploaded file",disable_web_page_preview=True,reply_markup=kb)
+            await XnX.delete()
+            kb = IKM([[IKB("Here is link to the uploaded text",url=upload)]])
+            await m.reply_text("Here is your uploaded text",disable_web_page_preview=True,reply_markup=kb)
             return
         elif not upload:
             await m.reply_text("Failed to upload the text to telegraph")
-            return     
-    size = await get_file_size(m.reply_to_message)
-    form = size.split(None,1)
-    if (form[-1] == "mb" and int(form[0]) > 5) or form[-1] == "gb":
-        await m.reply_text("File size too big to upload\nLimit: 5mbs")
-        return
+            return
+    if m.reply_to_message.photo or m.reply_to_message.document or m.reply_to_message.audio or m.reply_to_message.video:
+        size = await get_file_size(m.reply_to_message)
+        form = size.split(None,1)
+        if (form[-1] == "mb" and int(form[0]) > 5) or form[-1] == "gb":
+            await XnX.edit_text("File size too big to upload\nLimit: 5mbs")
+            return
+    await XnX.delete()
     try:
-        upload = telegraph_up(file)
+        upload = await telegraph_up(file)
     except Exception as e:
         await m.reply_text(f"Got an error\n{e}")
         return
@@ -55,84 +62,107 @@ async def telegraph_upload(c:Gojo,m:Message):
         await m.reply_text("Failed to upload the file to telegraph")
         return
 
-@Gojo.on_command(command["songname","insong","songinfo","whichsong","rsong","reversesong"])
-async def get_song_info(c: Gojo, m: Message):
-    if not is_audd:
-        await m.reply_text("Audd api is missing add it to use this command")
-        return
-    reply = m.reply_to_message
-    if not reply:
-        await m.reply_text("Reply to a video or audio file")
-        return
-    elif not (reply.video or reply.audio or reply.video_note or (reply.document.mime_type.split("/")[0] in ["video","audio"])):
-        await m.reply_text("Reply to a video or audio file")
-        return
-    URL = "https://api.audd.io/"
-    sizee = (await get_file_size(reply)).split()
-    if (int(sizee[0]) <= 15 and sizee[1] == "mb") or sizee[1] == "kb":
-        fpath = await reply.download()
-        files = {
-            "file" : open(fpath,"rb")
-        }
-        BASE_AUDD = {
-            "api_token":Audd,
-            "return": "spotify"
-        }
-        result = post(URL,data=BASE_AUDD, files=files)
-    elif int(sizee[0]) > 15 or int(sizee[0]) <= 30 and sizee[1] == "mb":
-        BASE_AUDD = {
-            "api_token":Audd,
-            "url": f'{reply.link}',
-            "return": "spotify"
-        }
-        result = post(URL,data=BASE_AUDD)
-    else:
-        await m.reply_text("File size too big\nI can only fetch file of size upto 30 mbs for now")
-        return
-    os.remove(fpath)
-    if result.status_code != 200:
-        await m.reply_text(f"{result.status_code}:{result.text}")
-        return
-    data = result["result"]
-    Artist = data["artist"]
-    Title = data["title"]
-    Release_date = data["release_date"]
-    web_slink = data["song_link"]
-    SPOTIFY = data["spotify"]
-    spotify_url = SPOTIFY["external_urls"]
-    album_url = SPOTIFY["album"]["external_urls"]
-    Album = SPOTIFY["album"]["name"]
-    photo = SPOTIFY["images"][0]["url"]
-    artist_url = SPOTIFY["artists"]["external_urls"]
-    cap = f"""
-Song name: {Title} 
-Artist: {Artist}
-Album: {Album}
-Release data: {Release_date}
-"""
-    kb = [
-        [
-            IKB("🗂 Album", url=album_url),
-            IKB("🎨 Artist",url=artist_url)
-        ],
-        [
-            IKB("🎵 Spotify song link",url=spotify_url),
-            IKB("♾ More links", url=web_slink)
-        ]
-    ]
-    if is_genius_lyrics:
-        g_k = [IKB("📝 Lyrics",f"lyrics_{Artist}:{Title}")]
-        kb.append(g_k)
+# @Gojo.on_message(command(["songname","insong","songinfo","whichsong","rsong","reversesong"]))
+# • /whichsong (/songname, /songinfo, /insong, /rsong, /reversesong) : Reply to file to get the song playing in it.
+# async def get_song_info(c: Gojo, m: Message):
+#     if not is_audd:
+#         await m.reply_text("Audd api is missing add it to use this command")
+#         return
+#     reply = m.reply_to_message
+#     if not reply:
+#         await m.reply_text("Reply to a video or audio file")
+#         return
+#     elif reply.text:
+#         await m.reply_text("Reply to a video or audio file")
+#         return
+#     elif not (reply.video or reply.audio or reply.video_note or reply.document and (reply.document.mime_type.split("/")[0] in ["video","audio"])):
+#         await m.reply_text("Reply to a video or audio file")
+#         return
+#     try:
+#         XnX = await m.reply_text("⏳")
+#         URL = "https://api.audd.io/"
+#         sizee = (await get_file_size(reply)).split()
+#         if (int(sizee[0]) <= 30 and sizee[1] == "mb") or sizee[1] == "kb":
+#             fpath = await reply.download()
+#             files = {
+#                 "file" : open(fpath,"rb")
+#             }
+#             BASE_AUDD = {
+#                 "api_token":Audd,
+#                 "return": "spotify"
+#             }
+#             result = resp_post(URL,data=BASE_AUDD, files=files)
+#         # elif int(sizee[0]) > 15 or int(sizee[0]) <= 30 and sizee[1] == "mb":
+#         #     BASE_AUDD = {
+#         #         "api_token":Audd,
+#         #         "url": f'{reply.link}',
+#         #         "return": "spotify"
+#         #     }
+#         #    result = resp_post(URL,data=BASE_AUDD)
+#         else:
+#             await XnX.edit_text("File size too big\nI can only fetch file of size upto 30 mbs for now")
+#             return
+#         if result.status_code != 200:
+#             await XnX.edit_text(f"{result.status_code}:{result.text}")
+#             return
+#         result = result.json()
+#         data = result["result"]
+#         Artist = data["artist"]
+#         Title = data["title"]
+#         Release_date = data["release_date"]
+#         web_slink = data["song_link"]
+#         SPOTIFY = data["spotify"]
+#         spotify_url = SPOTIFY["external_urls"]
+#         album_url = SPOTIFY["album"]["external_urls"]
+#         Album = SPOTIFY["album"]["name"]
+#         photo = SPOTIFY["images"][0]["url"]
+#         artist_url = SPOTIFY["artists"]["external_urls"]
+#         cap = f"""
+#     Song name: {Title} 
+#     Artist: {Artist}
+#     Album: {Album}
+#     Release data: {Release_date}
+#     """
+#         youtube_link = (await song_search(Title))[1]["link"]
+#         kb = [
+#             [
+#                 IKB("🗂 Album", url=album_url),
+#                 IKB("🎨 Artist",url=artist_url)
+#             ],
+#             [
+#                 IKB("🎵 Spotify song link",url=spotify_url),
+#                 IKB("▶️ Youtube",url=youtube_link)
+#             ],
+#             [IKB("♾ More links", url=web_slink)]
+#         ]
+#         if is_genius_lyrics:
+#             g_k = [IKB("📝 Lyrics",f"lyrics_{Title}:{Artist}")]
+#             kb.append(g_k)
+#         await XnX.delete()
+#         os.remove(fpath)
+#         await m.reply_photo(photo,caption=cap,reply_markup=IKM(kb))
+#     except Exception as e:
+#         await XnX.delete()
+#         await m.reply_text(f"Error\n{e}")
+#         try:
+#             os.remove(fpath)
+#         except Exception:
+#             pass
+#     return
 
-    await m.reply_photo(photo,caption=cap,reply_markup=IKM(kb))
-    
 
 @Gojo.on_callback_query(filters.regex("^lyrics_"))
 async def lyrics_for_song(c: Gojo, q: CallbackQuery):
     data = q.data.split("_")[1].split(":")
-    song = data[1]
-    artist = data[0]
-    song = genius_lyrics.search_song(song,artist)
+    song = data[0]
+    try:
+        artist = data[1]
+    except IndexError:
+        artist = None
+    if artist:
+        song = genius_lyrics.search_song(song,artist)
+    elif not artist:
+        song = genius_lyrics.search_song(song)
     if not song.lyrics:
         await q.answer("‼️ No lyrics found ‼️",True)
         return
@@ -162,7 +192,7 @@ async def lyrics_for_song(c: Gojo, q: CallbackQuery):
     await q.message.delete()
     return
 
-@Gojo.on_message(command["removebackground","removebg","rmbg"])
+@Gojo.on_message(command(["removebackground","removebg","rmbg"]))
 async def remove_background(c: Gojo, m: Message):
     if not is_rmbg:
         await m.reply_text("Add rmbg api to use this command")
@@ -170,27 +200,51 @@ async def remove_background(c: Gojo, m: Message):
     
     reply = m.reply_to_message
     if not reply:
-        await m.reply_text("Reply to image to remove it's background")
+        await m.reply_text("Reply to image/sticker to remove it's background")
+        return
+    elif not (reply.photo or (reply.document and reply.document.mime_type.split("/")[0] == "image") or reply.sticker):
+        await m.reply_text("Reply to image/sticker to remove it's background")
         return
-    elif not (reply.photo or reply.document.mime_type.split("/")[0] == "image" or reply.sticker and (reply.sticker.is_animated or reply.sticker.is_video)):
-        await m.reply_text("Reply to image to remove it's background")
+    elif reply.sticker and (reply.sticker.is_video or reply.sticker.is_animated):
+        await m.reply_text("Reply to normal sticker to remove it's background")
         return
+    XnX = await m.reply_text("⏳")
     URL = "https://api.remove.bg/v1.0/removebg"
-    file = await reply.download("Gojo_Satoru.png")
-    to_path = file.replace("\\","/").rsplit("/",1)[0]
+    if reply.sticker:
+        filee = await reply.download()
+        file = toimage(filee)
+    else:
+        file = await reply.download()
     finfo = {'image_file':open(file,'rb')}
     Data = {'size':'auto'}
     Headers = {'X-Api-Key':RMBG}
-    result = post(URL,files=finfo,data=Data,headers=Headers)
-    os.remove(file)
+    result = resp_post(URL,files=finfo,data=Data,headers=Headers)
+    await XnX.delete()
+    contentType = result.headers.get("content-type")
     if result.status_code != 200:
         await m.reply_text(f"{result.status_code}:{result.text}")
+        os.remove(file)
         return
-    to_path = f'{to_path}/no-bg.png'
+    elif "image" not in contentType:
+        await m.reply_text(f"Error\n{result.content.decode('UTF-8')}")
+        os.remove(file)
+        return
+    to_path = "./downloads"
+    if reply.sticker:
+        to_path = f'{to_path}/no-bg.webp'
+    else:
+        to_path = f'{to_path}/no-bg.png'
     with open(to_path,'wb') as out:
         out.write(result.content)
-    await m.reply_photo(to_path)
-    os.remove(to_path)
+    if reply.sticker:
+        await m.reply_sticker(to_path)
+    else:
+        await m.reply_photo(to_path)
+    try:
+        os.remove(file)
+        os.remove(to_path)
+    except PermissionError:
+        await asyncio.sleep(5)
     return
 
 @Gojo.on_message(command(["song","yta"]))
@@ -202,11 +256,15 @@ async def song_down_up(c: Gojo, m: Message):
     else:
         is_direct = False
         query = splited
+    XnX = await m.reply_text("⏳")
     try:
         await youtube_downloader(c,m,query,is_direct,"a")
+        await XnX.delete()
         return
     except Exception as e:
-        await m.reply_text(f"Got an error\n{e}")
+        await XnX.edit_text(f"Got an error\n{e}")
+        LOGGER.error(e)
+        LOGGER.error(format_exc())
         return
 
 @Gojo.on_message(command(["vsong","ytv"]))
@@ -218,11 +276,15 @@ async def video_down_up(c: Gojo, m: Message):
     else:
         is_direct = False
         query = splited
+    XnX = await m.reply_text("⏳")
     try:
         await youtube_downloader(c,m,query,is_direct,"v")
+        await XnX.delete()
         return
     except Exception as e:
-        await m.reply_text(f"Got an error\n{e}")
+        await XnX.edit_text(f"Got an error\n{e}")
+        LOGGER.error(e)
+        LOGGER.error(format_exc())
         return
 
 __PLUGIN__ = "web support"
@@ -231,9 +293,8 @@ __HELP__ = """
 **Available commands**
 • /telegraph (/tgh, /tgm) <page name> : Reply to media which you want to upload to telegraph.
 • /rmbg (/removebg, /removebackground) : Reply to image file or sticker of which you want to remove background
-• /whichsong (/songname, /songinfo, /insong, /rsong, /reversesong) : Reply to file to get the song playing in it.
 • /song (/yta) <songname or youtube link>
 • /vsong (/ytv) <songname or youtube link>
 
-**Bot will not download any song or video having duration greater than 5 minutes (to reduce the load on bot's server)**
+**Bot will not download any song or video having duration greater than 10 minutes (to reduce the load on bot's server)**
 """

Powers/utils/custom_filters.py

@@ -156,6 +156,8 @@ async def admin_check_func(_, __, m: Message or CallbackQuery):
     if m.sender_chat:
         return True
 
+    if not m.from_user:
+        return False
 
     try:
         admin_group = {i[0] for i in ADMIN_CACHE[m.chat.id]}
@@ -183,6 +185,9 @@ async def owner_check_func(_, __, m: Message or CallbackQuery):
 
     if m.chat.type not in [ChatType.SUPERGROUP, ChatType.GROUP]:
         return False
+    
+    if not m.from_user:
+        return False
 
     user = await m.chat.get_member(m.from_user.id)
 
@@ -209,10 +214,12 @@ async def restrict_check_func(_, __, m: Message or CallbackQuery):
     ):
         return False
 
+    if not m.from_user:
+        return False
 
     user = await m.chat.get_member(m.from_user.id)
 
-    if user.privileges.can_restrict_members or user.status == CMS.OWNER:
+    if user.status in [CMS.ADMINISTRATOR, CMS.OWNER] and user.privileges.can_restrict_members:
         status = True
     else:
         status = False
@@ -229,10 +236,12 @@ async def promote_check_func(_, __, m):
     if m.chat.type not in [ChatType.SUPERGROUP, ChatType.GROUP]:
         return False
 
+    if not m.from_user:
+        return False
 
     user = await m.chat.get_member(m.from_user.id)
 
-    if user.privileges.can_promote_members or user.status == CMS.OWNER:
+    if user.status in [CMS.ADMINISTRATOR, CMS.OWNER] and user.privileges.can_promote_members:
         status = True
     else:
         status = False
@@ -257,7 +266,7 @@ async def changeinfo_check_func(_, __, m):
 
     user = await m.chat.get_member(m.from_user.id)
 
-    if user.privileges.can_change_info or user.status == CMS.OWNER:
+    if user.status in [CMS.ADMINISTRATOR, CMS.OWNER] and user.privileges.can_change_info:
         status = True
     else:
         status = False
@@ -285,7 +294,7 @@ async def can_pin_message_func(_, __, m):
 
     user = await m.chat.get_member(m.from_user.id)
 
-    if user.privileges.can_pin_messages or user.status == CMS.OWNER:
+    if user.status in [CMS.ADMINISTRATOR, CMS.OWNER] and user.privileges.can_pin_messages:
         status = True
     else:
         status = False

Powers/utils/extras.py

@@ -690,3 +690,82 @@ StartPic = [
     "https://te.legra.ph/file/52d92a67f0c6ce0a9f89f.jpg",
     "https://te.legra.ph/file/d91e7353b3803a8148bfc.jpg",
 ]
+
+
+birthday_wish =  [
+    "Wishing you a happy birthday filled with love and joy.",
+    "Hope your birthday is as wonderful as you are.",
+    "Happy birthday to someone who deserves a truly special day.",
+    "May your birthday be full of surprises and delight.",
+    "Wishing you a year filled with new adventures and accomplishments.",
+    "May your birthday be as sweet as cake and as joyful as the celebration.",
+    "Here's to a fabulous birthday and a year filled with blessings.",
+    "Sending you lots of love and warm wishes on your special day.",
+    "May your birthday be a time for reflection, relaxation, and joy.",
+    "Cheers to another year of making unforgettable memories!",
+    "May your birthday be filled with laughter, love, and good times.",
+    "Wishing you a birthday that's just as amazing as you are.",
+    "Here's to a year filled with love, happiness, and success.",
+    "May your birthday be filled with all the love and blessings you deserve.",
+    "Sending you warm wishes for a joyful and memorable birthday.",
+    "Wishing you a birthday that's as wonderful as you are.",
+    "May your birthday be a time to celebrate all the amazing things you've accomplished.",
+    "Here's to another year of blessings, love, and adventure.",
+    "Sending you lots of love, hugs, and birthday wishes.",
+    "May your birthday be full of sunshine, laughter, and good times.",
+    "Wishing you a year filled with happiness, success, and love.",
+    "Here's to a fantastic birthday and an even better year ahead!",
+    "May your birthday be a day filled with joy, love, and celebration.",
+    "Sending you lots of love and warm wishes on your special day.",
+    "Wishing you a birthday that's as bright and beautiful as you are.",
+    "May your birthday be full of love, laughter, and happiness.",
+    "Here's to a year filled with exciting adventures and new opportunities.",
+    "Wishing you a birthday that's just as amazing as you are.",
+    "May your birthday be a time to reflect on all the wonderful things in your life.",
+    "Sending you lots of love, hugs, and birthday wishes from afar.",
+    "Wishing you a year filled with love, laughter, and all your heart desires.",
+    "May your birthday be a time to relax, unwind, and enjoy the company of loved ones.",
+    "Here's to another year of blessings, love, and adventure.",
+    "Sending you warm wishes for a wonderful and unforgettable birthday.",
+    "Wishing you a birthday that's as special and unique as you are.",
+    "May your birthday be a time to cherish all the special moments and memories you've created.",
+    "Here's to a year filled with joy, laughter, and happiness.",
+    "Wishing you a birthday that's just as amazing as you are.",
+    "May your birthday be a time to celebrate your wonderful achievements and accomplishments.",
+    "Sending you lots of love, hugs, and birthday wishes to make your day extra special.",
+    "Wishing you a year filled with love, happiness, and all your heart's desires.",
+    "May your birthday be a time to create new memories and cherish old ones.",
+    "Here's to another year of blessings, love, and adventure.",
+    "Sending you warm wishes for a fabulous and unforgettable birthday.",
+    "Wishing you a birthday that's full of love, laughter, and happiness.",
+    "May your birthday be a time to appreciate all the wonderful people in your life.",
+    "Wishing you a birthday as amazing as you are, filled with joy and memories to last a lifetime.",
+    "May your birthday be full of laughter and love, and your year be full of happiness and success.",
+    "Happy birthday to someone who makes the world a better place, may all your wishes come true.",
+    "Sending you warm birthday wishes and virtual hugs, can't wait to celebrate in person!",
+    "May your birthday be as special as you are, surrounded by all the people who love you the most.",
+    "Wishing you a day filled with laughter, and a year filled with new adventures and opportunities.",
+    "Happy birthday to someone who's always there to brighten up my day, may your day be as bright as you are.",
+    "Here's to a birthday that's just as awesome as you are, and a year filled with love and happiness.",
+    "May your birthday be a time to reflect on all the wonderful memories you've made, and look forward to new ones.",
+    "Wishing you a birthday that's full of surprises and excitement, and a year filled with new beginnings.",
+    "Happy birthday to my favorite person in the world, may your day be as special as you are to me.",
+    "Sending you the biggest birthday hugs and all my love, may your day be filled with joy and celebration.",
+    "May your birthday be a time to celebrate all your accomplishments and be proud of all you've achieved.",
+    "Wishing you a birthday that's as bright and beautiful as you are, filled with love and laughter.",
+    "Happy birthday to a true gem, may your day be filled with joy, laughter, and all the things you love.",
+    "Here's to a birthday that's full of happiness, excitement, and all the people who make your life special.",
+    "May your birthday be a time to let loose and have fun, and your year be filled with growth and success.",
+    "Wishing you a birthday that's full of all the things you love, and a year that's even better than the last.",
+    "Happy birthday to someone who makes my life brighter, may your day be as amazing as you are.",
+    "Sending you lots of love and virtual hugs on your special day, may your year be filled with blessings.",
+    "May your birthday be a time to cherish all the people who make your life special, and celebrate the person you've become.",
+    "Wishing you a birthday that's as unique and wonderful as you are, filled with love and laughter.",
+    "Happy birthday to someone who's always been there for me, may your day be filled with joy and celebration.",
+    "Here's to a birthday that's full of love, happiness, and all the things that bring you the most joy.",
+    "May your birthday be a time to reflect on all the amazing things you've accomplished, and look forward to all that's to come.",
+    "Wishing you a birthday that's full of surprises, happiness, and all the things that make you feel alive.",
+    "Happy birthday to someone who brings a smile to my face every day, may your day be as wonderful as you are.",
+    "Sending you all my love and warmest wishes on your special day, may your year be filled with love and happiness.",
+    "May your birthday be a time to appreciate all the people who make your life special, and cherish all the memories you've created.",
+    "Wishing you a birthday that's as beautiful as you are, filled with joy and celebration.",]

Powers/utils/start_utils.py

@@ -49,7 +49,15 @@ async def gen_start_kb(q: Message or CallbackQuery):
                     "url",
                 ),
             ],
-            [("📚 Commands & Help", "commands")],
+            [
+                (
+                    "📚 Commands & Help", "commands"
+                ),
+                (
+                    "👾 Bot info",
+                    "bot_curr_info"
+                )
+            ],
             [
                 (
                     "🗃️ Source Code",
@@ -58,8 +66,8 @@ async def gen_start_kb(q: Message or CallbackQuery):
                 ),
                 (
                     "Owner ❤️",
-                    f"https://t.me/{Config.owner_username}",
-                    "url",
+                    Config.OWNER_ID,
+                    "user_id",
                 ),
             ],
             [
@@ -260,7 +268,7 @@ async def get_help_msg(m: Message or CallbackQuery, help_option: str):
         )
     else:
         help_msg = """
-Hey There! My name is Gojo.
+Hey There! I am Gojo.
 I'm here to help you manage your groups!
 Commands available:
 × /start: Start the bot

Powers/utils/sticker_help.py

@@ -6,12 +6,14 @@ import textwrap
 from typing import List, Tuple
 
 from PIL import Image, ImageDraw, ImageFont
-from pyrogram import Client, errors, raw
+from pyrogram import errors, raw
 from pyrogram.file_id import FileId
 
+from Powers.bot_class import Gojo
+
 
 async def get_sticker_set_by_name(
-    client: Client, name: str
+    client: Gojo, name: str
 ) -> raw.base.messages.StickerSet:
     try:
         return await client.invoke(
@@ -26,7 +28,7 @@ async def get_sticker_set_by_name(
 
 
 async def create_sticker_set(
-    client: Client,
+    client: Gojo,
     owner: int,
     title: str,
     short_name: str,
@@ -47,7 +49,7 @@ async def create_sticker_set(
 
 
 async def add_sticker_to_set(
-    client: Client,
+    client: Gojo,
     stickerset: raw.base.messages.StickerSet,
     sticker: raw.base.InputStickerSetItem,
 ) -> raw.base.messages.StickerSet:
@@ -73,7 +75,6 @@ STICKER_DIMENSIONS = (512, 512)
 
 async def resize_file_to_sticker_size(file_path: str,length:int=512,width:int=512) -> str:
     im = Image.open(file_path)
-    file_path = file_path.replace("\\","/").rsplit("/",1)[0]
     if (im.width, im.height) < STICKER_DIMENSIONS:
         size1 = im.width
         size2 = im.height
@@ -91,16 +92,16 @@ async def resize_file_to_sticker_size(file_path: str,length:int=512,width:int=51
         im = im.resize(sizenew)
     else:
         im.thumbnail(STICKER_DIMENSIONS)
-    try:
-        os.remove(file_path)
-        file_path = f"{file_path}/resized.png"
-        return file_path
-    finally:
-        im.save(file_path)
+
+    file_pathh = "./downloads/resized.png"
+    im.save(file_pathh)
+    os.remove(file_path)
+    return file_pathh
+        
 
 
 async def upload_document(
-    client: Client, file_path: str, chat_id: int
+    client: Gojo, file_path: str, chat_id: int
 ) -> raw.base.InputDocument:
     media = await client.invoke(
         raw.functions.messages.UploadMedia(
@@ -113,6 +114,7 @@ async def upload_document(
                         file_name=os.path.basename(file_path)
                     )
                 ],
+                force_file=True,
             ),
         )
     )
@@ -133,11 +135,9 @@ async def get_document_from_file_id(
         file_reference=decoded.file_reference,
     )
 
-async def draw_meme(image_path, text):
+async def draw_meme(image_path, text:str,stick):
     """Hellbot se churaya hai hue hue hue..."""
     img = Image.open(image_path)
-    UwU = image_path.rsplit("/")[0]
-    os.remove(image_path)
     i_width, i_height = img.size
     m_font = ImageFont.truetype(
         "./extras/comic.ttf", int((70 / 640) * i_width)
@@ -150,7 +150,7 @@ async def draw_meme(image_path, text):
     draw = ImageDraw.Draw(img)
     current_h, pad = 10, 5
     if upper_text:
-        for u_text in textwrap.wrap(upper_text, width=15):
+        for u_text in textwrap.wrap(upper_text,width=15,subsequent_indent=" "):
             u_width, u_height = draw.textsize(u_text, font=m_font)
             draw.text(
                 xy=(((i_width - u_width) / 2) - 1, int((current_h / 640) * i_width)),
@@ -184,7 +184,7 @@ async def draw_meme(image_path, text):
             )
             current_h += u_height + pad
     if lower_text:
-        for l_text in textwrap.wrap(lower_text, width=15):
+        for l_text in textwrap.wrap(upper_text,width=15,subsequent_indent=" "):
             u_width, u_height = draw.textsize(l_text, font=m_font)
             draw.text(
                 xy=(
@@ -232,11 +232,32 @@ async def draw_meme(image_path, text):
                 fill=(255, 255, 255),
             )
             current_h += u_height + pad
-    
-    hue = f"{UwU}/@memesofdank_memer_hu_vai.png"
-    stick_path = await resize_file_to_sticker_size(hue)
-    mee = hue = f"{stick_path.rsplit('/',1)[0]}/@memesofdank_memer_hu_vai.webp"
-    os.remove(stick_path)
+
+    hue = image_path
+    if stick:
+        stick_path = image_path
+    else:
+        stick_path = await resize_file_to_sticker_size(hue)
+    mee = tosticker(stick_path,"@memesofdank_memer_hu_vai.webp")
     img.save(hue)
     img.save(mee)
     return hue, mee
+
+def toimage(image, filename=None):
+    filename = filename if filename else "gojo.jpg"
+    img = Image.open(image)
+    if img.mode != "RGB":
+        img = img.convert("RGB")
+    img.save(filename, "jpeg")
+    os.remove(image)
+    return filename
+
+
+def tosticker(response, filename=None):
+    filename = filename if filename else "gojo.webp"
+    image = Image.open(response)
+    if image.mode != "RGB":
+        image.convert("RGB")
+    image.save(filename, "webp")
+    os.remove(response)
+    return filename

Powers/utils/web_helpers.py

@@ -20,16 +20,20 @@ async def get_file_size(file: Message):
         size = file.document.file_size/1024
     elif file.video:
         size = file.video.file_size/1024
-
+    elif file.audio:
+        size = file.audio.file_size/1024
+    elif file.sticker:
+        size = file.sticker.file_size/1024
+        
     if size <= 1024:
-        return f"{round(size,3)} kb"
+        return f"{round(size)} kb"
     elif size > 1024:
         size = size/1024
         if size <= 1024:
-            return f"{round(size,3)} mb"
+            return f"{round(size)} mb"
         elif size > 1024:
             size = size/1024
-            return f"{round(size,3)} gb"
+            return f"{round(size)} gb"
 
 async def telegraph_up(file:Message=None,name=None,content=None):
     if not name:
@@ -70,9 +74,9 @@ class GOJO_YTS:
         encoded_search = parse.quote_plus(self.search_terms)
         BASE_URL = "https://youtube.com"
         url = f"{BASE_URL}/results?search_query={encoded_search}"
-        response = get(url).text
+        response = requests.get(url).text
         while "ytInitialData" not in response:
-            response = get(url).text
+            response = requests.get(url).text
         results = self._parse_html(response)
         if self.max_results is not None and len(results) > self.max_results:
             return results[: self.max_results]
@@ -145,9 +149,18 @@ async def song_search(query, max_results=1):
     except KeyError:
         return 
     yt_dict = {}
-    if not (i['duration'] > 300):       
-        nums = 1
-        for i in results["videos"]:
+           
+    nums = 1
+    for i in results["videos"]:
+        durr = i['duration'].split(":")
+        if len(durr) == 3:
+            hour_to_sec = int(durr[0])*60*60
+            minutes_to_sec = int(durr[1])*60
+            total = hour_to_sec + minutes_to_sec + int(durr[2])
+        if len(durr) == 2:
+            minutes_to_sec = int(durr[0])*60
+            total = minutes_to_sec + int(durr[1])
+        if not (total > 300):
             dict_form = {
                 "link": f"https://www.youtube.com{i['url_suffix']}",
                 "title": i['title'],
@@ -155,11 +168,11 @@ async def song_search(query, max_results=1):
                 "channel": i['channel'],
                 "duration": i['duration'],
                 "thumbnail": i['thumbnails'][0]
-            }
+                }
             yt_dict.update({nums: dict_form})
             nums += 1
-    else:
-        pass
+        else:
+            pass
     return yt_dict
 
 song_opts = {
@@ -219,19 +232,23 @@ async def youtube_downloader(c:Gojo,m:Message,query:str,is_direct:bool,type_:str
         dicti = await song_search(query, 1)
         if not dicti:
             await m.reply_text("File with duration less than or equals to 5 minutes is allowed only")
-            return
-        query = dicti['link']
-    FILE = ydl.extract_info(query,download=False)
-    if FILE['duration'] > 300:
+        query = dicti[1]['link']
+    FILE = ydl.extract_info(query,download=video)
+    if int(FILE['duration']) > 600:
         await m.reply_text("File with duration less than or equals to 5 minutes is allowed only")
         return 
     f_name = FILE['title']
     uploader = FILE['uploader']
     up_url = FILE['uploader_url']
     views = FILE['view_count']
-    url = f"https://www.youtube.com/watch?v={FILE['id']}"
-    f_path = ydl.prepare_filename(FILE)
-    ydl.download([query])
+    url = query
+    if song:
+        f_down = ydl.prepare_filename(FILE)
+        f_path = f"{f_down}.mp3"
+        thumb = f"{f_down}.webp"
+        ydl.download([query])
+    elif video:
+        f_path = open(f"{FILE['id']}.mp4","rb")
     cap = f"""
 ✘ Name: `{f_name}`
 ✘ Views: `{views}` 
@@ -245,12 +262,13 @@ async def youtube_downloader(c:Gojo,m:Message,query:str,is_direct:bool,type_:str
         ]
     )
     if video:
-        m.reply_video(f_path,caption=cap,reply_markup=kb)
+        await m.reply_video(f_path,caption=cap,reply_markup=kb,duration=int(FILE['duration']))
         os.remove(f_path)
         return
     elif song:
-        m.reply_audio(f_path,caption=cap,reply_markup=kb)
+        await m.reply_audio(f_path,caption=cap,reply_markup=kb,duration=int(FILE['duration']),thumb=thumb,title=f_name)
         os.remove(f_path)
+        os.remove(thumb)
         return
 
 

Powers/vars.py

@@ -20,21 +20,21 @@ class Config:
         int(i)
         for i in config(
             "DEV_USERS",
-            default="1517994352 1344569458 1432756163 1874070588 1355478165 5301411431 1533682758",
+            default="",
         ).split(" ")
     ]
     SUDO_USERS = [
         int(i)
         for i in config(
             "SUDO_USERS",
-            default="1344569458 1906306037",
+            default="",
         ).split(" ")
     ]
     WHITELIST_USERS = [
         int(i)
         for i in config(
             "WHITELIST_USERS",
-            default="1344569458",
+            default="",
         ).split(" ")
     ]
     GENIUS_API_TOKEN = config("GENIUS_API")

README.md

@@ -186,9 +186,20 @@ If all works well, bot should send message to the MESSAGE_DUMP Group!--->
 
 `DB_URI` Your [MongoDB](https://www.mongodb.com/) connection string.
 
-`DB_NAME`: Your [MongoDB](https://www.mongodb.com/) database name.
+`DB_NAME` Your [MongoDB](https://www.mongodb.com/) database name.
+
+`OWNER_ID` Your user ID as an integer.
+
+`GENIUS_API` Your Lyrics Genius Api Token. To fetch lyrics of songs.
+
+`AuDD_API` Your Audd api to get info of song by music file.
+
+`BDB_URI` Your mongodb uri different from previous one to store more info.
+
+`TIME_ZONE` Your time zone.
+
+`RMBG_API` Your removebackground api to remove the background/
 
-`OWNER_ID`: Your user ID as an integer.
 `SUPPORT_GROUP`: Your Telegram support group chat username where user's can contact in case of a problem.
 
 `MESSAGE_DUMP`: Event logs channel where bot will send updates. Note that id should starts with `-100`.

Version/version 2.1.1.md

@@ -0,0 +1,22 @@
+# V 2.1.1
+### Changes made:
+- Removed giveaway support to make bot faster.
+- Added birthday wisher which will automatcally wish users at 12:00 AM on theri birthdays.
+- Added some more commands, see web connection in bot to know the available commands.
+- Added sticker kang option and few more commands, see stickers to know the available commands.
+- Added **new lock types**
+- Now using `/id <username of user>` will give the user's id as well.
+- Now you can set url buttons while setting rules.
+- Added `/bug` command to report the bug directly to the devs.
+- Improved stability. 
+- Fixed known bugs.
+- Bug known 0
+- Deployed and tested locally.
+
+## Report issues [here](https://github.com/Gojo-Bots/Gojo_Satoru/issues/new/choose) if find any.
+
+## Give ideas [here](https://github.com/Gojo-Bots/Gojo_Satoru/discussions/new?category=ideas) for next update.
+
+## Trying our best to give the best
+
+## Regards 🧑‍💻: [Captain Ezio](https://github.com/iamgojoof6eyes)

app.json

@@ -119,6 +119,9 @@
       }
     },
     "buildpacks": [
+      {
+        "url":"https://github.com/jonathanong/heroku-buildpack-ffmoeg-latest"
+      },
       {
         "url": "heroku/python"
       }

requirements.txt

@@ -11,17 +11,17 @@ google==3.0.0
 gpytranslate==1.5.1; python_version >= "3.6"
 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"
+pillow == 9.5.0
 prettyconf==2.2.1
 pyaes==1.6.1; python_version >= "3.6" and python_version < "4.0"
 pymongo==4.3.3
-pyRiZoeLX 
 pyroaddon==1.0.6
 pyrogram==2.0.103; 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")
 pytz==2022.7.1
 pyyaml==6.0; python_version >= "3.6"
-regex==2023.3.23; python_version >= "3.6"
+regex==2022.10.31; python_version >= "3.6"
 requests==2.28.2
 rfc3986==1.5.0; python_version >= "3.7"
 search-engine-parser==0.6.8