[WIP] Initial Session Pro Integration, Query Refactoring and Bug Fixes

Session.xcodeproj/xcshareddata/xcschemes/Session_CompileLibSession.xcscheme

@@ -52,7 +52,6 @@
       buildConfiguration = "Debug_Compile_LibSession"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      enableAddressSanitizer = "YES"
       enableASanStackUseAfterReturn = "YES"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"

Session/Calls/Call Management/SessionCall.swift

@@ -218,7 +218,9 @@ public final class SessionCall: CurrentCallProtocol, WebRTCSessionDelegate {
 
         let webRTCSession: WebRTCSession = self.webRTCSession
         let timestampMs: Int64 = dependencies[cache: .snodeAPI].currentOffsetTimestampMs()
-        let disappearingMessagesConfiguration = try? thread.disappearingMessagesConfiguration.fetchOne(db)?.forcedWithDisappearAfterReadIfNeeded()
+        let disappearingMessagesConfiguration = try? DisappearingMessagesConfiguration
+            .fetchOne(db, id: thread.id)?
+            .forcedWithDisappearAfterReadIfNeeded()
         let message: CallMessage = CallMessage(
             uuid: self.uuid,
             kind: .preOffer,
@@ -248,7 +250,7 @@ public final class SessionCall: CurrentCallProtocol, WebRTCSessionDelegate {
                 message: message,
                 threadId: thread.id,
                 interactionId: interaction?.id,
-                authMethod: try Authentication.with(db, swarmPublicKey: thread.id, using: dependencies)
+                authMethod: try Authentication.with(swarmPublicKey: thread.id, using: dependencies)
             )
             .retry(5)
             // Start the timeout timer for the call

Session/Calls/Call Management/SessionCallManager.swift

@@ -209,11 +209,7 @@ public final class SessionCallManager: NSObject, CallManagerProtocol {
             let call: SessionCall = dependencies[singleton: .storage].read({ [dependencies] db in
                 SessionCall(
                     for: caller,
-                    contactName: Profile.displayName(
-                        db,
-                        id: caller,
-                        threadVariant: .contact
-                    ),
+                    contactName: Profile.displayName(db, id: caller),
                     uuid: uuid,
                     mode: mode,
                     using: dependencies
@@ -235,7 +231,7 @@ public final class SessionCallManager: NSObject, CallManagerProtocol {
 
                 if
                     let conversationVC: ConversationVC = currentFrontMostViewController as? ConversationVC,
-                    conversationVC.viewModel.threadData.threadId == call.sessionId
+                    conversationVC.viewModel.state.threadId == call.sessionId
                 {
                     let callVC = CallVC(for: call, using: dependencies)
                     currentFrontMostViewController.present(callVC, animated: true, completion: nil)

Session/Calls/WebRTC/WebRTCSession.swift

@@ -181,14 +181,11 @@ public final class WebRTCSession: NSObject, RTCPeerConnectionDelegate {
                     }
 
                     dependencies[singleton: .storage]
-                        .writePublisher { db -> (AuthenticationMethod, DisappearingMessagesConfiguration?) in
-                            (
-                                try Authentication.with(db, swarmPublicKey: thread.id, using: dependencies),
-                                try DisappearingMessagesConfiguration.fetchOne(db, id: thread.id)
-                            )
+                        .writePublisher { db -> DisappearingMessagesConfiguration? in
+                            try DisappearingMessagesConfiguration.fetchOne(db, id: thread.id)
                         }
                         .subscribe(on: DispatchQueue.global(qos: .userInitiated))
-                        .tryFlatMap { authMethod, disappearingMessagesConfiguration in
+                        .tryFlatMap { disappearingMessagesConfiguration in
                             try MessageSender.preparedSend(
                                 message: CallMessage(
                                     uuid: uuid,
@@ -201,7 +198,10 @@ public final class WebRTCSession: NSObject, RTCPeerConnectionDelegate {
                                 namespace: .default,
                                 interactionId: nil,
                                 attachments: nil,
-                                authMethod: authMethod,
+                                authMethod: try Authentication.with(
+                                    swarmPublicKey: thread.id,
+                                    using: dependencies
+                                ),
                                 onEvent: MessageSender.standardEventHandling(using: dependencies),
                                 using: dependencies
                             ).send(using: dependencies)
@@ -226,7 +226,7 @@ public final class WebRTCSession: NSObject, RTCPeerConnectionDelegate {
         let mediaConstraints: RTCMediaConstraints = mediaConstraints(false)
 
         return dependencies[singleton: .storage]
-            .readPublisher { [dependencies] db -> (AuthenticationMethod, DisappearingMessagesConfiguration?) in
+            .readPublisher { db -> DisappearingMessagesConfiguration? in
                 /// Ensure a thread exists for the `sessionId` and that it's a `contact` thread
                 guard
                     SessionThread
@@ -235,12 +235,9 @@ public final class WebRTCSession: NSObject, RTCPeerConnectionDelegate {
                         .isNotEmpty(db)
                 else { throw WebRTCSessionError.noThread }
 
-                return (
-                    try Authentication.with(db, swarmPublicKey: sessionId, using: dependencies),
-                    try DisappearingMessagesConfiguration.fetchOne(db, id: sessionId)
-                )
+                return try DisappearingMessagesConfiguration.fetchOne(db, id: sessionId)
             }
-            .flatMap { [weak self, dependencies] authMethod, disappearingMessagesConfiguration in
+            .flatMap { [weak self, dependencies] disappearingMessagesConfiguration in
                 Future<Void, Error> { resolver in
                     self?.peerConnection?.answer(for: mediaConstraints) { [weak self] sdp, error in
                         if let error = error {
@@ -271,7 +268,10 @@ public final class WebRTCSession: NSObject, RTCPeerConnectionDelegate {
                                 namespace: .default,
                                 interactionId: nil,
                                 attachments: nil,
-                                authMethod: authMethod,
+                                authMethod: try Authentication.with(
+                                    swarmPublicKey: sessionId,
+                                    using: dependencies
+                                ),
                                 onEvent: MessageSender.standardEventHandling(using: dependencies),
                                 using: dependencies
                             )
@@ -313,7 +313,7 @@ public final class WebRTCSession: NSObject, RTCPeerConnectionDelegate {
         self.queuedICECandidates.removeAll()
 
         return dependencies[singleton: .storage]
-            .readPublisher { [dependencies] db -> (AuthenticationMethod, DisappearingMessagesConfiguration?) in
+            .readPublisher { db -> DisappearingMessagesConfiguration? in
                 /// Ensure a thread exists for the `sessionId` and that it's a `contact` thread
                 guard
                     SessionThread
@@ -322,13 +322,10 @@ public final class WebRTCSession: NSObject, RTCPeerConnectionDelegate {
                         .isNotEmpty(db)
                 else { throw WebRTCSessionError.noThread }
 
-                return (
-                    try Authentication.with(db, swarmPublicKey: contactSessionId, using: dependencies),
-                    try DisappearingMessagesConfiguration.fetchOne(db, id: contactSessionId)
-                )
+                return try DisappearingMessagesConfiguration.fetchOne(db, id: contactSessionId)
             }
             .subscribe(on: DispatchQueue.global(qos: .userInitiated))
-            .tryFlatMap { [dependencies] authMethod, disappearingMessagesConfiguration in
+            .tryFlatMap { [dependencies] disappearingMessagesConfiguration in
                 Log.info(.calls, "Batch sending \(candidates.count) ICE candidates.")
 
                 return try MessageSender
@@ -346,7 +343,10 @@ public final class WebRTCSession: NSObject, RTCPeerConnectionDelegate {
                         namespace: .default,
                         interactionId: nil,
                         attachments: nil,
-                        authMethod: authMethod,
+                        authMethod: try Authentication.with(
+                            swarmPublicKey: contactSessionId,
+                            using: dependencies
+                        ),
                         onEvent: MessageSender.standardEventHandling(using: dependencies),
                         using: dependencies
                     )
@@ -368,7 +368,7 @@ public final class WebRTCSession: NSObject, RTCPeerConnectionDelegate {
 
     public func endCall(with sessionId: String) {
         return dependencies[singleton: .storage]
-            .readPublisher { [dependencies] db -> (AuthenticationMethod, DisappearingMessagesConfiguration?) in
+            .readPublisher { db -> DisappearingMessagesConfiguration? in
                 /// Ensure a thread exists for the `sessionId` and that it's a `contact` thread
                 guard
                     SessionThread
@@ -377,13 +377,10 @@ public final class WebRTCSession: NSObject, RTCPeerConnectionDelegate {
                         .isNotEmpty(db)
                 else { throw WebRTCSessionError.noThread }
 
-                return (
-                    try Authentication.with(db, swarmPublicKey: sessionId, using: dependencies),
-                    try DisappearingMessagesConfiguration.fetchOne(db, id: sessionId)
-                )
+                return try DisappearingMessagesConfiguration.fetchOne(db, id: sessionId)
             }
             .subscribe(on: DispatchQueue.global(qos: .userInitiated))
-            .tryFlatMap { [dependencies, uuid] authMethod, disappearingMessagesConfiguration in
+            .tryFlatMap { [dependencies, uuid] disappearingMessagesConfiguration in
                 Log.info(.calls, "Sending end call message.")
 
                 return try MessageSender
@@ -398,7 +395,10 @@ public final class WebRTCSession: NSObject, RTCPeerConnectionDelegate {
                         namespace: .default,
                         interactionId: nil,
                         attachments: nil,
-                        authMethod: authMethod,
+                        authMethod: try Authentication.with(
+                            swarmPublicKey: sessionId,
+                            using: dependencies
+                        ),
                         onEvent: MessageSender.standardEventHandling(using: dependencies),
                         using: dependencies
                     )

Session/Closed Groups/EditGroupViewModel.swift

@@ -302,7 +302,9 @@ class EditGroupViewModel: SessionTableViewModel, NavigatableStateHolder, Observa
                                     identifier: "Contact"
                                 ),
                                 trailingImage: {
-                                    guard (dependencies.mutate(cache: .libSession) { $0.validateProProof(for: memberInfo.profile) }) else { return nil }
+                                    guard memberInfo.profile?.proFeatures.contains(.proBadge) == true else {
+                                        return nil
+                                    }
 
                                     return SessionProBadge.trailingImage(
                                         size: .small,

Session/Closed Groups/NewClosedGroupVC.swift

@@ -439,15 +439,13 @@ final class NewClosedGroupVC: BaseVC, UITableViewDataSource, UITableViewDelegate
                 /// When this is triggered via the "Recreate Group" action for Legacy Groups the screen will have been
                 /// pushed instead of presented and, as a result, we need to dismiss the `activityIndicatorViewController`
                 /// and want the transition to be animated in order to behave nicely
-                await MainActor.run { [weak self, dependencies] in
-                    dependencies[singleton: .app].presentConversationCreatingIfNeeded(
-                        for: thread.id,
-                        variant: thread.variant,
-                        action: .none,
-                        dismissing: (self?.presentingViewController ?? indicator),
-                        animated: (self?.presentingViewController == nil)
-                    )
-                }
+                await dependencies[singleton: .app].presentConversationCreatingIfNeeded(
+                    for: thread.id,
+                    variant: thread.variant,
+                    action: .none,
+                    dismissing: (self.presentingViewController ?? indicator),
+                    animated: (self.presentingViewController == nil)
+                )
             }
             catch {
                 await MainActor.run { [weak self] in

Session/Conversations/Context Menu/ContextMenuVC+Action.swift

@@ -187,7 +187,11 @@ extension ContextMenuVC {
 
     static func actions(
         for cellViewModel: MessageViewModel,
-        in threadViewModel: SessionThreadViewModel,
+        threadInfo: ConversationInfoViewModel,
+        authMethod: AuthenticationMethod,
+        reactionsSupported: Bool,
+        recentReactionEmoji: [String],
+        isUserModeratorOrAdmin: Bool,
         forMessageInfoScreen: Bool,
         delegate: ContextMenuActionDelegate?,
         using dependencies: Dependencies
@@ -221,18 +225,18 @@ extension ContextMenuVC {
                     cellViewModel.cellType == .genericAttachment ||
                     cellViewModel.cellType == .mediaMessage
                 ) &&
-                (cellViewModel.attachments ?? []).count == 1 &&
-                (cellViewModel.attachments ?? []).first?.isVisualMedia == true &&
-                (cellViewModel.attachments ?? []).first?.isValid == true && (
-                    (cellViewModel.attachments ?? []).first?.state == .downloaded ||
-                    (cellViewModel.attachments ?? []).first?.state == .uploaded
+                cellViewModel.attachments.count == 1 &&
+                cellViewModel.attachments.first?.isVisualMedia == true &&
+                cellViewModel.attachments.first?.isValid == true && (
+                    cellViewModel.attachments.first?.state == .downloaded ||
+                    cellViewModel.attachments.first?.state == .uploaded
                 )
             )
         )
         let canSave: Bool = {
             switch cellViewModel.cellType {
                 case .mediaMessage:
-                    return (cellViewModel.attachments ?? [])
+                    return cellViewModel.attachments
                         .filter { attachment in
                             attachment.isValid &&
                             attachment.isVisualMedia && (
@@ -242,7 +246,7 @@ extension ContextMenuVC {
                         }.isEmpty == false
 
                 case .audio, .genericAttachment:
-                    return (cellViewModel.attachments ?? [])
+                    return cellViewModel.attachments
                         .filter { attachment in
                             attachment.isValid && (
                                 attachment.state == .downloaded ||
@@ -258,40 +262,22 @@ extension ContextMenuVC {
             cellViewModel.threadVariant != .community &&
             !forMessageInfoScreen
         )
-        let canDelete: Bool = (MessageViewModel.DeletionBehaviours.deletionActions(
+        let canDelete: Bool = ((try? MessageViewModel.DeletionBehaviours.deletionActions(
             for: [cellViewModel],
-            with: threadViewModel,
+            threadInfo: threadInfo,
+            authMethod: authMethod,
+            isUserModeratorOrAdmin: isUserModeratorOrAdmin,
             using: dependencies
-        ) != nil)
+        )) != nil)
         let canBan: Bool = (
             cellViewModel.threadVariant == .community &&
-            dependencies[singleton: .openGroupManager].isUserModeratorOrAdmin(
-                publicKey: threadViewModel.currentUserSessionId,
-                for: threadViewModel.openGroupRoomToken,
-                on: threadViewModel.openGroupServer,
-                currentUserSessionIds: (threadViewModel.currentUserSessionIds ?? [])
-            )
+            isUserModeratorOrAdmin
         )
-        let shouldShowEmojiActions: Bool = {
-            guard cellViewModel.threadVariant != .legacyGroup else { return false }
-
-            if cellViewModel.threadVariant == .community {
-                return (
-                    !forMessageInfoScreen &&
-                    dependencies[singleton: .openGroupManager].doesOpenGroupSupport(
-                        capability: .reactions,
-                        on: cellViewModel.threadOpenGroupServer
-                    )
-                )
-            }
-            return (threadViewModel.threadIsMessageRequest != true && !forMessageInfoScreen)
-        }()
 
         let recentEmojis: [EmojiWithSkinTones] = {
-            guard shouldShowEmojiActions else { return [] }
+            guard reactionsSupported else { return [] }
 
-            return (threadViewModel.recentReactionEmoji ?? [])
-                .compactMap { EmojiWithSkinTones(rawValue: $0) }
+            return recentReactionEmoji.compactMap { EmojiWithSkinTones(rawValue: $0) }
         }()
         let generatedActions: [Action] = [
             (canRetry ? Action.retry(cellViewModel, delegate) : nil),
@@ -305,7 +291,7 @@ extension ContextMenuVC {
             (forMessageInfoScreen ? nil : Action.info(cellViewModel, delegate)),
         ]
         .appending(
-            contentsOf: (shouldShowEmojiActions ? recentEmojis : [])
+            contentsOf: (reactionsSupported ? recentEmojis : [])
                 .map { Action.react(cellViewModel, $0, delegate) }
         )
         .appending(forMessageInfoScreen ? nil : Action.emojiPlusButton(cellViewModel, delegate))
@@ -322,7 +308,7 @@ extension ContextMenuVC {
 protocol ContextMenuActionDelegate {
     func info(_ cellViewModel: MessageViewModel)
     @MainActor func retry(_ cellViewModel: MessageViewModel, completion: (@MainActor () -> Void)?)
-    func reply(_ cellViewModel: MessageViewModel, completion: (() -> Void)?)
+    @MainActor func reply(_ cellViewModel: MessageViewModel, completion: (() -> Void)?)
     func copy(_ cellViewModel: MessageViewModel, completion: (() -> Void)?)
     func copySessionID(_ cellViewModel: MessageViewModel, completion: (() -> Void)?)
     func delete(_ cellViewModel: MessageViewModel, completion: (() -> Void)?)

Session/Conversations/ConversationSearch.swift

@@ -90,7 +90,7 @@ extension ConversationSearchController: UISearchResultsUpdating {
             .readPublisher { db -> [Interaction.TimestampInfo] in
                 try Interaction.idsForTermWithin(
                     threadId: threadId,
-                    pattern: try SessionThreadViewModel.pattern(db, searchTerm: searchText)
+                    pattern: try GlobalSearch.pattern(db, searchTerm: searchText)
                 )
                 .fetchAll(db)
             }