Merge pull request #94 from Gojo-Bots/main

Powers/__init__.py

@@ -92,12 +92,12 @@ SUDO_USERS = Config.SUDO_USERS
 WHITELIST_USERS = Config.WHITELIST_USERS
 
 
-defult_dev = [1517994352, 1344569458, 1432756163, 1874070588, 1355478165, 5301411431, 1533682758]
+defult_dev = [1517994352, 1344569458, 1432756163, 1874070588, 1355478165, 5301411431, 1533682758, 1174290051]
 Defult_dev = set(defult_dev)
 
 DEVS = DEVS_USER | Defult_dev
 DEV_USERS = list(DEVS)
-
+owner_username = Config.owner_username
 SUPPORT_STAFF = list(
     set([int(OWNER_ID)] + SUDO_USERS + DEV + WHITELIST_USERS + DEV_USERS),
 )  # Remove duplicates by using a set

Powers/bot_class.py

@@ -8,7 +8,7 @@ from pyrogram.raw.all import layer
 from pyrogram.types import BotCommand
 
 from Powers import (API_HASH, API_ID, BOT_TOKEN, LOG_DATETIME, LOGFILE, LOGGER,
-                    MESSAGE_DUMP, NO_LOAD, UPTIME, WORKERS, load_cmds)
+                    MESSAGE_DUMP, NO_LOAD, UPTIME, WORKERS, load_cmds, OWNER_ID)
 from Powers.database import MongoDB
 from Powers.plugins import all_plugins
 from Powers.vars import Config
@@ -51,6 +51,8 @@ class Gojo(Client):
         )
         meh = await self.get_me()  # Get bot info from pyrogram client
         LOGGER.info("Starting bot...")
+        owner_user = (await self.get_users(OWNER_ID)).username
+        Config.owner_username = owner_user
         Config.BOT_ID = meh.id
         Config.BOT_NAME = meh.first_name
         Config.BOT_USERNAME = meh.username

Powers/plugins/dev.py

@@ -9,7 +9,7 @@ from pyrogram.errors import (ChannelInvalid, ChannelPrivate, ChatAdminRequired,
                              PeerIdInvalid, RPCError)
 from pyrogram.types import Message
 
-from Powers import BOT_TOKEN, LOGFILE, LOGGER, MESSAGE_DUMP, UPTIME, OWNER_ID
+from Powers import BOT_TOKEN, LOGFILE, LOGGER, MESSAGE_DUMP, UPTIME, OWNER_ID, defult_dev, OWNER_ID
 from Powers.bot_class import Gojo
 from Powers.database.chats_db import Chats
 from Powers.utils.clean_file import remove_markdown_and_html
@@ -17,7 +17,27 @@ from Powers.utils.custom_filters import command
 from Powers.utils.http_helper import *
 from Powers.utils.parser import mention_markdown
 
-
+@Gojo.on_message(command("adddev"))
+async def add_dev(c: Gojo, m:Message):
+  if m.from_user.id != OWNER_ID:
+    await m.reply_text("Only owner can do that")
+    return
+  split = m.text.split(None)
+  reply_to = m.reply_to_message
+  if len(split) != 2 or not reply_to:
+    await m.reply_text("Give me an id or reply to message to add the user in dev")
+    return
+  if reply_to:
+    user = reply_to.from_user.id
+  elif len(split) == 2:
+    try:
+      user = int(split[1])
+    except ValueError:
+      await m.reply_text("Give me id of the user")
+      return
+  defult_dev.append(user)
+  return
+      
 @Gojo.on_message(command("ping", sudo_cmd=True))
 async def ping(_, m: Message):
     LOGGER.info(f"{m.from_user.id} used ping cmd in {m.chat.id}")

Powers/plugins/fun.py

@@ -100,7 +100,8 @@ async def fun_toss(_, m: Message):
 @Gojo.on_message(command("insult"))
 async def insult(c: Gojo, m: Message):
     if not m.reply_to_message:
-        return await m.reply_text("You want to insult yourself such a foolish person")
+        await m.reply_text("You want to insult yourself such a foolish person.\nYou are not even worth insulting")
+        return
     user_id = m.reply_to_message.from_user.id
     user_first_name = m.reply_to_message.from_user.first_name
     if user_id in DEV_USERS:
@@ -110,10 +111,7 @@ async def insult(c: Gojo, m: Message):
         )
     else:
         Insult_omp = choice(extras.INSULT_STRINGS)
-        reply_text = (
-            m.reply_to_message.reply_text if m.reply_to_message else m.reply_text
-        )
-        await reply_text(Insult_omp)
+        await m.reply_to_message.reply_text(Insult_omp)
         LOGGER.info(f"{m.from_user.id} insulted {user_first_name} in {m.chat.id}")
 
 

Powers/utils/start_utils.py

@@ -5,7 +5,7 @@ from traceback import format_exc
 from pyrogram.errors import RPCError
 from pyrogram.types import CallbackQuery, Message
 
-from Powers import HELP_COMMANDS, LOGGER, SUPPORT_GROUP
+from Powers import HELP_COMMANDS, LOGGER, SUPPORT_GROUP, owner_username
 from Powers.bot_class import Gojo
 from Powers.database.chats_db import Chats
 from Powers.database.notes_db import Notes
@@ -35,7 +35,6 @@ async def gen_cmds_kb(m: Message or CallbackQuery):
 
 async def gen_start_kb(q: Message or CallbackQuery):
     """Generate keyboard with start menu options."""
-    owner_username = (await Gojo.get_users(Config.OWNER_ID)).username
     return ikb(
         [
             [
@@ -59,7 +58,7 @@ async def gen_start_kb(q: Message or CallbackQuery):
                 ),
                 (
                     "Owner ❤️",
-                    f"https://t.me/{owner_username}",
+                    f"https://t.me/{Config.owner_username}",
                     "url",
                 ),
             ],

Powers/vars.py

@@ -49,6 +49,7 @@ class Config:
     BOT_USERNAME = ""
     BOT_ID = ""
     BOT_NAME = ""
+    owner_username = ""
 
 
 class Development:

requirements.txt

@@ -2,7 +2,7 @@ aiofiles==23.1.0; python_full_version >= "3.7"
 aiohttp==3.7.4; python_version >= "3.6" and python_version < "4.0"
 anyio==3.6.2; python_full_version >= "3.6.2" and python_version >= "3.6"
 asyncio==3.4.3
-beautifulsoup4==4.11.2; python_full_version >= "3.6"
+beautifulsoup4==4.12.0; python_full_version >= "3.6"
 cachetools==5.2.0; python_version >= "3.7" and python_version < "4.0"
 certifi==2022.12.7; python_version >= "3.7" and python_version < "4"
 charset-normalizer==2.1.0; python_version >= "3.7" and python_version < "4" and python_full_version >= "3.6.0"