handle text and media server messages, update pushkeys

Author: otsmr

ios/NotificationService/push_notification.pb.swift

@@ -128,8 +128,8 @@ struct PushNotification: Sendable {
 
   var kind: PushKind = .reaction
 
-  var messageID: Int64 {
-    get {return _messageID ?? 0}
+  var messageID: String {
+    get {return _messageID ?? String()}
     set {_messageID = newValue}
   }
   /// Returns true if `messageID` has been explicitly set.
@@ -150,7 +150,7 @@ struct PushNotification: Sendable {
 
   init() {}
 
-  fileprivate var _messageID: Int64? = nil
+  fileprivate var _messageID: String? = nil
   fileprivate var _reactionContent: String? = nil
 }
 
@@ -177,8 +177,8 @@ struct PushUser: Sendable {
 
   var blocked: Bool = false
 
-  var lastMessageID: Int64 {
-    get {return _lastMessageID ?? 0}
+  var lastMessageID: String {
+    get {return _lastMessageID ?? String()}
     set {_lastMessageID = newValue}
   }
   /// Returns true if `lastMessageID` has been explicitly set.
@@ -192,7 +192,7 @@ struct PushUser: Sendable {
 
   init() {}
 
-  fileprivate var _lastMessageID: Int64? = nil
+  fileprivate var _lastMessageID: String? = nil
 }
 
 struct PushKey: Sendable {
@@ -273,7 +273,7 @@ extension PushNotification: SwiftProtobuf.Message, SwiftProtobuf._MessageImpleme
       // enabled. https://github.com/apple/swift-protobuf/issues/1034
       switch fieldNumber {
       case 1: try { try decoder.decodeSingularEnumField(value: &self.kind) }()
-      case 2: try { try decoder.decodeSingularInt64Field(value: &self._messageID) }()
+      case 2: try { try decoder.decodeSingularStringField(value: &self._messageID) }()
       case 3: try { try decoder.decodeSingularStringField(value: &self._reactionContent) }()
       default: break
       }
@@ -289,7 +289,7 @@ extension PushNotification: SwiftProtobuf.Message, SwiftProtobuf._MessageImpleme
       try visitor.visitSingularEnumField(value: self.kind, fieldNumber: 1)
     }
     try { if let v = self._messageID {
-      try visitor.visitSingularInt64Field(value: v, fieldNumber: 2)
+      try visitor.visitSingularStringField(value: v, fieldNumber: 2)
     } }()
     try { if let v = self._reactionContent {
       try visitor.visitSingularStringField(value: v, fieldNumber: 3)
@@ -349,7 +349,7 @@ extension PushUser: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationB
       case 1: try { try decoder.decodeSingularInt64Field(value: &self.userID) }()
       case 2: try { try decoder.decodeSingularStringField(value: &self.displayName) }()
       case 3: try { try decoder.decodeSingularBoolField(value: &self.blocked) }()
-      case 4: try { try decoder.decodeSingularInt64Field(value: &self._lastMessageID) }()
+      case 4: try { try decoder.decodeSingularStringField(value: &self._lastMessageID) }()
       case 5: try { try decoder.decodeRepeatedMessageField(value: &self.pushKeys) }()
       default: break
       }
@@ -371,7 +371,7 @@ extension PushUser: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationB
       try visitor.visitSingularBoolField(value: self.blocked, fieldNumber: 3)
     }
     try { if let v = self._lastMessageID {
-      try visitor.visitSingularInt64Field(value: v, fieldNumber: 4)
+      try visitor.visitSingularStringField(value: v, fieldNumber: 4)
     } }()
     if !self.pushKeys.isEmpty {
       try visitor.visitRepeatedMessageField(value: self.pushKeys, fieldNumber: 5)

lib/src/constants/secure_storage_keys.dart

@@ -6,6 +6,6 @@ class SecureStorageKeys {
   static const String userData = 'userData';
   static const String twonlySafeLastBackupHash = 'twonly_safe_last_backup_hash';
 
-  static const String receivingPushKeys = 'receiving_push_keys';
-  static const String sendingPushKeys = 'sending_push_keys';
+  static const String receivingPushKeys = 'push_keys_receiving';
+  static const String sendingPushKeys = 'push_keys_sending';
 }

lib/src/database/daos/contacts.dao.dart

@@ -120,10 +120,7 @@ class ContactsDao extends DatabaseAccessor<TwonlyDB> with _$ContactsDaoMixin {
   Stream<List<Contact>> watchNotAcceptedContacts() {
     return (select(contacts)
           ..where(
-            (t) =>
-                t.accepted.equals(false) &
-                t.archived.equals(false) &
-                t.blocked.equals(false),
+            (t) => t.accepted.equals(false) & t.blocked.equals(false),
           ))
         .watch();
     // return (select(contacts)).watch();

lib/src/database/daos/groups.dao.dart

@@ -12,10 +12,18 @@ class GroupsDao extends DatabaseAccessor<TwonlyDB> with _$GroupsDaoMixin {
   GroupsDao(super.db);
 
   Future<bool> isContactInGroup(int contactId, String groupId) async {
-    final entry = await (select(groupMembers)
-          ..where(
-              (t) => t.contactId.equals(contactId) & t.groupId.equals(groupId)))
+    final entry = await (select(groupMembers)..where(
+            // ignore: require_trailing_commas
+            (t) => t.contactId.equals(contactId) & t.groupId.equals(groupId)))
         .getSingleOrNull();
     return entry != null;
   }
+
+  Future<void> updateGroup(
+    String groupId,
+    GroupsCompanion updates,
+  ) async {
+    await (update(groups)..where((c) => c.groupId.equals(groupId)))
+        .write(updates);
+  }
 }

lib/src/database/daos/mediafiles.dao.dart

@@ -0,0 +1,54 @@
+import 'package:drift/drift.dart';
+import 'package:twonly/src/database/tables/mediafiles.table.dart';
+import 'package:twonly/src/database/twonly.db.dart';
+import 'package:twonly/src/utils/log.dart';
+
+part 'mediafiles.dao.g.dart';
+
+@DriftAccessor(tables: [MediaFiles])
+class MediaFilesDao extends DatabaseAccessor<TwonlyDB>
+    with _$MediaFilesDaoMixin {
+  // this constructor is required so that the main database can create an instance
+  // of this object.
+  // ignore: matching_super_parameters
+  MediaFilesDao(super.db);
+
+  Future<MediaFile?> insertMedia(MediaFilesCompanion mediaFile) async {
+    try {
+      final rowId = await into(mediaFiles).insert(mediaFile);
+
+      return await (select(mediaFiles)..where((t) => t.rowId.equals(rowId)))
+          .getSingle();
+    } catch (e) {
+      Log.error('Could not insert media file: $e');
+      return null;
+    }
+  }
+
+  Future<void> updateMedia(
+    String mediaId,
+    MediaFilesCompanion updates,
+  ) async {
+    await (update(mediaFiles)..where((c) => c.mediaId.equals(mediaId)))
+        .write(updates);
+  }
+
+  Future<MediaFile?> getMediaFileById(String mediaId) async {
+    return (select(mediaFiles)..where((t) => t.mediaId.equals(mediaId)))
+        .getSingleOrNull();
+  }
+
+  Future<void> resetPendingDownloadState() async {
+    await (update(mediaFiles)
+          ..where(
+            (c) => c.downloadState.equals(
+              DownloadState.downloading.name,
+            ),
+          ))
+        .write(
+      const MediaFilesCompanion(
+        downloadState: Value(DownloadState.pending),
+      ),
+    );
+  }
+}

lib/src/database/daos/mediafiles.dao.g.dart

@@ -1,13 +1,24 @@
 import 'package:drift/drift.dart';
+import 'package:twonly/globals.dart';
 import 'package:twonly/src/database/tables/contacts.table.dart';
+import 'package:twonly/src/database/tables/groups.table.dart';
 import 'package:twonly/src/database/tables/mediafiles.table.dart';
 import 'package:twonly/src/database/tables/messages.table.dart';
 import 'package:twonly/src/database/twonly.db.dart';
 import 'package:twonly/src/services/mediafile.service.dart';
+import 'package:twonly/src/utils/log.dart';
 
 part 'messages.dao.g.dart';
 
-@DriftAccessor(tables: [Messages, Contacts, MediaFiles, MessageHistories])
+@DriftAccessor(
+  tables: [
+    Messages,
+    Contacts,
+    MediaFiles,
+    MessageHistories,
+    Groups,
+  ],
+)
 class MessagesDao extends DatabaseAccessor<TwonlyDB> with _$MessagesDaoMixin {
   // this constructor is required so that the main database can create an instance
   // of this object.
@@ -156,22 +167,6 @@ class MessagesDao extends DatabaseAccessor<TwonlyDB> with _$MessagesDaoMixin {
   //       .write(updates);
   // }
 
-  // Future<void> resetPendingDownloadState() {
-  //   // All media files in the downloading state are reset to the pending state
-  //   // When the app is used in mobile network, they will not be downloaded at the start
-  //   // if they are not yet downloaded...
-  //   const updates =
-  //       MessagesCompanion(downloadState: Value(DownloadState.pending));
-  //   return (update(messages)
-  //         ..where(
-  //           (t) =>
-  //               t.messageOtherId.isNotNull() &
-  //               t.downloadState.equals(DownloadState.downloading.index) &
-  //               t.kind.equals(MessageKind.media.name),
-  //         ))
-  //       .write(updates);
-  // }
-
   Future<void> handleMessageDeletion(
     int contactId,
     String messageId,
@@ -278,28 +273,33 @@ class MessagesDao extends DatabaseAccessor<TwonlyDB> with _$MessagesDaoMixin {
   //       .write(updatedValues);
   // }
 
-  // Future<void> updateMessageByMessageId(
-  //   int messageId,
-  //   MessagesCompanion updatedValues,
-  // ) {
-  //   return (update(messages)..where((c) => c.messageId.equals(messageId)))
-  //       .write(updatedValues);
-  // }
+  Future<void> updateMessageId(
+    String messageId,
+    MessagesCompanion updatedValues,
+  ) {
+    return (update(messages)..where((c) => c.messageId.equals(messageId)))
+        .write(updatedValues);
+  }
 
-  // Future<int?> insertMessage(MessagesCompanion message) async {
-  //   try {
-  //     await (update(contacts)
-  //           ..where(
-  //             (c) => c.userId.equals(message.contactId.value),
-  //           ))
-  //         .write(ContactsCompanion(lastMessageExchange: Value(DateTime.now())));
-
-  //     return await into(messages).insert(message);
-  //   } catch (e) {
-  //     Log.error('Error while inserting message: $e');
-  //     return null;
-  //   }
-  // }
+  Future<Message?> insertMessage(MessagesCompanion message) async {
+    try {
+      final rowId = await into(messages).insert(message);
+
+      await twonlyDB.groupsDao.updateGroup(
+        message.groupId.value,
+        GroupsCompanion(
+          lastMessageExchange: Value(DateTime.now()),
+          archived: const Value(false),
+        ),
+      );
+
+      return await (select(messages)..where((t) => t.rowId.equals(rowId)))
+          .getSingle();
+    } catch (e) {
+      Log.error('Could not insert message: $e');
+      return null;
+    }
+  }
 
   // Future<void> deleteMessagesByContactId(int contactId) {
   //   return (delete(messages)

lib/src/database/daos/messages.dao.dart

@@ -31,11 +31,13 @@ class ReactionsDao extends DatabaseAccessor<TwonlyDB> with _$ReactionsDaoMixin {
             ))
           .go();
       if (emoji != null) {
-        await into(reactions).insert(ReactionsCompanion(
-          messageId: Value(messageId),
-          emoji: Value(emoji),
-          senderId: Value(contactId),
-        ));
+        await into(reactions).insert(
+          ReactionsCompanion(
+            messageId: Value(messageId),
+            emoji: Value(emoji),
+            senderId: Value(contactId),
+          ),
+        );
       }
     } catch (e) {
       Log.error(e);

lib/src/database/daos/messages.dao.g.dart

@@ -15,8 +15,10 @@ class ReceiptsDao extends DatabaseAccessor<TwonlyDB> with _$ReceiptsDaoMixin {
 
   Future<void> confirmReceipt(String receiptId, int fromUserId) async {
     final receipt = await (select(receipts)
-          ..where((t) =>
-              t.receiptId.equals(receiptId) & t.contactId.equals(fromUserId)))
+          ..where(
+            (t) =>
+                t.receiptId.equals(receiptId) & t.contactId.equals(fromUserId),
+          ))
         .getSingleOrNull();
 
     if (receipt == null) return;
@@ -26,7 +28,7 @@ class ReceiptsDao extends DatabaseAccessor<TwonlyDB> with _$ReceiptsDaoMixin {
             ..where((t) => t.messageId.equals(receipt.messageId!)))
           .write(
         const MessagesCompanion(
-          acknowledgeByUser: Value(true),
+          ackByUser: Value(true),
         ),
       );
     }
@@ -39,6 +41,14 @@ class ReceiptsDao extends DatabaseAccessor<TwonlyDB> with _$ReceiptsDaoMixin {
         .go();
   }
 
+  Future<void> deleteReceipt(String receiptId) async {
+    await (delete(receipts)
+          ..where(
+            (t) => t.receiptId.equals(receiptId),
+          ))
+        .go();
+  }
+
   Future<Receipt?> insertReceipt(ReceiptsCompanion entry) async {
     try {
       final id = await into(receipts).insert(entry);
@@ -49,4 +59,33 @@ class ReceiptsDao extends DatabaseAccessor<TwonlyDB> with _$ReceiptsDaoMixin {
       return null;
     }
   }
+
+  Future<Receipt?> getReceiptById(String receiptId) async {
+    try {
+      return await (select(receipts)
+            ..where(
+              (t) => t.receiptId.equals(receiptId),
+            ))
+          .getSingleOrNull();
+    } catch (e) {
+      Log.error(e);
+      return null;
+    }
+  }
+
+  Future<List<Receipt>> getReceiptsNotAckByServer() async {
+    return (select(receipts)
+          ..where(
+            (t) => t.ackByServerAt.isNull(),
+          ))
+        .get();
+  }
+
+  Future<void> updateReceipt(
+    String receiptId,
+    ReceiptsCompanion updates,
+  ) async {
+    await (update(receipts)..where((c) => c.receiptId.equals(receiptId)))
+        .write(updates);
+  }
 }