diff --git a/app/bot.py b/app/bot.py
index a10f517..c0dfff1 100644
--- a/app/bot.py
+++ b/app/bot.py
@@ -34,8 +34,8 @@ def start(message: types.Message):
"""
-@bot.edited_message_handler(func=check_spam_list)
-@bot.message_handler(func=check_spam_list)
+@bot.edited_message_handler(func=in_spam_list)
+@bot.message_handler(func=in_spam_list)
def moderate_messages(message: types.Message):
""" Ban user and delete their message. """
logging.warning(f'[BAN] {message.from_user.id} {message.from_user.username} - {message.text}')
@@ -45,7 +45,7 @@ def moderate_messages(message: types.Message):
s['Banned'] += 1
-@bot.message_handler(func=check_caption_spam_list, content_types=['video'])
+@bot.message_handler(func=in_caption_spam_list, content_types=['video'])
def catch_videos(message: types.Message):
"""Catch offensive videos"""
logging.warning(f'[BAN] {message.from_user.id} {message.from_user.first_name} - {message.video.file_name}')
@@ -55,8 +55,8 @@ def catch_videos(message: types.Message):
s['Banned'] += 1
-@bot.edited_message_handler(func=check_delete_list)
-@bot.message_handler(func=check_delete_list)
+@bot.edited_message_handler(func=in_delete_list)
+@bot.message_handler(func=in_delete_list)
def delete_message(message: types.Message):
""" Delete unwanted message. """
bot.delete_message(message.chat.id, message.id)
@@ -77,14 +77,14 @@ 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.get_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()
markup.add(FAQ, row_width=1)
- send_or_reply(message, 'Почитай', reply_markup=markup)
+ send_or_reply(message, 'Почитай...', reply_markup=markup)
@bot.message_handler(commands=['lib', 'library', 'books'])
@@ -202,7 +202,7 @@ def google_it(message: types.Message):
send_or_reply(message, f'Ищем «{query}» в Гугле...', reply_markup=markup)
-@bot.message_handler(func=check_nongrata)
+@bot.message_handler(func=is_nongrata)
def tease_nongrata(message: types.Message):
""" Reply to non grata mentions. """
bot.reply_to(message, f'у нас тут таких не любят')
diff --git a/app/filters.py b/app/filters.py
index 2249816..ceea02a 100644
--- a/app/filters.py
+++ b/app/filters.py
@@ -1,7 +1,7 @@
from .config import *
-def check_spam_list(message: types.Message) -> bool:
+def in_spam_list(message: types.Message) -> bool:
""" Check for mentioning unwanted persons in text. """
if message.from_user.username not in WHITEUN and message.from_user.id not in WHITEIDS:
for url in SPAM:
@@ -9,35 +9,35 @@ def check_spam_list(message: types.Message) -> bool:
return True
-def check_caption_spam_list(type_message: types.Message) -> bool:
+def in_caption_spam_list(type_message: types.Message) -> bool:
""" Check for mentioning unwanted words in caption. """
for phrase in BAN_WORDS:
if type_message.caption and phrase in type_message.caption:
return True
-def check_no_allowed(word_list, msg):
+def in_not_allowed(word_list, msg):
for word in word_list:
if word in msg.casefold():
return False
return True
-def check_delete_list(type_message: types.Message) -> bool:
+def in_delete_list(type_message: types.Message) -> bool:
""" Check for URLs in message and delete. """
if type_message.from_user.username not in WHITEUN and type_message.from_user.id not in WHITEIDS:
- if URL_RX.search(type_message.text) and check_no_allowed(ALLOWED_WORDS, type_message.text):
+ if URL_RX.search(type_message.text) and in_not_allowed(ALLOWED_WORDS, type_message.text):
logging.info(f'[DEL] {type_message.from_user.id} {type_message.from_user.first_name} - {type_message.text}')
return True
if type_message.entities:
for entity in type_message.entities:
- if entity.url and check_no_allowed(ALLOWED_WORDS, entity.url):
+ if entity.url and in_not_allowed(ALLOWED_WORDS, entity.url):
logging.info(
f'[DEL] {type_message.from_user.id} {type_message.from_user.first_name} - Entity ({entity.url})')
return True
-def check_nongrata(type_message: types.Message) -> bool:
+def is_nongrata(type_message: types.Message) -> bool:
""" Check for non grata persons. """
for phrase in NON_GRATA:
if phrase in type_message.text.casefold():