Merge remote matrix-org/master
Travis Ralston
6 years ago
commit
9004be7bda
@ -0,0 +1,18 @@
|
|||||||
|
# Copyright 2018 New Vector Ltd
|
||||||
|
#
|
||||||
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
# you may not use this file except in compliance with the License.
|
||||||
|
# You may obtain a copy of the License at
|
||||||
|
#
|
||||||
|
# http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
#
|
||||||
|
# Unless required by applicable law or agreed to in writing, software
|
||||||
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
# See the License for the specific language governing permissions and
|
||||||
|
# limitations under the License.
|
||||||
|
homeserverAccessToken:
|
||||||
|
type: apiKey
|
||||||
|
description: The ``hs_token`` provided by the application service's registration.
|
||||||
|
name: access_token
|
||||||
|
in: query
|
||||||
@ -0,0 +1,27 @@
|
|||||||
|
# Copyright 2018 New Vector Ltd
|
||||||
|
#
|
||||||
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
# you may not use this file except in compliance with the License.
|
||||||
|
# You may obtain a copy of the License at
|
||||||
|
#
|
||||||
|
# http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
#
|
||||||
|
# Unless required by applicable law or agreed to in writing, software
|
||||||
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
# See the License for the specific language governing permissions and
|
||||||
|
# limitations under the License.
|
||||||
|
properties:
|
||||||
|
events:
|
||||||
|
description: List of events.
|
||||||
|
items:
|
||||||
|
allOf:
|
||||||
|
- $ref: event-schemas/schema/core-event-schema/sync_room_event.yaml
|
||||||
|
type: object
|
||||||
|
required:
|
||||||
|
- event_id
|
||||||
|
#- room_id - Not in /sync
|
||||||
|
- sender
|
||||||
|
- origin_server_ts
|
||||||
|
type: array
|
||||||
|
type: object
|
||||||
@ -0,0 +1,28 @@
|
|||||||
|
# Copyright 2018 New Vector Ltd
|
||||||
|
#
|
||||||
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
# you may not use this file except in compliance with the License.
|
||||||
|
# You may obtain a copy of the License at
|
||||||
|
#
|
||||||
|
# http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
#
|
||||||
|
# Unless required by applicable law or agreed to in writing, software
|
||||||
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
# See the License for the specific language governing permissions and
|
||||||
|
# limitations under the License.
|
||||||
|
properties:
|
||||||
|
events:
|
||||||
|
description: List of events.
|
||||||
|
items:
|
||||||
|
allOf:
|
||||||
|
- $ref: event-schemas/schema/core-event-schema/sync_state_event.yaml
|
||||||
|
type: object
|
||||||
|
required:
|
||||||
|
- event_id
|
||||||
|
#- room_id - Not in /sync
|
||||||
|
- sender
|
||||||
|
- origin_server_ts
|
||||||
|
- state_key
|
||||||
|
type: array
|
||||||
|
type: object
|
||||||
@ -0,0 +1,189 @@
|
|||||||
|
# Copyright 2018 New Vector Ltd
|
||||||
|
#
|
||||||
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
# you may not use this file except in compliance with the License.
|
||||||
|
# You may obtain a copy of the License at
|
||||||
|
#
|
||||||
|
# http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
#
|
||||||
|
# Unless required by applicable law or agreed to in writing, software
|
||||||
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
# See the License for the specific language governing permissions and
|
||||||
|
# limitations under the License.
|
||||||
|
|
||||||
|
swagger: '2.0'
|
||||||
|
info:
|
||||||
|
title: "Matrix Federation User Key Management API"
|
||||||
|
version: "1.0.0"
|
||||||
|
host: localhost:8448
|
||||||
|
schemes:
|
||||||
|
- https
|
||||||
|
basePath: /_matrix/federation/v1
|
||||||
|
consumes:
|
||||||
|
- application/json
|
||||||
|
produces:
|
||||||
|
- application/json
|
||||||
|
securityDefinitions:
|
||||||
|
$ref: definitions/security.yaml
|
||||||
|
paths:
|
||||||
|
"/user/keys/claim":
|
||||||
|
post:
|
||||||
|
summary: Claims one-time encryption keys for a user.
|
||||||
|
description: |-
|
||||||
|
Claims one-time keys for use in pre-key messages.
|
||||||
|
operationId: claimUserEncryptionKeys
|
||||||
|
security:
|
||||||
|
- signedRequest: []
|
||||||
|
parameters:
|
||||||
|
- in: body
|
||||||
|
name: body
|
||||||
|
type: object
|
||||||
|
required: true
|
||||||
|
schema:
|
||||||
|
type: object
|
||||||
|
properties:
|
||||||
|
one_time_keys:
|
||||||
|
type: object
|
||||||
|
description: |-
|
||||||
|
The keys to be claimed. A map from user ID, to a map from
|
||||||
|
device ID to algorithm name.
|
||||||
|
additionalProperties:
|
||||||
|
type: object
|
||||||
|
additionalProperties:
|
||||||
|
type: string
|
||||||
|
description: algorithm
|
||||||
|
example: "signed_curve25519"
|
||||||
|
example: {
|
||||||
|
"@alice:example.com": {
|
||||||
|
"JLAFKJWSCS": "signed_curve25519"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
required:
|
||||||
|
- one_time_keys
|
||||||
|
responses:
|
||||||
|
200:
|
||||||
|
description: The claimed keys
|
||||||
|
schema:
|
||||||
|
type: object
|
||||||
|
properties:
|
||||||
|
one_time_keys:
|
||||||
|
type: object
|
||||||
|
description: |-
|
||||||
|
One-time keys for the queried devices. A map from user ID, to a
|
||||||
|
map from devices to a map from ``<algorithm>:<key_id>`` to the key object.
|
||||||
|
additionalProperties:
|
||||||
|
type: object
|
||||||
|
additionalProperties:
|
||||||
|
type:
|
||||||
|
- string
|
||||||
|
- object
|
||||||
|
required: ['one_time_keys']
|
||||||
|
examples:
|
||||||
|
application/json: {
|
||||||
|
"one_time_keys": {
|
||||||
|
"@alice:example.com": {
|
||||||
|
"JLAFKJWSCS": {
|
||||||
|
"signed_curve25518:AAAAHg": {
|
||||||
|
"key": "zKbLg+NrIjpnagy+pIY6uPL4ZwEG2v+8F9lmgsnlZzs",
|
||||||
|
"signatures": {
|
||||||
|
"@alice:example.com": {
|
||||||
|
"ed25519:JLAFKJWSCS": "FLWxXqGbwrb8SM3Y795eB6OA8bwBcoMZFXBqnTn58AYWZSqiD45tlBVcDa2L7RwdKXebW/VzDlnfVJ+9jok1Bw"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
"/user/keys/query":
|
||||||
|
post:
|
||||||
|
summary: Download device identity keys.
|
||||||
|
description: |-
|
||||||
|
Returns the current devices and identity keys for the given users.
|
||||||
|
operationId: queryUserEncryptionKeys
|
||||||
|
security:
|
||||||
|
- signedRequest: []
|
||||||
|
parameters:
|
||||||
|
- in: body
|
||||||
|
name: body
|
||||||
|
type: object
|
||||||
|
required: true
|
||||||
|
schema:
|
||||||
|
type: object
|
||||||
|
properties:
|
||||||
|
device_keys:
|
||||||
|
type: object
|
||||||
|
description: |-
|
||||||
|
The keys to be downloaded. A map from user ID, to a list of
|
||||||
|
device IDs, or to an empty list to indicate all devices for the
|
||||||
|
corresponding user.
|
||||||
|
additionalProperties:
|
||||||
|
type: array
|
||||||
|
items:
|
||||||
|
type: string
|
||||||
|
description: "Device ID"
|
||||||
|
example: {
|
||||||
|
"@alice:example.com": []
|
||||||
|
}
|
||||||
|
required: ['device_keys']
|
||||||
|
responses:
|
||||||
|
200:
|
||||||
|
description: The device information.
|
||||||
|
schema:
|
||||||
|
type: object
|
||||||
|
properties:
|
||||||
|
device_keys:
|
||||||
|
type: object
|
||||||
|
description: |-
|
||||||
|
Information on the queried devices. A map from user ID, to a
|
||||||
|
map from device ID to device information. For each device,
|
||||||
|
the information returned will be the same as uploaded via
|
||||||
|
``/keys/upload``, with the addition of an ``unsigned``
|
||||||
|
property.
|
||||||
|
additionalProperties:
|
||||||
|
type: object
|
||||||
|
additionalProperties:
|
||||||
|
allOf:
|
||||||
|
- $ref: ../client-server/definitions/device_keys.yaml
|
||||||
|
properties:
|
||||||
|
unsigned:
|
||||||
|
title: UnsignedDeviceInfo
|
||||||
|
type: object
|
||||||
|
description: |-
|
||||||
|
Additional data added to the device key information
|
||||||
|
by intermediate servers, and not covered by the
|
||||||
|
signatures.
|
||||||
|
properties:
|
||||||
|
device_display_name:
|
||||||
|
type: string
|
||||||
|
description:
|
||||||
|
The display name which the user set on the device.
|
||||||
|
required: ['device_keys']
|
||||||
|
examples:
|
||||||
|
application/json: {
|
||||||
|
"device_keys": {
|
||||||
|
"@alice:example.com": {
|
||||||
|
"JLAFKJWSCS": {
|
||||||
|
"user_id": "@alice:example.com",
|
||||||
|
"device_id": "JLAFKJWSCS",
|
||||||
|
"algorithms": [
|
||||||
|
"m.olm.v1.curve25519-aes-sha256",
|
||||||
|
"m.megolm.v1.aes-sha"
|
||||||
|
],
|
||||||
|
"keys": {
|
||||||
|
"curve25519:JLAFKJWSCS": "3C5BFWi2Y8MaVvjM8M22DBmh24PmgR0nPvJOIArzgyI",
|
||||||
|
"ed25519:JLAFKJWSCS": "lEuiRJBit0IG6nUf5pUzWTUEsRVVe/HJkoKuEww9ULI"
|
||||||
|
},
|
||||||
|
"signatures": {
|
||||||
|
"@alice:example.com": {
|
||||||
|
"ed25519:JLAFKJWSCS": "dSO80A01XiigH3uBiDVx/EjzaoycHcjq9lfQX0uWsqxl2giMIiSPR8a4d291W1ihKJL/a+myXS367WT6NAIcBA"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"unsigned": {
|
||||||
|
"device_display_name": "Alice's mobile phone"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,7 @@
|
|||||||
|
r0.1.0
|
||||||
|
======
|
||||||
|
|
||||||
|
This is the first release of the Application Service specification. It
|
||||||
|
includes support for application services being able to interact with
|
||||||
|
homeservers and bridge third party networks, such as IRC, over to Matrix
|
||||||
|
in a standard and accessible way.
|
||||||
@ -0,0 +1 @@
|
|||||||
|
!.gitignore
|
||||||
@ -0,0 +1,30 @@
|
|||||||
|
[tool.towncrier]
|
||||||
|
filename = "../application_service.rst"
|
||||||
|
directory = "newsfragments"
|
||||||
|
issue_format = "`#{issue} <https://github.com/matrix-org/matrix-doc/issues/{issue}>`_"
|
||||||
|
title_format = "{version}"
|
||||||
|
|
||||||
|
[[tool.towncrier.type]]
|
||||||
|
directory = "breaking"
|
||||||
|
name = "Breaking Changes"
|
||||||
|
showcontent = true
|
||||||
|
|
||||||
|
[[tool.towncrier.type]]
|
||||||
|
directory = "deprecation"
|
||||||
|
name = "Deprecations"
|
||||||
|
showcontent = true
|
||||||
|
|
||||||
|
[[tool.towncrier.type]]
|
||||||
|
directory = "new"
|
||||||
|
name = "New Endpoints"
|
||||||
|
showcontent = true
|
||||||
|
|
||||||
|
[[tool.towncrier.type]]
|
||||||
|
directory = "feature"
|
||||||
|
name = "Backwards Compatible Changes"
|
||||||
|
showcontent = true
|
||||||
|
|
||||||
|
[[tool.towncrier.type]]
|
||||||
|
directory = "clarification"
|
||||||
|
name = "Spec Clarifications"
|
||||||
|
showcontent = true
|
||||||
@ -0,0 +1 @@
|
|||||||
|
Update all event examples to be accurate representations of their associated events.
|
||||||
@ -0,0 +1 @@
|
|||||||
|
Document the ``validated_at`` and ``added_at`` fields on ``GET /acount/3pid``.
|
||||||
@ -0,0 +1 @@
|
|||||||
|
Add ``POST /account/3pid/delete``
|
||||||
@ -0,0 +1 @@
|
|||||||
|
Clarify the homeserver's behaviour for searching users.
|
||||||
@ -0,0 +1 @@
|
|||||||
|
Clarify the event fields used in the ``/sync`` response.
|
||||||
@ -0,0 +1 @@
|
|||||||
|
Add an ``inhibit_login`` registration option.
|
||||||
@ -0,0 +1 @@
|
|||||||
|
Document the 403 error for sending state events.
|
||||||
@ -0,0 +1 @@
|
|||||||
|
Recommend that servers set a Content Security Policy for the content repository.
|
||||||
@ -0,0 +1 @@
|
|||||||
|
Add the other keys that redactions are expected to preserve.
|
||||||
@ -0,0 +1 @@
|
|||||||
|
Clarify that clients should not be generating invalid HTML for formatted events.
|
||||||
@ -0,0 +1 @@
|
|||||||
|
Clarify the room tag structure (thanks @KitsuneRal!)
|
||||||
@ -0,0 +1 @@
|
|||||||
|
Add a note that clients may use the transaction ID to avoid flickering when doing local echo.
|
||||||
@ -0,0 +1 @@
|
|||||||
|
Add more presence options to the ``set_presence`` parameter of ``/sync``. (Thanks @mujx!)
|
||||||
@ -0,0 +1 @@
|
|||||||
|
!.gitignore
|
||||||
@ -0,0 +1,30 @@
|
|||||||
|
[tool.towncrier]
|
||||||
|
filename = "../identity_service.rst"
|
||||||
|
directory = "newsfragments"
|
||||||
|
issue_format = "`#{issue} <https://github.com/matrix-org/matrix-doc/issues/{issue}>`_"
|
||||||
|
title_format = "{version}"
|
||||||
|
|
||||||
|
[[tool.towncrier.type]]
|
||||||
|
directory = "breaking"
|
||||||
|
name = "Breaking Changes"
|
||||||
|
showcontent = true
|
||||||
|
|
||||||
|
[[tool.towncrier.type]]
|
||||||
|
directory = "deprecation"
|
||||||
|
name = "Deprecations"
|
||||||
|
showcontent = true
|
||||||
|
|
||||||
|
[[tool.towncrier.type]]
|
||||||
|
directory = "new"
|
||||||
|
name = "New Endpoints"
|
||||||
|
showcontent = true
|
||||||
|
|
||||||
|
[[tool.towncrier.type]]
|
||||||
|
directory = "feature"
|
||||||
|
name = "Backwards Compatible Changes"
|
||||||
|
showcontent = true
|
||||||
|
|
||||||
|
[[tool.towncrier.type]]
|
||||||
|
directory = "clarification"
|
||||||
|
name = "Spec Clarifications"
|
||||||
|
showcontent = true
|
||||||
@ -0,0 +1 @@
|
|||||||
|
!.gitignore
|
||||||
@ -0,0 +1,30 @@
|
|||||||
|
[tool.towncrier]
|
||||||
|
filename = "../server_server.rst"
|
||||||
|
directory = "newsfragments"
|
||||||
|
issue_format = "`#{issue} <https://github.com/matrix-org/matrix-doc/issues/{issue}>`_"
|
||||||
|
title_format = "{version}"
|
||||||
|
|
||||||
|
[[tool.towncrier.type]]
|
||||||
|
directory = "breaking"
|
||||||
|
name = "Breaking Changes"
|
||||||
|
showcontent = true
|
||||||
|
|
||||||
|
[[tool.towncrier.type]]
|
||||||
|
directory = "deprecation"
|
||||||
|
name = "Deprecations"
|
||||||
|
showcontent = true
|
||||||
|
|
||||||
|
[[tool.towncrier.type]]
|
||||||
|
directory = "new"
|
||||||
|
name = "New Endpoints"
|
||||||
|
showcontent = true
|
||||||
|
|
||||||
|
[[tool.towncrier.type]]
|
||||||
|
directory = "feature"
|
||||||
|
name = "Backwards Compatible Changes"
|
||||||
|
showcontent = true
|
||||||
|
|
||||||
|
[[tool.towncrier.type]]
|
||||||
|
directory = "clarification"
|
||||||
|
name = "Spec Clarifications"
|
||||||
|
showcontent = true
|
||||||
@ -0,0 +1,6 @@
|
|||||||
|
{
|
||||||
|
"content": {
|
||||||
|
"key": "value"
|
||||||
|
},
|
||||||
|
"type": "org.example.custom.event"
|
||||||
|
}
|
||||||
@ -0,0 +1,4 @@
|
|||||||
|
{
|
||||||
|
"$ref": "event.json",
|
||||||
|
"room_id": "!jEsUZKDJdhlrceRyVU:domain.com"
|
||||||
|
}
|
||||||
@ -0,0 +1,10 @@
|
|||||||
|
{
|
||||||
|
"$ref": "event.json",
|
||||||
|
"event_id": "$143273582443PhrSn:domain.com",
|
||||||
|
"room_id": "!jEsUZKDJdhlrceRyVU:domain.com",
|
||||||
|
"sender": "@example:domain.com",
|
||||||
|
"origin_server_ts": 1432735824653,
|
||||||
|
"unsigned": {
|
||||||
|
"age": 1234
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,4 @@
|
|||||||
|
{
|
||||||
|
"$ref": "room_event.json",
|
||||||
|
"state_key": "ArbitraryString"
|
||||||
|
}
|
||||||
@ -1,12 +1,8 @@
|
|||||||
{
|
{
|
||||||
"age": 242352,
|
"$ref": "core/room_event.json",
|
||||||
|
"type": "m.call.hangup",
|
||||||
"content": {
|
"content": {
|
||||||
"version" : 0,
|
"version" : 0,
|
||||||
"call_id": "12345"
|
"call_id": "12345"
|
||||||
},
|
}
|
||||||
"origin_server_ts": 1431961217939,
|
|
||||||
"event_id": "$WLGTSEFSEF:localhost",
|
|
||||||
"type": "m.call.hangup",
|
|
||||||
"room_id": "!Cuyf34gef24t:localhost",
|
|
||||||
"sender": "@example:localhost"
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,10 +1,11 @@
|
|||||||
{
|
{
|
||||||
|
"$ref": "core/event.json",
|
||||||
|
"sender": "@example:localhost",
|
||||||
|
"type": "m.presence",
|
||||||
"content": {
|
"content": {
|
||||||
"avatar_url": "mxc://localhost:wefuiwegh8742w",
|
"avatar_url": "mxc://localhost:wefuiwegh8742w",
|
||||||
"last_active_ago": 2478593,
|
"last_active_ago": 2478593,
|
||||||
"presence": "online",
|
"presence": "online",
|
||||||
"currently_active": false
|
"currently_active": false
|
||||||
},
|
}
|
||||||
"sender": "@example:localhost",
|
|
||||||
"type": "m.presence"
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,12 +1,8 @@
|
|||||||
{
|
{
|
||||||
"age": 242352,
|
"$ref": "core/state_event.json",
|
||||||
"content": {
|
"state_key": "domain.com",
|
||||||
"aliases": ["#somewhere:localhost", "#another:localhost"]
|
|
||||||
},
|
|
||||||
"state_key": "localhost",
|
|
||||||
"origin_server_ts": 1431961217939,
|
|
||||||
"event_id": "$WLGTSEFSEF:localhost",
|
|
||||||
"type": "m.room.aliases",
|
"type": "m.room.aliases",
|
||||||
"room_id": "!Cuyf34gef24t:localhost",
|
"content": {
|
||||||
"sender": "@example:localhost"
|
"aliases": ["#somewhere:domain.com", "#another:domain.com"]
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,12 +1,8 @@
|
|||||||
{
|
{
|
||||||
"age": 242352,
|
"$ref": "core/state_event.json",
|
||||||
|
"type": "m.room.canonical_alias",
|
||||||
|
"state_key": "",
|
||||||
"content": {
|
"content": {
|
||||||
"alias": "#somewhere:localhost"
|
"alias": "#somewhere:localhost"
|
||||||
},
|
}
|
||||||
"state_key": "",
|
|
||||||
"origin_server_ts": 1431961217939,
|
|
||||||
"event_id": "$WLGTSEFSEF:localhost",
|
|
||||||
"type": "m.room.canonical_alias",
|
|
||||||
"room_id": "!Cuyf34gef24t:localhost",
|
|
||||||
"sender": "@example:localhost"
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,12 +1,10 @@
|
|||||||
{
|
{
|
||||||
"age": 242352,
|
"$ref": "core/state_event.json",
|
||||||
"content": {
|
|
||||||
"creator": "@example:localhost"
|
|
||||||
},
|
|
||||||
"state_key": "",
|
|
||||||
"origin_server_ts": 1431961217939,
|
|
||||||
"event_id": "$WLGTSEFSEF:localhost",
|
|
||||||
"type": "m.room.create",
|
"type": "m.room.create",
|
||||||
"room_id": "!Cuyf34gef24t:localhost",
|
"state_key": "",
|
||||||
"sender": "@example:localhost"
|
"content": {
|
||||||
|
"creator": "@example:domain.com",
|
||||||
|
"room_version": "1",
|
||||||
|
"m.federate": true
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,14 +1,11 @@
|
|||||||
{
|
{
|
||||||
|
"$ref": "core/room_event.json",
|
||||||
|
"type": "m.room.encrypted",
|
||||||
"content": {
|
"content": {
|
||||||
"algorithm": "m.megolm.v1.aes-sha2",
|
"algorithm": "m.megolm.v1.aes-sha2",
|
||||||
"ciphertext": "AwgAEnACgAkLmt6qF84IK++J7UDH2Za1YVchHyprqTqsg...",
|
"ciphertext": "AwgAEnACgAkLmt6qF84IK++J7UDH2Za1YVchHyprqTqsg...",
|
||||||
"device_id": "RJYKSTBOIE",
|
"device_id": "RJYKSTBOIE",
|
||||||
"sender_key": "IlRMeOPX2e0MurIyfWEucYBRVOEEUMrOHqn/8mLqMjA",
|
"sender_key": "IlRMeOPX2e0MurIyfWEucYBRVOEEUMrOHqn/8mLqMjA",
|
||||||
"session_id": "X3lUlvLELLYxeTx4yOVu6UDpasGEVO0Jbu+QFnm0cKQ"
|
"session_id": "X3lUlvLELLYxeTx4yOVu6UDpasGEVO0Jbu+QFnm0cKQ"
|
||||||
},
|
}
|
||||||
"event_id": "$WLGTSEFSEF:localhost",
|
|
||||||
"room_id": "!Cuyf34gef24t:localhost",
|
|
||||||
"origin_server_ts": 1476648761524,
|
|
||||||
"sender": "@example:localhost",
|
|
||||||
"type": "m.room.encrypted"
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,13 +1,10 @@
|
|||||||
{
|
{
|
||||||
|
"$ref": "core/state_event.json",
|
||||||
|
"type": "m.room.encryption",
|
||||||
|
"state_key": "",
|
||||||
"content": {
|
"content": {
|
||||||
"algorithm": "m.megolm.v1.aes-sha2",
|
"algorithm": "m.megolm.v1.aes-sha2",
|
||||||
"rotation_period_ms": 604800000,
|
"rotation_period_ms": 604800000,
|
||||||
"rotation_period_msgs": 100
|
"rotation_period_msgs": 100
|
||||||
},
|
}
|
||||||
"event_id": "$WLGTSEFJJKJ:localhost",
|
|
||||||
"origin_server_ts": 1476648761524,
|
|
||||||
"sender": "@example:localhost",
|
|
||||||
"room_id": "!Cuyf34gef24t:localhost",
|
|
||||||
"state_key": "",
|
|
||||||
"type": "m.room.encryption"
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,12 +1,8 @@
|
|||||||
{
|
{
|
||||||
"age": 242353,
|
"$ref": "core/state_event.json",
|
||||||
|
"type": "m.room.guest_access",
|
||||||
|
"state_key": "",
|
||||||
"content": {
|
"content": {
|
||||||
"guest_access": "can_join"
|
"guest_access": "can_join"
|
||||||
},
|
}
|
||||||
"state_key": "",
|
|
||||||
"origin_server_ts": 1431961217938,
|
|
||||||
"event_id": "$WLGTSEFSEG:localhost",
|
|
||||||
"type": "m.room.guest_access",
|
|
||||||
"room_id": "!Cuyf34gef24u:localhost",
|
|
||||||
"sender": "@example:localhost"
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,12 +1,8 @@
|
|||||||
{
|
{
|
||||||
"age": 242352,
|
"$ref": "core/state_event.json",
|
||||||
|
"type": "m.room.history_visibility",
|
||||||
|
"state_key": "",
|
||||||
"content": {
|
"content": {
|
||||||
"history_visibility": "shared"
|
"history_visibility": "shared"
|
||||||
},
|
}
|
||||||
"state_key": "",
|
|
||||||
"origin_server_ts": 1431961217939,
|
|
||||||
"event_id": "$WLGTSEFSEF:localhost",
|
|
||||||
"type": "m.room.history_visibility",
|
|
||||||
"room_id": "!Cuyf34gef24t:localhost",
|
|
||||||
"sender": "@example:localhost"
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,12 +1,8 @@
|
|||||||
{
|
{
|
||||||
"age": 242352,
|
"$ref": "core/state_event.json",
|
||||||
|
"type": "m.room.join_rules",
|
||||||
|
"state_key": "",
|
||||||
"content": {
|
"content": {
|
||||||
"join_rule": "public"
|
"join_rule": "public"
|
||||||
},
|
}
|
||||||
"state_key": "",
|
|
||||||
"origin_server_ts": 1431961217939,
|
|
||||||
"event_id": "$WLGTSEFSEF:localhost",
|
|
||||||
"type": "m.room.join_rules",
|
|
||||||
"room_id": "!Cuyf34gef24t:localhost",
|
|
||||||
"sender": "@example:localhost"
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,14 +1,10 @@
|
|||||||
{
|
{
|
||||||
"age": 242352,
|
"$ref": "core/state_event.json",
|
||||||
|
"state_key": "@alice:domain.com",
|
||||||
|
"type": "m.room.member",
|
||||||
"content": {
|
"content": {
|
||||||
"membership": "join",
|
"membership": "join",
|
||||||
"avatar_url": "mxc://localhost/SEsfnsuifSDFSSEF#auto",
|
"avatar_url": "mxc://domain.com/SEsfnsuifSDFSSEF#auto",
|
||||||
"displayname": "Alice Margatroid"
|
"displayname": "Alice Margatroid"
|
||||||
},
|
}
|
||||||
"state_key": "@alice:localhost",
|
|
||||||
"origin_server_ts": 1431961217939,
|
|
||||||
"event_id": "$WLGTSEFSEF:localhost",
|
|
||||||
"type": "m.room.member",
|
|
||||||
"room_id": "!Cuyf34gef24t:localhost",
|
|
||||||
"sender": "@example:localhost"
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,18 +1,14 @@
|
|||||||
{
|
{
|
||||||
"age": 146,
|
"$ref": "core/room_event.json",
|
||||||
|
"type": "m.room.message",
|
||||||
"content": {
|
"content": {
|
||||||
"body": "Bee Gees - Stayin' Alive",
|
"body": "Bee Gees - Stayin' Alive",
|
||||||
"url": "mxc://localhost/ffed755USFFxlgbQYZGtryd",
|
"url": "mxc://domain.com/ffed755USFFxlgbQYZGtryd",
|
||||||
"info": {
|
"info": {
|
||||||
"duration": 2140786,
|
"duration": 2140786,
|
||||||
"size": 1563685,
|
"size": 1563685,
|
||||||
"mimetype": "audio/mpeg"
|
"mimetype": "audio/mpeg"
|
||||||
},
|
},
|
||||||
"msgtype": "m.audio"
|
"msgtype": "m.audio"
|
||||||
},
|
}
|
||||||
"event_id": "$143273582443PhrSn:localhost",
|
|
||||||
"origin_server_ts": 1432735824653,
|
|
||||||
"room_id": "!jEsUZKDJdhlrceRyVU:localhost",
|
|
||||||
"type": "m.room.message",
|
|
||||||
"sender": "@example:localhost"
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,14 +1,10 @@
|
|||||||
{
|
{
|
||||||
"age": 242352,
|
"$ref": "core/room_event.json",
|
||||||
|
"type": "m.room.message",
|
||||||
"content": {
|
"content": {
|
||||||
"body": "thinks this is an example emote",
|
"body": "thinks this is an example emote",
|
||||||
"msgtype": "m.emote",
|
"msgtype": "m.emote",
|
||||||
"format": "org.matrix.custom.html",
|
"format": "org.matrix.custom.html",
|
||||||
"formatted_body": "thinks <b>this</b> is an example emote"
|
"formatted_body": "thinks <b>this</b> is an example emote"
|
||||||
},
|
}
|
||||||
"origin_server_ts": 1431961217939,
|
|
||||||
"event_id": "$WLGTSEFSEF:localhost",
|
|
||||||
"type": "m.room.message",
|
|
||||||
"room_id": "!Cuyf34gef24t:localhost",
|
|
||||||
"sender": "@example:localhost"
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,14 +1,10 @@
|
|||||||
{
|
{
|
||||||
"age": 242352,
|
"$ref": "core/room_event.json",
|
||||||
|
"type": "m.room.message",
|
||||||
"content": {
|
"content": {
|
||||||
"body": "This is an example notice",
|
"body": "This is an example notice",
|
||||||
"msgtype": "m.notice",
|
"msgtype": "m.notice",
|
||||||
"format": "org.matrix.custom.html",
|
"format": "org.matrix.custom.html",
|
||||||
"formatted_body": "This is an <strong>example</strong> notice"
|
"formatted_body": "This is an <strong>example</strong> notice"
|
||||||
},
|
}
|
||||||
"origin_server_ts": 1431961217939,
|
|
||||||
"event_id": "$WLGTSEFSEF:localhost",
|
|
||||||
"type": "m.room.message",
|
|
||||||
"room_id": "!Cuyf34gef24t:localhost",
|
|
||||||
"sender": "@example:localhost"
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,14 +1,10 @@
|
|||||||
{
|
{
|
||||||
"age": 242352,
|
"$ref": "core/room_event.json",
|
||||||
|
"type": "m.room.message",
|
||||||
"content": {
|
"content": {
|
||||||
"body": "This is an example text message",
|
"body": "This is an example text message",
|
||||||
"msgtype": "m.text",
|
"msgtype": "m.text",
|
||||||
"format": "org.matrix.custom.html",
|
"format": "org.matrix.custom.html",
|
||||||
"formatted_body": "<b>This is an example text message</b>"
|
"formatted_body": "<b>This is an example text message</b>"
|
||||||
},
|
}
|
||||||
"origin_server_ts": 1431961217939,
|
|
||||||
"event_id": "$WLGTSEFSEF:localhost",
|
|
||||||
"type": "m.room.message",
|
|
||||||
"room_id": "!Cuyf34gef24t:localhost",
|
|
||||||
"sender": "@example:localhost"
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,12 +1,8 @@
|
|||||||
{
|
{
|
||||||
"age": 242352,
|
"$ref": "core/room_event.json",
|
||||||
|
"type": "m.room.message.feedback",
|
||||||
"content": {
|
"content": {
|
||||||
"type": "delivered",
|
"type": "delivered",
|
||||||
"target_event_id": "$WEIGFHFW:localhost"
|
"target_event_id": "$WEIGFHFW:localhost"
|
||||||
},
|
}
|
||||||
"origin_server_ts": 1431961217939,
|
|
||||||
"event_id": "$WLGTSEFSEF:localhost",
|
|
||||||
"type": "m.room.message.feedback",
|
|
||||||
"room_id": "!Cuyf34gef24t:localhost",
|
|
||||||
"sender": "@example:localhost"
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,12 +1,8 @@
|
|||||||
{
|
{
|
||||||
"age": 242352,
|
"$ref": "core/state_event.json",
|
||||||
|
"type": "m.room.name",
|
||||||
|
"state_key": "",
|
||||||
"content": {
|
"content": {
|
||||||
"name": "The room name"
|
"name": "The room name"
|
||||||
},
|
}
|
||||||
"state_key": "",
|
|
||||||
"origin_server_ts": 1431961217939,
|
|
||||||
"event_id": "$WLGTSEFSEF:localhost",
|
|
||||||
"type": "m.room.name",
|
|
||||||
"room_id": "!Cuyf34gef24t:localhost",
|
|
||||||
"sender": "@example:localhost"
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,12 +1,8 @@
|
|||||||
{
|
{
|
||||||
"age": 242352,
|
"$ref": "core/state_event.json",
|
||||||
"content": {
|
|
||||||
"pinned": ["$someevent:localhost"]
|
|
||||||
},
|
|
||||||
"state_key": "",
|
|
||||||
"origin_server_ts": 1431961217939,
|
|
||||||
"event_id": "$WLGTSEFSEF:localhost",
|
|
||||||
"type": "m.room.pinned_events",
|
"type": "m.room.pinned_events",
|
||||||
"room_id": "!Cuyf34gef24t:localhost",
|
"state_key": "",
|
||||||
"sender": "@example:localhost"
|
"content": {
|
||||||
|
"pinned": ["$someevent:domain.com"]
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,14 +1,8 @@
|
|||||||
{
|
{
|
||||||
"unsigned": {
|
"$ref": "core/room_event.json",
|
||||||
"age": 242352
|
|
||||||
},
|
|
||||||
"content": {
|
|
||||||
"reason": "Spamming"
|
|
||||||
},
|
|
||||||
"origin_server_ts": 1431961217939,
|
|
||||||
"event_id": "$WLGTSEFSEF:localhost",
|
|
||||||
"type": "m.room.redaction",
|
"type": "m.room.redaction",
|
||||||
"room_id": "!Cuyf34gef24t:localhost",
|
|
||||||
"redacts": "$fukweghifu23:localhost",
|
"redacts": "$fukweghifu23:localhost",
|
||||||
"sender": "@example:localhost"
|
"content": {
|
||||||
|
"reason": "Spamming"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,12 +1,8 @@
|
|||||||
{
|
{
|
||||||
"age": 242352,
|
"$ref": "core/state_event.json",
|
||||||
|
"type": "m.room.topic",
|
||||||
|
"state_key": "",
|
||||||
"content": {
|
"content": {
|
||||||
"topic": "A room topic"
|
"topic": "A room topic"
|
||||||
},
|
}
|
||||||
"state_key": "",
|
|
||||||
"origin_server_ts": 1431961217939,
|
|
||||||
"event_id": "$WLGTSEFSEF:localhost",
|
|
||||||
"type": "m.room.topic",
|
|
||||||
"room_id": "!Cuyf34gef24t:localhost",
|
|
||||||
"sender": "@example:localhost"
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,9 +1,10 @@
|
|||||||
{
|
{
|
||||||
|
"$ref": "core/event.json",
|
||||||
|
"type": "m.room_key",
|
||||||
"content": {
|
"content": {
|
||||||
"algorithm": "m.megolm.v1.aes-sha2",
|
"algorithm": "m.megolm.v1.aes-sha2",
|
||||||
"room_id": "!Cuyf34gef24t:localhost",
|
"room_id": "!Cuyf34gef24t:localhost",
|
||||||
"session_id": "X3lUlvLELLYxeTx4yOVu6UDpasGEVO0Jbu+QFnm0cKQ",
|
"session_id": "X3lUlvLELLYxeTx4yOVu6UDpasGEVO0Jbu+QFnm0cKQ",
|
||||||
"session_key": "AgAAAADxKHa9uFxcXzwYoNueL5Xqi69IkD4sni8LlfJL7qNBEY..."
|
"session_key": "AgAAAADxKHa9uFxcXzwYoNueL5Xqi69IkD4sni8LlfJL7qNBEY..."
|
||||||
},
|
}
|
||||||
"type": "m.room_key"
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,8 +1,9 @@
|
|||||||
{
|
{
|
||||||
|
"$ref": "core/event.json",
|
||||||
"type": "m.tag",
|
"type": "m.tag",
|
||||||
"content": {
|
"content": {
|
||||||
"tags": {
|
"tags": {
|
||||||
"u.work": {"order": 1}
|
"u.work": {"order": 0.9}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,46 +1,14 @@
|
|||||||
allOf:
|
allOf:
|
||||||
- $ref: event.yaml
|
- $ref: sync_room_event.yaml
|
||||||
description: In addition to the Event fields, Room Events have the following additional
|
description: In addition to the Event fields, Room Events have the following additional
|
||||||
fields.
|
fields.
|
||||||
properties:
|
properties:
|
||||||
event_id:
|
|
||||||
description: The globally unique event identifier.
|
|
||||||
type: string
|
|
||||||
room_id:
|
room_id:
|
||||||
description: The ID of the room associated with this event.
|
description: |-
|
||||||
type: string
|
The ID of the room associated with this event. Will not be present on events
|
||||||
sender:
|
that arrive through ``/sync``, despite being required everywhere else.
|
||||||
description: Contains the fully-qualified ID of the user who *sent*
|
|
||||||
this event.
|
|
||||||
type: string
|
|
||||||
origin_server_ts:
|
|
||||||
description: Timestamp in milliseconds on originating homeserver
|
|
||||||
when this event was sent.
|
|
||||||
type: integer
|
|
||||||
format: int64
|
|
||||||
unsigned:
|
|
||||||
description: Contains optional extra information about the event.
|
|
||||||
properties:
|
|
||||||
age:
|
|
||||||
description: The time in milliseconds that has elapsed since the event was
|
|
||||||
sent. This field is generated by the local homeserver, and may be incorrect
|
|
||||||
if the local time on at least one of the two servers is out of sync, which can
|
|
||||||
cause the age to either be negative or greater than it actually is.
|
|
||||||
type: integer
|
|
||||||
redacted_because:
|
|
||||||
description: Optional. The event that redacted this event, if any.
|
|
||||||
title: Event
|
|
||||||
type: object
|
|
||||||
transaction_id:
|
|
||||||
description: The client-supplied transaction ID, if the client being given
|
|
||||||
the event is the same one which sent it.
|
|
||||||
type: string
|
type: string
|
||||||
title: UnsignedData
|
|
||||||
type: object
|
|
||||||
required:
|
required:
|
||||||
- event_id
|
|
||||||
- room_id
|
- room_id
|
||||||
- sender
|
|
||||||
- origin_server_ts
|
|
||||||
title: Room Event
|
title: Room Event
|
||||||
type: object
|
type: object
|
||||||
|
|||||||
@ -1,23 +1,7 @@
|
|||||||
allOf:
|
allOf:
|
||||||
- $ref: room_event.yaml
|
- $ref: room_event.yaml
|
||||||
|
- $ref: sync_state_event.yaml
|
||||||
description: In addition to the Room Event fields, State Events have the following
|
description: In addition to the Room Event fields, State Events have the following
|
||||||
additional fields.
|
additional fields.
|
||||||
properties:
|
|
||||||
prev_content:
|
|
||||||
description: Optional. The previous ``content`` for this event. If there is no
|
|
||||||
previous content, this key will be missing.
|
|
||||||
title: EventContent
|
|
||||||
type: object
|
|
||||||
state_key:
|
|
||||||
description: A unique key which defines the overwriting semantics for this piece
|
|
||||||
of room state. This value is often a zero-length string. The presence of this
|
|
||||||
key makes this event a State Event.
|
|
||||||
|
|
||||||
State keys starting with an ``@`` are reserved for referencing user IDs, such
|
|
||||||
as room members. With the exception of a few events, state events set with a
|
|
||||||
given user's ID as the state key MUST only be set by that user.
|
|
||||||
type: string
|
|
||||||
required:
|
|
||||||
- state_key
|
|
||||||
title: State Event
|
title: State Event
|
||||||
type: object
|
type: object
|
||||||
|
|||||||
@ -0,0 +1,60 @@
|
|||||||
|
# Copyright 2018 New Vector Ltd
|
||||||
|
#
|
||||||
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
# you may not use this file except in compliance with the License.
|
||||||
|
# You may obtain a copy of the License at
|
||||||
|
#
|
||||||
|
# http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
#
|
||||||
|
# Unless required by applicable law or agreed to in writing, software
|
||||||
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
# See the License for the specific language governing permissions and
|
||||||
|
# limitations under the License.
|
||||||
|
|
||||||
|
# Note: this is technically not a core event schema, however it is included here
|
||||||
|
# to keep things sane. The short story is that /sync doesn't require a room_id to
|
||||||
|
# be on events, so we give it a whole event structure as a base for room_event.
|
||||||
|
# This base doesn't declare a room_id, which instead appears in the room_event.
|
||||||
|
|
||||||
|
allOf:
|
||||||
|
- $ref: event.yaml
|
||||||
|
description: In addition to the Event fields, Room Events have the following additional
|
||||||
|
fields.
|
||||||
|
properties:
|
||||||
|
event_id:
|
||||||
|
description: The globally unique event identifier.
|
||||||
|
type: string
|
||||||
|
sender:
|
||||||
|
description: Contains the fully-qualified ID of the user who sent this event.
|
||||||
|
type: string
|
||||||
|
origin_server_ts:
|
||||||
|
description: Timestamp in milliseconds on originating homeserver
|
||||||
|
when this event was sent.
|
||||||
|
type: integer
|
||||||
|
format: int64
|
||||||
|
unsigned:
|
||||||
|
description: Contains optional extra information about the event.
|
||||||
|
properties:
|
||||||
|
age:
|
||||||
|
description: The time in milliseconds that has elapsed since the event was
|
||||||
|
sent. This field is generated by the local homeserver, and may be incorrect
|
||||||
|
if the local time on at least one of the two servers is out of sync, which can
|
||||||
|
cause the age to either be negative or greater than it actually is.
|
||||||
|
type: integer
|
||||||
|
redacted_because:
|
||||||
|
description: Optional. The event that redacted this event, if any.
|
||||||
|
title: Event
|
||||||
|
type: object
|
||||||
|
transaction_id:
|
||||||
|
description: The client-supplied transaction ID, if the client being given
|
||||||
|
the event is the same one which sent it.
|
||||||
|
type: string
|
||||||
|
title: UnsignedData
|
||||||
|
type: object
|
||||||
|
required:
|
||||||
|
- event_id
|
||||||
|
- sender
|
||||||
|
- origin_server_ts
|
||||||
|
title: Room Event
|
||||||
|
type: object
|
||||||
@ -0,0 +1,39 @@
|
|||||||
|
# Copyright 2018 New Vector Ltd
|
||||||
|
#
|
||||||
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
# you may not use this file except in compliance with the License.
|
||||||
|
# You may obtain a copy of the License at
|
||||||
|
#
|
||||||
|
# http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
#
|
||||||
|
# Unless required by applicable law or agreed to in writing, software
|
||||||
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
# See the License for the specific language governing permissions and
|
||||||
|
# limitations under the License.
|
||||||
|
|
||||||
|
# See sync_room_event.yaml for why this file is here.
|
||||||
|
|
||||||
|
allOf:
|
||||||
|
- $ref: sync_room_event.yaml
|
||||||
|
description: In addition to the Room Event fields, State Events have the following
|
||||||
|
additional fields.
|
||||||
|
properties:
|
||||||
|
prev_content:
|
||||||
|
description: Optional. The previous ``content`` for this event. If there is no
|
||||||
|
previous content, this key will be missing.
|
||||||
|
title: EventContent
|
||||||
|
type: object
|
||||||
|
state_key:
|
||||||
|
description: A unique key which defines the overwriting semantics for this piece
|
||||||
|
of room state. This value is often a zero-length string. The presence of this
|
||||||
|
key makes this event a State Event.
|
||||||
|
|
||||||
|
State keys starting with an ``@`` are reserved for referencing user IDs, such
|
||||||
|
as room members. With the exception of a few events, state events set with a
|
||||||
|
given user's ID as the state key MUST only be set by that user.
|
||||||
|
type: string
|
||||||
|
required:
|
||||||
|
- state_key
|
||||||
|
title: State Event
|
||||||
|
type: object
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue