model: Temporarily cut matchContent, matchTopic from message objects

We plan to revert this when we do #1663.

Author: chrisbobbe

lib/api/model/events.dart

@@ -763,11 +763,6 @@ class MessageEvent extends Event {
   // In the server API, the `flags` field appears directly on the event rather
   // than on the message object.  To avoid proliferating message types, we
   // normalize that away in deserialization.
-  //
-  // The other difference in the server API between message objects in these
-  // events and in the get-messages results is that `matchContent` and
-  // `matchTopic` are absent here.  Already [Message.matchContent] and
-  // [Message.matchTopic] are optional, so no action is needed on that.
   @JsonKey(readValue: _readMessageValue, fromJson: Message.fromJson, includeToJson: false)
   final Message message;
 

lib/api/model/model.dart

@@ -865,9 +865,8 @@ sealed class Message<T extends Conversation> extends MessageBase<T> {
   // final string type; // handled by runtime type of object
   @JsonKey(fromJson: _flagsFromJson)
   List<MessageFlag> flags; // Unrecognized flags won't roundtrip through {to,from}Json.
-  final String? matchContent;
-  @JsonKey(name: 'match_subject')
-  final String? matchTopic;
+  // TODO(#1663) Add matchContent and matchTopic back again;
+  //   revert the commit that removed these and related test/comment changes.
 
   static MessageEditState _messageEditStateFromJson(Object? json) {
     // This is a no-op so that [MessageEditState._readFromMessage]
@@ -912,8 +911,6 @@ sealed class Message<T extends Conversation> extends MessageBase<T> {
     required this.senderRealmStr,
     required super.timestamp,
     required this.flags,
-    required this.matchContent,
-    required this.matchTopic,
   });
 
   // TODO(dart): This has to be a static method, because factories/constructors
@@ -997,8 +994,6 @@ class StreamMessage extends Message<StreamConversation> {
     required super.senderRealmStr,
     required super.timestamp,
     required super.flags,
-    required super.matchContent,
-    required super.matchTopic,
     required this.conversation,
   });
 
@@ -1059,8 +1054,6 @@ class DmMessage extends Message<DmConversation> {
     required super.senderRealmStr,
     required super.timestamp,
     required super.flags,
-    required super.matchContent,
-    required super.matchTopic,
     required this.conversation,
   });
 

lib/api/model/model.g.dart

@@ -69,8 +69,6 @@ extension MessageChecks on Subject<Message> {
   Subject<Poll?> get poll => has((e) => e.poll, 'poll');
   Subject<String> get type => has((e) => e.type, 'type');
   Subject<List<MessageFlag>> get flags => has((e) => e.flags, 'flags');
-  Subject<String?> get matchContent => has((e) => e.matchContent, 'matchContent');
-  Subject<String?> get matchTopic => has((e) => e.matchTopic, 'matchTopic');
 }
 
 extension StreamMessageChecks on Subject<StreamMessage> {

test/api/model/model_checks.dart

@@ -93,13 +93,6 @@ void main() {
         .topic.equals(const TopicName('hello'));
     });
 
-    test('match_subject -> matchTopic', () {
-      check(baseStreamJson()).not((it) => it.containsKey('match_topic'));
-      check(Message.fromJson(baseStreamJson()
-        ..['match_subject'] = 'yo'
-      )).matchTopic.equals('yo');
-    });
-
     test('no crash on unrecognized flag', () {
       final m1 = Message.fromJson(
         (deepToJson(eg.streamMessage()) as Map<String, dynamic>)