Filip/matrix-spec
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-spec synced 2026-02-22 05:53:42 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge 53150b739b into 625ed5c599

Browse source
This commit is contained in:
Johannes Marbach 2025-07-10 22:33:18 +02:00 committed by GitHub
parent 625ed5c599 53150b739b
commit 1a3dc9fabd
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 17 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelogs/client_server/newsfragments/2167.clarification Normal file
View file

@ -0,0 +1 @@
Clarify that `format` is required if `formatted_body` is specified.

4
data/event-schemas/schema/m.room.message$m.audio.yaml
View file

@ -15,8 +15,8 @@ properties:
"1.10": This property can act as a caption for the audio. "1.10": This property can act as a caption for the audio.
format: format:
description: |- description: |-
The format used in the `formatted_body`. Currently only The format used in the `formatted_body`. This is required if `formatted_body`
`org.matrix.custom.html` is supported. is specified. Currently only `org.matrix.custom.html` is supported.
type: string type: string
x-addedInMatrixVersion: "1.10" x-addedInMatrixVersion: "1.10"
formatted_body: formatted_body:

4
data/event-schemas/schema/m.room.message$m.emote.yaml
View file

@ -14,8 +14,8 @@ properties:
type: string type: string
format: format:
description: |- description: |-
The format used in the `formatted_body`. Currently only The format used in the `formatted_body`. This is required if `formatted_body`
`org.matrix.custom.html` is supported. is specified. Currently only `org.matrix.custom.html` is supported.
type: string type: string
formatted_body: formatted_body:
description: |- description: |-

4
data/event-schemas/schema/m.room.message$m.file.yaml
View file

@ -15,8 +15,8 @@ properties:
"1.10": This property can act as a caption for the file. "1.10": This property can act as a caption for the file.
format: format:
description: |- description: |-
The format used in the `formatted_body`. Currently only The format used in the `formatted_body`. This is required if `formatted_body`
`org.matrix.custom.html` is supported. is specified. Currently only `org.matrix.custom.html` is supported.
type: string type: string
x-addedInMatrixVersion: "1.10" x-addedInMatrixVersion: "1.10"
formatted_body: formatted_body:

4
data/event-schemas/schema/m.room.message$m.image.yaml
View file

@ -15,8 +15,8 @@ properties:
"1.10": This property can act as a caption for the image. "1.10": This property can act as a caption for the image.
format: format:
description: |- description: |-
The format used in the `formatted_body`. Currently only The format used in the `formatted_body`. This is required if `formatted_body`
`org.matrix.custom.html` is supported. is specified. Currently only `org.matrix.custom.html` is supported.
type: string type: string
x-addedInMatrixVersion: "1.10" x-addedInMatrixVersion: "1.10"
formatted_body: formatted_body:

4
data/event-schemas/schema/m.room.message$m.key.verification.request.yaml
View file

@ -22,8 +22,8 @@ properties:
verification. verification.
format: format:
description: |- description: |-
The format used in the `formatted_body`. Currently only The format used in the `formatted_body`. This is required if `formatted_body`
`org.matrix.custom.html` is supported. is specified. Currently only `org.matrix.custom.html` is supported.
type: string type: string
formatted_body: formatted_body:
description: |- description: |-

4
data/event-schemas/schema/m.room.message$m.notice.yaml
View file

@ -14,8 +14,8 @@ properties:
type: string type: string
format: format:
description: |- description: |-
The format used in the `formatted_body`. Currently only The format used in the `formatted_body`. This is required if `formatted_body`
`org.matrix.custom.html` is supported. is specified. Currently only `org.matrix.custom.html` is supported.
type: string type: string
formatted_body: formatted_body:
description: |- description: |-

4
data/event-schemas/schema/m.room.message$m.text.yaml
View file

@ -14,8 +14,8 @@ properties:
type: string type: string
format: format:
description: |- description: |-
The format used in the `formatted_body`. Currently only The format used in the `formatted_body`. This is required if `formatted_body`
`org.matrix.custom.html` is supported. is specified. Currently only `org.matrix.custom.html` is supported.
type: string type: string
formatted_body: formatted_body:
description: |- description: |-

4
data/event-schemas/schema/m.room.message$m.video.yaml
View file

@ -15,8 +15,8 @@ properties:
"1.10": This property can act as a caption for the video. "1.10": This property can act as a caption for the video.
format: format:
description: |- description: |-
The format used in the `formatted_body`. Currently only The format used in the `formatted_body`. This is required if `formatted_body`
`org.matrix.custom.html` is supported. is specified. Currently only `org.matrix.custom.html` is supported.
type: string type: string
x-addedInMatrixVersion: "1.10" x-addedInMatrixVersion: "1.10"
formatted_body: formatted_body: