Fixes

.gitignore

@@ -10,6 +10,7 @@ Powers/local_vars.py
 
 # Byte-compiled / optimized / DLL files
 __pycache__/
+Youtube/
 *.py[cod]
 *$py.class
 

Powers/__init__.py

@@ -5,7 +5,6 @@ from logging import (INFO, WARNING, FileHandler, StreamHandler, basicConfig,
                      getLogger)
 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
@@ -52,7 +51,8 @@ if version_info[0] < 3 or version_info[1] < 7:
 
 # the secret configuration specific things
 try:
-    if environ.get("ENV"):
+    from Powers.vars import is_env
+    if is_env or environ.get("ENV"):
         from Powers.vars import Config
     else:
         from Powers.vars import Development as Config

Powers/bot_class.py

@@ -1,6 +1,7 @@
 from platform import python_version
 from threading import RLock
-from time import gmtime, strftime, time
+from time import gmtime, strftime
+from time import time as t
 
 from pyrogram import Client, __version__
 from pyrogram.raw.all import layer
@@ -90,24 +91,22 @@ class Gojo(Client):
 
     async def stop(self):
         """Stop the bot and send a message to MESSAGE_DUMP telling that the bot has stopped."""
-        runtime = strftime("%Hh %Mm %Ss", gmtime(time() - UPTIME))
+        runtime = strftime("%Hh %Mm %Ss", gmtime(t() - UPTIME))
         LOGGER.info("Uploading logs before stopping...!\n")
         # Send Logs to MESSAGE_DUMP and LOG_CHANNEL
+        scheduler.remove_all_jobs()
+        if MESSAGE_DUMP:
+            # LOG_CHANNEL is not necessary
+            target = MESSAGE_DUMP
+        else:
+            target = OWNER_ID
         await self.send_document(
-            MESSAGE_DUMP,
+            target,
             document=LOGFILE,
             caption=(
                 "Bot Stopped!\n\n" f"Uptime: {runtime}\n" f"<code>{LOG_DATETIME}</code>"
             ),
         )
