Merge pull request #1586 from turt2live/travis/as/comment-ts-section

Comment out the timestamp massaging section for now
This commit is contained in:
Travis Ralston 2018-08-29 10:10:36 -06:00 committed by GitHub
commit 73feee5d73
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -289,26 +289,37 @@ An example request would be::
GET /_matrix/client/%CLIENT_MAJOR_VERSION%/account/whoami?user_id=@_irc_user:example.org GET /_matrix/client/%CLIENT_MAJOR_VERSION%/account/whoami?user_id=@_irc_user:example.org
Authorization: Bearer YourApplicationServiceTokenHere Authorization: Bearer YourApplicationServiceTokenHere
.. TODO-TravisR: Temporarily take out timestamp massaging while we're releasing r0.
See https://github.com/matrix-org/matrix-doc/issues/1585
.. Timestamp massaging
+++++++++++++++++++
The application service may want to inject events at a certain time (reflecting
the time on the network they are tracking e.g. irc, xmpp). Application services
need to be able to adjust the ``origin_server_ts`` value to do this.
Inputs:
- Application service token (``as_token``)
- Desired timestamp (in milliseconds since the unix epoch)
Notes:
- This will only apply when sending events.
::
PUT /_matrix/client/r0/rooms/!somewhere:domain.com/send/m.room.message/txnId?ts=1534535223283
Authorization: Bearer YourApplicationServiceTokenHere
Content: The event to send, as per the Client-Server API.
Timestamp massaging Timestamp massaging
+++++++++++++++++++ +++++++++++++++++++
The application service may want to inject events at a certain time (reflecting
the time on the network they are tracking e.g. irc, xmpp). Application services
need to be able to adjust the ``origin_server_ts`` value to do this.
Inputs: Previous drafts of the Application Service API permitted application services
- Application service token (``as_token``) to alter the timestamp of their sent events by providing a ``ts`` query parameter
- Desired timestamp (in milliseconds since the unix epoch) when sending an event. This API has been excluded from the first release due to
design concerns, however some servers may still support the feature. Please visit
Notes: `issue #1585 <https://github.com/matrix-org/matrix-doc/issues/1585>`_ for more
- This will only apply when sending events. information.
::
PUT /_matrix/client/r0/rooms/!somewhere:domain.com/send/m.room.message/txnId?ts=1534535223283
Authorization: Bearer YourApplicationServiceTokenHere
Content: The event to send, as per the Client-Server API.
Server admin style permissions Server admin style permissions
++++++++++++++++++++++++++++++ ++++++++++++++++++++++++++++++