From cf9b0e03cc1baff6541d08c0a6e28943a0515d05 Mon Sep 17 00:00:00 2001 From: Midgard Date: Tue, 3 Sep 2019 01:05:40 +0200 Subject: [PATCH] Refactor and fix --- chat.py | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/chat.py b/chat.py index 731b02e..a440b1b 100644 --- a/chat.py +++ b/chat.py @@ -77,7 +77,7 @@ def messages_post(): if (time-last_sent_from_ip).total_seconds() < timeout: return "OK Felix" - message = request.data + message = request.data.decode() if len(message) > 200: return "Message too long, maximum 200" @@ -85,23 +85,26 @@ def messages_post(): if not message: return "No message found" - message_str = message.decode() - - if "spam" in message_str.lower(): + if "spam" in message.lower(): messages.append(Message(time, "1.3.3.7", "ip", "Nee")) return "OK" - if sender != "somebody": - message_str = "<{}> {}".format(sender, message_str) - messages.append(Message(time, sender, sendertype, message_str)) - url = 'http://10.0.5.42:8000/' # Set destination URL here - post_fields = {'X-Messages': base64.b64encode(message)} + # Save message to serve it in this application + messages.append(Message(time, sender, sendertype, message)) + # Send message to espeak to speak it out loud + speak(message.encode()) + + # Send message to MessageOS + msg_with_sendr: str = "<{}> {}".format(sender, message) if sender != "somebody" else message + msg_b64 = base64.b64encode(msg_with_sendr.encode()) + + url = "http://10.0.5.42:8000/" # Set destination URL here + post_fields = {"X-Messages": msg_b64} assembly_request = urllib.request.Request(url, urlencode(post_fields).encode()) - assembly_request.add_header('X-Messages', base64.b64encode(message)) + assembly_request.add_header("X-Messages", msg_b64) urllib.request.urlopen(assembly_request).read().decode() - speak(message) return "OK"