diff options
| author | Erik Johnston <erik@matrix.org> | 2015-05-21 15:25:54 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-05-21 15:25:54 +0100 |
| commit | 4fb858d90a179f5c49f7c7773421db9267251b6c (patch) | |
| tree | 33f445ee5afd305bb5d468c7d5a3aaf1f40198a0 | |
| parent | Merge branch 'erikj/join_perf' of github.com:matrix-org/synapse into erikj/ba... (diff) | |
| parent | Oops, get_rooms_for_user returns a namedtuple, not a room_id (diff) | |
| download | synapse-4fb858d90a179f5c49f7c7773421db9267251b6c.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/backfill_fixes
| -rw-r--r-- | synapse/notifier.py | 1 | ||||
| -rw-r--r-- | tests/rest/client/v1/test_presence.py | 7 |
2 files changed, 7 insertions, 1 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, diff --git a/tests/rest/client/v1/test_presence.py b/tests/rest/client/v1/test_presence.py index 29c0038f06..21f42b3d3e 100644 --- a/tests/rest/client/v1/test_presence.py +++ b/tests/rest/client/v1/test_presence.py @@ -29,6 +29,8 @@ from synapse.rest.client.v1 import events from synapse.types import UserID from synapse.util.async import run_on_reactor +from collections import namedtuple + OFFLINE = PresenceState.OFFLINE UNAVAILABLE = PresenceState.UNAVAILABLE @@ -302,7 +304,10 @@ class PresenceEventStreamTestCase(unittest.TestCase): return_value=defer.succeed(None) ) self.mock_datastore.get_rooms_for_user = ( - lambda u: get_rooms_for_user(UserID.from_string(u)) + lambda u: [ + namedtuple("Room", "room_id")(r) + for r in get_rooms_for_user(UserID.from_string(u)) + ] ) def get_profile_displayname(user_id): |