diff options
| author | Erik Johnston <erik@matrix.org> | 2016-02-02 16:23:54 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-02-02 16:23:54 +0000 |
| commit | 43e13dbd4d22632a56903826df56cc8aa28be944 (patch) | |
| tree | 96557786f18ba3f815553d3e4e34354135a7128c /synapse/handlers | |
| parent | Merge pull request #545 from matrix-org/erikj/sync (diff) | |
| parent | s/get_room_changes_for_user/get_membership_changes_for_user/ (diff) | |
| download | synapse-43e13dbd4d22632a56903826df56cc8aa28be944.tar.xz | |
Merge pull request #549 from matrix-org/erikj/sync
Fetch events in a separate transaction.
Diffstat (limited to 'synapse/handlers')
| -rw-r--r-- | synapse/handlers/room.py | 2 | ||||
| -rw-r--r-- | synapse/handlers/sync.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py index 68e2c75a48..799221c198 100644 --- a/synapse/handlers/room.py +++ b/synapse/handlers/room.py @@ -1013,7 +1013,7 @@ class RoomEventSource(object): limit=limit, ) else: - room_events = yield self.store.get_room_changes_for_user( + room_events = yield self.store.get_membership_changes_for_user( user.to_string(), from_key, to_key ) diff --git a/synapse/handlers/sync.py b/synapse/handlers/sync.py index 8d8d10da33..dc686db541 100644 --- a/synapse/handlers/sync.py +++ b/synapse/handlers/sync.py @@ -479,7 +479,7 @@ class SyncHandler(BaseHandler): ) # Get a list of membership change events that have happened. - rooms_changed = yield self.store.get_room_changes_for_user( + rooms_changed = yield self.store.get_membership_changes_for_user( user_id, since_token.room_key, now_token.room_key ) |