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

Make the key orders consistent

Browse source
This commit is contained in:
Mark Haines 2016-11-07 14:54:59 +00:00
parent 05001bcaa6
commit 6f1c598db8
7 changed files with 18 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
event-schemas/schema/core-event-schema/msgtype_infos/image_info.yaml
View file

@ -4,15 +4,15 @@ properties:
h: h:
description: The height of the image in pixels. description: The height of the image in pixels.
type: integer type: integer
w:
description: The width of the image in pixels.
type: integer
mimetype: mimetype:
description: The mimetype of the image, e.g. ``image/jpeg``. description: The mimetype of the image, e.g. ``image/jpeg``.
type: string type: string
size: size:
description: Size of the image in bytes. description: Size of the image in bytes.
type: integer type: integer
w:
description: The width of the image in pixels.
type: integer
thumbnail_url: thumbnail_url:
description: The URL to a thumbnail of the image. description: The URL to a thumbnail of the image.
type: string type: string
@ -20,6 +20,5 @@ properties:
allOf: allOf:
- $ref: thumbnail_info.yaml - $ref: thumbnail_info.yaml
description: Metadata about the image referred to in ``thumbnail_url``. description: Metadata about the image referred to in ``thumbnail_url``.
title: ThumbnailInfo
type: object
title: ImageInfo title: ImageInfo
type: object

6
event-schemas/schema/core-event-schema/msgtype_infos/thumbnail_info.yaml
View file

@ -4,14 +4,14 @@ properties:
h: h:
description: The height of the image in pixels. description: The height of the image in pixels.
type: integer type: integer
w:
description: The width of the image in pixels.
type: integer
mimetype: mimetype:
description: The mimetype of the image, e.g. ``image/jpeg``. description: The mimetype of the image, e.g. ``image/jpeg``.
type: string type: string
size: size:
description: Size of the image in bytes. description: Size of the image in bytes.
type: integer type: integer
w:
description: The width of the image in pixels.
type: integer
title: ThumbnailInfo title: ThumbnailInfo
type: object type: object

2
event-schemas/schema/m.room.avatar
View file

@ -9,8 +9,6 @@ properties:
allOf: allOf:
- $ref: core-event-schema/msgtype_infos/image_info.yaml - $ref: core-event-schema/msgtype_infos/image_info.yaml
description: Metadata about the image referred to in ``url``. description: Metadata about the image referred to in ``url``.
title: ImageInfo
type: object
url: url:
description: The URL to the image. description: The URL to the image.
type: string type: string

2
event-schemas/schema/m.room.message#m.file
View file

@ -27,8 +27,6 @@ properties:
allOf: allOf:
- $ref: core-event-schema/msgtype_infos/thumbnail_info.yaml - $ref: core-event-schema/msgtype_infos/thumbnail_info.yaml
description: Metadata about the image referred to in ``thumbnail_url``. description: Metadata about the image referred to in ``thumbnail_url``.
title: ThumbnailInfo
type: object
title: FileInfo title: FileInfo
type: object type: object
msgtype: msgtype:

2
event-schemas/schema/m.room.message#m.image
View file

@ -12,8 +12,6 @@ properties:
allOf: allOf:
- $ref: core-event-schema/msgtype_infos/image_info.yaml - $ref: core-event-schema/msgtype_infos/image_info.yaml
description: Metadata about the image referred to in ``url``. description: Metadata about the image referred to in ``url``.
title: ImageInfo
type: object
msgtype: msgtype:
enum: enum:
- m.image - m.image

9
event-schemas/schema/m.room.message#m.location
View file

@ -18,14 +18,13 @@ properties:
info: info:
type: object type: object
properties: properties:
thumbnail_info:
allOf:
- $ref: core-event-schema/msgtype_infos/thumbnail_info.yaml
title: ThumbnailInfo
type: object
thumbnail_url: thumbnail_url:
description: The URL to a thumbnail of the location being represented. description: The URL to a thumbnail of the location being represented.
type: string type: string
thumbnail_info:
allOf:
- $ref: core-event-schema/msgtype_infos/thumbnail_info.yaml
description: Metadata about the image referred to in ``thumbnail_url``.
title: LocationInfo title: LocationInfo
required: required:
- msgtype - msgtype

15
event-schemas/schema/m.room.message#m.video
View file

@ -17,23 +17,22 @@ properties:
h: h:
description: The height of the video in pixels. description: The height of the video in pixels.
type: integer type: integer
w:
description: The width of the video in pixels.
type: integer
mimetype: mimetype:
description: The mimetype of the video e.g. ``video/mp4``. description: The mimetype of the video e.g. ``video/mp4``.
type: string type: string
size: size:
description: The size of the video in bytes. description: The size of the video in bytes.
type: integer type: integer
thumbnail_url:
description: The URL to an image thumbnail of the video clip.
type: string
thumbnail_info: thumbnail_info:
allOf: allOf:
- $ref: core-event-schema/msgtype_infos/thumbnail_info.yaml - $ref: core-event-schema/msgtype_infos/thumbnail_info.yaml
title: ThumbnailInfo description: Metadata about the image referred to in ``thumbnail_url``.
type: object
thumbnail_url:
description: The URL to a thumbnail of the video clip.
type: string
w:
description: The width of the video in pixels.
type: integer
title: VideoInfo title: VideoInfo
type: object type: object
msgtype: msgtype: