Merge branch 'kitsune/more-gtad-fixes' into dev

2 files changed, 26 insertions, 8 deletions

diff --git a/gtad/gtad b/gtad/gtad
-Subproject fcc8e0f28367f37890db9cfa5e96d08d599b36f
+Subproject 9ea32fb74767a62a3a0d27b3b181e8c18fb0c69
diff --git a/gtad/gtad.yaml b/gtad/gtad.yaml
index 2d004cbc..0bec3b7a 100644
--- a/gtad/gtad.yaml
+++ b/gtad/gtad.yaml
@@ -29,6 +29,8 @@ analyzer:
     login>/user: ""
     login>/medium: ""
     login>/address: ""
+    login</home_server: ""
+    register</home_server: ""
 
   # Structure inside `types`:
   # - swaggerType: <targetTypeSpec>
@@ -88,7 +90,8 @@ analyzer:
         - /(room|client)_event.yaml$/: RoomEventPtr
         - /event(_without_room_id)?.yaml$/: EventPtr
       - +set:
-          # This renderer actually applies to all $ref things
+          # This renderer applies to everything actually $ref'ed
+          # (not substituted)
           _importRenderer: '"{{#segments}}{{_}}{{#_join}}/{{/_join}}{{/segments}}.h"'
         +on:
         - '/^(\./)?definitions/request_email_validation.yaml$/':
@@ -96,7 +99,20 @@ analyzer:
         - '/^(\./)?definitions/request_msisdn_validation.yaml$/':
             title: MsisdnValidationData
         - /_filter.yaml$/: # Event/RoomEventFilters do NOT need Omittable<>
+
+          # Despite being used in two calls, it's more practical to have those
+          # fields available as getters right from the respective job classes
         - /public_rooms_response.yaml$/: { _inline: true }
+
+          # list_public_rooms.yaml (via public_rooms_response.yaml) and
+          # space_hierarchy.yaml use public_rooms_chunk.yaml as a common base
+          # structure, adding (space_hiearchy) or overriding
+          # (public_rooms_response) fields for their purposes. The spec text
+          # confusingly ends up with having two different structures named
+          # "PublicRoomsChunk". To make sure the types are distinct in
+          # libQuotient, this common base is inlined into the actually used
+          # data structures (that have distinct names) defined
+          # in space_hierarchy.h and public_rooms_response.h, respectively
         - /public_rooms_chunk.yaml$/: { _inline: true }
         - //: *UseOmittable # Also apply "avoidCopy" to all other ref'ed types
     - schema:
@@ -105,6 +121,7 @@ analyzer:
 #          type: Filter
 #          imports: '"csapi/definitions/sync_filter.h"'
 #      - getFilter<: *Filter
+      - StrippedChildStateEvent: void # only used in an array, see below
       - RoomFilter: # A structure inside Filter, same story as with *_filter.yaml
       - OneTimeKeys:
           type: OneTimeKeys
@@ -114,20 +131,21 @@ analyzer:
       - string: QStringList
       - +set: { moveOnly: }
         +on:
-        - /^Notification|Result$/:
-            type: "std::vector<{{1}}>"
+        - /^Notification|Result|ChildRoomsChunk$/: "std::vector<{{1}}>"
+        - StrippedChildStateEvent:
+            type: StateEvents
             imports: '"events/eventloader.h"'
-        - /state_event.yaml$/: StateEvents
-        - /(room|client)_event.yaml$/: RoomEvents
-        - /event(_without_room_id)?.yaml$/: Events
+        - /state_event.yaml$/: StateEvents # 'imports' already set under $ref
+        - /(room|client)_event.yaml$/: RoomEvents # ditto
+        - /event(_without_room_id)?.yaml$/: Events # ditto
       - //: "QVector<{{1}}>"
     - map: # `additionalProperties` in OpenAPI
       - RoomState:
           type: "UnorderedMap<QString, {{1}}>"
           moveOnly:
       - /.+/: "QHash<QString, {{1}}>"
-      - //: QVariantHash
-    - variant: # A sequence `type` (multitype) in OpenAPI
+      - //: QVariantHash # QJsonObject?..
+    - variant: # A sequence `type` or a 'oneOf' group in OpenAPI
       - /^string,null|null,string$/: *QString
       - //: QVariant