From a370fa178c7ffcded3daa61ba3b996b12f5fe2ee Mon Sep 17 00:00:00 2001 From: yasir Date: Tue, 6 Dec 2022 19:58:35 +0700 Subject: [PATCH] Improve --- misskaty/__main__.py | 10 +++++----- misskaty/helper/tools.py | 4 ++-- misskaty/plugins/copy_forward.py | 6 ++++-- misskaty/plugins/detect_afk.py | 2 +- misskaty/plugins/genss.py | 4 ++-- misskaty/plugins/grup_tools.py | 6 ++---- misskaty/plugins/inline_search.py | 4 ++-- misskaty/plugins/mediainfo.py | 4 +--- misskaty/plugins/misc_tools.py | 16 +++++++--------- misskaty/plugins/nightmode.py | 12 ++++++------ misskaty/plugins/scrapwebsite.py | 22 +++++++--------------- misskaty/plugins/sub_extractor.py | 2 +- 12 files changed, 40 insertions(+), 52 deletions(-) diff --git a/misskaty/__main__.py b/misskaty/__main__.py index d33d06fd..db109260 100644 --- a/misskaty/__main__.py +++ b/misskaty/__main__.py @@ -83,18 +83,18 @@ home_keyboard_pm = InlineKeyboardMarkup( [ InlineKeyboardButton( text="Add Me To Your Group 🎉", - url="http://t.me/MissKatyRoBot?startgroup=new", + url=f"http://t.me/{app.me.first_name}?startgroup=new", ) ], ] ) -home_text_pm = f"Hey there! My name is MissKatyRoBot. 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 {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." keyboard = InlineKeyboardMarkup( [ [ - InlineKeyboardButton(text="Help ❓", url="t.me/MissKatyRoBot?start=help"), + InlineKeyboardButton(text="Help ❓", url=f"t.me/{app.me.username}?start=help"), InlineKeyboardButton( text="Source Code īŋŊ", url="https://github.com/yasirarism/MissKatyPyro", @@ -199,7 +199,7 @@ async def help_command(_, message): [ InlineKeyboardButton( text="Click here", - url=f"t.me/MissKatyRoBot?start=help_{name}", + url=f"t.me/{app.me.first_name}?start=help_{name}", ) ], ] @@ -339,7 +339,7 @@ if __name__ == "__main__": except KeyboardInterrupt: pass except Exception as err: - logging.error(err.with_traceback(None)) + LOGGER.error(err.with_traceback(None)) finally: loop.stop() print("------------------------ Stopped Services ------------------------") diff --git a/misskaty/helper/tools.py b/misskaty/helper/tools.py index 5f1a0795..99fe2d5d 100644 --- a/misskaty/helper/tools.py +++ b/misskaty/helper/tools.py @@ -3,7 +3,7 @@ import string import psutil import time import os -from misskaty import botStartTime +from misskaty import botStartTime, user, app from misskaty.plugins import ALL_MODULES from misskaty.helper.human_read import get_readable_time from misskaty.helper.http import http @@ -42,7 +42,7 @@ async def bot_sys_stats(): disk = psutil.disk_usage("/").percent process = psutil.Process(os.getpid()) return f""" -YasirArisM@MissKatyRoBot +{user.me.first_name}@{app.me.first_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 6140b94c..540c5c7c 100644 --- a/misskaty/plugins/copy_forward.py +++ b/misskaty/plugins/copy_forward.py @@ -25,7 +25,8 @@ async def copy(client, message): [ [ InlineKeyboardButton( - text="đŸ’Ŧ Chat Aku Yahh", url="https://t.me/MissKatyRoBot" + text="đŸ’Ŧ Chat Aku Yahh", + url=f"https://t.me/{app.me.username}", ) ] ] @@ -76,7 +77,8 @@ async def forward(client, message): [ [ InlineKeyboardButton( - text="đŸ’Ŧ Chat Aku Yahh", url="https://t.me/MissKatyRoBot" + text="đŸ’Ŧ Chat Aku Yahh", + url=f"https://t.me/{app.me.username}", ) ] ] diff --git a/misskaty/plugins/detect_afk.py b/misskaty/plugins/detect_afk.py index dcef4c87..e52b4581 100644 --- a/misskaty/plugins/detect_afk.py +++ b/misskaty/plugins/detect_afk.py @@ -28,7 +28,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@MissKatyRoBot", "!afk"] + possible = ["/afk", f"/afk@{app.me.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 f8a035c6..80fdba43 100644 --- a/misskaty/plugins/genss.py +++ b/misskaty/plugins/genss.py @@ -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 @MissKatyRoBot", + 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}", 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 @MissKatyRoBot.", + f"☑ī¸ Uploaded [8] screenshoot.\n\nGenerated by @{app.me.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 f3c8f0fb..412e9b56 100644 --- a/misskaty/plugins/grup_tools.py +++ b/misskaty/plugins/grup_tools.py @@ -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), - "Generated by @MissKatyRoBot", + f"Generated by @{app.me.username}", font=ImageFont.truetype("Calistoga-Regular.ttf", 28), size=20, align="right", @@ -347,9 +347,7 @@ async def gen_invite(bot, message): await message.reply(f"Here is your Invite Link {link.invite_link}") -@app.on_message( - filters.command(["adminlist", "adminlist@MissKatyRoBot"], COMMAND_HANDLER) -) +@app.on_message(filters.command(["adminlist"], COMMAND_HANDLER)) @capture_err async def adminlist(_, message): if message.chat.type == enums.ChatType.PRIVATE: diff --git a/misskaty/plugins/inline_search.py b/misskaty/plugins/inline_search.py index 36d6584b..d4fb44bb 100644 --- a/misskaty/plugins/inline_search.py +++ b/misskaty/plugins/inline_search.py @@ -77,7 +77,7 @@ async def inline_menu(_, inline_query: InlineQuery): title="Github Repo", description="Github Repo of This Bot.", input_message_content=InputTextMessageContent( - "Github Repo @MissKatyRoBot\n\nhttps://github.com/yasirarism/MissKatyPyro" + f"Github Repo @{app.me.username}\n\nhttps://github.com/yasirarism/MissKatyPyro" ), thumb_url="https://hamker.me/gjc9fo3.png", ), @@ -574,7 +574,7 @@ async def imdb_inl(_, query): res_str += f"🏆 Penghargaan: {GoogleTranslator('auto', 'id').translate(awards)}\n\n" else: res_str += "\n" - res_str += "Šī¸ IMDb by @MissKatyRoBot" + res_str += f"Šī¸ IMDb by @{app.me.username}" if r_json.get("trailer"): trailer_url = r_json["trailer"]["url"] markup = InlineKeyboardMarkup( diff --git a/misskaty/plugins/mediainfo.py b/misskaty/plugins/mediainfo.py index fd772c6b..ff5039cf 100644 --- a/misskaty/plugins/mediainfo.py +++ b/misskaty/plugins/mediainfo.py @@ -21,9 +21,7 @@ from misskaty.helper.pyro_progress import ( ) -@app.on_message( - filters.command(["mediainfo", "mediainfo@MissKatyRoBot"], COMMAND_HANDLER) -) +@app.on_message(filters.command(["mediainfo"], COMMAND_HANDLER)) @capture_err async def mediainfo(client, message): if message.reply_to_message and message.reply_to_message.media: diff --git a/misskaty/plugins/misc_tools.py b/misskaty/plugins/misc_tools.py index 1eb11002..1a8725cc 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 @MissKatyRoBot", + text=f"Ada {total} Hasil Pencarian dari {query}:\n{res}Scraped by @{app.me.username}", disable_web_page_preview=True, ) @@ -195,9 +195,7 @@ async def tts(_, message): pass -@app.on_message( - filters.command(["tosticker", "tosticker@MissKatyRoBot"], COMMAND_HANDLER) -) +@app.on_message(filters.command(["tosticker"], COMMAND_HANDLER)) @capture_err async def tostick(client, message): try: @@ -213,7 +211,7 @@ async def tostick(client, message): await message.reply_text(str(e)) -@app.on_message(filters.command(["toimage", "toimage@MissKatyRoBot"], COMMAND_HANDLER)) +@app.on_message(filters.command(["toimage"], COMMAND_HANDLER)) @capture_err async def topho(client, message): try: @@ -228,7 +226,7 @@ async def topho(client, message): f"tostick_{message.from_user.id}.jpg", ) await message.reply_photo( - photo=photo, caption="Sticker -> Image\n@MissKatyRoBot" + photo=photo, caption=f"Sticker -> Image\n@{app.me.username}" ) os.remove(photo) @@ -236,7 +234,7 @@ async def topho(client, message): await message.reply_text(str(e)) -@app.on_message(filters.command(["id", "id@MissKatyRoBot"], COMMAND_HANDLER)) +@app.on_message(filters.command(["id"], COMMAND_HANDLER)) async def showid(client, message): chat_type = message.chat.type if chat_type == "private": @@ -610,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 += "Šī¸ IMDb by @MissKatyRoBot" + res_str += f"Šī¸ IMDb by @{app.me.username}" if r_json.get("trailer"): trailer_url = r_json["trailer"]["url"] markup = InlineKeyboardMarkup( @@ -844,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 += "Šī¸ IMDb by @MissKatyRoBot" + res_str += f"Šī¸ IMDb by @{app.me.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 4b8ca75f..a9bdbac1 100644 --- a/misskaty/plugins/nightmode.py +++ b/misskaty/plugins/nightmode.py @@ -199,7 +199,7 @@ 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 MissKatyRoBot 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 {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", show_alert=True, cache_time=21600, ) @@ -207,8 +207,8 @@ async def _callbackanightmd(c: Client, q: CallbackQuery): scheduler = AsyncIOScheduler(timezone="Asia/Jakarta") if NIGHTMODE: - scheduler.add_job(job_close, trigger="cron", hour=22, minute=0) - scheduler.add_job(job_close_ymoviez, trigger="cron", hour=22, minute=0) - scheduler.add_job(job_open, trigger="cron", hour=6, minute=0) - scheduler.add_job(job_open_ymoviez, trigger="cron", hour=10, minute=0) - scheduler.start() + scheduler.add_job(job_close, trigger="cron", hour=22, minute=0) + scheduler.add_job(job_close_ymoviez, trigger="cron", hour=22, minute=0) + scheduler.add_job(job_open, trigger="cron", hour=6, minute=0) + scheduler.add_job(job_open_ymoviez, trigger="cron", hour=10, minute=0) + scheduler.start() diff --git a/misskaty/plugins/scrapwebsite.py b/misskaty/plugins/scrapwebsite.py index 9b72bc53..d0e5ac67 100644 --- a/misskaty/plugins/scrapwebsite.py +++ b/misskaty/plugins/scrapwebsite.py @@ -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 @MissKatyRoBot" + f"Hasil Pencarian di Nodrakor:\n{res}\nScraped by @{app.me.username}" ) except Exception as e: await msg.edit(f"ERROR: {str(e)}") @@ -284,7 +284,7 @@ async def lk21_scrap(_, message): ) -@app.on_message(filters.command(["gomov", "gomov@MissKatyRoBot"], COMMAND_HANDLER)) +@app.on_message(filters.command(["gomov"], COMMAND_HANDLER)) @capture_err async def gomov_scrap(_, message): try: @@ -310,18 +310,14 @@ 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 @MissKatyRoBot" + f"Hasil Pencarian di website GoMov:\n{res}\nScraped by @{app.me.username}" ) except Exception: exc = traceback.format_exc() await msg.edit(f"ERROR: {exc}") -@app.on_message( - filters.command( - ["savefilm21_scrap", "savefilm21_scrap@MissKatyRoBot"], COMMAND_HANDLER - ) -) +@app.on_message(filters.command(["savefilm21_scrap"], COMMAND_HANDLER)) @capture_err async def savefilm21_scrap(_, message): try: @@ -343,9 +339,7 @@ async def savefilm21_scrap(_, message): await message.reply(f"ERROR: {str(e)}") -@app.on_message( - filters.command(["nodrakor_scrap", "nodrakor_scrap@MissKatyRoBot"], COMMAND_HANDLER) -) +@app.on_message(filters.command(["nodrakor_scrap"], COMMAND_HANDLER)) @capture_err async def nodrakor_scrap(_, message): try: @@ -367,9 +361,7 @@ async def nodrakor_scrap(_, message): # Scrape Link Download Movieku.CC -@app.on_message( - filters.command(["movieku_scrap", "movieku_scrap@MissKatyRoBot"], COMMAND_HANDLER) -) +@app.on_message(filters.command(["movieku_scrap"], COMMAND_HANDLER)) @capture_err async def muviku_scrap(_, message): try: @@ -401,7 +393,7 @@ async def muviku_scrap(_, message): @app.on_message( - filters.command(["melong", "melong@MissKatyRoBot"], COMMAND_HANDLER) + filters.command(["melong"], COMMAND_HANDLER) & filters.user([617426792, 1985689491, 1172699512, 2024984460]) ) @capture_err diff --git a/misskaty/plugins/sub_extractor.py b/misskaty/plugins/sub_extractor.py index 5f65e05b..10b274c9 100644 --- a/misskaty/plugins/sub_extractor.py +++ b/misskaty/plugins/sub_extractor.py @@ -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 @MissKatyRoBot in {timelog}", + caption=f"Filename: {namafile}\n\nExtracted by @{app.me.username} in {timelog}", reply_to_message_id=usr.id, ) await update.message.delete()