From a29d12a18a00821391c4b1dcd47b3be68e35ed33 Mon Sep 17 00:00:00 2001 From: Mark Haines Date: Tue, 26 Aug 2014 16:13:26 +0100 Subject: Use state_key rather than target_user_id --- synapse/handlers/federation.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'synapse/handlers') diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py index 2680678de7..bfc1ab86f2 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py @@ -114,7 +114,7 @@ class FederationHandler(BaseHandler): if event.type == RoomMemberEvent.TYPE: if event.membership == Membership.JOIN: - user = self.hs.parse_userid(event.target_user_id) + user = self.hs.parse_userid(event.state_key) self.distributor.fire( "user_joined_room", user=user, room_id=event.room_id ) -- cgit 1.5.1 From 9a93e83d9007706df019f6f3b046e9332f3e9340 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Tue, 26 Aug 2014 16:26:30 +0100 Subject: Respect 'limit' param in initialSync api --- synapse/handlers/room.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'synapse/handlers') diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py index c2b10f4189..5a4569ac95 100644 --- a/synapse/handlers/room.py +++ b/synapse/handlers/room.py @@ -270,6 +270,10 @@ class MessageHandler(BaseHandler): # FIXME (erikj): We need to not generate this token, now_token = "%s_%s" % (now_rooms_token, now_presence_token) + limit = pagin_config.limit + if not limit: + limit = 10 + for event in room_list: d = { "room_id": event.room_id, @@ -286,7 +290,7 @@ class MessageHandler(BaseHandler): try: messages, token = yield self.store.get_recent_events_for_room( event.room_id, - limit=10, + limit=limit, end_token=now_rooms_token, ) -- cgit 1.5.1