These aren't defined for redacted events so don't crash

2015-03-10 11:21:37 +00:00 · 2015-03-10 11:21:37 +00:00 · 8916acbc13
parent abaf47bbb6
commit 8916acbc13
1 changed files with 4 additions and 2 deletions
--- a/synapse/storage/init.py
+++ b/synapse/storage/init.py
@ -484,9 +484,11 @@ class DataStore(RoomMemberStore, RoomStore,

        for e in events:
            if e.type == 'm.room.name':
-                name = e.content['name']
+                if 'name' in e.content:
+                    name = e.content['name']
            elif e.type == 'm.room.aliases':
-                aliases.extend(e.content['aliases'])
+                if 'aliases' in e.content:
+                    aliases.extend(e.content['aliases'])

        defer.returnValue((name, aliases))