feat: apply multiple user-requested changes

DragMusic/plugins/goodnight.py

@@ -1,42 +0,0 @@
-import re
-from dotenv import load_dotenv
-from pyrogram import filters
-import random
-from pyrogram.types import Message
-from pyrogram import Client, filters
-from DragMusic import app
-
-
-
-# "/gn" command ka handler
-@app.on_message(filters.command("oodnight", prefixes="g"))
-def goodnight_command_handler(client: Client, message: Message):
-    # Randomly decide whether to send a sticker or an emoji
-    send_sticker = random.choice([True, False])
-    
-    # Send a sticker or an emoji based on the random choice
-    if send_sticker:
-        client.send_sticker(message.chat.id, get_random_sticker())
-    else:
-        client.send_message(message.chat.id, get_random_emoji())
-
-# Function to get a random sticker
-def get_random_sticker():
-    stickers = [
-        "CAACAgQAAx0Ce9_hCAACaEVlwn7HeZhgwyVfKHc3WUGC_447IAACLgwAAkQwKVPtub8VAR018x4E",
-        "CAACAgIAAx0Ce9_hCAACaEplwn7dvj7G0-a1v3wlbN281RMX2QACUgwAAligOUoi7DhLVTsNsh4E",
-        "CAACAgIAAx0Ce9_hCAACaFBlwn8AAZNB9mOUvz5oAyM7CT-5pjAAAtEKAALa7NhLvbTGyDLbe1IeBA",
-        "CAACAgUAAx0CcmOuMwACldVlwn9ZHHF2-S-CuMSYabwwtVGC3AACOAkAAoqR2VYDjyK6OOr_Px4E",
-        "CAACAgIAAx0Ce9_hCAACaFVlwn-fG58GKoEmmZpVovxEj4PodAACfwwAAqozQUrt2xSTf5Ac4h4E",
-    ]
-    return random.choice(stickers)
-
-# Function to get a random emoji
-def get_random_emoji():
-    emojis = [
-        "😴",
-        "😪", 
-        "💤",
-        
-    ]
-    return random.choice(emojis)

DragMusic/plugins/sudo/gban.py

@@ -23,7 +23,13 @@ async def global_ban(client, message: Message, _):
     if not message.reply_to_message:
         if len(message.command) != 2:
             return await message.reply_text(_["general_1"])
-    user = await extract_user(message)
+        user = message.command[1]
+        if "@" in user:
+            user = user.replace("@", "")
+        user = await app.get_users(user)
+    else:
+        user = await extract_user(message)
+        
     if user.id == message.from_user.id:
         return await message.reply_text(_["gban_1"])
     elif user.id == app.id:
@@ -78,7 +84,13 @@ async def global_un(client, message: Message, _):
     if not message.reply_to_message:
         if len(message.command) != 2:
             return await message.reply_text(_["general_1"])
-    user = await extract_user(message)
+        user = message.command[1]
+        if "@" in user:
+            user = user.replace("@", "")
+        user = await app.get_users(user)
+    else:
+        user = await extract_user(message)
+
     is_gbanned = await is_banned_user(user.id)
     if not is_gbanned:
         return await message.reply_text(_["gban_7"].format(user.mention))

DragMusic/plugins/sudo/restart.py

@@ -31,7 +31,7 @@ async def is_heroku():
 @language
 async def log_(client, message, _):
     try:
-        await message.reply_document(document="log.txt")
+        await message.reply_document(document="/tmp/logs.txt")
     except:
         await message.reply_text(_["server_1"])
 

DragMusic/plugins/tools/chatlog.py

@@ -47,9 +47,6 @@ async def on_left_chat_member(_, message: Message):
             await app.send_message(
                 LOG_GROUP_ID,
                 text=left,
-                reply_markup=InlineKeyboardMarkup([
-                    [InlineKeyboardButton(f"ᴀᴅᴅ ᴍᴇ ʟᴏᴠᴇ", url=f"https://t.me/{(await app.get_me()).username}?startgroup=true")]
-                ]),
                 message_thread_id=12279
             )
         except Exception as e:

