summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-05-21 15:25:54 +0100
committerErik Johnston <erik@matrix.org>2015-05-21 15:25:54 +0100
commit4fb858d90a179f5c49f7c7773421db9267251b6c (patch)
tree33f445ee5afd305bb5d468c7d5a3aaf1f40198a0 /synapse
parentMerge branch 'erikj/join_perf' of github.com:matrix-org/synapse into erikj/ba... (diff)
parentOops, get_rooms_for_user returns a namedtuple, not a room_id (diff)
downloadsynapse-4fb858d90a179f5c49f7c7773421db9267251b6c.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/backfill_fixes
Diffstat (limited to 'synapse')
-rw-r--r--synapse/notifier.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/notifier.py b/synapse/notifier.py
index 1e73d52c4d..4f47f88df8 100644
--- a/synapse/notifier.py
+++ b/synapse/notifier.py
@@ -296,6 +296,7 @@ class Notifier(object):
             appservice = yield self.store.get_app_service_by_user_id(user)
             current_token = yield self.event_sources.get_current_token()
             rooms = yield self.store.get_rooms_for_user(user)
+            rooms = [room.room_id for room in rooms]
             user_stream = _NotifierUserStream(
                 user=user,
                 rooms=rooms,