Merge pull request #291 from gergelypolonkai/room-avatar-image-info

Update m.room.avatar schema so it references image_info in info
matrix-org · Mar 14, 2016 · dd6dfa7 · dd6dfa7
2 parents 92dfc0b + 6e2b02a
commit dd6dfa7
Showing 1 changed file with 3 additions and 18 deletions.
diff --git a/event-schemas/schema/m.room.avatar b/event-schemas/schema/m.room.avatar
@@ -29,24 +29,9 @@
                     "type": "object",
                     "title": "ImageInfo",
                     "description": "Metadata about the image referred to in ``url``.",
-                    "properties": {
-                        "size": {
-                            "type": "integer",
-                            "description": "Size of the image in bytes."
-                        },
-                        "w": {
-                            "type": "integer",
-                            "description": "The width of the image in pixels."
-                        },
-                        "h": {
-                            "type": "integer",
-                            "description": "The height of the image in pixels."
-                        },
-                        "mimetype": {
-                            "type": "string",
-                            "description": "The mimetype of the image, e.g. ``image/jpeg``."
-                        }
-                    }
+                    "allOf": [{
+                        "$ref": "core-event-schema/msgtype_infos/image_info.yaml"
+                    }]
                 }
             },
             "required": ["url"]