Merge pull request #783 from mpretty-cyro/fix/deletable-outgoing-community-messages

Fix deletable outgoing community messages

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

@@ -111,6 +111,7 @@ extension ContextMenuVC {
         for cellViewModel: MessageViewModel,
         recentEmojis: [EmojiWithSkinTones],
         currentUserPublicKey: String,
+        currentUserBlindedPublicKey: String?,
         currentUserIsOpenGroupModerator: Bool,
         currentThreadIsMessageRequest: Bool,
         delegate: ContextMenuActionDelegate?
@@ -165,6 +166,7 @@ extension ContextMenuVC {
             cellViewModel.threadVariant != .openGroup ||
             currentUserIsOpenGroupModerator ||
             cellViewModel.authorId == currentUserPublicKey ||
+            cellViewModel.authorId == currentUserBlindedPublicKey ||
             cellViewModel.state == .failed
         )
         let canBan: Bool = (

Session/Conversations/ConversationVC+Interaction.swift

@@ -778,6 +778,7 @@ extension ConversationVC:
                 for: cellViewModel,
                 recentEmojis: (self.viewModel.threadData.recentReactionEmoji ?? []).compactMap { EmojiWithSkinTones(rawValue: $0) },
                 currentUserPublicKey: self.viewModel.threadData.currentUserPublicKey,
+                currentUserBlindedPublicKey: self.viewModel.threadData.currentUserBlindedPublicKey,
                 currentUserIsOpenGroupModerator: OpenGroupManager.isUserModeratorOrAdmin(
                     self.viewModel.threadData.currentUserPublicKey,
                     for: self.viewModel.threadData.openGroupRoomToken,

Session/Conversations/ConversationViewModel.swift

@@ -115,6 +115,7 @@ public class ConversationViewModel: OWSAudioPlayerDelegate {
             }
         )
     )
+    .populatingCurrentUserBlindedKey()
     
     /// This is all the data the screen needs to populate itself, please see the following link for tips to help optimise
     /// performance https://github.com/groue/GRDB.swift#valueobservation-performance
@@ -130,7 +131,7 @@ public class ConversationViewModel: OWSAudioPlayerDelegate {
     
     private func setupObservableThreadData(for threadId: String) -> ValueObservation<ValueReducers.RemoveDuplicates<ValueReducers.Fetch<SessionThreadViewModel?>>> {
         return ValueObservation
-            .trackingConstantRegion { db -> SessionThreadViewModel? in
+            .trackingConstantRegion { [weak self] db -> SessionThreadViewModel? in
                 let userPublicKey: String = getUserHexEncodedPublicKey(db)
                 let recentReactionEmoji: [String] = try Emoji.getRecent(db, withDefaultEmoji: true)
                 let threadViewModel: SessionThreadViewModel? = try SessionThreadViewModel
@@ -139,6 +140,11 @@ public class ConversationViewModel: OWSAudioPlayerDelegate {
                 
                 return threadViewModel
                     .map { $0.with(recentReactionEmoji: recentReactionEmoji) }
+                    .map { viewModel -> SessionThreadViewModel in
+                        viewModel.populatingCurrentUserBlindedKey(
+                            currentUserBlindedPublicKeyForThisThread: self?.threadData.currentUserBlindedPublicKey
+                        )
+                    }
             }
             .removeDuplicates()
     }