Set lastVisibleRowId on threads and wasRead on messages when restoring

signalapp · Nov 1, 2024 · 03d9cc0 · 03d9cc0
1 parent 2a88f9e
commit 03d9cc0
Show file tree

Hide file tree

Showing 15 changed files with 270 additions and 17 deletions.
diff --git a/SignalServiceKit/Environment/AppSetup.swift b/SignalServiceKit/Environment/AppSetup.swift
@@ -1136,6 +1136,7 @@ public class AppSetup {
             plaintextStreamProvider: MessageBackupPlaintextProtoStreamProviderImpl(),
             postFrameRestoreActionManager: MessageBackupPostFrameRestoreActionManager(
                 interactionStore: backupInteractionStore,
+                lastVisibleInteractionStore: lastVisibleInteractionStore,
                 recipientDatabaseTable: recipientDatabaseTable,
                 sskPreferences: MessageBackupPostFrameRestoreActionManager.Wrappers.SSKPreferences(),
                 threadStore: backupThreadStore

diff --git a/SignalServiceKit/MessageBackup/Archivers/Chat/ChatContexts.swift b/SignalServiceKit/MessageBackup/Archivers/Chat/ChatContexts.swift
@@ -213,6 +213,7 @@ extension MessageBackup {
         public struct PostFrameRestoreActions {
             var isPinned: Bool
             var lastVisibleInteractionRowId: Int64?
+            var hadAnyUnreadMessages: Bool = false
 
             var shouldBeMarkedVisible: Bool {
                 isPinned || lastVisibleInteractionRowId != nil
@@ -234,6 +235,7 @@ extension MessageBackup {
 
         func updateLastVisibleInteractionRowId(
             interactionRowId: Int64,
+            wasRead: Bool,
             chatId: ChatId
         ) {
             var actions = postFrameRestoreActions[chatId] ?? .default
@@ -245,6 +247,7 @@ extension MessageBackup {
             {
                 actions.lastVisibleInteractionRowId = interactionRowId
             }
+            actions.hadAnyUnreadMessages = actions.hadAnyUnreadMessages || !wasRead
             postFrameRestoreActions[chatId] = actions
         }
     }

diff --git a/...geBackup/Archivers/ChatItem/ChatUpdateMessages/Calls/MessageBackupGroupCallArchiver.swift b/...geBackup/Archivers/ChatItem/ChatUpdateMessages/Calls/MessageBackupGroupCallArchiver.swift
@@ -147,11 +147,20 @@ final class MessageBackupGroupCallArchiver {
             thread: groupThread,
             sentAtTimestamp: chatItem.dateSent
         )
+
+        guard let directionalDetails = chatItem.directionalDetails else {
+            return .messageFailure([.restoreFrameError(
+                .invalidProtoData(.chatItemMissingDirectionalDetails),
+                chatItem.id
+            )])
+        }
+
         do {
             try interactionStore.insert(
                 groupCallInteraction,
                 in: chatThread,
                 chatId: chatItem.typedChatId,
+                directionalDetails: directionalDetails,
                 context: context
             )
         } catch let error {

diff --git a/...kup/Archivers/ChatItem/ChatUpdateMessages/Calls/MessageBackupIndividualCallArchiver.swift b/...kup/Archivers/ChatItem/ChatUpdateMessages/Calls/MessageBackupIndividualCallArchiver.swift
@@ -188,11 +188,20 @@ final class MessageBackupIndividualCallArchiver {
             thread: contactThread,
             sentAtTimestamp: chatItem.dateSent
         )
+
+        guard let directionalDetails = chatItem.directionalDetails else {
+            return .messageFailure([.restoreFrameError(
+                .invalidProtoData(.chatItemMissingDirectionalDetails),
+                chatItem.id
+            )])
+        }
+
         do {
             try interactionStore.insert(
                 individualCallInteraction,
                 in: chatThread,
                 chatId: chatItem.typedChatId,
+                directionalDetails: directionalDetails,
                 context: context
             )
         } catch let error {

diff --git a/...rs/ChatItem/ChatUpdateMessages/GroupUpdates/MessageBackupGroupUpdateMessageArchiver.swift b/...rs/ChatItem/ChatUpdateMessages/GroupUpdates/MessageBackupGroupUpdateMessageArchiver.swift
@@ -223,11 +223,20 @@ final class MessageBackupGroupUpdateMessageArchiver {
             groupThread: groupThread,
             updateItems: persistableUpdates
         )
+
+        guard let directionalDetails = chatItem.directionalDetails else {
+            return .messageFailure([.restoreFrameError(
+                .invalidProtoData(.chatItemMissingDirectionalDetails),
+                chatItem.id
+            )])
+        }
+
         do {
             try interactionStore.insert(
                 infoMessage,
                 in: chatThread,
                 chatId: chatItem.typedChatId,
+                directionalDetails: directionalDetails,
                 context: context
             )
         } catch let error {

diff --git a/...rchivers/ChatItem/ChatUpdateMessages/MessageBackupExpirationTimerChatUpdateArchiver.swift b/...rchivers/ChatItem/ChatUpdateMessages/MessageBackupExpirationTimerChatUpdateArchiver.swift
@@ -144,11 +144,17 @@ final class MessageBackupExpirationTimerChatUpdateArchiver {
             configurationDurationSeconds: UInt32(clamping: expiresInSeconds), // Safe to clamp, we checked for overflow above
             createdByRemoteName: createdByRemoteName
         )
+
+        guard let directionalDetails = chatItem.directionalDetails else {
+            return invalidProtoData(.chatItemMissingDirectionalDetails)
+        }
+
         do {
             try interactionStore.insert(
                 dmUpdateInfoMessage,
                 in: chatThread,
                 chatId: chatItem.typedChatId,
+                directionalDetails: directionalDetails,
                 context: context
             )
         } catch let error {

diff --git a/...Archivers/ChatItem/ChatUpdateMessages/MessageBackupLearnedProfileChatUpdateArchiver.swift b/...Archivers/ChatItem/ChatUpdateMessages/MessageBackupLearnedProfileChatUpdateArchiver.swift
@@ -112,11 +112,20 @@ final class MessageBackupLearnedProfileChatUpdateArchiver {
             timestamp: chatItem.dateSent,
             displayNameBefore: displayNameBefore
         )
+
+        guard let directionalDetails = chatItem.directionalDetails else {
+            return .messageFailure([.restoreFrameError(
+                .invalidProtoData(.chatItemMissingDirectionalDetails),
+                chatItem.id
+            )])
+        }
+
         do {
             try interactionStore.insert(
                 learnedProfileKeyInfoMessage,
                 in: chatThread,
                 chatId: chatItem.typedChatId,
+                directionalDetails: directionalDetails,
                 context: context
             )
         } catch let error {

diff --git a/.../Archivers/ChatItem/ChatUpdateMessages/MessageBackupProfileChangeChatUpdateArchiver.swift b/.../Archivers/ChatItem/ChatUpdateMessages/MessageBackupProfileChangeChatUpdateArchiver.swift
@@ -114,11 +114,19 @@ final class MessageBackupProfileChangeChatUpdateArchiver {
             )
         )
 
+        guard let directionalDetails = chatItem.directionalDetails else {
+            return .messageFailure([.restoreFrameError(
+                .invalidProtoData(.chatItemMissingDirectionalDetails),
+                chatItem.id
+            )])
+        }
+
         do {
             try interactionStore.insert(
                 profileChangeInfoMessage,
                 in: chatThread,
                 chatId: chatItem.typedChatId,
+                directionalDetails: directionalDetails,
                 context: context
             )
         } catch let error {

diff --git a/...hivers/ChatItem/ChatUpdateMessages/MessageBackupSessionSwitchoverChatUpdateArchiver.swift b/...hivers/ChatItem/ChatUpdateMessages/MessageBackupSessionSwitchoverChatUpdateArchiver.swift
@@ -103,11 +103,19 @@ final class MessageBackupSessionSwitchoverChatUpdateArchiver {
             phoneNumber: e164.stringValue
         )
 
+        guard let directionalDetails = chatItem.directionalDetails else {
+            return .messageFailure([.restoreFrameError(
+                .invalidProtoData(.chatItemMissingDirectionalDetails),
+                chatItem.id
+            )])
+        }
+
         do {
             try interactionStore.insert(
                 sessionSwitchoverInfoMessage,
                 in: chatThread,
                 chatId: chatItem.typedChatId,
+                directionalDetails: directionalDetails,
                 context: context
             )
         } catch let error {

diff --git a/...eBackup/Archivers/ChatItem/ChatUpdateMessages/MessageBackupSimpleChatUpdateArchiver.swift b/...eBackup/Archivers/ChatItem/ChatUpdateMessages/MessageBackupSimpleChatUpdateArchiver.swift
@@ -564,28 +564,55 @@ final class MessageBackupSimpleChatUpdateArchiver {
             simpleChatUpdateInteraction = .simpleInfoMessage(.acceptedMessageRequest)
         }
 
-        let interactionToInsert: TSInteraction = switch simpleChatUpdateInteraction {
+        guard let directionalDetails = chatItem.directionalDetails else {
+            return .messageFailure([.restoreFrameError(
+                .invalidProtoData(.chatItemMissingDirectionalDetails),
+                chatItem.id
+            )])
+        }
+
+        switch simpleChatUpdateInteraction {
         case .simpleInfoMessage(let infoMessageType):
-            TSInfoMessage(
+            let infoMessage = TSInfoMessage(
                 thread: thread,
                 messageType: infoMessageType,
                 timestamp: chatItem.dateSent
             )
+            do {
+                try interactionStore.insert(
+                    infoMessage,
+                    in: chatThread,
+                    chatId: chatItem.typedChatId,
+                    directionalDetails: directionalDetails,
+                    context: context
+                )
+            } catch let error {
+                return .messageFailure([.restoreFrameError(.databaseInsertionFailed(error), chatItem.id)])
+            }
         case .prebuiltInfoMessage(let infoMessage):
-            infoMessage
+            do {
+                try interactionStore.insert(
+                    infoMessage,
+                    in: chatThread,
+                    chatId: chatItem.typedChatId,
+                    directionalDetails: directionalDetails,
+                    context: context
+                )
+            } catch let error {
+                return .messageFailure([.restoreFrameError(.databaseInsertionFailed(error), chatItem.id)])
+            }
         case .errorMessage(let errorMessage):
-            errorMessage
-        }
-
-        do {
-            try interactionStore.insert(
-                interactionToInsert,
-                in: chatThread,
-                chatId: chatItem.typedChatId,
-                context: context
-            )
-        } catch let error {
-            return .messageFailure([.restoreFrameError(.databaseInsertionFailed(error), chatItem.id)])
+            do {
+                try interactionStore.insert(
+                    errorMessage,
+                    in: chatThread,
+                    chatId: chatItem.typedChatId,
+                    directionalDetails: directionalDetails,
+                    context: context
+                )
+            } catch let error {
+                return .messageFailure([.restoreFrameError(.databaseInsertionFailed(error), chatItem.id)])
+            }
         }
 
         return .success(())

diff --git a/...up/Archivers/ChatItem/ChatUpdateMessages/MessageBackupThreadMergeChatUpdateArchiver.swift b/...up/Archivers/ChatItem/ChatUpdateMessages/MessageBackupThreadMergeChatUpdateArchiver.swift
@@ -103,11 +103,19 @@ final class MessageBackupThreadMergeChatUpdateArchiver {
             previousE164: previousE164.stringValue
         )
 
+        guard let directionalDetails = chatItem.directionalDetails else {
+            return .messageFailure([.restoreFrameError(
+                .invalidProtoData(.chatItemMissingDirectionalDetails),
+                chatItem.id
+            )])
+        }
+
         do {
             try interactionStore.insert(
                 threadMergeInfoMessage,
                 in: chatThread,
                 chatId: chatItem.typedChatId,
+                directionalDetails: directionalDetails,
                 context: context
             )
         } catch let error {