From edd3b0f2ddc63bd34e7258de0db8543ddaf6d8c0 Mon Sep 17 00:00:00 2001
From: yasirarism <55983182+yasirarism@users.noreply.github.com>
Date: Sun, 27 Aug 2023 13:26:49 +0700
Subject: [PATCH] Change logger

---
 misskaty/__main__.py                          |  2 +-
 misskaty/core/decorator/misc.py               |  2 +-
 misskaty/core/misskaty_patch/bound/message.py |  2 +-
 misskaty/core/misskaty_patch/listen/listen.py |  2 +-
 .../misskaty_patch/utils/handler_error.py     |  2 +-
 misskaty/core/misskaty_patch/utils/utils.py   |  2 +-
 misskaty/helper/kuso_utils.py                 |  2 +-
 misskaty/helper/tools.py                      |  2 +-
 misskaty/plugins/__init__.py                  |  2 +-
 misskaty/plugins/admin.py                     | 39 ++++++++++---------
 misskaty/plugins/auto_forwarder.py            |  2 +-
 misskaty/plugins/currency.py                  |  2 +-
 misskaty/plugins/dev.py                       |  2 +-
 misskaty/plugins/download_upload.py           |  2 +-
 misskaty/plugins/genss.py                     |  2 +-
 misskaty/plugins/grup_tools.py                |  2 +-
 misskaty/plugins/imdb_search.py               |  2 +-
 misskaty/plugins/inline_search.py             |  2 +-
 misskaty/plugins/media_extractor.py           |  2 +-
 misskaty/plugins/misc_tools.py                |  2 +-
 misskaty/plugins/session_generator.py         |  2 +-
 misskaty/plugins/subscene_dl.py               |  2 +-
 misskaty/plugins/web_scraper.py               |  2 +-
 misskaty/plugins/ytdl_plugins.py              |  2 +-
 misskaty/vars.py                              |  2 +-
 update.py                                     |  2 +-
 utils.py                                      |  2 +-
 27 files changed, 47 insertions(+), 44 deletions(-)

diff --git a/misskaty/__main__.py b/misskaty/__main__.py
index f174e681..5a62dbab 100644
--- a/misskaty/__main__.py
+++ b/misskaty/__main__.py
@@ -21,7 +21,7 @@ from misskaty.plugins.web_scraper import web
 from misskaty.vars import SUDO, USER_SESSION
 from utils import auto_clean
 
-LOGGER = getLogger(__name__)
+LOGGER = getLogger("MissKaty")
 loop = asyncio.get_event_loop()
 
 
diff --git a/misskaty/core/decorator/misc.py b/misskaty/core/decorator/misc.py
index 12e4be50..a6f41b84 100644
--- a/misskaty/core/decorator/misc.py
+++ b/misskaty/core/decorator/misc.py
@@ -2,7 +2,7 @@ import asyncio
 import logging
 from functools import wraps
 
-LOGGER = logging.getLogger(__name__)
+LOGGER = logging.getLogger("MissKaty")
 
 
 def asyncify(func):
diff --git a/misskaty/core/misskaty_patch/bound/message.py b/misskaty/core/misskaty_patch/bound/message.py
index 53e3bb89..ab96257f 100644
--- a/misskaty/core/misskaty_patch/bound/message.py
+++ b/misskaty/core/misskaty_patch/bound/message.py
@@ -19,7 +19,7 @@ from pyrogram.errors import (
 )
 from pyrogram.types import Message
 
