Many fixes

wbb/__init__.py

@@ -47,8 +47,7 @@ mongo_client = MongoClient(MONGO_DB_URI)
 db = mongo_client.wbb
 
 
-# Userbot client
-print("\nStarting Helper Userbot\n")
+
 app2 = Client(
     "userbot",
     phone_number=PHONE_NUMBER,
@@ -56,11 +55,6 @@ app2 = Client(
     api_hash=API_HASH
 )
 
-with app2:
-    SUDOERS.append((app2.get_me()).id)
-
-# Mainbot client
-print("\nStarting Main Bot\n")
 app = Client(
     "wbb",
     bot_token=BOT_TOKEN,
@@ -68,5 +62,46 @@ app = Client(
     api_hash=API_HASH
 )
 
+
+BOT_ID = 0
+BOT_NAME = ""
+BOT_USERNAME = ""
+BOT_MENTION = ""
+BOT_DC_ID = 0
+USERBOT_ID = 0
+USERBOT_NAME = ""
+USERBOT_USERNAME = ""
+USERBOT_DC_ID = 0
+USERBOT_MENTION = ""
+
+
+def get_info(app, app2):
+    global BOT_ID, BOT_NAME, BOT_USERNAME, BOT_DC_ID, BOT_MENTION
+    global USERBOT_ID, USERBOT_NAME, USERBOT_USERNAME, USERBOT_DC_ID, USERBOT_MENTION
+    getme = app.get_me()
+    getme2 = app2.get_me()
+    BOT_ID = getme.id
+    USERBOT_ID = getme2.id
+    if getme.last_name:
+        BOT_NAME = getme.first_name + " " + getme.last_name
+    else:
+        BOT_NAME = getme.first_name
+    BOT_USERNAME = getme.username
+    BOT_MENTION = getme.mention
+    BOT_DC_ID = getme.dc_id
+
+    if getme2.last_name:
+        USERBOT_NAME = getme2.first_name + " " + getme2.last_name
+    else:
+        USERBOT_NAME = getme2.first_name
+    USERBOT_USERNAME = getme2.username
+    USERBOT_MENTION = getme2.mention
+    USERBOT_DC_ID = getme2.dc_id
+
+
+app.start()
+app2.start()
+get_info(app, app2)
+SUDOERS.append(USERBOT_ID)
 # ARQ client
 arq = ARQ(ARQ_API)

wbb/__main__.py

@@ -4,9 +4,8 @@ import importlib
 import uvloop
 from pyrogram import filters, idle
 from pyrogram.types import InlineKeyboardButton, InlineKeyboardMarkup
-from wbb import app, app2
-from wbb.utils import get_info, paginate_modules
-from wbb.utils import botinfo
+from wbb import app, app2, BOT_NAME, BOT_USERNAME
+from wbb.utils import paginate_modules
 from wbb.modules.sudoers import bot_sys_stats
 from wbb.modules import ALL_MODULES
 
@@ -18,9 +17,6 @@ HELPABLE = {}
 
 async def start_bot():
     global COMMANDS_COUNT
-    await app2.start()
-    await app.start()
-    await get_info(app, app2) 
 
     for module in ALL_MODULES:
         imported_module = importlib.import_module("wbb.modules." + module)
@@ -50,10 +46,9 @@ async def start_bot():
     print("+===============+===============+===============+===============+")
     print(bot_modules)
     print("+===============+===============+===============+===============+")
-    print("Bot Started Successfully as {}!".format(botinfo.BOT_NAME))
+    print("Bot Started Successfully as {}!".format(BOT_NAME))
     await idle()
 
-
 @app.on_message(filters.command(["help", "start"]))
 async def help_command(_, message):
     if message.chat.type != "private":
@@ -68,7 +63,7 @@ async def help_command(_, message):
                 [
                     InlineKeyboardButton(
                         text="Help ❓",
-                        url=f"t.me/{botinfo.BOT_USERNAME}?start=help",
+                        url=f"t.me/{BOT_USERNAME}?start=help",
                     ),
                     InlineKeyboardButton(
                         text="Repo 🛠",
@@ -114,12 +109,12 @@ async def help_command(_, message):
             [
                 InlineKeyboardButton(
                     text="Add Me To Your Group 🎉",
-                    url=f"http://t.me/{botinfo.BOT_USERNAME}?startgroup=new"
+                    url=f"http://t.me/{BOT_USERNAME}?startgroup=new"
                 )
             ]
         ]
     )
-    await message.reply(f"Hey there! My name is {botinfo.BOT_NAME}. I can manage your group with lots of useful features, feel free to add me to your group.", reply_markup=keyboard)
+    await message.reply(f"Hey there! My name is {BOT_NAME}. I can manage your group with lots of useful features, feel free to add me to your group.", reply_markup=keyboard)
 
 
 async def help_parser(name, keyboard=None):
@@ -135,7 +130,7 @@ General command are:
  - /start: Start the bot
  - /help: Give this message""".format(
             first_name=name,
-            bot_name=botinfo.BOT_NAME,
+            bot_name=BOT_NAME,
         ),
         keyboard,
     )
@@ -189,7 +184,7 @@ async def help_button(client, query):
         await query.message.edit(
             text="Hi {first_name}. I am {bot_name}".format(
                 first_name=query.from_user.first_name,
-                bot_name=botinfo.BOT_NAME,
+                bot_name=BOT_NAME,
             ),
             reply_markup=InlineKeyboardMarkup(
                 paginate_modules(curr_page - 1, HELPABLE, "help")
@@ -202,7 +197,7 @@ async def help_button(client, query):
         await query.message.edit(
             text="Hi {first_name}. I am {bot_name}".format(
                 first_name=query.from_user.first_name,
-                bot_name=botinfo.BOT_NAME,
+                bot_name=BOT_NAME,
             ),
             reply_markup=InlineKeyboardMarkup(
                 paginate_modules(next_page + 1, HELPABLE, "help")
@@ -214,7 +209,7 @@ async def help_button(client, query):
         await query.message.edit(
             text="Hi {first_name}. I am {bot_name}".format(
                 first_name=query.from_user.first_name,
-                bot_name=botinfo.BOT_NAME,
+                bot_name=BOT_NAME,
             ),
             reply_markup=InlineKeyboardMarkup(
                 paginate_modules(0, HELPABLE, "help")

wbb/modules/admin.py

@@ -1,7 +1,6 @@
 from pyrogram import filters
 from pyrogram.types import ChatPermissions
-from wbb import SUDOERS, app
-from wbb.utils.botinfo import BOT_ID
+from wbb import SUDOERS, app, BOT_ID
 from wbb.utils.errors import capture_err
 from wbb.utils.dbfunctions import add_warn, get_warn, remove_warns, int_to_alpha
 

wbb/modules/chatbot.py

@@ -1,6 +1,5 @@
-from wbb import app, arq
+from wbb import app, arq, BOT_ID
 from wbb.utils.errors import capture_err
-from wbb.utils.botinfo import BOT_ID
 from wbb.utils.filter_groups import chatbot_group
 from pyrogram import filters
 

wbb/modules/global_stats.py

@@ -1,7 +1,6 @@
-from wbb import app, SUDOERS
+from wbb import app, SUDOERS, BOT_ID, BOT_NAME
 from wbb.utils.filter_groups import global_stats_group
 from wbb.utils.errors import capture_err
-from wbb.utils.botinfo import BOT_ID, BOT_NAME
 from wbb.utils.fetch import fetch
 from wbb.modules import ALL_MODULES
 from wbb.utils.dbfunctions import (

wbb/modules/alive.py → wbb/modules/inline.py

@@ -1,5 +1,5 @@
 import sys
-from wbb import app, app2, SUDOERS
+from wbb import app, app2, SUDOERS, USERBOT_USERNAME, BOT_USERNAME
 from wbb.utils.errors import capture_err
 from pykeyboard import InlineKeyboard
 from sys import version as pyver
@@ -27,6 +27,7 @@ async def alive_function(answers):
 **Pyrogram:** `{pyrover}`
 **MongoDB:** `{mongover}`
 **Platform:** `{sys.platform}`
+**Profiles:** [BOT](t.me/{BOT_USERNAME}) | [UBOT](t.me/{USERBOT_USERNAME})
 """
     answers.append(
         InlineQueryResultArticle(
@@ -44,11 +45,22 @@ async def alive_function(answers):
 
 @app.on_inline_query()
 async def inline_query_handler(client, query):
+    text = query.query.lower()
     answers = []
-    answerss = await alive_function(answers)
-    await client.answer_inline_query(
-        query.id,
-        results=answerss,
-        switch_pm_text=f'Hello',
-        switch_pm_parameter='start',
-    )
+    if text == '':
+        await client.answer_inline_query(
+            query.id,
+            results=answers,
+            switch_pm_text='Commands',
+            switch_pm_parameter='help',
+        )
+        return
+    elif text == "alive":
+        answerss = await alive_function(answers)
+        await client.answer_inline_query(
+            query.id,
+            results=answerss,
+            cache_time=60,
+            switch_pm_text=f'Hello',
+            switch_pm_parameter='start',
+        )

wbb/modules/stickers.py

@@ -1,7 +1,6 @@
 import os
 import imghdr
-from wbb.utils.botinfo import BOT_USERNAME
-from wbb import app
+from wbb import app, BOT_USERNAME
 from pyrogram import filters
 from wbb.utils.errors import capture_err
 from wbb.utils.files import resize_file_to_sticker_size, upload_document, get_document_from_file_id

wbb/modules/sudoers.py

@@ -6,10 +6,9 @@ from pyrogram import filters, types
 import speedtest
 import psutil
 import asyncio
-from wbb import app, SUDOERS, bot_start_time
+from wbb import app, SUDOERS, bot_start_time, BOT_ID, USERBOT_USERNAME
 from wbb.utils import nekobin, formatter
 from wbb.utils.errors import capture_err
-from wbb.utils.botinfo import BOT_ID
 from wbb.utils.dbfunctions import (
     is_gbanned_user,
     add_gban_user,
@@ -105,7 +104,6 @@ async def get_speedtest_result(_, message):
 
 
 async def bot_sys_stats():
-    from wbb.utils.botinfo import USERBOT_USERNAME
     bot_uptime = int(time.time() - bot_start_time)
     cpu = psutil.cpu_percent(interval=0.5)
     mem = psutil.virtual_memory().percent

wbb/utils/__init__.py

@@ -1,3 +1,2 @@
 from .read_lines import random_line  # noqa: F401
-from .botinfo import get_info        # noqa: F401
 from .misc import paginate_modules   # noqa: F401

wbb/utils/botinfo.py

@@ -1,30 +0,0 @@
-BOT_ID = 0
-BOT_NAME = ""
-BOT_USERNAME = ""
-BOT_DC_ID = 0
-USERBOT_ID = 0
-USERBOT_NAME = ""
-USERBOT_USERNAME = ""
-USERBOT_DC_ID = 0
-
-
-async def get_info(app, app2):
-    global BOT_ID, BOT_NAME, BOT_USERNAME, BOT_DC_ID
-    global USERBOT_ID, USERBOT_NAME, USERBOT_USERNAME, USERBOT_DC_ID
-    getme = await app.get_me()
-    getme2 = await app2.get_me()
-    BOT_ID = getme.id
-    USERBOT_ID = getme2.id
-    if getme.last_name:
-        BOT_NAME = getme.first_name + " " + getme.last_name
-    else:
-        BOT_NAME = getme.first_name
-    BOT_USERNAME = getme.username
-    BOT_DC_ID = getme.dc_id
-
-    if getme2.last_name:
-        USERBOT_NAME = getme2.first_name + " " + getme2.last_name
-    else:
-        USERBOT_NAME = getme2.first_name
-    USERBOT_USERNAME = getme2.username
-    USERBOT_DC_ID = getme2.dc_id