Merge master

main.cfg.example

@@ -21,7 +21,7 @@ all=.!?;()\-—"[]{}«»/*&^#$
 
 [media_checker]
 lifetime=28800.0
-stickers=BQADAgADGwEAAjbsGwVVGLVNyOWfuwI
+messages=[:||||||||||||:]
 
 [updates]
 mode=polling
@@ -43,4 +43,4 @@ database=
 user=
 password=
 prefix=
-log_queries=
+log_queries=

src/config.py

@@ -8,7 +8,7 @@ sections = {
     'grammar': ['chain_length', 'separator', 'stop_word', 'end_sentence', 'all'],
     'logging': ['level'],
     'updates': ['mode'],
-    'media_checker': ['lifetime', 'stickers'],
+    'media_checker': ['lifetime', 'messages'],
     'redis': ['host', 'port', 'db'],
     'db': []
 }

src/handler/message_handler.py

@@ -17,7 +17,7 @@ class MessageHandler(ParentHandler):
         self.media_checker = media_checker
         self.chance_manager = chance_manager
         self.spam_stickers = config.getlist('bot', 'spam_stickers')
-        self.media_checker_stickers = config.getlist('media_checker', 'stickers')
+        self.media_checker_messages = config.getlist('media_checker', 'messages')
 
     def handle(self, bot, update):
         chance = self.chance_manager.get_chance(update.message.chat.id)
@@ -38,9 +38,9 @@ class MessageHandler(ParentHandler):
                           (message.chat_type,
                            message.chat_id))
 
-            bot.send_sticker(chat_id=message.chat_id,
+            bot.send_message(chat_id=message.chat_id,
                              reply_to_message_id=message.message.message_id,
-                             sticker=choice(self.media_checker_stickers))
+                             text=choice(self.media_checker_messages))
 
     def __process_message(self, bot, message):
         logging.debug("[Chat %s %s message length] %s" %