Mirrors
/
synapse
mirror of https://github.com/element-hq/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
synapse/storage/__init__.py
View File

@ -484,8 +484,10 @@ class DataStore(RoomMemberStore, RoomStore,
for e in events: for e in events:
if e.type == 'm.room.name': if e.type == 'm.room.name':
if 'name' in e.content:
name = e.content['name'] name = e.content['name']
elif e.type == 'm.room.aliases': elif e.type == 'm.room.aliases':
if 'aliases' in e.content:
aliases.extend(e.content['aliases']) aliases.extend(e.content['aliases'])
defer.returnValue((name, aliases)) defer.returnValue((name, aliases))