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

This commit is contained in:
David Baker 2015-03-10 11:21:37 +00:00
parent abaf47bbb6
commit 8916acbc13

View File

@ -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))