DragMusic/plugins/tools/welcome.py

@@ -1,312 +0,0 @@
-import os
-from PIL import ImageDraw, Image, ImageFont, ImageChops
-from pyrogram import *
-from pyrogram.types import *
-from logging import getLogger
-from DragMusic import app
-from typing import Union
-import textwrap
-
-
-
-
-
-LOGGER = getLogger(__name__)
-
-class WelDatabase:
-    def __init__(self):
-        self.data = {}
-
-    async def find_one(self, chat_id):
-        return chat_id in self.data
-
-    async def add_wlcm(self, chat_id):
-        self.data[chat_id] = {}
-
-    async def rm_wlcm(self, chat_id):
-        if chat_id in self.data:
-            del self.data[chat_id]
-
-wlcm = WelDatabase()
-
-class temp:
-    ME = None
-    CURRENT = 2
-    CANCEL = False
-    MELCOW = {}
-    U_NAME = None
-    B_NAME = None
-
-# ... (rest of your code remains unchanged)
-
-# ... (FUCK you randi ke bacvhhe )
-
-def circle(pfp, size=(500, 500)):
-    pfp = pfp.resize(size, Image.ANTIALIAS).convert("RGBA")
-    bigsize = (pfp.size[0] * 3, pfp.size[1] * 3)
-    mask = Image.new("L", bigsize, 0)
-    draw = ImageDraw.Draw(mask)
-    draw.ellipse((0, 0) + bigsize, fill=255)
-    mask = mask.resize(pfp.size, Image.ANTIALIAS)
-    mask = ImageChops.darker(mask, pfp.split()[-1])
-    pfp.putalpha(mask)
-    return pfp
-
-def welcomepic(pic, user, chatname, id, uname):
-    background = Image.open("DragMusic/assets/wel2.png")
-    pfp = Image.open(pic).convert("RGBA")
-    pfp = circle(pfp)
-    pfp = pfp.resize((825, 824))
-    draw = ImageDraw.Draw(background)
-    font = ImageFont.truetype('DragMusic/assets/font.ttf', size=110)
-    welcome_font = ImageFont.truetype('DragMusic/assets/font.ttf', size=60)
-    draw.text((2100, 1420), f'ID: {id}', fill=(12000, 12000, 12000), font=font)
-    pfp_position = (1990, 435)
-    background.paste(pfp, pfp_position, pfp)
-    background.save(f"/tmp/downloads/welcome#{id}.png")
-    return f"/tmp/downloads/welcome#{id}.png"
-
-# FUCK you bhosadiwale 
-
-
-@app.on_message(filters.command("wel") & ~filters.private)
-async def auto_state(_, message):
-    usage = "**Usage:**\n⦿/wel [on|off]"
-    if len(message.command) == 1:
-        return await message.reply_text(usage)
-    chat_id = message.chat.id
-    user = await app.get_chat_member(message.chat.id, message.from_user.id)
-    if user.status in (
-        enums.ChatMemberStatus.ADMINISTRATOR,
-        enums.ChatMemberStatus.OWNER,
-    ):
-        A = await wlcm.find_one(chat_id)
-        state = message.text.split(None, 1)[1].strip().lower()
-        if state == "on":
-            if A:
-                return await message.reply_text("Special Welcome Already Enabled")
-            elif not A:
-                await wlcm.add_wlcm(chat_id)
-                await message.reply_text(f"Enabled Special Welcome in {message.chat.title}")
-        elif state == "off":
-            if not A:
-                return await message.reply_text("Special Welcome Already Disabled")
-            elif A:
-                await wlcm.rm_wlcm(chat_id)
-                await message.reply_text(f"Disabled Special Welcome in {message.chat.title}")
-        else:
-            await message.reply_text(usage)
-    else:
-        await message.reply("Only Admins Can Use This Command")
-
-# ... (copy paster teri maa ki chut  )
-
-@app.on_chat_member_updated(filters.group, group=-3)
-async def greet_group(_, member: ChatMemberUpdated):
-    chat_id = member.chat.id
-    A = await wlcm.find_one(chat_id)
-    if not A:
-        return
-    if (
-        not member.new_chat_member
-        or member.new_chat_member.status in {"banned", "left", "restricted"}
-        or member.old_chat_member
-    ):
-        return
-    user = member.new_chat_member.user if member.new_chat_member else member.from_user
-    try:
-        pic = await app.download_media(
-            user.photo.big_file_id, file_name=f"/tmp/downloads/pp{user.id}.png"
-        )
-    except AttributeError:
-        pic = "DragMusic/assets/upic.png"
-    if (temp.MELCOW).get(f"welcome-{member.chat.id}") is not None:
-        try:
-            await temp.MELCOW[f"welcome-{member.chat.id}"].delete()
-        except Exception as e:
-            LOGGER.error(e)
-    try:
-        welcomeimg = welcomepic(
-            pic, user.first_name, member.chat.title, user.id, user.username
-        )
-        temp.MELCOW[f"welcome-{member.chat.id}"] = await app.send_photo(
-            member.chat.id,
-            photo=welcomeimg,
-            caption=f"""
-**❀ ᴡᴇʟᴄᴏᴍᴇ ᴛᴏ ᴛʜᴇ {member.chat.title} ɢʀᴏᴜᴘ ❀
-
-๏ ɴᴀᴍᴇ ➛ {user.mention}
-๏ ɪᴅ ➛ {user.id}
-๏ ᴜsᴇʀɴᴀᴍᴇ ➛ @{user.username}
-""",
-            reply_markup=InlineKeyboardMarkup([[InlineKeyboardButton(f"ᴀᴅᴅ ᴍᴇ ʙᴀʙʏ", url=f"https://t.me/{(await app.get_me()).username}?startgroup=true")]])
-        )
-    except Exception as e:
-        LOGGER.error(e)
-    try:
-        os.remove(f"/tmp/downloads/welcome#{user.id}.png")
-        os.remove(f"/tmp/downloads/pp{user.id}.png")
-    except Exception as e:
-        pass
-
-# ... (resfuxbk 
-
-@app.on_message(filters.new_chat_members & filters.group, group=-1)
-async def bot_wel(_, message):
-    for u in message.new_chat_members:
-        if u.id == app.me.id:
-            await app.send_message(message.chat.id, "Thanks for adding me to your group.")
-
-async def welcome_captcha(
-    _, message: Message, cb_data: dict, failed: bool = False
-) -> Union[int, bool]:
-    if failed:
-        photo = (
-            "https://telegra.ph/file/223695233211590f7ac71.jpg"
-        )
-    else:
-        photo = (
-            "https://telegra.ph/file/223695233211590f7ac71.jpg"
-        )
-    background = Image.open(photo)
-    background = background.resize((1280, 720))
-
-    #
-    image3 = Image.new("RGBA", (1280, 720))
-    image3.paste(background, (0, 0))
-    #
-
-    # Drawing with Impact Font
-    draw = ImageDraw.Draw(image3)
-    font = ImageFont.truetype("DragMusic/assets/font.ttf", 60)
-    font2 = ImageFont.truetype("DragMusic/assets/font2.ttf", 70)
-    arial = ImageFont.truetype("DragMusic/assets/font2.ttf", 40)
-    gfont = ImageFont.truetype("DragMusic/assets/font2.tf", 40)
-    para = textwrap.wrap(title, width=32)
-    j = 0
-    try:
-        if para[0]:
-            draw.text(
-                (5, 5),
-                f"{para[0]}",
-                fill="white",
-                stroke_width=3,
-                stroke_fill="black",
-                font=font,
-            )
-        if para[1]:
-            draw.text(
-                (5, 70),
-                f"{para[1]}",
-                fill="white",
-                stroke_width=3,
-                stroke_fill="black",
-                font=font,
-            )
-    except:
-        pass
-    text_w, text_h = draw.textsize(f"Welcome to {ctitle}", font=gfont)
-    draw.text(
-        ((1280 - text_w) / 2, 615),
-        f"Welcome to {ctitle}",
-        fill="white",
-        font=gfont,
-    )
-    draw.text((740, 480), "NAME:", fill="white", font=arial)
-    draw.text(
-        (915, 480),
-        f"{fullname}",
-        fill="white",
-        font=arial,
-    )
-    draw.text(
-        (740, 530),
-        f"USERNAME : @{uname}",
-        (255, 255, 255),
-        font=arial,
-    )
-
-    background.save(f"/tmp/downloads/welcome#{id}.png")
-    return f"/tmp/downloads/welcome#{id}.png"
-
-
-async def on_new_chat_member(client, message: Message):
-    if not await is_approved(message.chat.id):
-        return await message.reply_text(
-            f"Greetings {message.from_user.mention}, and welcome to {message.chat.title}.\n\n{app.mention} do not have permission to work here. You must request permission from my owner."
-        )
-    if message.from_user.id in BANNED_USERS:
-        return
-    if (await client.get_me()).id in [user.id for user in message.new_chat_members]:
-        return
-    for user in message.new_chat_members:
-        if await is_gbanned_user(user.id):
-            await message.chat.ban_member(user.id)
-            await message.reply_text(
-                f"{user.mention} was globally banned, so I'm kicking them. Sorry for the inconvenience."
-            )
-            return
-        if user.is_bot:
-            return
-        if not await is_welcome_on(message.chat.id):
-            continue
-        # Check if the user is a bot
-        if user.is_bot:
-            return  # Do not send a welcome message to bots
-
-        # Get the welcome message and buttons for the chat
-        welcome, buttons = await get_welcome(str(message.chat.id))
-
-        # Replace placeholders in the welcome message with user and chat information
-        mention = user.mention
-        title = message.chat.title
-        fullname = user.first_name + " " + user.last_name if user.last_name else user.first_name
-        username = f"@{user.username}" if user.username else "NO USERNAME"
-        user_id = user.id
-        # Send the welcome message with the custom buttons
-        await client.send_message(
-            chat_id=message.chat.id,
-            text=welcome.format(
-                mention=mention,
-                title=title,
-                fullname=fullname,
-                username=username,
-                id=user_id,
-            ),
-            reply_markup=InlineKeyboardMarkup(buttons),
-            disable_web_page_preview=True,
-        )
-
-
-async def on_user_left(client, message: Message):
-    if not await is_goodbye_on(message.chat.id):
-        return
-    if await is_gbanned_user(message.left_chat_member.id):
-        return
-
-    left = message.left_chat_member
-    if left.is_bot:
-        return  # Do not send a goodbye message to bots
-
-    # Get the goodbye message and buttons for the chat
-    goodbye, buttons = await get_goodbye(str(message.chat.id))
-
-    # Replace placeholders in the goodbye message with user and chat information
-    mention = left.mention
-    title = message.chat.title
-    fullname = left.first_name + " " + left.last_name if left.last_name else left.first_name
-    username = f"@{left.username}" if left.username else "NO USERNAME"
-    user_id = left.id
-    # Send the goodbye message with the custom buttons
-    await client.send_message(
-        chat_id=message.chat.id,
-        text=goodbye.format(
-            mention=mention,
-            title=title,
-            fullname=fullname,
-            username=username,
-            id=user_id,
-        ),
-        reply_markup=InlineKeyboardMarkup(buttons),
-        disable_web_page_preview=True,
-    )