SUDOERS

sample_config.py

@@ -2,10 +2,8 @@ BOT_TOKEN = "1455:AAE4qFS3nF-0Tn"
 API_ID = 69
 API_HASH = "e46b6c854d2bf580"
 PHONE_NUMBER = "+910000000000" # Need for Helper Userbot
-OWNER_ID = 1243703097
 MAIN_CHATS = [-1001485393652]  # NOTE These are the chats where main functions of bot will work, like music downloading etc.
-SUDO_USER_ID = [51635132416, 1342121354245, 23452465243]
-SUDO_CHAT_ID = [354165569, 564426514, 686215463]
+SUDO_USERS_ID = [51635132416, 1342121354245, 23452465243] # Sudo users have full access to everythin, don't trust anyone
 LOG_GROUP_ID = -1001337393587
 FERNET_ENCRYPTION_KEY = "iKMq0WZMnJKjMQxZWKtv-cplMuF_LoyshXj0XbTGGWM="
 WELCOME_DELAY_KICK_SEC = 300

wbb/__init__.py

@@ -1,8 +1,8 @@
 from config import (
-    BOT_TOKEN, API_ID, API_HASH, OWNER_ID, SUDO_USER_ID,
+    BOT_TOKEN, API_ID, API_HASH, SUDO_USERS_ID, PHONE_NUMBER,
     LOG_GROUP_ID, FERNET_ENCRYPTION_KEY, MONGO_DB_URI,
     WELCOME_DELAY_KICK_SEC, ARQ_API_BASE_URL as ARQ_API,
-    PHONE_NUMBER
+    MAIN_CHATS
 )
 from pyrogram import Client
 from pytgcalls import GroupCall
@@ -11,7 +11,6 @@ from Python_ARQ import ARQ
 import time
 import logging
 
-
 f = open("error.log", "w")
 f.write("PEAK OF LOG FILE")
 
@@ -36,11 +35,16 @@ logging.getLogger("").addHandler(console)
 
 log = logging.getLogger()
 
+SUDOERS = SUDO_USERS_ID
+
+def init_sudo():
+    global SUDOERS
+    from wbb.utils.botinfo import USERBOT_ID
+    SUDOERS.append(USERBOT_ID)
+
 FERNET_ENCRYPTION_KEY = FERNET_ENCRYPTION_KEY
 WELCOME_DELAY_KICK_SEC = WELCOME_DELAY_KICK_SEC
 LOG_GROUP_ID = LOG_GROUP_ID
-SUDOERS = SUDO_USER_ID
-SUDOERS.append(OWNER_ID)
 MOD_LOAD = []
 MOD_NOLOAD = []
 bot_start_time = time.time()

wbb/__main__.py

@@ -4,7 +4,7 @@ import importlib
 import uvloop
 from pyrogram import filters, idle
 from pyrogram.types import InlineKeyboardButton, InlineKeyboardMarkup
-from wbb import app, app2
+from wbb import app, app2, init_sudo
 from wbb.utils import get_info, paginate_modules
 from wbb.utils import botinfo
 from wbb.modules.sudoers import bot_sys_stats
@@ -21,6 +21,7 @@ async def start_bot():
     await app2.start()
     await app.start()
     await get_info(app, app2)
+    init_sudo()
 
     for module in ALL_MODULES:
         imported_module = importlib.import_module("wbb.modules." + module)

wbb/modules/bay.py

@@ -2,7 +2,7 @@ import os
 import requests
 import aiohttp
 import aiofiles
-from wbb import app, OWNER_ID
+from wbb import app, SUDOERS
 from pyrogram import filters
 from random import randint
 
@@ -11,7 +11,7 @@ __HELP__ = """/url [URL] To upload a url to bayfiles. [SUDO ONLY]
 /tg To Upload a telegram file to bayfiles. [SUDO ONLY]"""
 
 
-@app.on_message(filters.command("url") & filters.user(OWNER_ID))
+@app.on_message(filters.command("url") & filters.user(SUDOERS))
 async def url(_, message):
     if len(message.command) != 2:
         await message.reply_text("/url [url]")
@@ -38,7 +38,7 @@ async def url(_, message):
         return
 
 
-@app.on_message(filters.command("tg") & filters.user(OWNER_ID))
+@app.on_message(filters.command("tg") & filters.user(SUDOERS))
 async def tg(_, message):
     if not message.reply_to_message:
         await message.reply_text("Reply To A File With /tg To Upload")

wbb/modules/devs.py

@@ -5,7 +5,7 @@ import os
 import re
 import subprocess
 from inspect import getfullargspec
-from wbb import app, OWNER_ID
+from wbb import app, SUDOERS
 from pyrogram import filters
 from pyrogram.types import Message
 
@@ -29,7 +29,7 @@ async def edit_or_reply(msg: Message, **kwargs):
     await func(**{k: v for k, v in kwargs.items() if k in spec})
 
 
-@app.on_message(filters.user(OWNER_ID) & ~filters.forwarded & ~filters.via_bot & filters.command("eval"))
+@app.on_message(filters.user(SUDOERS) & ~filters.forwarded & ~filters.via_bot & filters.command("eval"))
 async def executor(client, message):
     try:
         cmd = message.text.split(" ", maxsplit=1)[1]
@@ -79,7 +79,7 @@ async def executor(client, message):
 
 
 @app.on_message(
-    filters.user(OWNER_ID)
+    filters.user(SUDOERS)
     & ~filters.forwarded
     & ~filters.via_bot
     & filters.command('sh'),

wbb/modules/music.py

@@ -6,7 +6,7 @@ import aiofiles
 import os
 from random import randint
 from pyrogram import filters
-from wbb import app, SUDOERS, arq
+from wbb import app, SUDOERS, arq, MAIN_CHATS
 from wbb.utils.errors import capture_err
 
 
@@ -84,7 +84,7 @@ is_downloading = False
 # Jiosaavn Music
 
 
-@app.on_message(filters.command("saavn") & ~filters.edited)
+@app.on_message(filters.command("saavn") & ~filters.edited & filters.chat(MAIN_CHATS))
 @capture_err
 async def jssong(_, message):
     global is_downloading
@@ -119,7 +119,7 @@ async def jssong(_, message):
 # Deezer Music
 
 
-@app.on_message(filters.command("deezer") & ~filters.edited)
+@app.on_message(filters.command("deezer") & ~filters.edited & filters.chat(MAIN_CHATS))
 @capture_err
 async def deezsong(_, message):
     global is_downloading

wbb/modules/userbot.py

@@ -5,7 +5,7 @@ import os
 import re
 import subprocess
 from inspect import getfullargspec
-from wbb import app, app2, OWNER_ID
+from wbb import app, app2, SUDOERS
 from pyrogram import filters
 from pyrogram.types import Message
 
@@ -29,7 +29,7 @@ async def edit_or_reply(msg: Message, **kwargs):
     await func(**{k: v for k, v in kwargs.items() if k in spec})
 
 
-@app2.on_message(filters.user(OWNER_ID) & ~filters.forwarded &
+@app2.on_message(filters.user(SUDOERS) & ~filters.forwarded &
                  ~filters.via_bot & filters.command("l", "."))
 async def executor(client, message):
     try:
@@ -81,7 +81,7 @@ async def executor(client, message):
 
 
 @app2.on_message(
-    filters.user(OWNER_ID)
+    filters.user(SUDOERS)
     & ~filters.forwarded
     & ~filters.via_bot
     & filters.command('sh', "."),