From e13ae89fcbd1543bf583e7a56f82ccaef4dfa8d4 Mon Sep 17 00:00:00 2001
From: Jan Tuomi <jan-sebastian.tuomi@aalto.fi>
Date: Wed, 20 Jul 2016 23:08:54 +0300
Subject: Fix API post functionality

---
 project/botmanager.py | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

(limited to 'project/botmanager.py')

diff --git a/project/botmanager.py b/project/botmanager.py
index 448dbb8..151e94d 100644
--- a/project/botmanager.py
+++ b/project/botmanager.py
@@ -27,6 +27,7 @@ class BotManager(object):
         If not possible, crash gracefully
         """
         TelegramCommunicator.token = token
+        self.running_message_id = 1
         try:
             logging.info("Creating bot listener with token {}...".format(token))
             TelegramCommunicator.spawn_bot(token)
@@ -103,13 +104,22 @@ class BotManager(object):
             logging.warning("Skipped sending message to shoutbox.")
             return
 
-        data = JSONFactory.make_object(text, user_name, date, "null")
-        logging.info("Created JSON packet:\n{}".format(data))
-        ShoutboxCommunicator.send(data)
+        message = {
+            "user": user_name,
+            "text": text,
+            "id": self.running_message_id,
+            "ip": "null",
+            "timestamp": date
+        }
+        self.running_message_id += 1
+        ShoutboxCommunicator.send(message)
 
     def handle(self, msg):
         """Start parsing the incoming message if it is a text message"""
         content_type, chat_type, chat_id = telepot.glance(msg)
 
         if content_type == 'text':
+            logging.info("Got text message.")
             self.parse_message(msg)
+        else:
+            logging.info("Got non-text message.")
-- 
cgit v1.3