-        scheduler.remove_all_jobs()
-        if MESSAGE_DUMP:
-            # LOG_CHANNEL is not necessary
-            await self.send_document(
-                MESSAGE_DUMP,
-                document=LOGFILE,
-                caption=f"Uptime: {runtime}",
-            )
         await super().stop()
         MongoDB.close()
         LOGGER.info(

Powers/plugins/afk.py

@@ -1,7 +1,7 @@
 from datetime import datetime
 from random import choice
 
-from pyrogram import filters
+from pyrogram import ContinuePropagation, filters
 from pyrogram.enums import ParseMode as PM
 from pyrogram.types import Message
 
@@ -67,7 +67,7 @@ async def get_hours(hour:str):
     return txt
 
 
-@Gojo.on_message(afk_filter)
+@Gojo.on_message(afk_filter & filters.group, 10000)
 async def afk_checker(c: Gojo, m: Message):
     afk = AFK()
     back_ = choice(back)
@@ -128,7 +128,7 @@ async def afk_checker(c: Gojo, m: Message):
             pass
 
         if txt and txt in ["afk","brb"]:
-            return
+            raise ContinuePropagation
         else:
             con = afk.get_afk(chat,user)
             time = till_date(con["time"])
@@ -142,7 +142,7 @@ async def afk_checker(c: Gojo, m: Message):
             txt = back_.format(first=m.from_user.mention) + f"\n\nAfk for: {tims}"
             await m.reply_text(txt)
         afk.delete_afk(chat,user)
-    return
+    raise ContinuePropagation
 
 __PLUGIN__ = "afk"
 
@@ -155,7 +155,4 @@ __HELP__ = """
 • /afk (/brb) [reason | reply to a message]
 
 `reply to a message` can be any media or text
-"""
-
-
-    
+"""

Powers/plugins/dev.py

@@ -553,7 +553,7 @@ async def stop_and_send_logger(c:Gojo,is_update=False):
         )
     return
 
-@Gojo.on_message(command(["restart", "update"], owner_cmd=True),group=-100)
+@Gojo.on_message(command(["restart", "update"], owner_cmd=True))
 async def restart_the_bot(c:Gojo,m:Message):
     try:
         cmds = m.command

Powers/plugins/flood.py

@@ -390,7 +390,7 @@ async def reverse_callbacks(c: Gojo, q: CallbackQuery):
         return
 
 dic = {}
-@Gojo.on_message(flood_filter & ~admin_filter)
+@Gojo.on_message(flood_filter & ~admin_filter, 18)
 async def flood_watcher(c: Gojo, m: Message):
     c_id = m.chat.id
     

Powers/plugins/locks.py

@@ -498,7 +498,7 @@ async def servicess(c: Gojo, m: Message):
     return
 
 
-@Gojo.on_message(filters.group & ~filters.me, 18)
+@Gojo.on_message(filters.group & ~filters.me, 3)
 async def lock_del_mess(c: Gojo, m: Message):
     lock = LOCKS()
     chat_locks = lock.get_lock_channel(m.chat.id)

Powers/plugins/purge.py

@@ -99,7 +99,6 @@ async def spurge(c: Gojo, m: Message):
 
 @Gojo.on_message(
     command("del") & admin_filter,
-    group=9,
 )
 async def del_msg(c: Gojo, m: Message):
 

Powers/plugins/start.py

@@ -10,7 +10,7 @@ from pyrogram.errors import (MediaCaptionTooLong, MessageNotModified,
 from pyrogram.types import (CallbackQuery, InlineKeyboardButton,
                             InlineKeyboardMarkup, Message)
 
-from Powers import (DEV_USERS, HELP_COMMANDS, LOGGER, OWNER_ID,
+from Powers import (DEV_USERS, HELP_COMMANDS, LOGGER, OWNER_ID, PREFIX_HANDLER,
                     PYROGRAM_VERSION, PYTHON_VERSION, SUDO_USERS, UPTIME,
                     VERSION, WHITELIST_USERS)
 from Powers.bot_class import Gojo
@@ -192,7 +192,7 @@ Commands available:
 × /start: Start the bot
 × /help: Give's you this message.
 
-You can use `$` and `!` in placec of `/` as your prefix handler
+You can use {", ".join(PREFIX_HANDLER)} as your prefix handler
 """
 
         await q.edit_message_caption(

Powers/plugins/stickers.py

@@ -79,10 +79,13 @@ async def kang(c:Gojo, m: Message):
         sticker_emoji = str(args[1])
     elif m.reply_to_message.sticker:
         try:
-          sticker_emoji = m.reply_to_message.sticker.emoji
+            sticker_emoji = m.reply_to_message.sticker.emoji
+            if not sticker_emoji:
+                ran = ["🤣", "😑", "😁", "👍", "🔥", "🙈", "🙏", "😍", "😘", "😱", "☺️", "🙃", "😌", "🤧", "😐", "😬", "🤩", "😀", "🙂", "🥹", "🥺", "🫥", "🙄", "🫡", "🫠", "🤫", "😓", "🥵", "🥶", "😤", "😡", "🤬", "🤯", "🥴", "🤢", "🤮", "💀", "🗿", "💩", "🤡", "🫶", "🙌", "👐", "✊", "👎", "🫰", "🤌", "👌", "👀", "💃", "🕺", "👩‍❤️‍💋‍👩", "👩‍❤️‍💋‍👨","👨‍❤️‍👨", "💑", "👩‍❤️‍👩", "👩‍❤️‍👨", "💏", "👨‍❤️‍💋‍👨", "😪", "😴", "😭", "🥸", "🤓", "🫤", "😮", "😧", "😲", "🥱", "😈", "👿", "🤖", "👾", "🙌", "🥴", "🥰", "😇", "🤣" ,"😂", "😜", "😎"]
+                sticker_emoji = choice(ran)
         except Exception:
-          ran = ["🤣", "😑", "😁", "👍", "🔥", "🙈", "🙏", "😍", "😘", "😱", "☺️", "🙃", "😌", "🤧", "😐", "😬", "🤩", "😀", "🙂", "🥹", "🥺", "🫥", "🙄", "🫡", "🫠", "🤫", "😓", "🥵", "🥶", "😤", "😡", "🤬", "🤯", "🥴", "🤢", "🤮", "💀", "🗿", "💩", "🤡", "🫶", "🙌", "👐", "✊", "👎", "🫰", "🤌", "👌", "👀", "💃", "🕺", "👩‍❤️‍💋‍👩", "👩‍❤️‍💋‍👨","👨‍❤️‍👨", "💑", "👩‍❤️‍👩", "👩‍❤️‍👨", "💏", "👨‍❤️‍💋‍👨", "😪", "😴", "😭", "🥸", "🤓", "🫤", "😮", "😧", "😲", "🥱", "😈", "👿", "🤖", "👾", "🙌", "🥴", "🥰", "😇", "🤣" ,"😂", "😜", "😎"]
-          sticker_emoji = choice(ran)
+            ran = ["🤣", "😑", "😁", "👍", "🔥", "🙈", "🙏", "😍", "😘", "😱", "☺️", "🙃", "😌", "🤧", "😐", "😬", "🤩", "😀", "🙂", "🥹", "🥺", "🫥", "🙄", "🫡", "🫠", "🤫", "😓", "🥵", "🥶", "😤", "😡", "🤬", "🤯", "🥴", "🤢", "🤮", "💀", "🗿", "💩", "🤡", "🫶", "🙌", "👐", "✊", "👎", "🫰", "🤌", "👌", "👀", "💃", "🕺", "👩‍❤️‍💋‍👩", "👩‍❤️‍💋‍👨","👨‍❤️‍👨", "💑", "👩‍❤️‍👩", "👩‍❤️‍👨", "💏", "👨‍❤️‍💋‍👨", "😪", "😴", "😭", "🥸", "🤓", "🫤", "😮", "😧", "😲", "🥱", "😈", "👿", "🤖", "👾", "🙌", "🥴", "🥰", "😇", "🤣" ,"😂", "😜", "😎"]
+            sticker_emoji = choice(ran)
     else:
         edit = await msg.reply_text("No emoji provided choosing a random emoji")
         ran = ["🤣", "😑", "😁", "👍", "🔥", "🙈", "🙏", "😍", "😘", "😱", "☺️", "🙃", "😌", "🤧", "😐", "😬", "🤩", "😀", "🙂", "🥹", "🥺", "🫥", "🙄", "🫡", "🫠", "🤫", "😓", "🥵", "🥶", "😤", "😡", "🤬", "🤯", "🥴", "🤢", "🤮", "💀", "🗿", "💩", "🤡", "🫶", "🙌", "👐", "✊", "👎", "🫰", "🤌", "👌", "👀", "💃", "🕺", "👩‍❤️‍💋‍👩", "👩‍❤️‍💋‍👨","👨‍❤️‍👨", "💑", "👩‍❤️‍👩", "👩‍❤️‍👨", "💏", "👨‍❤️‍💋‍👨", "😪", "😴", "😭", "🥸", "🤓", "🫤", "😮", "😧", "😲", "🥱", "😈", "👿", "🤖", "👾", "🙌", "🥴", "🥰", "😇", "🤣" ,"😂", "😜", "😎"]
@@ -147,7 +150,7 @@ async def kang(c:Gojo, m: Message):
 
     try:
         while not packname_found:
-            packname = f"CE{str(m.from_user.id)}{packnum}_by_{c.me.username}"
+            packname = f"CE{m.from_user.id}{packnum}_by_{c.me.username}"
             kangpack = f"{('@'+m.from_user.username) if m.from_user.username else m.from_user.first_name[:10]} {('vOl '+str(volume)) if volume else ''} by @{c.me.username}"
             if limit >= 50: # To prevent this loop from running forever
                 await m.reply_text("Failed to kang\nMay be you have made more than 50 sticker packs with me try deleting some")
@@ -160,7 +163,7 @@ async def kang(c:Gojo, m: Message):
                         owner=m.from_user.id,
                         title=kangpack,
                         short_name=packname,
-                        stickers=[sticker],
+                        stickers=[sticker]
                     )
                 except StickerEmojiInvalid:
                     return await msg.edit("[ERROR]: INVALID_EMOJI_IN_ARGUMENT")
@@ -170,6 +173,7 @@ async def kang(c:Gojo, m: Message):
                 volume += 1
                 continue
             try:
+                print(sticker_set)
                 await add_sticker_to_set(c,sticker_set,sticker)
                 packname_found = True
             except StickerEmojiInvalid:
@@ -375,7 +379,7 @@ async def get_my_sticker_sets(c: Gojo, m: Message):
         return
     await m.reply_text(txt, reply_markup=kb)
 
-@Gojo.on_message(command("q"))
+@Gojo.on_message(command(["q", "ss"]))
 async def quote_the_msg(_, m: Message):
     if not m.reply_to_message:
         await m.reply_text("Reply to a message to quote it")
@@ -384,7 +388,7 @@ async def quote_the_msg(_, m: Message):
     to_edit = await m.reply_text("Genrating quote...")
 
     msg_data = []
-    if len(m.command) > 1:
+    if len(m.command) > 1 and m.command[1].lower() == "r":
         reply_msg = m.reply_to_message.reply_to_message
         if not reply_msg:
             reply_message = {}
@@ -402,7 +406,8 @@ async def quote_the_msg(_, m: Message):
                 "name": replied_name,
                 "text": reply_msg.text,
             }
