diff --git a/app/bot.py b/app/bot.py index 639af99..2243611 100644 --- a/app/bot.py +++ b/app/bot.py @@ -69,19 +69,19 @@ def send_rules(message): if len(args) > 1 and args[-1].isdigit() and 0 < int(args[-1]): send_or_reply(message, f'Правило {args[-1]}\n{rules.fetch_rule(args[-1])}', reply_markup=markup) else: - send_or_reply(message, '⤵️', reply_markup=markup) + send_or_reply(message, '...', reply_markup=markup) @bot.message_handler(commands=['faq', 'чзв']) def send_faq(message): markup = types.InlineKeyboardMarkup([[FAQ]], 1) - send_or_reply(message, '⤵️', reply_markup=markup) + send_or_reply(message, '...', reply_markup=markup) @bot.message_handler(commands=['lib', 'library', 'books', 'книги', 'библиотека']) def send_lib(message): markup = types.InlineKeyboardMarkup([[LIB]], 1) - send_or_reply(message, '⤵️', reply_markup=markup) + send_or_reply(message, '...', reply_markup=markup) @bot.message_handler(commands=['lutz', 'лутц']) @@ -167,7 +167,7 @@ def google_it(message: types.Message): markup = types.InlineKeyboardMarkup() markup.add(types.InlineKeyboardButton('🔍 Google Поиск', url=get_query), row_width=1) - send_or_reply(message, f'Ищем «{query}» в Гугле...', reply_markup=markup) + send_or_reply(message, f'Ищем «{query}»...', reply_markup=markup) """ diff --git a/app/report.py b/app/report.py index 6769e9b..78fc8ad 100644 --- a/app/report.py +++ b/app/report.py @@ -10,8 +10,7 @@ def create_report_text(chat_id): if os.path.exists(f'{DATA}{chat_id}.db'): with shelve.open(f'{DATA}{chat_id}') as s: for n in range(min(3, len(s['Messages']))): - top_user = s['Messages'][ - sorted(s['Messages'], key=lambda a: s['Messages'][a]['Count'], reverse=True)[n]] + top_user = s['Messages'][sorted(s['Messages'], key=lambda a: s['Messages'][a]['Count'], reverse=True)[n]] if top_user['Count'] >= 10: flooders.append(top_user) @@ -21,13 +20,13 @@ def create_report_text(chat_id): top_users += f'\n {i + 1}. {name} ({flooder["Count"]})' if s['Banned'] or s['Deleted']: - report = f"Hello, World! 🌍\n" report += f""" Заблокировано ⛔ ├ Пользователей: {s['Banned']} └ Сообщений: {s['Deleted']} """ if len(flooders) >= 3: + report += f"Hello, World! 🌍" report += f"\nТоп 🗣{top_users}" return report else: diff --git a/app/stan.py b/app/stan.py index 04b3fb3..7891e57 100644 --- a/app/stan.py +++ b/app/stan.py @@ -1,4 +1,4 @@ -""" Stan quote generator. """ +""" Stan's commands and reactions. """ import random from .config import bot, types from .filters import is_white, is_nongrata