mirror
/
gomatrix
mirror of https://github.com/matrix-org/gomatrix
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #65 from matrix-org/babolivier/thumbnails 

ImageInfo can have a Thumbnail (and it's needed for Riot on Android)
This commit is contained in:
Brendan Abolivier 2019-04-18 16:55:19 +01:00 committed by GitHub
parent 51f01ddc3d 5df0d882cd
commit 0c31efc5dc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
events.go
View File

@ -46,18 +46,28 @@ type TextMessage struct {
Body string `json:"body"` Body string `json:"body"`
} }
// ImageInfo contains info about an image - http://matrix.org/docs/spec/client_server/r0.2.0.html#m-image // ThumbnailInfo contains info about an thumbnail image - http://matrix.org/docs/spec/client_server/r0.2.0.html#m-image
type ImageInfo struct { type ThumbnailInfo struct {
Height uint `json:"h,omitempty"` Height uint `json:"h,omitempty"`
Width uint `json:"w,omitempty"` Width uint `json:"w,omitempty"`
Mimetype string `json:"mimetype,omitempty"` Mimetype string `json:"mimetype,omitempty"`
Size uint `json:"size,omitempty"` Size uint `json:"size,omitempty"`
} }
// ImageInfo contains info about an image - http://matrix.org/docs/spec/client_server/r0.2.0.html#m-image
type ImageInfo struct {
Height uint `json:"h,omitempty"`
Width uint `json:"w,omitempty"`
Mimetype string `json:"mimetype,omitempty"`
Size uint `json:"size,omitempty"`
ThumbnailInfo ThumbnailInfo `json:"thumbnail_info,omitempty"`
ThumbnailURL string `json:"thumbnail_url,omitempty"`
}
// VideoInfo contains info about a video - http://matrix.org/docs/spec/client_server/r0.2.0.html#m-video // VideoInfo contains info about a video - http://matrix.org/docs/spec/client_server/r0.2.0.html#m-video
type VideoInfo struct { type VideoInfo struct {
Mimetype string `json:"mimetype,omitempty"` Mimetype string `json:"mimetype,omitempty"`
ThumbnailInfo ImageInfo `json:"thumbnail_info"` ThumbnailInfo ThumbnailInfo `json:"thumbnail_info"`
ThumbnailURL string `json:"thumbnail_url,omitempty"` ThumbnailURL string `json:"thumbnail_url,omitempty"`
Height uint `json:"h,omitempty"` Height uint `json:"h,omitempty"`
Width uint `json:"w,omitempty"` Width uint `json:"w,omitempty"`