Filip/matrix-spec
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-spec synced 2026-03-23 19:44:09 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

S2S: Modernize section text

Browse source
This commit is contained in:
Travis Ralston 2024-06-10 17:47:20 -06:00
parent 0617aced7c
commit 1621eccd2f
1 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
content/server-server-api.md
View file

@ -1189,15 +1189,26 @@ using the following EDU:
Attachments to events (images, files, etc) are uploaded to a homeserver Attachments to events (images, files, etc) are uploaded to a homeserver
via the Content Repository described in the [Client-Server via the Content Repository described in the [Client-Server
API](/client-server-api). When a server wishes API](/client-server-api/#content-repository). When a server wishes
to serve content originating from a remote server, it needs to ask the to serve content originating from a remote server, it needs to ask the
remote server for the media. remote server for the media.
Servers should use the server described in the Matrix Content URI, which Servers should use the server described in the [Matrix Content URI](/client-server-api/#matrix-content-mxc-uris).
has the format `mxc://{ServerName}/{MediaID}`. Servers should use the Formatted as `mxc://{ServerName}/{MediaID}`, servers MUST download the media from
download endpoint described in the [Client-Server `ServerName` using the below endpoints.
API](/client-server-api), being sure to use
the `allow_remote` parameter (set to `false`). {{% boxes/added-in-paragraph %}}
{{< changed-in v="1.11" >}} Servers were previously advised to use the `/_matrix/media/*`
endpoints described by the [Content Repository module in the Client-Server API](/client-server-api/#content-repository),
however, those endpoints have been deprecated. New endpoints are introduced which
require authentication. Naturally, as a server is not a user, they cannot provide
the required access token to those endpoints. Instead, servers MUST try the endpoints
described below before falling back to the deprecated `/_matrix/media/*` endpoints
when they receive a `404 M_UNRECOGNIZED` error. When falling back, servers MUST
be sure to set `allow_remote` to `false`.
{{% /boxes/added-in-paragraph %}}
{{% http-api spec="server-server" api="content_repository" %}}
## Server Access Control Lists (ACLs) ## Server Access Control Lists (ACLs)