diff --git a/misskaty/__init__.py b/misskaty/__init__.py
index 5d1143a4..f62120a5 100644
--- a/misskaty/__init__.py
+++ b/misskaty/__init__.py
@@ -30,3 +30,14 @@ user = Client(
name="YasirUBot",
session_string=USER_SESSION,
)
+
+app.start()
+user.start()
+bot = app.get_me()
+ubot = user.get_me()
+BOT_ID = bot.id
+BOT_NAME = bot.first_name
+BOT_USERNAME = bot.username
+UBOT_ID = ubot.id
+UBOT_NAME = ubot.first_name
+UBOT_USERNAME = ubot.username
\ No newline at end of file
diff --git a/misskaty/__main__.py b/misskaty/__main__.py
index b7aeb082..99eb167b 100644
--- a/misskaty/__main__.py
+++ b/misskaty/__main__.py
@@ -7,21 +7,22 @@
"""
import asyncio, importlib, re
from logging import getLogger
-from misskaty import app, user, HELPABLE
-from misskaty.plugins import ALL_MODULES
-from misskaty.helper import paginate_modules
-from misskaty.helper.tools import bot_sys_stats
-from database.users_chats_db import db
-from misskaty.vars import (
- LOG_CHANNEL,
- SUDO,
+from misskaty import (
+ app,
+ user,
+ HELPABLE,
BOT_ID,
BOT_NAME,
BOT_USERNAME,
UBOT_ID,
UBOT_NAME,
- UBOT_USERNAME,
+ UBOT_USERNAME
)
+from misskaty.plugins import ALL_MODULES
+from misskaty.helper import paginate_modules
+from misskaty.helper.tools import bot_sys_stats
+from database.users_chats_db import db
+from misskaty.vars import LOG_CHANNEL, SUDO
from utils import temp, auto_clean
from pyrogram.raw.all import layer
from pyrogram import idle, __version__, filters
@@ -49,16 +50,6 @@ async def start_bot():
else:
bot_modules += "|{:<15}".format(i)
j += 1
- await app.start()
- await user.start()
- bot = await app.get_me()
- ubot = await user.get_me()
- BOT_ID = bot.id
- BOT_NAME = bot.first_name
- BOT_USERNAME = bot.username
- UBOT_ID = ubot.id
- UBOT_NAME = ubot.first_name
- UBOT_USERNAME = ubot.username
LOGGER.info("+===============================================================+")
LOGGER.info("| MissKatyPyro |")
LOGGER.info("+===============+===============+===============+===============+")
@@ -71,7 +62,7 @@ async def start_bot():
for i in SUDO:
await app.send_message(
i,
- f"USERBOT AND BOT STARTED with Pyrogram v{__version__}..\nUserBot: {UBOT_NAME}\nBot: {BOT_NAME}\n\nwith Pyrogram v{__version__} (Layer {layer}) started on @{BOT_USERNAME}.\n\n{bot_modules}",
+ f"USERBOT AND BOT STARTED with Pyrogram v{__version__}..\nUserBot: {UBOT_NAME}\nBot: {BOT_NAME}\n\nwith Pyrogram v{__version__} (Layer {layer}) started on @{BOT_USERNAME}.\n\n{bot_modules}",
)
except Exception as e:
LOGGER.error(str(e))
@@ -109,9 +100,7 @@ home_text_pm = f"Hey there! My name is {BOT_NAME}. I have many useful features f
keyboard = InlineKeyboardMarkup(
[
[
- InlineKeyboardButton(
- text="Help ❓", url=f"t.me/{BOT_USERNAME}?start=help"
- ),
+ InlineKeyboardButton(text="Help ❓", url=f"t.me/{BOT_USERNAME}?start=help"),
InlineKeyboardButton(
text="Source Code �",
url="https://github.com/yasirarism/MissKatyPyro",
diff --git a/misskaty/helper/tools.py b/misskaty/helper/tools.py
index c5a4996c..c348b51d 100644
--- a/misskaty/helper/tools.py
+++ b/misskaty/helper/tools.py
@@ -3,9 +3,8 @@ import string
import psutil
import time
import os
-from misskaty import botStartTime, user, app
+from misskaty import botStartTime, user, app, UBOT_NAME, BOT_NAME
from misskaty.plugins import ALL_MODULES
-from misskaty.vars import UBOT_NAME, BOT_NAME
from misskaty.helper.human_read import get_readable_time
from misskaty.helper.http import http
from http.cookies import SimpleCookie
diff --git a/misskaty/plugins/copy_forward.py b/misskaty/plugins/copy_forward.py
index bba518ef..7c3f8041 100644
--- a/misskaty/plugins/copy_forward.py
+++ b/misskaty/plugins/copy_forward.py
@@ -1,9 +1,9 @@
from pyrogram import filters, enums
from pyrogram.errors import UserIsBlocked, UserNotParticipant
-from misskaty.vars import COMMAND_HANDLER, BOT_USERNAME
+from misskaty.vars import COMMAND_HANDLER
from pyrogram.types import InlineKeyboardButton, InlineKeyboardMarkup
from misskaty.core.decorator.errors import capture_err
-from misskaty import app
+from misskaty import app, BOT_USERNAME
@app.on_message(filters.command(["copy"], COMMAND_HANDLER))
diff --git a/misskaty/plugins/detect_afk.py b/misskaty/plugins/detect_afk.py
index 57e949e2..694e9413 100644
--- a/misskaty/plugins/detect_afk.py
+++ b/misskaty/plugins/detect_afk.py
@@ -12,8 +12,7 @@
import re
import time
from utils import put_cleanmode
-from misskaty import app
-from misskaty.vars import BOT_USERNAME
+from misskaty import app, BOT_USERNAME
from pyrogram import filters, enums
from database.afk_db import remove_afk, is_afk
from misskaty.helper.human_read import get_readable_time2
diff --git a/misskaty/plugins/genss.py b/misskaty/plugins/genss.py
index f88b4028..16c5672b 100644
--- a/misskaty/plugins/genss.py
+++ b/misskaty/plugins/genss.py
@@ -11,9 +11,9 @@ from shutil import rmtree
from logging import getLogger
from pyrogram import filters, enums
from pyrogram.errors import FloodWait
-from misskaty import app
+from misskaty import app, BOT_USERNAME
from misskaty.helper.ffmpeg_helper import take_ss, genss_link
-from misskaty.vars import COMMAND_HANDLER, BOT_USERNAME
+from misskaty.vars import COMMAND_HANDLER
from misskaty.helper.pyro_progress import progress_for_pyrogram
LOGGER = getLogger(__name__)
diff --git a/misskaty/plugins/grup_tools.py b/misskaty/plugins/grup_tools.py
index 89528a80..547cde24 100644
--- a/misskaty/plugins/grup_tools.py
+++ b/misskaty/plugins/grup_tools.py
@@ -11,14 +11,14 @@ from pyrogram.errors import (
RPCError,
SlowmodeWait,
)
-from misskaty import app
+from misskaty import app, BOT_USERNAME
from misskaty.core.decorator.errors import capture_err, asyncify
from PIL import Image, ImageChops, ImageDraw, ImageFont
import textwrap
from database.users_chats_db import db
from utils import temp
from pyrogram.errors import ChatAdminRequired
-from misskaty.vars import SUDO, LOG_CHANNEL, SUPPORT_CHAT, COMMAND_HANDLER, BOT_USERNAME
+from misskaty.vars import SUDO, LOG_CHANNEL, SUPPORT_CHAT, COMMAND_HANDLER
LOGGER = getLogger(__name__)
diff --git a/misskaty/plugins/inline_search.py b/misskaty/plugins/inline_search.py
index c2057845..83d81775 100644
--- a/misskaty/plugins/inline_search.py
+++ b/misskaty/plugins/inline_search.py
@@ -1,12 +1,11 @@
import json, traceback
from sys import version as pyver, platform
-from misskaty import app, user
+from misskaty import app, user, BOT_USERNAME
from motor import version as mongover
from misskaty.plugins.misc_tools import get_content
from pyrogram import __version__ as pyrover
from misskaty.helper.http import http
from misskaty.helper.tools import GENRES_EMOJI
-from misskaty.vars import BOT_USERNAME
from pyrogram import filters, enums
from bs4 import BeautifulSoup
from utils import demoji
diff --git a/misskaty/plugins/misc_tools.py b/misskaty/plugins/misc_tools.py
index 47672c61..5459e8e3 100644
--- a/misskaty/plugins/misc_tools.py
+++ b/misskaty/plugins/misc_tools.py
@@ -24,7 +24,7 @@ from pyrogram.types import InlineKeyboardMarkup, InlineKeyboardButton, CallbackQ
from misskaty.core.decorator.errors import capture_err
from misskaty.helper.tools import rentry, GENRES_EMOJI
from misskaty.helper.http import http
-from misskaty import app
+from misskaty import app, BOT_USERNAME
LOGGER = getLogger(__name__)
diff --git a/misskaty/plugins/nightmode.py b/misskaty/plugins/nightmode.py
index 3f7c765c..607ebbe8 100644
--- a/misskaty/plugins/nightmode.py
+++ b/misskaty/plugins/nightmode.py
@@ -4,7 +4,7 @@ from pyrogram import Client, __version__, filters
from apscheduler.schedulers.asyncio import AsyncIOScheduler
import pytz
import traceback
-from misskaty import app
+from misskaty import app, BOT_USERNAME
from datetime import datetime
from pyrogram.types import InlineKeyboardButton, InlineKeyboardMarkup, CallbackQuery
from misskaty.vars import LOG_CHANNEL, NIGHTMODE
diff --git a/misskaty/plugins/ping.py b/misskaty/plugins/ping.py
index e2c8ff3e..e0c1b7cb 100644
--- a/misskaty/plugins/ping.py
+++ b/misskaty/plugins/ping.py
@@ -1,3 +1,10 @@
+"""
+ * @author yasir
+ * @date 2022-12-01 09:12:27
+ * @lastModified 2022-12-01 09:32:31
+ * @projectName MissKatyPyro
+ * Copyright @YasirPedia All rights reserved
+"""
import time
from re import findall, MULTILINE
from asyncio import Lock
diff --git a/misskaty/plugins/scrapwebsite.py b/misskaty/plugins/scrapwebsite.py
index 7464f965..64fe3c30 100644
--- a/misskaty/plugins/scrapwebsite.py
+++ b/misskaty/plugins/scrapwebsite.py
@@ -11,10 +11,10 @@ from bs4 import BeautifulSoup
import aiohttp
import re
import traceback
-from misskaty import app
+from misskaty import app, BOT_USERNAME
from pyrogram import filters
from pyrogram.errors import MessageTooLong
-from misskaty.vars import COMMAND_HANDLER, BOT_USERNAME
+from misskaty.vars import COMMAND_HANDLER
from misskaty.core.decorator.errors import capture_err
from misskaty.helper.tools import rentry
from misskaty.helper.http import http
diff --git a/misskaty/plugins/sub_extractor.py b/misskaty/plugins/sub_extractor.py
index 37978851..66fa9d17 100644
--- a/misskaty/plugins/sub_extractor.py
+++ b/misskaty/plugins/sub_extractor.py
@@ -5,11 +5,11 @@
* @projectName MissKatyPyro
* Copyright @YasirPedia All rights reserved
"""
-from misskaty import app
+from misskaty import app, BOT_USERNAME
from logging import getLogger
from pyrogram import filters
from pyrogram.types import InlineKeyboardButton, InlineKeyboardMarkup
-from misskaty.vars import COMMAND_HANDLER, BOT_USERNAME
+from misskaty.vars import COMMAND_HANDLER
from misskaty.core.decorator.errors import capture_err
from misskaty.plugins.dev import shell_exec
import json, os, traceback
diff --git a/misskaty/plugins/ubot_plugin.py b/misskaty/plugins/ubot_plugin.py
index 7f8debe0..41c94b3d 100644
--- a/misskaty/plugins/ubot_plugin.py
+++ b/misskaty/plugins/ubot_plugin.py
@@ -1,3 +1,10 @@
+"""
+ * @author yasir
+ * @date 2022-12-01 09:12:27
+ * @lastModified 2022-12-01 09:32:31
+ * @projectName MissKatyPyro
+ * Copyright @YasirPedia All rights reserved
+"""
# Code in this plugin to learn basic userbot in pyrogram
import os
from pyrogram import enums, filters
diff --git a/misskaty/vars.py b/misskaty/vars.py
index 0cca0595..28269398 100644
--- a/misskaty/vars.py
+++ b/misskaty/vars.py
@@ -26,12 +26,6 @@ try:
except Exception as e:
LOGGER.error(f"One or more env variables missing! Exiting now.\n{e}")
exit(1)
-BOT_USERNAME = ""
-BOT_ID = ""
-BOT_NAME = ""
-UBOT_USERNAME = ""
-UBOT_ID = ""
-UBOT_NAME = ""
COMMAND_HANDLER = environ.get("COMMAND_HANDLER", "! /").split()
SUDO = list(
{