diff --git a/misskaty/__init__.py b/misskaty/__init__.py index 81d264a9..257d0c28 100644 --- a/misskaty/__init__.py +++ b/misskaty/__init__.py @@ -41,7 +41,7 @@ MOD_NOLOAD = ["subscene_dl"] HELPABLE = {} cleanmode = {} botStartTime = time.time() -misskaty_version = "v2.10.14 - Stable" +misskaty_version = "v2.10.15 - Stable" # Pyrogram Bot Client app = Client( diff --git a/misskaty/plugins/admin.py b/misskaty/plugins/admin.py index 3a52edac..4b9834c4 100644 --- a/misskaty/plugins/admin.py +++ b/misskaty/plugins/admin.py @@ -197,7 +197,10 @@ async def kickFunc(client: Client, ctx: Message, strings) -> "Message": @app.adminsOnly("can_restrict_members") @use_chat_lang() async def banFunc(client, message, strings): - user_id, reason = await extract_user_and_reason(message, sender_chat=True) + try: + user_id, reason = await extract_user_and_reason(message, sender_chat=True) + except UsernameNotOccupied: + return await message.reply_msg("Sorry, i didn't know that user.") if not user_id: return await message.reply_text(strings("user_not_found")) diff --git a/misskaty/plugins/anime.py b/misskaty/plugins/anime.py index cad67015..b1de6e5f 100644 --- a/misskaty/plugins/anime.py +++ b/misskaty/plugins/anime.py @@ -167,7 +167,7 @@ def shorten(description, info="anilist.co"): @app.on_message(filters.command("anime", COMMAND_HANDLER)) async def anime_search(_, mesg): - search = mesg.text.split(" ", 1) + search = mesg.text.split(None, 1) reply = await mesg.reply("⏳ Please wait ...", quote=True) if len(search) == 1: return await reply.edit("⚠️ Give Anime name please.") diff --git a/misskaty/plugins/chatbot_ai.py b/misskaty/plugins/chatbot_ai.py index 4556b09e..da3abba4 100644 --- a/misskaty/plugins/chatbot_ai.py +++ b/misskaty/plugins/chatbot_ai.py @@ -31,7 +31,7 @@ async def bard_chatbot(_, ctx: Message, strings): msg = await ctx.reply_msg(strings("find_answers_str"), quote=True) try: req = await fetch.get( - f"https://yasirapi.eu.org/bard?input={ctx.text.split(' ', 1)[1]}" + f"https://yasirapi.eu.org/bard?input={ctx.text.split(maxsplit=1)[1]}" ) random_choice = random.choice(req.json().get("choices")) await msg.edit_msg( diff --git a/misskaty/plugins/dev.py b/misskaty/plugins/dev.py index 06dd7c2d..be8256ea 100644 --- a/misskaty/plugins/dev.py +++ b/misskaty/plugins/dev.py @@ -380,7 +380,7 @@ async def cmd_eval(self: Client, ctx: Message, strings) -> Optional[str]: else await ctx.reply_msg(strings("run_eval"), quote=True) ) code = ( - ctx.text.split(" ", 1)[1] if ctx.command else ctx.text.split("\napp.run()")[0] + ctx.text.split(maxsplit=1)[1] if ctx.command else ctx.text.split("\napp.run()")[0] ) out_buf = io.StringIO() out = "" diff --git a/misskaty/plugins/fun.py b/misskaty/plugins/fun.py index 222fa2c2..de2d1ece 100644 --- a/misskaty/plugins/fun.py +++ b/misskaty/plugins/fun.py @@ -189,7 +189,7 @@ async def beriharapan(c, m): reply = m.reply_to_message if not reply and m.command == 1: return m.reply("Harap berikan kalimat yang ingin diberi pada seseorang") - pesan = m.text.split(" ", 1)[1] + pesan = m.text.split(maxsplit=1)[1] reply_name = reply.from_user.mention if reply.from_user else reply.sender_chat.title sender_name = m.from_user.mention if m.from_user else m.sender_chat.title await reply.reply(f"{sender_name} memberikan {pesan} pada {reply_name}") diff --git a/misskaty/plugins/imdb_search.py b/misskaty/plugins/imdb_search.py index b0e2c3ce..6f95fa57 100644 --- a/misskaty/plugins/imdb_search.py +++ b/misskaty/plugins/imdb_search.py @@ -49,7 +49,7 @@ async def imdb_choose(_, ctx: Message): return await ctx.reply_msg( "Cannot identify user, please use in private chat.", del_in=7 ) - kuery = ctx.text.split()[1] + kuery = ctx.text.split(None, 1)[1] is_imdb, lang = await is_imdbset(ctx.from_user.id) if is_imdb: if lang == "eng": diff --git a/misskaty/plugins/locks.py b/misskaty/plugins/locks.py index e1f996b4..b135d98c 100644 --- a/misskaty/plugins/locks.py +++ b/misskaty/plugins/locks.py @@ -83,6 +83,8 @@ async def current_chat_permissions(chat_id): perm = (await app.get_chat(chat_id)).permissions if perm.can_send_messages: perms.append("can_send_messages") + else: + LOGGER.info(f"debug perm: {perm}") # Temporary debug, idk why give error no object if perm.can_send_media_messages: perms.append("can_send_media_messages") if perm.can_send_audios: diff --git a/misskaty/plugins/misc_tools.py b/misskaty/plugins/misc_tools.py index 39342d33..2ad1c3d1 100644 --- a/misskaty/plugins/misc_tools.py +++ b/misskaty/plugins/misc_tools.py @@ -193,7 +193,7 @@ async def stackoverflow(_, message): async def gsearch(_, message): if len(message.command) == 1: return await message.reply("Give a query to search in Google!") - query = message.text.split(" ", maxsplit=1)[1] + query = message.text.split(maxsplit=1)[1] msg = await message.reply_text(f"**Googling** for `{query}` ...") try: gs = await fetch.get( diff --git a/misskaty/plugins/web_scraper.py b/misskaty/plugins/web_scraper.py index 2d8c8c0d..a3c4ff75 100644 --- a/misskaty/plugins/web_scraper.py +++ b/misskaty/plugins/web_scraper.py @@ -532,7 +532,7 @@ async def getSame(msg, query, current_page, strings): @app.on_cmd("samehadaku", no_channel=True) @use_chat_lang() async def same_search(_, msg, strings): - query = msg.text.split(" ", 1)[1] if len(msg.command) > 1 else None + query = msg.text.split(maxsplit=1)[1] if len(msg.command) > 1 else None bmsg = await msg.reply_msg(strings("get_data"), quote=True) sameres, PageLen = await getSame(bmsg, query, 1, strings) if not sameres: @@ -1261,7 +1261,7 @@ async def savefilm21_scrap(_, callback_query, strings): @use_chat_lang() async def muviku_scrap(_, message, strings): try: - link = message.text.split(" ", maxsplit=1)[1] + link = message.text.split(maxsplit=1)[1] html = await fetch.get(link) soup = BeautifulSoup(html.text, "lxml") res = soup.find_all(class_="smokeurl") diff --git a/misskaty/plugins/ytdl_plugins.py b/misskaty/plugins/ytdl_plugins.py index 722b6ac4..008a4377 100644 --- a/misskaty/plugins/ytdl_plugins.py +++ b/misskaty/plugins/ytdl_plugins.py @@ -44,7 +44,7 @@ def rand_key(): async def ytsearch(_, ctx: Message, strings): if len(ctx.command) == 1: return await ctx.reply_msg(strings("no_query")) - query = ctx.text.split(" ", maxsplit=1)[1] + query = ctx.text.split(maxsplit=1)[1] search_key = rand_key() YT_DB[search_key] = query search = await main.VideosSearch(query).next()