From 2756d484b3cde0085ee2442159c642638f02385c Mon Sep 17 00:00:00 2001
From: Ed Geraghty <ed@geraghty.london>
Date: Sun, 10 Apr 2022 18:57:35 +0100
Subject: [PATCH] Revert "feature: add the beginnings of self_destruct_after
 field handling"

This reverts commit 2e7d96539171e62dbcf8a4756c85f0bac9457a96.
---
 lib/store/events/messages/formatters.dart |  7 +------
 lib/store/events/messages/model.dart      | 10 ----------
 2 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/lib/store/events/messages/formatters.dart b/lib/store/events/messages/formatters.dart
index 1d7471516..54add392c 100644
--- a/lib/store/events/messages/formatters.dart
+++ b/lib/store/events/messages/formatters.dart
@@ -32,8 +32,6 @@ Future<Message> formatMessageContent({
   EncryptInfo? info = const EncryptInfo(),
   File? file,
 }) async {
-  final timestamp = DateTime.now().millisecondsSinceEpoch;
-
   final formatted = Message(
     id: tempId,
     url: message.url,
@@ -41,10 +39,7 @@ Future<Message> formatMessageContent({
     type: message.type,
     sender: userId,
     roomId: room.id,
-    timestamp: timestamp,
-    selfDestructAfter: (room.ephemeralMessagesTimer! > 0)
-                          ? timestamp + (room.ephemeralMessagesTimer ?? 0)
-                          : 0,
+    timestamp: DateTime.now().millisecondsSinceEpoch,
     pending: true,
     syncing: true,
   );
diff --git a/lib/store/events/messages/model.dart b/lib/store/events/messages/model.dart
index c1a4d8164..733ce9e66 100644
--- a/lib/store/events/messages/model.dart
+++ b/lib/store/events/messages/model.dart
@@ -32,8 +32,6 @@ class Message extends Event implements drift.Insertable<Message> {
   // Message timestamps
   @JsonKey(defaultValue: 0)
   final int received;
-  @JsonKey(defaultValue: 0)
-  final int selfDestructAfter;
 
   // Message Only
   final String? body;
@@ -78,7 +76,6 @@ class Message extends Event implements drift.Insertable<Message> {
     this.info,
     this.formattedBody,
     this.received = 0,
-    this.selfDestructAfter = 0,
     this.ciphertext,
     this.senderKey,
     this.deviceId,
@@ -124,7 +121,6 @@ class Message extends Event implements drift.Insertable<Message> {
     bool? edited,
     int? timestamp,
     int? received,
-    int? selfDestructAfter,
     String? body,
     String? typeDecrypted, // inner type of decrypted event
     String? msgtype,
@@ -161,7 +157,6 @@ class Message extends Event implements drift.Insertable<Message> {
         url: url ?? this.url,
         info: info ?? this.info,
         received: received ?? this.received,
-        selfDestructAfter: selfDestructAfter ?? this.selfDestructAfter,
         ciphertext: ciphertext ?? this.ciphertext,
         senderKey: senderKey ?? this.senderKey,
         deviceId: deviceId ?? this.deviceId,
@@ -196,7 +191,6 @@ class Message extends Event implements drift.Insertable<Message> {
       edited: drift.Value(edited),
       timestamp: drift.Value(timestamp),
       received: drift.Value(received),
-      selfDestructAfter: drift.Value(selfDestructAfter),
       body: drift.Value(body),
       msgtype: drift.Value(msgtype),
       format: drift.Value(format),
@@ -250,9 +244,6 @@ class Message extends Event implements drift.Insertable<Message> {
         }
       }
 
-      // see https://github.com/matrix-org/synapse/pull/6409#issuecomment-585722447
-      final selfDestructAfter = content['org.matrix.self_destruct_after'] ?? 0;
-
       return Message(
         id: event.id,
         userId: event.userId,
@@ -280,7 +271,6 @@ class Message extends Event implements drift.Insertable<Message> {
         replacement: replacement,
         relatedEventId: relatedEventId,
         received: DateTime.now().millisecondsSinceEpoch,
-        selfDestructAfter: selfDestructAfter,
         failed: false,
         pending: false,
         syncing: false,