1 files changed, 33 insertions, 7 deletions
diff --git a/lib/jobs/gtad.yaml b/lib/jobs/gtad.yaml
index 052d8301..4ef55bce 100644
--- a/lib/jobs/gtad.yaml
+++ b/lib/jobs/gtad.yaml
@@ -6,7 +6,8 @@ analyzer:
     signed: signedData
     unsigned: unsignedData
     default: isDefault
-    origin_server_ts: originServerTimestamp
+    origin_server_ts: originServerTimestamp # Instead of originServerTs
+    start: begin # Because start() is a method in BaseJob
 
   types:
     # Structure:
@@ -51,18 +52,42 @@ analyzer:
         avoidCopy?: true
     file: *ByteStream
     object:
-    - definitions/event.yaml:
+    - /.+m\.room\.member/: # A stub for EventsBatch<RoomMemberEvent>
+        type: none
+    - /.+state_event.yaml/:
+        type: StateEventPtr
+        noCopy?: true
+        imports: '"events/event.h"'
+    - /.*room_event.yaml/:
+        type: RoomEventPtr
+        noCopy?: true
+        imports: '"events/event.h"'
+    - /.*event.yaml/:
         type: EventPtr
+        noCopy?: true
         imports: '"events/event.h"'
     - //:
         type: QJsonObject
         avoidCopy?: true
         imports: <QtCore/QJsonObject>
     array:
-    - Notification:
+    - /^Notification|Result$/:
         type: "std::vector<{{1}}>"
-        avoidCopy?: true
-        imports: <vector>
+        noCopy?: true
+        imports: '"events/event.h"'
+    - /.+m\.room\.member/:
+        type: "EventsArray<RoomMemberEvent>"
+        noCopy?: true
+        imports: '"events/roommemberevent.h"'
+    - /.+state_event.yaml/:
+        type: StateEvents
+        noCopy?: true
+    - /.+room_event.yaml/:
+        type: RoomEvents
+        noCopy?: true
+    - /.+event.yaml/:
+        type: Events
+        noCopy?: true
     - /.+/:
         type: "QVector<{{1}}>"
         avoidCopy?: true
@@ -78,8 +103,9 @@ mustache:
   definitions:
     _scopeRenderer: "{{scopeCamelCase}}Job::"
     _literalQuote: '"'
-    maybeCrefType: "{{#avoidCopy?}}const {{/avoidCopy?}}{{dataType.name}}{{#avoidCopy?}}&{{/avoidCopy?}}"
-    qualifiedMaybeCrefType: "{{#avoidCopy?}}const {{/avoidCopy?}}{{dataType.qualifiedName}}{{#avoidCopy?}}&{{/avoidCopy?}}"
+    maybeCrefType: "{{#avoidCopy?}}const {{/avoidCopy?}}{{dataType.name}}{{#avoidCopy?}}&{{/avoidCopy?}}{{#noCopy?}}&&{{/noCopy?}}"
+    qualifiedMaybeCrefType:
+      "{{#avoidCopy?}}const {{/avoidCopy?}}{{dataType.qualifiedName}}{{#avoidCopy?}}&{{/avoidCopy?}}{{#noCopy?}}&&{{/noCopy?}}"
     initializeDefaultValue: "{{#defaultValue}}{{>initializer}}{{/defaultValue}}{{^defaultValue}}{}{{/defaultValue}}"
     joinedParamDecl: '{{>maybeCrefType}} {{paramName}}{{^required?}} = {{>initializeDefaultValue}}{{/required?}}{{#@join}}, {{/@join}}'
     joinedParamDef: '{{>maybeCrefType}} {{paramName}}{{#@join}}, {{/@join}}'