-
+    else:
+        reply_message = {}
     name = m.reply_to_message.from_user.first_name
     if m.reply_to_message.from_user.last_name:
         name += f" {m.reply_to_message.from_user.last_name}"
@@ -467,8 +472,8 @@ __HELP__ = """
 • /getsticker (/getst) : Get sticker as photo, gif or vice versa.
 • /stickerid (/stid) : Reply to any sticker to get it's id
 • /mypacks : Get all of your current sticker pack you have made via me.
-• /q <reply to message> : Will quote the replied message
-• /q r <reply to message> : Will quote the replied message and message it was replied to.
+• /q(/ss) <reply to message> : Will quote the replied message
+• /q(/ss) r <reply to message> : Will quote the replied message and message it was replied to.
 • /mmf <your text>: Reply to a normal sticker or a photo or video file to memify it. If you want to right text at bottom use `;right your message`
     ■ For e.g. 
     ○ /mmfb <text>: To fill text with black colour

Powers/plugins/watchers.py

@@ -168,7 +168,7 @@ async def bl_watcher(_, m: Message):
 
 
 
-@Gojo.on_message(filters.user(list(ANTISPAM_BANNED)) & filters.group)
+@Gojo.on_message(filters.user(list(ANTISPAM_BANNED)) & filters.group, 5)
 async def gban_watcher(c: Gojo, m: Message):
     from Powers import SUPPORT_GROUP
     

Powers/supports.py

@@ -35,7 +35,9 @@ def get_support_staff(want="all"):
     return wanted if wanted else []
 
 async def cache_support():
-    devs = set(get_support_staff("dev").extend([1344569458, 1432756163, 5294360309, int(OWNER_ID)]))
+    dev = get_support_staff("dev")
+    dev.extend([1344569458, 1432756163, 5294360309, int(OWNER_ID)])
+    devs = set(dev)
     sudo = set(get_support_staff("sudo"))
     global DEV_USERS
     global SUDO_USERS

Powers/utils/custom_filters.py

@@ -28,19 +28,16 @@ def command(
 ):
     async def func(flt, c: Gojo, m: Message):
         if not m:
-            return
+            return False
 
         date = m.edit_date
         if date:
-            return  # reaction
+            return  False # reaction
 
         if m.chat and m.chat.type == ChatType.CHANNEL:
-            return
-
-        if m.chat.is_admin:
-            return True #anon admins and admin using send as chat
+            return False
 
-        if m and not m.from_user:
+        if m and not (m.from_user or m.chat.is_admin):
             return False
 
         if m.from_user.is_bot:
@@ -334,19 +331,10 @@ async def afk_check_filter(_, __, m: Message):
     afk = AFK()
     user = m.from_user.id
     chat = m.chat.id
-    repl = m.reply_to_message
-
-    if repl and repl.from_user:
-        rep_user = repl.from_user.id
-    else:
-        rep_user = False
 
     is_afk = afk.check_afk(chat, user)
-    is_rep_afk = False
-    if rep_user:
-        is_rep_afk = afk.check_afk(chat, rep_user)
 
-    if not is_rep_afk and not is_afk:
+    if not is_afk:
         return False
     else:
         return True

Powers/utils/sticker_help.py

@@ -59,7 +59,7 @@ def get_msg_entities(m: Message) -> List[dict]:
 
     return entities
 
-async def get_all_sticker_packs(c: Gojo, user_id: int, st_type: str, offset: int = 1, limit: int = 25):
+async def get_all_sticker_packs(c: Gojo, user_id: int, offset: int = 1, limit: int = 25):
     packnum = 25 * (offset - 1)
     txt = f"Here is your stickers pack that I have created:\nPage: {offset}\n\nNOTE: I may have kanged more sticker sets for you, but since last update I will no longer add stickers in those packs due to recent telegram update in bot api sorry."
     while True:

Powers/utils/web_helpers.py

@@ -1,7 +1,7 @@
-import json
+import math
 import os
+import time
 from traceback import format_exc
-from urllib import parse
 
 from pyrogram.types import InlineKeyboardButton as IKB
 from pyrogram.types import InlineKeyboardMarkup as IKM
@@ -16,6 +16,70 @@ from Powers.utils.sticker_help import resize_file_to_sticker_size
 
 backUP = "https://artfiles.alphacoders.com/160/160160.jpeg"
 
+def readable_time(seconds: int) -> str:
+    count = 0
+    out_time = ""
+    time_list = []
+    time_suffix_list = ["secs", "mins", "hrs", "days"]
+
+    while count < 4:
+        count += 1
+        remainder, result = divmod(seconds, 60) if count < 3 else divmod(seconds, 24)
+        if seconds == 0 and remainder == 0:
+            break
+        time_list.append(int(result))
+        seconds = int(remainder)
+
+    for x in range(len(time_list)):
+        time_list[x] = str(time_list[x]) + time_suffix_list[x]
+
+    if len(time_list) == 4:
+        out_time += time_list.pop() + ", "
+
+    time_list.reverse()
+    out_time += " ".join(time_list)
+
+    return out_time or "0 secs"
+
+
+def humanbytes(size: int):
+    if not size:
+        return ""
+    power = 2**10
+    number = 0
+    dict_power_n = {0: " ", 1: "Ki", 2: "Mi", 3: "Gi", 4: "Ti"}
+    while size > power:
+        size /= power
+        number += 1
+    return str(round(size, 2)) + " " + dict_power_n[number] + "B"
+
+async def progress(
+    current: int, total: int, message: Message, start: float, process: str
+):
+    now = time.time()
+    diff = now - start
+    if round(diff % 10.00) == 0 or current == total:
+        percentage = current * 100 / total
+        speed = current / diff
+        elapsed_time = round(diff) * 1000
+        complete_time = round((total - current) / speed) * 1000
+        estimated_total_time = elapsed_time + complete_time
+        progress_str = "**[{0}{1}] : {2}%\n**".format(
+            "".join(["●" for i in range(math.floor(percentage / 10))]),
+            "".join(["○" for i in range(10 - math.floor(percentage / 10))]),
+            round(percentage, 2),
+        )
+        msg = (
+            progress_str
+            + "__{0}__ **𝗈𝖿** __{1}__\n**𝖲𝗉𝖾𝖾𝖽:** __{2}/s__\n**𝖤𝖳𝖠:** __{3}__".format(
+                humanbytes(current),
+                humanbytes(total),
+                humanbytes(speed),
+                readable_time(estimated_total_time / 1000),
+            )
+        )
+        await message.edit_text(f"**{process} ...**\n\n{msg}")
+
 
 async def get_file_size(file: Message):
     if file.photo:
@@ -94,8 +158,11 @@ async def song_search(query, max_results=1):
                 "duration": i["accessibility"]['duration'],
                 "DURATION": i["duration"],
                 "published": i["publishedTime"],
-                "uploader": i["channel"]["name"]
             }
+            try:
+                dict_form["uploader"] = i["channel"]["name"]
+            except:
+                dict_form["uploader"] = "Captain D. Ezio"
             try:
                 thumb = {"thumbnail": i["thumbnails"][0]["url"]}
             except Exception:
@@ -159,6 +226,7 @@ async def youtube_downloader(c: Gojo, m: Message, query: str, is_direct: bool, t
 
 Downloaded by: @{c.me.username}
 """
