aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStavros Korokithakis <hi@stavros.io>2019-03-07 01:51:18 +0200
committerStavros Korokithakis <hi@stavros.io>2019-03-07 01:51:18 +0200
commit13e2367f264461e9f97750c44d739c7d3bff53e3 (patch)
treebceefdff0a3ff4a8943f2f881240442934d8ae8a
parentfbfdc06597b1b71fd0b9376dc859d6651e63fcb8 (diff)
downloadpysignald-13e2367f264461e9f97750c44d739c7d3bff53e3.tar.gz
pysignald-13e2367f264461e9f97750c44d739c7d3bff53e3.zip
Don't crash on missing keys
-rw-r--r--signald/main.py4
1 files 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"],