From 144542ddf58f114f0c8eaef5d2209705f493f04b Mon Sep 17 00:00:00 2001
From: Jan Tuomi <jan-sebastian.tuomi@aalto.fi>
Date: Mon, 18 Jul 2016 00:10:13 +0300
Subject: Fix json message, general fixes

---
 botmanager.py       | 11 ++++++++---
 mock_http_server.py | 10 ++++++----
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/botmanager.py b/botmanager.py
index 32fa69f..dc91a3b 100644
--- a/botmanager.py
+++ b/botmanager.py
@@ -1,3 +1,4 @@
+import json
 import random
 import sys
 import requests
@@ -8,7 +9,7 @@ import logging
 
 
 class BotManager(object):
-    shoutbox_api_url = "http://localhost:8080"
+    shoutbox_api_url = "http://localhost:8000"
     telegram_chat_id = "default_id"
 
     def __init__(self, token):
@@ -44,13 +45,17 @@ class BotManager(object):
         try:
             r = requests.get(self.shoutbox_api_url)
             logging.info("Response from API OK.")
-            logging.info("Messages:")
-            logging.info(r.text)
+
         except:
             logging.warning("Failed to get response from API!")
             traceback.print_exc(2)
             return
 
+        content = json.loads(r.text)
+        logging.info("Messages:")
+        for msg in content:
+            logging.info("{}: {}".format(msg["user"], msg["text"]))
+
     def default_action(self, chat_id):
         self.bot.sendMessage(chat_id, "Radio palaa keväällä 2017!")
 
diff --git a/mock_http_server.py b/mock_http_server.py
index 6d2fff7..2399ba5 100644
--- a/mock_http_server.py
+++ b/mock_http_server.py
@@ -24,10 +24,12 @@ class MyHandler(SimpleHTTPRequestHandler):
         self.send_header("Content-type", "application/json")
         self.end_headers()
 
-        body =  """{
-                \"message\":\"test message\"
-                \"user\":\"test user\"
-                }"""
+        body =  """[
+                    {
+                    \"text\":\"test message\",
+                    \"user\":\"test user\"
+                    }
+                ]"""
 
         self.wfile.write(body.encode())
 
-- 
cgit v1.3