From 1bb054b2ce2e6ed4bf9c7f465a429b5b400e1a30 Mon Sep 17 00:00:00 2001 From: yasirarism <55983182+yasirarism@users.noreply.github.com> Date: Sun, 30 Apr 2023 21:13:59 +0700 Subject: [PATCH] Revert because stuck --- misskaty/__main__.py | 4 +-- misskaty/plugins/imdb_search.py | 60 ++++++++++++++++++--------------- 2 files changed, 34 insertions(+), 30 deletions(-) diff --git a/misskaty/__main__.py b/misskaty/__main__.py index 00b138f7..edcbf3ee 100644 --- a/misskaty/__main__.py +++ b/misskaty/__main__.py @@ -81,7 +81,7 @@ if __name__ == "__main__": pass except Exception: err = traceback.format_exc() - print(err) + LOGGER.info(err) finally: loop.stop() - print("------------------------ Stopped Services ------------------------") + LOGGER.info("------------------------ Stopped Services ------------------------") diff --git a/misskaty/plugins/imdb_search.py b/misskaty/plugins/imdb_search.py index cf00a3f4..bf8c3035 100644 --- a/misskaty/plugins/imdb_search.py +++ b/misskaty/plugins/imdb_search.py @@ -155,14 +155,15 @@ async def imdb_search_id(kueri, message): ) buttons.add(*BTN) msg = await k.edit_caption(msg, reply_markup=buttons) - await msg.wait_for_click( - from_user_id=message.from_user.id, - timeout=30 - ) - except ListenerTimeout: - await msg.edit_caption("πŸ˜Άβ€πŸŒ«οΈ Waktu Habis. Task Telah Dibatalkan!") + try: + await msg.wait_for_click( + from_user_id=message.from_user.id, + timeout=30 + ) + except ListenerTimeout: + await msg.edit_caption("πŸ˜Άβ€πŸŒ«οΈ Waktu Habis. Task Telah Dibatalkan!") except Exception as err: - await msg.edit_caption(f"Ooppss, gagal mendapatkan daftar judul di IMDb. Mungkin terkena rate limit atau down.\n\nERROR: {err}") + await k.edit_caption(f"Ooppss, gagal mendapatkan daftar judul di IMDb. Mungkin terkena rate limit atau down.\n\nERROR: {err}") async def imdb_search_en(kueri, message): @@ -211,14 +212,15 @@ async def imdb_search_en(kueri, message): ) buttons.add(*BTN) msg = await k.edit_caption(msg, reply_markup=buttons) - await msg.wait_for_click( - from_user_id=message.from_user.id, - timeout=30 - ) - except ListenerTimeout: - await msg.edit_caption("πŸ˜Άβ€πŸŒ«οΈ Timeout. Task Has Been Cancelled!") + try: + await msg.wait_for_click( + from_user_id=message.from_user.id, + timeout=30 + ) + except ListenerTimeout: + await msg.edit_caption("πŸ˜Άβ€πŸŒ«οΈ Timeout. Task Has Been Cancelled!") except Exception as err: - await msg.edit_caption(f"Failed when requesting movies title. Maybe got rate limit or down.\n\nERROR: {err}") + await k.edit_caption(f"Failed when requesting movies title. Maybe got rate limit or down.\n\nERROR: {err}") @app.on_callback_query(filters.regex("^imdbcari")) @@ -263,14 +265,15 @@ async def imdbcari(self: Client, query: CallbackQuery): ) buttons.add(*BTN) msg = await query.message.edit_caption(msg, reply_markup=buttons) - await msg.wait_for_click( - from_user_id=int(uid), - timeout=30 - ) - except ListenerTimeout: - await msg.edit_caption("πŸ˜Άβ€πŸŒ«οΈ Waktu Habis. Task Telah Dibatalkan!") + try: + await msg.wait_for_click( + from_user_id=int(uid), + timeout=30 + ) + except ListenerTimeout: + await msg.edit_caption("πŸ˜Άβ€πŸŒ«οΈ Waktu Habis. Task Telah Dibatalkan!") except Exception as err: - await msg.edit_caption(f"Ooppss, gagal mendapatkan daftar judul di IMDb. Mungkin terkena rate limit atau down.\n\nERROR: {err}") + await query.message.edit_caption(f"Ooppss, gagal mendapatkan daftar judul di IMDb. Mungkin terkena rate limit atau down.\n\nERROR: {err}") else: if query.from_user.id != int(uid): return await query.answer("⚠️ Access Denied!", True) @@ -308,14 +311,15 @@ async def imdbcari(self: Client, query: CallbackQuery): ) buttons.add(*BTN) msg = await query.message.edit_caption(msg, reply_markup=buttons) - await msg.wait_for_click( - from_user_id=int(uid), - timeout=30 - ) - except ListenerTimeout: - await msg.edit_caption("πŸ˜Άβ€πŸŒ«οΈ Timeout. Task Has Been Cancelled!") + try: + await msg.wait_for_click( + from_user_id=int(uid), + timeout=30 + ) + except ListenerTimeout: + return await msg.edit_caption("πŸ˜Άβ€πŸŒ«οΈ Timeout. Task Has Been Cancelled!") except Exception as err: - await msg.edit_caption(f"Failed when requesting movies title. Maybe got rate limit or down.\n\nERROR: {err}") + await query.message.edit_caption(f"Failed when requesting movies title. Maybe got rate limit or down.\n\nERROR: {err}") @app.on_callback_query(filters.regex("^imdbres_id"))