api: Ensure DeleteMessageEvent.{streamId,topic} present when stream message

Author: chrisbobbe

lib/api/model/events.dart

@@ -438,8 +438,15 @@ class DeleteMessageEvent extends Event {
     this.topic,
   });
 
-  factory DeleteMessageEvent.fromJson(Map<String, dynamic> json) =>
-    _$DeleteMessageEventFromJson(json);
+  factory DeleteMessageEvent.fromJson(Map<String, dynamic> json) {
+    final result = _$DeleteMessageEventFromJson(json);
+    // Crunchy-shell validation
+    if (result.messageType == MessageType.stream) {
+      result.streamId as int;
+      result.topic as String;
+    }
+    return result;
+  }
 
   @override
   Map<String, dynamic> toJson() => _$DeleteMessageEventToJson(this);

test/api/model/events_test.dart

@@ -43,6 +43,38 @@ void main() {
     check(mkEvent([MessageFlag.read])).message.flags.deepEquals([MessageFlag.read]);
   });
 
+  test('delete_message: require streamId and topic for stream messages', () {
+    check(() => DeleteMessageEvent.fromJson({
+      'id': 1,
+      'type': 'delete_message',
+      'message_ids': [1, 2, 3],
+      'message_type': 'private',
+    })).returnsNormally();
+
+    final baseJsonStream = {
+      'id': 1,
+      'type': 'delete_message',
+      'message_ids': [1, 2, 3],
+      'message_type': 'stream',
+    };
+
+    check(() => DeleteMessageEvent.fromJson({
+      ...baseJsonStream
+    })).throws();
+
+    check(() => DeleteMessageEvent.fromJson({
+      ...baseJsonStream, 'stream_id': 1, 'topic': 'some topic',
+    })).returnsNormally();
+
+    check(() => DeleteMessageEvent.fromJson({
+      ...baseJsonStream, 'stream_id': 1,
+    })).throws();
+
+    check(() => DeleteMessageEvent.fromJson({
+      ...baseJsonStream, 'topic': 'some topic',
+    })).throws();
+  });
+
   test('update_message_flags/remove: require messageDetails in mark-as-unread', () {
     final baseJson = {
       'id': 1,