minor fixes

Waga43 · Aug 20, 2020 · f0d8017 · f0d8017
1 parent d2412b0
commit f0d8017
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/userge/core/client.py b/userge/core/client.py
@@ -16,7 +16,7 @@
 import asyncio
 import importlib
 from types import ModuleType
-from typing import List, Awaitable, Any, Optional
+from typing import List, Awaitable, Any, Optional, Union
 
 import psutil
 
@@ -154,9 +154,11 @@ def __init__(self, **kwargs) -> None:
         super().__init__(**kwargs)
 
     @property
-    def bot(self) -> '_UsergeBot':
+    def bot(self) -> Union['_UsergeBot', 'Userge']:
         """ returns usergebot """
         if self._bot is None:
+            if Config.BOT_TOKEN:
+                return self
             raise UsergeBotNotFound("Need BOT_TOKEN ENV!")
         return self._bot
 

diff --git a/userge/plugins/admin/gban.py b/userge/plugins/admin/gban.py
@@ -299,7 +299,7 @@ async def gban_at_entry(message: Message):
         elif Config.ANTISPAM_SENTRY:
             res = requests.get(f'https://api.cas.chat/check?user_id={user_id}').json()
             if res['ok']:
-                reason = res['result']['messages'][0] if 'result' in res else None
+                reason = ' | '.join(res['result']['messages']) if 'result' in res else None
                 await asyncio.gather(
                     message.client.kick_chat_member(chat_id, user_id),
                     message.reply(

diff --git a/userge/plugins/fun/kang.py b/userge/plugins/fun/kang.py
@@ -45,6 +45,9 @@ async def kang_(message: Message):
         elif replied.document and "tgsticker" in replied.document.mime_type:
             is_anim = True
         elif replied.sticker:
+            if not replied.sticker.file_name:
+                await message.edit("`Sticker has no Name!`")
+                return
             emoji_ = replied.sticker.emoji
             is_anim = replied.sticker.is_animated
             if not replied.sticker.file_name.endswith('.tgs'):

diff --git a/userge/plugins/tools/system.py b/userge/plugins/tools/system.py
@@ -49,7 +49,8 @@ async def shutdown_(message: Message) -> None:
         try:
             Config.HEROKU_APP.scale_formation_process("worker", 0)
         except Exception as h_e:  # pylint: disable=broad-except
-            await message.err(h_e)
+            await message.edit(f"**heroku error** : `{h_e}`")
+            await asyncio.sleep(3)
     else:
         await asyncio.sleep(1)
     await message.delete()