mirror of
https://mau.dev/maunium/synapse.git
synced 2024-08-28 13:11:56 +00:00
Merge pull request #580 from Rugvip/develop
api/filtering: don't assume that event content will always be a dict
This commit is contained in:
commit
200de16440
@ -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),
|
||||||
|
Loading…
Reference in New Issue
Block a user