diff --git a/app/bot.py b/app/bot.py
index 248acdb..c67f36e 100644
--- a/app/bot.py
+++ b/app/bot.py
@@ -17,7 +17,7 @@ from .me import get_me
logging.basicConfig(level=logging.INFO, format='%(message)s')
app = Flask(__name__)
-print(">>> PYBOT IS RUNNING!")
+logging.warning('>>> PYBOT STARTED!')
zen_rows = ['Beautiful is better than ugly.', 'Explicit is better than implicit.', 'Simple is better than complex.',
'Complex is better than complicated.', 'Flat is better than nested.', 'Sparse is better than dense.',
@@ -44,10 +44,10 @@ def start(message: types.Message):
def check_spam_list(type_message: types.Message) -> bool:
""" Check for mentioning unwanted persons in text. """
if type_message.from_user.username not in WHITEUN and type_message.from_user.id not in WHITEIDS:
- unwanted_phrases = ['me.sv/', 'tg.sv/', 'goo.by/', 'go.sv/', 'intim.video/',
- 'uclck.ru/']
- for phrase in unwanted_phrases:
- if phrase in type_message.text.casefold():
+ spam_urls = ['me.sv/', 'tg.sv/', 'goo.by/', 'go.sv/', 'intim.video/',
+ 'uclck.ru/']
+ for url in spam_urls:
+ if url in type_message.text.casefold():
return True
@@ -251,9 +251,11 @@ def check_chat(message: types.Message):
@bot.message_handler(commands=['tsya'])
def send_tsya_link(message: types.Message):
""" тся/ться """
- link = '-тся/-ться'
+ answer = '-тся/-ться'
if message.reply_to_message:
- bot.reply_to(message.reply_to_message, link, parse_mode='HTML', disable_web_page_preview=True)
+ bot.reply_to(message.reply_to_message, answer, parse_mode='HTML', disable_web_page_preview=True)
+ else:
+ bot.send_message(message.chat.id, answer, parse_mode='HTML', disable_web_page_preview=True)
@bot.message_handler(commands=['nometa'])
@@ -262,6 +264,8 @@ def send_nometa(message: types.Message):
answer = 'Пожалуйста, не задавайте мета-вопросов в чате!'
if message.reply_to_message:
bot.reply_to(message.reply_to_message, answer, parse_mode='HTML', disable_web_page_preview=True)
+ else:
+ bot.send_message(message.chat.id, answer, parse_mode='HTML', disable_web_page_preview=True)
@bot.message_handler(commands=['neprivet'])
@@ -270,6 +274,8 @@ def send_neprivet(message: types.Message):
answer = 'Непривет'
if message.reply_to_message:
bot.reply_to(message.reply_to_message, answer, parse_mode='HTML', disable_web_page_preview=True)
+ else:
+ bot.send_message(message.chat.id, answer, parse_mode='HTML', disable_web_page_preview=True)
@bot.message_handler(commands=['g'])
diff --git a/app/config.py b/app/config.py
index 48a72d6..05577af 100644
--- a/app/config.py
+++ b/app/config.py
@@ -2,10 +2,6 @@ import os
import re
from telebot import TeleBot
from dotenv import load_dotenv
-import logging
-
-logging.basicConfig(level=logging.INFO, format='%(message)s')
-
load_dotenv()
@@ -16,11 +12,8 @@ ADMIN_ID = 280887861 # Rykov7
PYTHONCHATRU = -1001338616632 # pythonchatru
URL_RX = re.compile(r'\w+\.\w+/\w+')
-ALLOWED_WORDS = ['pastebin', 'github', 'google', 'nometa', 'python', 'django', 'flask', 'fastapi',
+ALLOWED_WORDS = ['paste', 'github', 'google', 'nometa', 'python', 'django', 'flask', 'fastapi',
'stackoverflow', 'habr', 'medium', 'youtu', 'stepik', 'telegraph', '#rtfm']
WHITEUN = set(os.environ.get('whitelist', '<<