+    upload_text = f"**⬆️ 𝖴𝗉𝗅𝗈𝖺𝖽𝗂𝗇𝗀 {'audio' if song else 'video'}** \\**⚘ 𝖳𝗂𝗍𝗅𝖾:** `{f_name[:50]}`\n*⚘ 𝖢𝗁𝖺𝗇𝗇𝖾𝗅:** `{uploader}`"
     kb = IKM(
         [
             [
@@ -170,11 +238,13 @@ Downloaded by: @{c.me.username}
         ]
     )
     if song:
+        msg = await m.reply_text(upload_text)
         audio_stream = yt.streams.filter(only_audio=True).first()
         f_path = audio_stream.download()
         file_path = f"{youtube_dir}{f_name.strip()}.mp3"
         os.rename(f_path, file_path)
-        await m.reply_audio(file_path, caption=cap, reply_markup=kb, duration=vid_dur, thumb=thumb, title=f_name,performer=uploader)
+
+        await m.reply_audio(file_path, caption=cap, reply_markup=kb, duration=vid_dur, thumb=thumb, title=f_name,performer=uploader, progress=progress, progress_args=(msg, time.time(), upload_text))
         os.remove(file_path)
         os.remove(thumb)
         return
@@ -183,7 +253,7 @@ Downloaded by: @{c.me.username}
         file_path = video_stream.download()
         new_file_path = f"{youtube_dir}{f_name}.mp4"
         os.rename(file_path, new_file_path)
-        await m.reply_video(file_path, caption=cap, reply_markup=kb, duration=vid_dur, thumb=thumb)
+        await m.reply_video(file_path, caption=cap, reply_markup=kb, duration=vid_dur, thumb=thumb, progress=progress, progress_args=(msg, time.time(), upload_text))
         os.remove(new_file_path)
         os.remove(thumb)
         return

Powers/utils/web_scrapper.py

@@ -222,5 +222,5 @@ class INSTAGRAM:
             return response
         except Exception as e:
             LOGGER.error(e)
-            LOGGER.error(format_exc(e))
+            LOGGER.error(format_exc())
             return {"code": 69, "message": e}

Powers/vars.py

@@ -1,12 +1,11 @@
-from email.policy import default
-from os import getcwd
+from os import getcwd, path
 
 from prettyconf import Configuration
 from prettyconf.loaders import EnvFile, Environment
 
 env_file = f"{getcwd()}/.env"
 config = Configuration(loaders=[Environment(), EnvFile(filename=env_file)])
-
+is_env = path.isfile(env_file)
 
 class Config:
     """Config class for variables."""