Cleanup summaries and descriptions

pull/977/head
Kitsune Ral 4 years ago
parent c441e74b27
commit 202bf8abb1

@ -163,9 +163,10 @@ paths:
- Media - Media
"/download/{serverName}/{mediaId}/{fileName}": "/download/{serverName}/{mediaId}/{fileName}":
get: get:
summary: |- summary: Download content from the content repository overriding the file name
Download content from the content repository. This is the same as description: |-
the download endpoint above, except permitting a desired file name. This is the same as the download endpoint above, except permitting
a desired file name.
operationId: getContentOverrideName operationId: getContentOverrideName
produces: ["*/*"] produces: ["*/*"]
parameters: parameters:
@ -233,9 +234,9 @@ paths:
- Media - Media
"/thumbnail/{serverName}/{mediaId}": "/thumbnail/{serverName}/{mediaId}":
get: get:
summary: |- summary: Download a thumbnail of content from the content repository
Download a thumbnail of content from the content repository. See the `thumbnailing <#thumbnails>`_ description: |-
section for more information. See the `thumbnailing <#thumbnails>`_ section for more information.
operationId: getContentThumbnail operationId: getContentThumbnail
produces: ["image/jpeg", "image/png"] produces: ["image/jpeg", "image/png"]
parameters: parameters:
@ -283,10 +284,10 @@ paths:
x-example: false x-example: false
required: false required: false
default: true default: true
description: | description: |-
Indicates to the server that it should not attempt to fetch the media if it is deemed Indicates to the server that it should not attempt to fetch
remote. This is to prevent routing loops where the server contacts itself. Defaults to the media if it is deemed remote. This is to prevent routing loops
true if not provided. where the server contacts itself. Defaults to true if not provided.
responses: responses:
200: 200:
description: "A thumbnail of the requested content." description: "A thumbnail of the requested content."

@ -31,7 +31,8 @@ paths:
post: post:
summary: Start the requesting user participating in a particular room. summary: Start the requesting user participating in a particular room.
description: |- description: |-
*Note that this API requires a room ID, not alias.* ``/join/{roomIdOrAlias}`` *exists if you have a room alias.* *Note that this API requires a room ID, not alias.*
``/join/{roomIdOrAlias}`` *exists if you have a room alias.*
This API starts a user participating in a particular room, if that user This API starts a user participating in a particular room, if that user
is allowed to participate in that room. After this call, the client is is allowed to participate in that room. After this call, the client is
@ -40,10 +41,6 @@ paths:
After a user has joined a room, the room will appear as an entry in the After a user has joined a room, the room will appear as an entry in the
response of the |/initialSync|_ and |/sync|_ APIs. response of the |/initialSync|_ and |/sync|_ APIs.
If a ``third_party_signed`` was supplied, the homeserver must verify
that it matches a pending ``m.room.third_party_invite`` event in the
room, and perform key validity checking if required by the event.
operationId: joinRoomById operationId: joinRoomById
security: security:
- accessToken: [] - accessToken: []
@ -56,6 +53,10 @@ paths:
x-example: "!d41d8cd:matrix.org" x-example: "!d41d8cd:matrix.org"
- in: body - in: body
name: third_party_signed name: third_party_signed
description: |-
If supplied, the homeserver must verify that it matches a pending
``m.room.third_party_invite`` event in the room, and perform
key validity checking if required by the event.
schema: schema:
type: object type: object
properties: properties:
@ -79,7 +80,8 @@ paths:
required: ["room_id"] required: ["room_id"]
403: 403:
description: |- description: |-
You do not have permission to join the room. A meaningful ``errcode`` and description error text will be returned. Example reasons for rejection are: You do not have permission to join the room. A meaningful ``errcode``
and description error text will be returned. Example reasons for rejection are:
- The room is invite-only and the user was not invited. - The room is invite-only and the user was not invited.
- The user has been banned from the room. - The user has been banned from the room.
@ -155,7 +157,8 @@ paths:
required: ["room_id"] required: ["room_id"]
403: 403:
description: |- description: |-
You do not have permission to join the room. A meaningful ``errcode`` and description error text will be returned. Example reasons for rejection are: You do not have permission to join the room. A meaningful ``errcode``
and description error text will be returned. Example reasons for rejection are:
- The room is invite-only and the user was not invited. - The room is invite-only and the user was not invited.
- The user has been banned from the room. - The user has been banned from the room.

Loading…
Cancel
Save