From 77c4c4b07cb1cfe30d7a3477944eb2229e62ab2f Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Fri, 7 Jun 2019 08:27:18 -0600 Subject: [PATCH] Add general clarity --- api/client-server/definitions/room_event_filter.yaml | 2 +- api/client-server/sync.yaml | 9 +++++---- specification/client_server_api.rst | 3 +++ specification/modules/instant_messaging.rst | 2 +- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/api/client-server/definitions/room_event_filter.yaml b/api/client-server/definitions/room_event_filter.yaml index 0659be8e0..7045396d8 100644 --- a/api/client-server/definitions/room_event_filter.yaml +++ b/api/client-server/definitions/room_event_filter.yaml @@ -25,7 +25,7 @@ allOf: include_redundant_members: type: boolean description: |- - If ``true``, enables redudant membership events. Does not + If ``true``, enables redundant membership events. Does not apply unless ``lazy_load_members`` is ``true``. See `Lazy-loading room members <#lazy-loading-room-members>`_ for more information. Defaults to ``false``. diff --git a/api/client-server/sync.yaml b/api/client-server/sync.yaml index a0d2fd600..ed9d74206 100644 --- a/api/client-server/sync.yaml +++ b/api/client-server/sync.yaml @@ -40,10 +40,11 @@ paths: for this endpoint. When lazy-loading is enabled, servers MUST include the syncing user's own membership event when they join a room, or when the full state of rooms is requested. The user's own membership event is eligible - for being considered redudant by the server. When a sync is ``limited``, - the server MUST return membership events for the timeline, even if the - applicable events are not in the response, regardless as to whether or not - they are redundant. + for being considered redundant by the server. When a sync is ``limited``, + the server MUST return membership events for events in the gap (from ``since``), + even if the applicable events are not in the response, regardless as to whether + or not they are redundant. ``include_redundant_members`` is ignored for limited + syncs. operationId: sync security: - accessToken: [] diff --git a/specification/client_server_api.rst b/specification/client_server_api.rst index 740023fb8..5290ec200 100644 --- a/specification/client_server_api.rst +++ b/specification/client_server_api.rst @@ -1306,6 +1306,9 @@ The current endpoints which support lazy-loading room members are: * |/rooms//messages|_ * |/rooms/{roomId}/context/{eventId}|_ +API endpoints +~~~~~~~~~~~~~ + {{filter_cs_http_api}} Events diff --git a/specification/modules/instant_messaging.rst b/specification/modules/instant_messaging.rst index dd3e9c6cf..c514f4813 100644 --- a/specification/modules/instant_messaging.rst +++ b/specification/modules/instant_messaging.rst @@ -293,7 +293,7 @@ choose a name: users (`disambiguating them if required`_) and concatenating them. For example, the client may choose to show "Alice, Bob, and Charlie (@charlie:example.org)" as the room name. The client may optionally - limit the number + limit the number of users it uses to generate a room name. #. If there are fewer heroes than ``m.joined_member_count + m.invited_member_count - 1``, and ``m.joined_member_count + m.invited_member_count`` is greater