Merge pull request #185 from matrix-org/daniel/flattenapis

Flatten out v1 and v2_alpha directories

As a side effect, I got rid of all of the horrible symlinks and just put
in all of the proper relative paths. Because the horrible symlinks were
horrible.

api/client-server/definitions/room_event_filter.json

@@ -1,6 +1,6 @@
 {
   "type": "object",
-  "allOf": [{"$ref": "definitions/event_filter.json"}],
+  "allOf": [{"$ref": "event_filter.json"}],
   "properties": {
     "rooms": {
       "type": "array",

api/client-server/definitions/sync_filter.json

@@ -7,24 +7,24 @@
         "state": {
           "description":
             "The state events to include for rooms.",
-          "allOf": [{"$ref": "definitions/room_event_filter.json"}]
+          "allOf": [{"$ref": "room_event_filter.json"}]
         },
         "timeline": {
           "description":
             "The message and state update events to include for rooms.",
-          "allOf": [{"$ref": "definitions/room_event_filter.json"}]
+          "allOf": [{"$ref": "room_event_filter.json"}]
         },
         "ephemeral": {
           "description":
             "The events that aren't recorded in the room history, e.g. typing and receipts, to include for rooms.",
-          "allOf": [{"$ref": "definitions/room_event_filter.json"}]
+          "allOf": [{"$ref": "room_event_filter.json"}]
         }
       }
     },
     "presence": {
       "description":
         "The presence updates to include.",
-      "allOf": [{"$ref": "definitions/event_filter.json"}]
+      "allOf": [{"$ref": "event_filter.json"}]
     },
     "event_format": {
       "description":

api/client-server/definitions/timeline_batch.json

@@ -1,6 +1,6 @@
 {
   "type": "object",
-  "allOf": [{"$ref":"definitions/event_batch.json"}],
+  "allOf": [{"$ref":"event_batch.json"}],
   "properties": {
     "limited": {
       "type": "boolean",

api/client-server/guest_events.yaml

@@ -98,6 +98,6 @@ paths:
                   type: object
                   title: Event
                   allOf:
-                   - "$ref": "core-event-schema/room_event.json"
+                    - "$ref": "../../event-schemas/schema/core-event-schema/room_event.json"
         400:
           description: "Bad pagination ``from`` parameter."

api/client-server/old_sync.yaml

@@ -84,7 +84,7 @@ paths:
                   type: object
                   title: Event
                   allOf:
-                   - "$ref": "core-event-schema/room_event.json"
+                    - "$ref": "../../event-schemas/schema/core-event-schema/room_event.json"
         400:
           description: "Bad pagination ``from`` parameter."
   "/initialSync":
@@ -285,7 +285,7 @@ paths:
                   type: object
                   title: Event
                   allOf:
-                   - "$ref": "core-event-schema/event.json"
+                    - "$ref": "../../event-schemas/schema/core-event-schema/event.json"
               rooms:
                 type: array
                 items:
@@ -304,7 +304,7 @@ paths:
                         title: "InviteEvent"
                         description: "The invite event if ``membership`` is ``invite``"
                         allOf:
-                          - "$ref": "v1-event-schema/m.room.member"
+                          - "$ref": "../../event-schemas/schema/m.room.member"
                     messages:
                       type: object
                       title: PaginationChunk
@@ -332,7 +332,7 @@ paths:
                             type: object
                             title: RoomEvent
                             allOf:
-                              - "$ref": "core-event-schema/room_event.json"
+                              - "$ref": "../../event-schemas/schema/core-event-schema/room_event.json"
                       required: ["start", "end", "chunk"]
                     state:
                       type: array
@@ -345,7 +345,7 @@ paths:
                         title: StateEvent
                         type: object
                         allOf:
-                          - "$ref": "core-event-schema/state_event.json"
+                          - "$ref": "../../event-schemas/schema/core-event-schema/state_event.json"
                     visibility:
                       type: string
                       enum: ["private", "public"]
@@ -361,7 +361,7 @@ paths:
                         title: Event
                         type: object
                         allOf:
-                          - "$ref": "core-event-schema/event.json"
+                          - "$ref": "../../event-schemas/schema/core-event-schema/event.json"
                   required: ["room_id", "membership"]
             required: ["end", "rooms", "presence"]
         404:
@@ -398,6 +398,6 @@ paths:
               }
           schema:
             allOf:
-              - "$ref": "core-event-schema/event.json"
+              - "$ref": "../../event-schemas/schema/core-event-schema/event.json"
         404:
           description: The event was not found or you do not have permission to read this event.

api/client-server/presence.yaml

@@ -205,4 +205,4 @@ paths:
               type: object
               title: PresenceEvent
               allOf:
-                - "$ref": "core-event-schema/event.json"
+                - "$ref": "../../event-schemas/schema/core-event-schema/event.json"

api/client-server/rooms.yaml

@@ -173,7 +173,7 @@ paths:
               title: StateEvent
               type: object
               allOf:
-                - "$ref": "core-event-schema/state_event.json"
+                - "$ref": "../../event-schemas/schema/core-event-schema/state_event.json"
         403:
           description: >
             You aren't a member of the room and weren't previously a
@@ -355,7 +355,7 @@ paths:
                       type: object
                       title: RoomEvent
                       allOf:
-                        - "$ref": "core-event-schema/room_event.json"
+                        - "$ref": "../../event-schemas/schema/core-event-schema/room_event.json"
                 required: ["start", "end", "chunk"]
               state:
                 type: array
@@ -368,7 +368,7 @@ paths:
                   title: StateEvent
                   type: object
                   allOf:
-                    - "$ref": "core-event-schema/state_event.json"
+                    - "$ref": "../../event-schemas/schema/core-event-schema/state_event.json"
               visibility:
                 type: string
                 enum: ["private", "public"]
@@ -383,7 +383,7 @@ paths:
                   title: Event
                   type: object
                   allOf:
-                    - "$ref": "core-event-schema/event.json"
+                    - "$ref": "../../event-schemas/schema/core-event-schema/event.json"
             required: ["room_id"]
         403:
           description: >
@@ -453,7 +453,7 @@ paths:
                   title: MemberEvent
                   type: object
                   allOf:
-                    - "$ref": "v1-event-schema/m.room.member"
+                    - "$ref": "../../event-schemas/schema/m.room.member"
         403:
           description: >
             You aren't a member of the room and weren't previously a

api/client-server/search.yaml

@@ -111,7 +111,7 @@ paths:
                                 title: Event
                                 description: The event that matched.
                                 allOf:
-                                  - "$ref": "core-event-schema/room_event.json"
+                                  - "$ref": "../../event-schemas/schema/core-event-schema/room_event.json"
           examples:
             application/json: |-
                {

api/client-server/v1/core-event-schema

@@ -1 +0,0 @@
-v1-event-schema/core-event-schema

api/client-server/v1/v1-event-schema

@@ -1 +0,0 @@
-../../../event-schemas/schema/v1

api/client-server/v2_alpha/definitions/definitions

@@ -1 +0,0 @@
-.

api/client-server/v2_alpha/definitions/error.yaml

@@ -1,10 +0,0 @@
-type: object
-description: A Matrix-level Error
-properties:
-  errcode:
-    type: string
-    description: An error code.
-  error:
-    type: string
-    description: A human-readable error message.
-required: ["errcode"]

event-schemas/README.md

@@ -7,7 +7,7 @@ resolved correctly. For basic CLI testing, we recommend and have verified they
 work with the Node.js package [z-schema](https://github.com/zaggino/z-schema):
 ```
  $ npm install -g z-schema
- $ z-schema schema/v1/m.room.message examples/v1/m.room.message_m.text
+ $ z-schema schema/m.room.message examples/m.room.message_m.text
  schema validation passed
  json #1 validation passed
 ```

event-schemas/check.sh

@@ -6,17 +6,17 @@ if ! which z-schema; then
   exit 1
 fi
 
-find schema/v1/m.* | while read line
+find schema/m.* | while read line
 do
     split_path=(${line///// })
     event_type=(${split_path[2]})
     echo "Checking $event_type"
     echo "--------------------"
     # match exact name or exact name with a #<something>
-    find examples/v1 -name $event_type -o -name "$event_type#*" | while read exline
+    find examples -name $event_type -o -name "$event_type#*" | while read exline
     do
         echo "    against $exline"
         # run z-schema: because of bash -e if this fails we bail with exit code 1
-        z-schema schema/v1/$event_type $exline
+        z-schema schema/$event_type $exline
     done
 done

event-schemas/schema/core-event-schema/room_event.json

@@ -3,7 +3,7 @@
   "title": "Room Event",
   "description": "In addition to the Event fields, Room Events MUST have the following additional field.",
   "allOf":[{
-    "$ref": "core-event-schema/event.json"
+    "$ref": "event.json"
   }],
   "properties": {
     "room_id": {

event-schemas/schema/core-event-schema/state_event.json

@@ -3,7 +3,7 @@
   "title": "State Event",
   "description": "In addition to the Room Event fields, State Events have the following additional fields.",
   "allOf":[{
-    "$ref": "core-event-schema/room_event.json"
+    "$ref": "room_event.json"
   }],
   "properties": {
     "state_key": {