From 869c77b97c12efb8fc97de18d75d4662893b4887 Mon Sep 17 00:00:00 2001
From: Rykov7 <rykov7@protonmail.ch>
Date: Mon, 28 Nov 2022 10:23:37 +0300
Subject: [PATCH] bug fix

---
 app/__init__.py |  1 -
 app/admin.py    |  4 ++++
 app/bot.py      | 17 ++++++++---------
 app/report.py   |  8 ++++----
 4 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/app/__init__.py b/app/__init__.py
index f5518ae..e69de29 100644
--- a/app/__init__.py
+++ b/app/__init__.py
@@ -1 +0,0 @@
-from . import trolling
diff --git a/app/admin.py b/app/admin.py
index cdb895f..d6f07f9 100644
--- a/app/admin.py
+++ b/app/admin.py
@@ -5,6 +5,7 @@ from . import me
 from . import query_log
 from . import reminder
 from . import report
+from . import bot as bot_mod
 
 
 def reload_modules():
@@ -13,3 +14,6 @@ def reload_modules():
     reload(config)
     reload(me)
     reload(query_log)
+    reload(bot_mod)
+
+
diff --git a/app/bot.py b/app/bot.py
index 5663dfc..3fca52b 100644
--- a/app/bot.py
+++ b/app/bot.py
@@ -9,13 +9,13 @@ from flask import Flask, request, abort
 from telebot import types
 
 from . import reminder
+from . import trolling
+from . import admin
 from . import report
-from .admin import reload_modules
 from .config import bot, URL_RX, ALLOWED_WORDS, ADMIN_ID, TOKEN, PYTHONCHATRU
 from .me import get_me
 from .query_log import logging
 
-
 # https://core.telegram.org/bots/api Telegram Bot API
 # https://github.com/eternnoir/pyTelegramBotAPI/tree/master/examples
 
@@ -227,13 +227,6 @@ def send_stats(message):
                      parse_mode='HTML', disable_web_page_preview=True)
 
 
-@bot.message_handler(commands=['reload'])
-def send_stats(message):
-    reload_modules()
-    bot.send_message(message.chat.id, 'Reloaded successful',
-                     parse_mode='HTML')
-
-
 @bot.message_handler(commands=['reset_stats'])
 def send_stats(message):
     report.reset_report_stats()
@@ -241,6 +234,12 @@ def send_stats(message):
                      parse_mode='HTML', disable_web_page_preview=True)
 
 
+@bot.message_handler(commands=['reload'])
+def send_stats(message):
+    admin.reload_modules()
+    bot.send_message(message.chat.id, 'Reloaded successfully')
+
+
 def check_chat(message: types.Message):
     if message.chat.id == PYTHONCHATRU:
         return True
diff --git a/app/report.py b/app/report.py
index 262c162..5d68ce8 100644
--- a/app/report.py
+++ b/app/report.py
@@ -14,15 +14,15 @@ def create_report_text():
             user = flooder["User"]
             name = f"{user.first_name} {user.last_name}" if user.last_name else user.first_name
             top_users += f'\n  {i + 1}. <a href="tg://user?id={user.id}">{name}</a> ({flooder["Count"]})'
-        report = f"""<code>Hello, World!</code> 🌍
-
+        report = f"<code>Hello, World!</code> 🌍"
+        if s['Banned'] or s['Deleted']:
+            report += f"""
 <b>Заблокировано</b> ⛔
 ├ <b>Пользователей: </b>{s['Banned']}
 └ <b>Сообщений: </b>{s['Deleted']}
 """
     if flooders:
-        report += f"""
-<b>Топ</b> 🏆{top_users}"""
+        report += f"\n<b>Топ</b> 🗣{top_users}"
     return report