From 0858e7bd23b102ad2d937c542df81fc8ed8de831 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Tue, 7 Aug 2018 16:58:14 -0600 Subject: [PATCH 1/2] Mention how the content repository works over federation We might want to consider promoting the media repo to it's own API, and maybe consider calling it the Media Repo rather than Content Repo. Source of information: experience. --- specification/server_server_api.rst | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/specification/server_server_api.rst b/specification/server_server_api.rst index 84a76639..af314c1e 100644 --- a/specification/server_server_api.rst +++ b/specification/server_server_api.rst @@ -1020,6 +1020,20 @@ the following EDU:: for the user +Content Repository +------------------ + +Attachments to events (images, files, etc) are uploaded to a homeserver via the +Content Repository described in the `Client-Server API`_. When a server wishes +to serve content originating from a remote server, it needs to ask the remote +server for the media. + +Servers should use the server described in the Matrix Content URI, which has the +format ``mxc://{ServerName}/{MediaID}``. Servers should use the download endpoint +described in the `Client-Server API`_, being sure to use the ``allow_remote`` +parameter (set to ``false``). + + Signing Events -------------- From cdcd72c0e3e8212828e0f6ddbf28b84b6cabdd00 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Tue, 7 Aug 2018 17:02:24 -0600 Subject: [PATCH 2/2] Fix stray hash on client-server API link This shouldn't be here, and nothing appears to need it. Removing it now because it has been noticed. --- specification/server_server_api.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/server_server_api.rst b/specification/server_server_api.rst index af314c1e..4f11f917 100644 --- a/specification/server_server_api.rst +++ b/specification/server_server_api.rst @@ -1182,7 +1182,7 @@ that are too long. .. _`Invitation storage`: ../identity_service/unstable.html#invitation-storage .. _`Identity Service API`: ../identity_service/unstable.html -.. _`Client-Server API`: ../client_server/unstable.html#m-room-member +.. _`Client-Server API`: ../client_server/unstable.html .. _`Inviting to a room`: #inviting-to-a-room .. _`Canonical JSON`: ../appendices.html#canonical-json .. _`Unpadded Base64`: ../appendices.html#unpadded-base64