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
)
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,
)
diff --git a/synapse/rest/__init__.py b/synapse/rest/__init__.py
index da18933b63..47896612ce 100644
--- a/synapse/rest/__init__.py
+++ b/synapse/rest/__init__.py
@@ -15,7 +15,8 @@
from . import (
- room, events, register, login, profile, public, presence, im, directory
+ room, events, register, login, profile, public, presence, initial_sync,
+ directory
)
@@ -41,5 +42,5 @@ class RestServletFactory(object):
profile.register_servlets(hs, client_resource)
public.register_servlets(hs, client_resource)
presence.register_servlets(hs, client_resource)
- im.register_servlets(hs, client_resource)
+ initial_sync.register_servlets(hs, client_resource)
directory.register_servlets(hs, client_resource)
diff --git a/synapse/rest/im.py b/synapse/rest/initial_sync.py
index 63a77716a0..fab748f562 100644
--- a/synapse/rest/im.py
+++ b/synapse/rest/initial_sync.py
@@ -19,8 +19,8 @@ from synapse.api.streams import PaginationConfig
from base import RestServlet, client_path_pattern
-class ImSyncRestServlet(RestServlet):
- PATTERN = client_path_pattern("/im/sync$")
+class InitialSyncRestServlet(RestServlet):
+ PATTERN = client_path_pattern("/initialSync$")
@defer.inlineCallbacks
def on_GET(self, request):
@@ -37,4 +37,4 @@ class ImSyncRestServlet(RestServlet):
def register_servlets(hs, http_server):
- ImSyncRestServlet(hs).register(http_server)
+ InitialSyncRestServlet(hs).register(http_server)
diff --git a/synapse/rest/room.py b/synapse/rest/room.py
index 6771da8fcd..b031ad1bc4 100644
--- a/synapse/rest/room.py
+++ b/synapse/rest/room.py
@@ -306,7 +306,7 @@ class FeedbackRestServlet(RestServlet):
class RoomMemberListRestServlet(RestServlet):
- PATTERN = client_path_pattern("/rooms/(?P<room_id>[^/]*)/members/list$")
+ PATTERN = client_path_pattern("/rooms/(?P<room_id>[^/]*)/members$")
@defer.inlineCallbacks
def on_GET(self, request, room_id):
@@ -333,7 +333,7 @@ class RoomMemberListRestServlet(RestServlet):
class RoomMessageListRestServlet(RestServlet):
- PATTERN = client_path_pattern("/rooms/(?P<room_id>[^/]*)/messages/list$")
+ PATTERN = client_path_pattern("/rooms/(?P<room_id>[^/]*)/messages$")
@defer.inlineCallbacks
def on_GET(self, request, room_id):
|
