diff options
author | Stavros Korokithakis <hi@stavros.io> | 2020-05-14 17:48:26 +0000 |
---|---|---|
committer | Stavros Korokithakis <hi@stavros.io> | 2020-05-14 17:48:26 +0000 |
commit | 36d96687fa0eaea53371fb8293892395ace6ab14 (patch) | |
tree | 1a7d96979ea875db9ca2ead619e7d599e4b51cb6 /signald | |
parent | 7f6bbd5414ed27e13bd88d93566bb754ce0a4222 (diff) | |
parent | 2658a4b432110e5f3c9db290282e75bade06a17f (diff) | |
download | pysignald-36d96687fa0eaea53371fb8293892395ace6ab14.tar.gz pysignald-36d96687fa0eaea53371fb8293892395ace6ab14.zip |
Merge branch 'feat/add_group' into 'master'
add group info to message
See merge request stavros/pysignald!1
Diffstat (limited to 'signald')
-rw-r--r-- | signald/main.py | 3 | ||||
-rw-r--r-- | signald/types.py | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/signald/main.py b/signald/main.py index e82f3e7..d4ece1d 100644 --- a/signald/main.py +++ b/signald/main.py @@ -107,7 +107,7 @@ class Signal: continue message = message["data"] - data_message = message["dataMessage"] if message.get("dataMessage") else {} + data_message = message.get("dataMessage", {}) yield Message( username=message["username"], @@ -118,6 +118,7 @@ class Signal: timestamp_iso=message["timestampISO"], expiration_secs=data_message.get("expiresInSeconds"), is_receipt=message["isReceipt"], + group_info=data_message.get("groupInfo", {}), attachments=[ Attachment( content_type=attachment["contentType"], diff --git a/signald/types.py b/signald/types.py index b1c4b51..1b605b3 100644 --- a/signald/types.py +++ b/signald/types.py @@ -21,3 +21,4 @@ class Message: is_receipt = attr.ib(type=bool, default=False) attachments = attr.ib(type=list, default=[]) quote = attr.ib(type=str, default=None) + group_info = attr.ib(type=dict, default={}) |