OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #580 from Rugvip/develop 

api/filtering: don't assume that event content will always be a dict
pull/579/head
Erik Johnston 2016-02-17 12:51:02 +00:00
parent 97d1b3a506 536f949a1a
commit 200de16440
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
synapse/api/filtering.py
View File

@ -198,7 +198,10 @@ class Filter(object):
sender = event.get("sender", None) sender = event.get("sender", None)
if not sender: if not sender:
# Presence events have their 'sender' in content.user_id # Presence events have their 'sender' in content.user_id
sender = event.get("content", {}).get("user_id", None) content = event.get("content")
# account_data has been allowed to have non-dict content, so check type first
if isinstance(content, dict):
sender = content.get("user_id")
return self.check_fields( return self.check_fields(
event.get("room_id", None), event.get("room_id", None),