-LOGGER = getLogger(__name__)
+LOGGER = getLogger("MissKaty")
 
 Message.input = property(
     lambda m: m.text[m.text.find(m.command[0]) + len(m.command[0]) + 1 :]
diff --git a/misskaty/core/misskaty_patch/listen/listen.py b/misskaty/core/misskaty_patch/listen/listen.py
index 5453e9aa..20c8d131 100644
--- a/misskaty/core/misskaty_patch/listen/listen.py
+++ b/misskaty/core/misskaty_patch/listen/listen.py
@@ -29,7 +29,7 @@ from pyrogram.errors import MessageIdInvalid
 
 from ..utils import PyromodConfig, patch, patchable
 
-logger = logging.getLogger(__name__)
+logger = logging.getLogger("MissKaty")
 
 
 class ListenerStopped(Exception):
diff --git a/misskaty/core/misskaty_patch/utils/handler_error.py b/misskaty/core/misskaty_patch/utils/handler_error.py
index 89c7f97e..30f22c45 100644
--- a/misskaty/core/misskaty_patch/utils/handler_error.py
+++ b/misskaty/core/misskaty_patch/utils/handler_error.py
@@ -26,7 +26,7 @@ import pyrogram
 
 from misskaty.vars import LOG_CHANNEL
 
-LOGGER = logging.getLogger(__name__)
+LOGGER = logging.getLogger("MissKaty")
 
 
 async def handle_error(
diff --git a/misskaty/core/misskaty_patch/utils/utils.py b/misskaty/core/misskaty_patch/utils/utils.py
index 90571767..444d94c2 100644
--- a/misskaty/core/misskaty_patch/utils/utils.py
+++ b/misskaty/core/misskaty_patch/utils/utils.py
@@ -24,7 +24,7 @@ from typing import Callable
 
 from pyrogram.sync import async_to_sync
 
-logger = getLogger(__name__)
+logger = getLogger("MissKaty")
 
 
 class PyromodConfig:
diff --git a/misskaty/helper/kuso_utils.py b/misskaty/helper/kuso_utils.py
index c82cb4db..d2d2bff7 100644
--- a/misskaty/helper/kuso_utils.py
+++ b/misskaty/helper/kuso_utils.py
@@ -9,7 +9,7 @@ from telegraph.aio import Telegraph
 from misskaty import BOT_USERNAME
 from misskaty.helper.http import fetch
 
-LOGGER = logging.getLogger(__name__)
+LOGGER = logging.getLogger("MissKaty")
 
 headers = {
     "Accept": "*/*",
diff --git a/misskaty/helper/tools.py b/misskaty/helper/tools.py
index 130942e8..4dd471c1 100644
--- a/misskaty/helper/tools.py
+++ b/misskaty/helper/tools.py
@@ -14,7 +14,7 @@ from misskaty.helper.http import fetch
 from misskaty.helper.human_read import get_readable_time
 from misskaty.plugins import ALL_MODULES
 
-LOGGER = logging.getLogger(__name__)
+LOGGER = logging.getLogger("MissKaty")
 URL_REGEX = r"(http|ftp|https):\/\/([\w_-]+(?:(?:\.[\w_-]+)+))([\w.,@?^=%&:\/~+#-]*[\w@?^=%&\/~+#-])"
 GENRES_EMOJI = {
     "Action": "👊",
diff --git a/misskaty/plugins/__init__.py b/misskaty/plugins/__init__.py
index 086516c4..e93a0f27 100644
--- a/misskaty/plugins/__init__.py
+++ b/misskaty/plugins/__init__.py
@@ -12,7 +12,7 @@ from os.path import basename, dirname, isfile
 
 from misskaty import MOD_LOAD, MOD_NOLOAD
 
-LOGGER = getLogger(__name__)
+LOGGER = getLogger("MissKaty")
 
 
 def __list_all_modules():
diff --git a/misskaty/plugins/admin.py b/misskaty/plugins/admin.py
index 0e83f4c0..24dace88 100644
--- a/misskaty/plugins/admin.py
+++ b/misskaty/plugins/admin.py
@@ -55,7 +55,7 @@ from misskaty.helper.functions import (
 from misskaty.helper.localization import use_chat_lang
 from misskaty.vars import COMMAND_HANDLER, SUDO
 
-LOGGER = getLogger(__name__)
+LOGGER = getLogger("MissKaty")
 
 __MODULE__ = "Admin"
 __HELP__ = """
@@ -403,12 +403,12 @@ async def deleteFunc(_, message, strings):
 async def promoteFunc(client, message, strings):
     try:
         user_id = await extract_user(message)
-        umention = (await app.get_users(user_id)).mention
+        umention = (await client.get_users(user_id)).mention
     except:
         return await message.reply(strings("invalid_id_uname"))
     if not user_id:
         return await message.reply_text(strings("user_not_found"))
-    bot = await app.get_chat_member(message.chat.id, client.me.id)
+    bot = await client.get_chat_member(message.chat.id, client.me.id)
     if user_id == client.me.id:
         return await message.reply_text(strings("promote_self_err"))
     if not bot.privileges.can_promote_members:
@@ -460,21 +460,24 @@ async def demote(client, message, strings):
         return await message.reply_text(strings("demote_self_err"))
     if user_id in SUDO:
         return await message.reply_text(strings("demote_sudo_err"))
-    await message.chat.promote_member(
-        user_id=user_id,
-        privileges=ChatPrivileges(
-            can_change_info=False,
-            can_invite_users=False,
-            can_delete_messages=False,
-            can_restrict_members=False,
-            can_pin_messages=False,
-            can_promote_members=False,
-            can_manage_chat=False,
-            can_manage_video_chats=False,
-        ),
-    )
-    umention = (await app.get_users(user_id)).mention
-    await message.reply_text(f"Demoted! {umention}")
+    try:
+        await message.chat.promote_member(
+            user_id=user_id,
+            privileges=ChatPrivileges(
+                can_change_info=False,
+                can_invite_users=False,
+                can_delete_messages=False,
+                can_restrict_members=False,
+                can_pin_messages=False,
+                can_promote_members=False,
+                can_manage_chat=False,
+                can_manage_video_chats=False,
+            ),
+        )
+        umention = (await app.get_users(user_id)).mention
+        await message.reply_text(f"Demoted! {umention}")
+    except ChatAdminRequired:
+        await message.reply()
 
 
 # Pin Messages
diff --git a/misskaty/plugins/auto_forwarder.py b/misskaty/plugins/auto_forwarder.py
index 28db9910..5317d5b0 100644
--- a/misskaty/plugins/auto_forwarder.py
+++ b/misskaty/plugins/auto_forwarder.py
@@ -16,7 +16,7 @@ from misskaty.vars import (
     MINIMUM_FILE_SIZE,
 )
 
-LOGGER = getLogger(__name__)
+LOGGER = getLogger("MissKaty")
 
 
 async def FilterMessage(message: Message):
diff --git a/misskaty/plugins/currency.py b/misskaty/plugins/currency.py
index 632824dd..6f7eac23 100644
--- a/misskaty/plugins/currency.py
+++ b/misskaty/plugins/currency.py
@@ -16,7 +16,7 @@ __HELP__ = """
 /currency - Send structure message Telegram in JSON using Pyrogram Style.
 """
 
-LOGGER = logging.getLogger(__name__)
+LOGGER = logging.getLogger("MissKaty")
 
 
 @app.on_cmd("currency")
diff --git a/misskaty/plugins/dev.py b/misskaty/plugins/dev.py
index 1756ac9d..cacc2a2b 100644
--- a/misskaty/plugins/dev.py
+++ b/misskaty/plugins/dev.py
@@ -484,7 +484,7 @@ async def cmd_eval(self: Client, ctx: Message, strings) -> Optional[str]:
     else:
         await edit_or_reply(
             ctx,
-            text=f"<code>{final_output}</code>",
+            text=final_output,
             parse_mode=enums.ParseMode.HTML,
             reply_markup=InlineKeyboardMarkup(
                 [
diff --git a/misskaty/plugins/download_upload.py b/misskaty/plugins/download_upload.py
index 3eb0ff32..0eed930b 100644
--- a/misskaty/plugins/download_upload.py
+++ b/misskaty/plugins/download_upload.py
@@ -22,7 +22,7 @@ from misskaty.helper.http import fetch
 from misskaty.helper.pyro_progress import humanbytes, progress_for_pyrogram
 from misskaty.vars import COMMAND_HANDLER, SUDO
 
-LOGGER = getLogger(__name__)
+LOGGER = getLogger("MissKaty")
 
 __MODULE__ = "Download/Upload"
 __HELP__ = """
diff --git a/misskaty/plugins/genss.py b/misskaty/plugins/genss.py
index 499c40c1..d33fb62f 100644
--- a/misskaty/plugins/genss.py
+++ b/misskaty/plugins/genss.py
@@ -24,7 +24,7 @@ from misskaty.helper import is_url, progress_for_pyrogram, take_ss
 from misskaty.helper.localization import use_chat_lang
 from misskaty.helper.pyro_progress import humanbytes
 
-LOGGER = getLogger(__name__)
+LOGGER = getLogger("MissKaty")
 
 __MODULE__ = "MediaTool"
 __HELP__ = """"
diff --git a/misskaty/plugins/grup_tools.py b/misskaty/plugins/grup_tools.py
index b59c9fc0..8918787f 100644
--- a/misskaty/plugins/grup_tools.py
+++ b/misskaty/plugins/grup_tools.py
@@ -22,7 +22,7 @@ from misskaty.helper import fetch, use_chat_lang
 from misskaty.vars import COMMAND_HANDLER, SUDO, SUPPORT_CHAT
 from utils import temp
 
-LOGGER = getLogger(__name__)
+LOGGER = getLogger("MissKaty")
 
 
 def circle(pfp, size=(215, 215)):
diff --git a/misskaty/plugins/imdb_search.py b/misskaty/plugins/imdb_search.py
index 1dbd59f8..d56f4e9e 100644
--- a/misskaty/plugins/imdb_search.py
+++ b/misskaty/plugins/imdb_search.py
@@ -34,7 +34,7 @@ from misskaty.core.decorator.ratelimiter import ratelimiter
 from misskaty.helper import GENRES_EMOJI, Cache, fetch, get_random_string, search_jw
 from utils import demoji
 
-LOGGER = logging.getLogger(__name__)
+LOGGER = logging.getLogger("MissKaty")
 LIST_CARI = Cache(filename="imdb_cache.db", path="cache", in_memory=False)
 
 
diff --git a/misskaty/plugins/inline_search.py b/misskaty/plugins/inline_search.py
index 11eefd32..c4d32eb6 100644
--- a/misskaty/plugins/inline_search.py
+++ b/misskaty/plugins/inline_search.py
@@ -45,7 +45,7 @@ To use this feature, just type bot username with following args below.
 keywords_list = ["imdb", "pypi", "git", "google", "secretmsg", "info", "botapi"]
 
 PRVT_MSGS = {}
-LOGGER = getLogger()
+LOGGER = getLogger("MissKaty")
 
 
 @app.on_inline_query()
diff --git a/misskaty/plugins/media_extractor.py b/misskaty/plugins/media_extractor.py
index 806663ff..209c0452 100644
--- a/misskaty/plugins/media_extractor.py
+++ b/misskaty/plugins/media_extractor.py
@@ -31,7 +31,7 @@ from misskaty.helper.tools import get_random_string
 from misskaty.plugins.dev import shell_exec
 from misskaty.vars import COMMAND_HANDLER
 
-LOGGER = getLogger(__name__)
+LOGGER = getLogger("MissKaty")
 
 ARCH_EXT = (
     "mkv",
diff --git a/misskaty/plugins/misc_tools.py b/misskaty/plugins/misc_tools.py
index 56f9097c..49e7fa6b 100644
--- a/misskaty/plugins/misc_tools.py
+++ b/misskaty/plugins/misc_tools.py
@@ -41,7 +41,7 @@ from misskaty.helper.tools import rentry
 from misskaty.vars import COMMAND_HANDLER
 from utils import extract_user, get_file_id
 
-LOGGER = getLogger(__name__)
+LOGGER = getLogger("MissKaty")
 
 __MODULE__ = "Misc"
 __HELP__ = """
diff --git a/misskaty/plugins/session_generator.py b/misskaty/plugins/session_generator.py
index aa71de97..ede48b4f 100644
--- a/misskaty/plugins/session_generator.py
+++ b/misskaty/plugins/session_generator.py
@@ -27,7 +27,7 @@ from misskaty.core.decorator.ratelimiter import ratelimiter
 from misskaty.core.misskaty_patch.listen.listen import ListenerTimeout
 from misskaty.vars import API_HASH, API_ID, COMMAND_HANDLER
 
-LOGGER = getLogger(__name__)
+LOGGER = getLogger("MissKaty")
 
 __MODULE__ = "SessionGen"
 __HELP__ = """
diff --git a/misskaty/plugins/subscene_dl.py b/misskaty/plugins/subscene_dl.py
index bce9602e..82667338 100644
--- a/misskaty/plugins/subscene_dl.py
+++ b/misskaty/plugins/subscene_dl.py
@@ -19,7 +19,7 @@ from misskaty.vars import COMMAND_HANDLER
 
 from .web_scraper import split_arr
 
-LOGGER = logging.getLogger(__name__)
+LOGGER = logging.getLogger("MissKaty")
 SUB_TITLE_DICT = {}
 SUB_DL_DICT = {}
 
diff --git a/misskaty/plugins/web_scraper.py b/misskaty/plugins/web_scraper.py
index d596c9b2..325d6744 100644
--- a/misskaty/plugins/web_scraper.py
+++ b/misskaty/plugins/web_scraper.py
@@ -33,7 +33,7 @@ __HELP__ = """
 /samehadaku [query <optional>] - Scrape website data from Samehadaku.
 """
 
-LOGGER = logging.getLogger(__name__)
+LOGGER = logging.getLogger("MissKaty")
 SCRAP_DICT = Cache(filename="scraper_cache.db", path="cache", in_memory=False)
 data_kuso = Cache(filename="kuso_cache.db", path="cache", in_memory=False)
 webdb = dbname["web"]
diff --git a/misskaty/plugins/ytdl_plugins.py b/misskaty/plugins/ytdl_plugins.py
index f85e04db..d112a021 100644
--- a/misskaty/plugins/ytdl_plugins.py
+++ b/misskaty/plugins/ytdl_plugins.py
@@ -30,7 +30,7 @@ from misskaty.core.decorator import capture_err, new_task, ratelimiter
 from misskaty.helper import fetch, use_chat_lang
 from misskaty.vars import COMMAND_HANDLER, LOG_CHANNEL, SUDO
 
-LOGGER = getLogger(__name__)
+LOGGER = getLogger("MissKaty")
 YT_REGEX = r"^(https?://)?(www\.)?(youtube|youtu|youtube-nocookie)\.(com|be)/(watch\?v=|embed/|v/|.+\?v=)?(?P<id>[A-Za-z0-9\-=_]{11})"
 YT_DB = {}
 
diff --git a/misskaty/vars.py b/misskaty/vars.py
index 5c5841c4..af8880da 100644
--- a/misskaty/vars.py
+++ b/misskaty/vars.py
@@ -6,7 +6,7 @@ import sys
 from logging import getLogger
 from os import environ
 
-LOGGER = getLogger(__name__)
+LOGGER = getLogger("MissKaty")
 
 
 def getConfig(name: str):
diff --git a/update.py b/update.py
index dc6a5067..fb25aff0 100644
--- a/update.py
+++ b/update.py
@@ -20,7 +20,7 @@ basicConfig(
     ],
 )
 
-LOGGER = getLogger(__name__)
+LOGGER = getLogger("MissKaty")
 
 ENV_URL = os.environ.get("ENV_URL")
 try:
diff --git a/utils.py b/utils.py
index a2d6690c..2998f389 100644
--- a/utils.py
+++ b/utils.py
@@ -17,7 +17,7 @@ from database.afk_db import is_cleanmode_on
 from database.users_chats_db import db
 from misskaty import app, cleanmode
 
-LOGGER = getLogger(__name__)
+LOGGER = getLogger("MissKaty")
 BANNED = {}
 
 loop = asyncio.get_event_loop()