Matrix-Mirrors/synapse-product
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse-product.git synced 2024-10-01 08:25:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

s/get_room_changes_for_user/get_membership_changes_for_user/

Browse Source
This commit is contained in:
Erik Johnston 2016-02-02 16:12:10 +00:00
parent 477b1ed6cf
commit 8a391e33ae
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
synapse/handlers/room.py
View File

@ -1013,7 +1013,7 @@ class RoomEventSource(object):
limit=limit, limit=limit,
) )
else: 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 user.to_string(), from_key, to_key
) )

2
synapse/handlers/sync.py
View File

@ -479,7 +479,7 @@ class SyncHandler(BaseHandler):
) )
# Get a list of membership change events that have happened. # 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 user_id, since_token.room_key, now_token.room_key
) )

4
synapse/storage/stream.py
View File

@ -243,7 +243,7 @@ class StreamStore(SQLBaseStore):
defer.returnValue((ret, key)) defer.returnValue((ret, key))
@defer.inlineCallbacks @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: if from_key is not None:
from_id = RoomStreamToken.parse_stream_token(from_key).stream from_id = RoomStreamToken.parse_stream_token(from_key).stream
else: else:
@ -285,7 +285,7 @@ class StreamStore(SQLBaseStore):
return rows 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( ret = yield self._get_events(
[r["event_id"] for r in rows], [r["event_id"] for r in rows],