summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-02-02 16:12:10 +0000
committerErik Johnston <erik@matrix.org>2016-02-02 16:12:10 +0000
commit8a391e33ae21f9a62c57cca8eea47435a14a6247 (patch)
tree96557786f18ba3f815553d3e4e34354135a7128c
parentFetch events in a separate transaction. (diff)
downloadsynapse-8a391e33ae21f9a62c57cca8eea47435a14a6247.tar.xz
s/get_room_changes_for_user/get_membership_changes_for_user/
-rw-r--r--synapse/handlers/room.py2
-rw-r--r--synapse/handlers/sync.py2
-rw-r--r--synapse/storage/stream.py4
3 files changed, 4 insertions, 4 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
         )
 
diff --git a/synapse/storage/stream.py b/synapse/storage/stream.py
index bcae3d718e..338a9d40d5 100644
--- a/synapse/storage/stream.py
+++ b/synapse/storage/stream.py
@@ -243,7 +243,7 @@ class StreamStore(SQLBaseStore):
         defer.returnValue((ret, key))
 
     @defer.inlineCallbacks
-    def get_room_changes_for_user(self, user_id, from_key, to_key):
+    def get_membership_changes_for_user(self, user_id, from_key, to_key):
         if from_key is not None:
             from_id = RoomStreamToken.parse_stream_token(from_key).stream
         else:
@@ -285,7 +285,7 @@ class StreamStore(SQLBaseStore):
 
             return rows
 
-        rows = yield self.runInteraction("get_room_changes_for_user", f)
+        rows = yield self.runInteraction("get_membership_changes_for_user", f)
 
         ret = yield self._get_events(
             [r["event_id"] for r in rows],