From 13e2367f264461e9f97750c44d739c7d3bff53e3 Mon Sep 17 00:00:00 2001 From: Stavros Korokithakis Date: Thu, 7 Mar 2019 01:51:18 +0200 Subject: Don't crash on missing keys --- signald/main.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/signald/main.py b/signald/main.py index 30231c7..e82f3e7 100644 --- a/signald/main.py +++ b/signald/main.py @@ -99,7 +99,7 @@ class Signal: print("Invalid JSON") if message.get("type") != "message" or ( - not message["data"]["isReceipt"] and message["data"]["dataMessage"] is None + not message["data"]["isReceipt"] and message["data"].get("dataMessage") is None ): # If the message type isn't "message", or if it's a weird message whose # purpose I don't know, return. I think the weird message is a typing @@ -107,7 +107,7 @@ class Signal: continue message = message["data"] - data_message = message["dataMessage"] if message["dataMessage"] else {} + data_message = message["dataMessage"] if message.get("dataMessage") else {} yield Message( username=message["username"], -- cgit v1.2.3-54-g00ecf