diff --git a/misskaty/__main__.py b/misskaty/__main__.py index db109260..f08d0d95 100644 --- a/misskaty/__main__.py +++ b/misskaty/__main__.py @@ -12,7 +12,16 @@ 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.vars import ( + LOG_CHANNEL, + SUDO, + BOT_ID, + BOT_NAME, + BOT_USERNAME, + UBOT_ID, + UBOT_NAME, + UBOT_USERNAME, +) from utils import temp, auto_clean from pyrogram.raw.all import layer from pyrogram import idle, __version__, filters @@ -42,21 +51,27 @@ async def start_bot(): j += 1 await app.start() await user.start() - me = await app.get_me() + 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("+===============+===============+===============+===============+") LOGGER.info(bot_modules) LOGGER.info("+===============+===============+===============+===============+") - LOGGER.info(f"[INFO]: BOT STARTED AS @{me.username}!") + LOGGER.info(f"[INFO]: BOT STARTED AS @{BOT_USERNAME}!") try: LOGGER.info("[INFO]: SENDING ONLINE STATUS") for i in SUDO: await app.send_message( i, - f"USERBOT AND BOT STARTED with Pyrogram v{__version__}..\nUserBot: {ubot.first_name}\nBot: {me.first_name}\n\nwith Pyrogram v{__version__} (Layer {layer}) started on @{me.username}.", + 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{botmodules}", ) except Exception as e: LOGGER.error(str(e)) @@ -83,18 +98,20 @@ home_keyboard_pm = InlineKeyboardMarkup( [ InlineKeyboardButton( text="Add Me To Your Group 🎉", - url=f"http://t.me/{app.me.first_name}?startgroup=new", + url=f"http://t.me/{BOT_USERNAME}?startgroup=new", ) ], ] ) -home_text_pm = f"Hey there! My name is {app.me.first_name}. I have many useful features for you, feel free to add me to your group.\n\nIf you want give coffee to my owner you can send /donate command for more info." +home_text_pm = f"Hey there! My name is {BOT_NAME}. I have many useful features for you, feel free to add me to your group.\n\nIf you want give coffee to my owner you can send /donate command for more info." keyboard = InlineKeyboardMarkup( [ [ - InlineKeyboardButton(text="Help ❓", url=f"t.me/{app.me.username}?start=help"), + InlineKeyboardButton( + text="Help ❓", url=f"t.me/{BOT_USERNAME}?start=help" + ), InlineKeyboardButton( text="Source Code īŋŊ", url="https://github.com/yasirarism/MissKatyPyro", @@ -199,7 +216,7 @@ async def help_command(_, message): [ InlineKeyboardButton( text="Click here", - url=f"t.me/{app.me.first_name}?start=help_{name}", + url=f"t.me/{BOT_USERNAME}?start=help_{name}", ) ], ] diff --git a/misskaty/helper/tools.py b/misskaty/helper/tools.py index 99fe2d5d..c5a4996c 100644 --- a/misskaty/helper/tools.py +++ b/misskaty/helper/tools.py @@ -5,6 +5,7 @@ import time import os from misskaty import botStartTime, user, app 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 @@ -42,7 +43,7 @@ async def bot_sys_stats(): disk = psutil.disk_usage("/").percent process = psutil.Process(os.getpid()) return f""" -{user.me.first_name}@{app.me.first_name} +{UBOT_NAME}@{BOT_NAME} ------------------ UPTIME: {get_readable_time(bot_uptime)} BOT: {round(process.memory_info()[0] / 1024**2)} MB diff --git a/misskaty/plugins/copy_forward.py b/misskaty/plugins/copy_forward.py index 540c5c7c..bba518ef 100644 --- a/misskaty/plugins/copy_forward.py +++ b/misskaty/plugins/copy_forward.py @@ -1,6 +1,6 @@ from pyrogram import filters, enums from pyrogram.errors import UserIsBlocked, UserNotParticipant -from misskaty.vars import COMMAND_HANDLER +from misskaty.vars import COMMAND_HANDLER, BOT_USERNAME from pyrogram.types import InlineKeyboardButton, InlineKeyboardMarkup from misskaty.core.decorator.errors import capture_err from misskaty import app @@ -26,7 +26,7 @@ async def copy(client, message): [ InlineKeyboardButton( text="đŸ’Ŧ Chat Aku Yahh", - url=f"https://t.me/{app.me.username}", + url=f"https://t.me/{BOT_USERNAME}", ) ] ] @@ -78,7 +78,7 @@ async def forward(client, message): [ InlineKeyboardButton( text="đŸ’Ŧ Chat Aku Yahh", - url=f"https://t.me/{app.me.username}", + url=f"https://t.me/{BOT_USERNAME}", ) ] ] diff --git a/misskaty/plugins/detect_afk.py b/misskaty/plugins/detect_afk.py index e52b4581..57e949e2 100644 --- a/misskaty/plugins/detect_afk.py +++ b/misskaty/plugins/detect_afk.py @@ -13,6 +13,7 @@ import re import time from utils import put_cleanmode from misskaty import app +from misskaty.vars import 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 @@ -28,7 +29,7 @@ async def chat_watcher_func(_, message): userid = message.from_user.id user_name = message.from_user.first_name if message.entities: - possible = ["/afk", f"/afk@{app.me.username}", "!afk"] + possible = ["/afk", f"/afk@{BOT_USERNAME}", "!afk"] message_text = message.text or message.caption for entity in message.entities: if entity.type == enums.MessageEntityType.BOT_COMMAND: diff --git a/misskaty/plugins/genss.py b/misskaty/plugins/genss.py index 80fdba43..f88b4028 100644 --- a/misskaty/plugins/genss.py +++ b/misskaty/plugins/genss.py @@ -13,7 +13,7 @@ from pyrogram import filters, enums from pyrogram.errors import FloodWait from misskaty import app from misskaty.helper.ffmpeg_helper import take_ss, genss_link -from misskaty.vars import COMMAND_HANDLER +from misskaty.vars import COMMAND_HANDLER, BOT_USERNAME from misskaty.helper.pyro_progress import progress_for_pyrogram LOGGER = getLogger(__name__) @@ -74,7 +74,7 @@ async def genss(client, message): ] ) await message.reply( - f"☑ī¸ Uploaded [1] screenshoot.\n\n{message.from_user.first_name} ({message.from_user.id})\n#ī¸âƒŖ #ssgen #id{message.from_user.id}\n\nSS Generate by @{app.me.username}", + f"☑ī¸ Uploaded [1] screenshoot.\n\n{message.from_user.first_name} ({message.from_user.id})\n#ī¸âƒŖ #ssgen #id{message.from_user.id}\n\nSS Generate by @{BOT_USERNAME}", reply_to_message_id=message.id, ) await process.delete() @@ -127,7 +127,7 @@ async def genss_link(client, message): await sleep(e.value) await message.reply_media_group(images, reply_to_message_id=message.id) await message.reply( - f"☑ī¸ Uploaded [8] screenshoot.\n\nGenerated by @{app.me.username}.", + f"☑ī¸ Uploaded [8] screenshoot.\n\nGenerated by @{BOT_USERNAME}.", reply_to_message_id=message.id, ) await process.delete() diff --git a/misskaty/plugins/grup_tools.py b/misskaty/plugins/grup_tools.py index 412e9b56..89528a80 100644 --- a/misskaty/plugins/grup_tools.py +++ b/misskaty/plugins/grup_tools.py @@ -18,7 +18,7 @@ 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 +from misskaty.vars import SUDO, LOG_CHANNEL, SUPPORT_CHAT, COMMAND_HANDLER, BOT_USERNAME LOGGER = getLogger(__name__) @@ -68,7 +68,7 @@ def welcomepic(pic, user, chat, count, id): draw_multiple_line_text(background, chat, font, 47) ImageDraw.Draw(background).text( (530, 460), - f"Generated by @{app.me.username}", + f"Generated by @{BOT_USERNAME}", font=ImageFont.truetype("Calistoga-Regular.ttf", 28), size=20, align="right", diff --git a/misskaty/plugins/inline_search.py b/misskaty/plugins/inline_search.py index d4fb44bb..c2057845 100644 --- a/misskaty/plugins/inline_search.py +++ b/misskaty/plugins/inline_search.py @@ -6,6 +6,7 @@ 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 @@ -77,7 +78,7 @@ async def inline_menu(_, inline_query: InlineQuery): title="Github Repo", description="Github Repo of This Bot.", input_message_content=InputTextMessageContent( - f"Github Repo @{app.me.username}\n\nhttps://github.com/yasirarism/MissKatyPyro" + f"Github Repo @{BOT_USERNAME}\n\nhttps://github.com/yasirarism/MissKatyPyro" ), thumb_url="https://hamker.me/gjc9fo3.png", ), @@ -574,7 +575,7 @@ async def imdb_inl(_, query): res_str += f"🏆 Penghargaan: {GoogleTranslator('auto', 'id').translate(awards)}\n\n" else: res_str += "\n" - res_str += f"Šī¸ IMDb by @{app.me.username}" + res_str += f"Šī¸ IMDb by @{BOT_USERNAME}" if r_json.get("trailer"): trailer_url = r_json["trailer"]["url"] markup = InlineKeyboardMarkup( diff --git a/misskaty/plugins/misc_tools.py b/misskaty/plugins/misc_tools.py index 1a8725cc..47672c61 100644 --- a/misskaty/plugins/misc_tools.py +++ b/misskaty/plugins/misc_tools.py @@ -123,7 +123,7 @@ async def gsearch(client, message): exc = traceback.format_exc() return await msg.edit(exc) await msg.edit( - text=f"Ada {total} Hasil Pencarian dari {query}:\n{res}Scraped by @{app.me.username}", + text=f"Ada {total} Hasil Pencarian dari {query}:\n{res}Scraped by @{BOT_USERNAME}", disable_web_page_preview=True, ) @@ -226,7 +226,7 @@ async def topho(client, message): f"tostick_{message.from_user.id}.jpg", ) await message.reply_photo( - photo=photo, caption=f"Sticker -> Image\n@{app.me.username}" + photo=photo, caption=f"Sticker -> Image\n@{BOT_USERNAME}" ) os.remove(photo) @@ -608,7 +608,7 @@ async def imdbcb_backup(bot: Client, query: CallbackQuery): res_str += f"🏆 Penghargaan: {GoogleTranslator('auto', 'id').translate(awards)}\n\n" else: res_str += "\n" - res_str += f"Šī¸ IMDb by @{app.me.username}" + res_str += f"Šī¸ IMDb by @{BOT_USERNAME}" if r_json.get("trailer"): trailer_url = r_json["trailer"]["url"] markup = InlineKeyboardMarkup( @@ -842,7 +842,7 @@ async def imdb_en_callback(bot: Client, query: CallbackQuery): res_str += f"🏆 Awards: {awards}\n\n" else: res_str += "\n" - res_str += f"Šī¸ IMDb by @{app.me.username}" + res_str += f"Šī¸ IMDb by @{BOT_USERNAME}" if r_json.get("trailer"): trailer_url = r_json["trailer"]["url"] markup = InlineKeyboardMarkup( diff --git a/misskaty/plugins/nightmode.py b/misskaty/plugins/nightmode.py index a9bdbac1..3f7c765c 100644 --- a/misskaty/plugins/nightmode.py +++ b/misskaty/plugins/nightmode.py @@ -199,9 +199,9 @@ async def job_open_ymoviez(): async def _callbackanightmd(c: Client, q: CallbackQuery): # version = check_output(["git log -1 --date=format:v%y.%m%d.%H%M --pretty=format:%cd"], shell=True).decode() await q.answer( - f"🔖 Hai, Aku {app.me.username} dibuat menggunakan Framework Pyrogram v{__version__} dan Python 3.10.\n\nMau buat bot seperti ini? Yuuk belajar di @botindonesia\nOwner: @YasirArisM", + f"🔖 Hai, Aku {BOT_USERNAME} dibuat menggunakan Framework Pyrogram v{__version__} dan Python 3.10.\n\nMau buat bot seperti ini? Yuuk belajar di @botindonesia\nOwner: @YasirArisM", show_alert=True, - cache_time=21600, + cache_time=2160, ) diff --git a/misskaty/plugins/scrapwebsite.py b/misskaty/plugins/scrapwebsite.py index d0e5ac67..7464f965 100644 --- a/misskaty/plugins/scrapwebsite.py +++ b/misskaty/plugins/scrapwebsite.py @@ -14,7 +14,7 @@ import traceback from misskaty import app from pyrogram import filters from pyrogram.errors import MessageTooLong -from misskaty.vars import COMMAND_HANDLER +from misskaty.vars import COMMAND_HANDLER, BOT_USERNAME from misskaty.core.decorator.errors import capture_err from misskaty.helper.tools import rentry from misskaty.helper.http import http @@ -56,7 +56,7 @@ async def nodrakor(_, message): return await msg.edit("Oops, data film tidak ditemukan.") res = "".join(f"{i['judul']}\n{i['link']}\n\n" for i in data) await msg.edit( - f"Hasil Pencarian di Nodrakor:\n{res}\nScraped by @{app.me.username}" + f"Hasil Pencarian di Nodrakor:\n{res}\nScraped by @{BOT_USERNAME}" ) except Exception as e: await msg.edit(f"ERROR: {str(e)}") @@ -310,7 +310,7 @@ async def gomov_scrap(_, message): return await msg.edit("Oops, data film tidak ditemukan di GoMov") res = "".join(f"Judul: {i['judul']}\n{i['link']}\n\n" for i in DATA) await msg.edit( - f"Hasil Pencarian di website GoMov:\n{res}\nScraped by @{app.me.username}" + f"Hasil Pencarian di website GoMov:\n{res}\nScraped by @{BOT_USERNAME}" ) except Exception: exc = traceback.format_exc() diff --git a/misskaty/plugins/sub_extractor.py b/misskaty/plugins/sub_extractor.py index 10b274c9..37978851 100644 --- a/misskaty/plugins/sub_extractor.py +++ b/misskaty/plugins/sub_extractor.py @@ -9,7 +9,7 @@ from misskaty import app from logging import getLogger from pyrogram import filters from pyrogram.types import InlineKeyboardButton, InlineKeyboardMarkup -from misskaty.vars import COMMAND_HANDLER +from misskaty.vars import COMMAND_HANDLER, BOT_USERNAME from misskaty.core.decorator.errors import capture_err from misskaty.plugins.dev import shell_exec import json, os, traceback @@ -148,7 +148,7 @@ async def stream_extract(bot, update): timelog = "{:.2f}".format(end_time - start_time) + " second" await update.message.reply_document( namafile, - caption=f"Filename: {namafile}\n\nExtracted by @{app.me.username} in {timelog}", + caption=f"Filename: {namafile}\n\nExtracted by @{BOT_USERNAME} in {timelog}", reply_to_message_id=usr.id, ) await update.message.delete() diff --git a/misskaty/vars.py b/misskaty/vars.py index 28269398..0cca0595 100644 --- a/misskaty/vars.py +++ b/misskaty/vars.py @@ -26,6 +26,12 @@ 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( {