Added handling for bounced messages (#405)

Author: martinmitrevski

CHANGELOG.md

@@ -7,6 +7,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Jump to a message that is not on the first page
 - Jump to a message in a thread
 - Bi-directional scrolling of the message list
+- Handling of bounced messages
 
 ### 🐞 Fixed
 - Some links not being rendered correctly

Sources/StreamChatSwiftUI/ChatChannel/MessageList/MessageContainerView.swift

@@ -60,7 +60,7 @@ public struct MessageContainerView<Factory: ViewFactory>: View {
 
     public var body: some View {
         HStack(alignment: .bottom) {
-            if message.type == .system || message.type == .error {
+            if message.type == .system || (message.type == .error && message.isBounced == false) {
                 factory.makeSystemMessageView(message: message)
             } else {
                 if message.isRightAligned {
@@ -105,7 +105,7 @@ public struct MessageContainerView<Factory: ViewFactory>: View {
                                 )
                                 : nil
 
-                            message.localState == .sendingFailed ? SendFailureIndicator() : nil
+                            (message.localState == .sendingFailed || message.isBounced) ? SendFailureIndicator() : nil
                         }
                     )
                     .background(

Sources/StreamChatSwiftUI/ChatChannel/Reactions/MessageActions/DefaultMessageActions.swift

@@ -42,6 +42,23 @@ extension MessageAction {
                 onError: onError
             )
             return messageActions
+        } else if message.isBounced {
+            let title = MessageAction(
+                title: L10n.Message.Bounce.title,
+                iconName: "exclamationmark.octagon.fill",
+                action: {},
+                confirmationPopup: nil,
+                isDestructive: false
+            )
+            messageActions = messageNotSentActions(
+                for: message,
+                channel: channel,
+                chatClient: chatClient,
+                onFinish: onFinish,
+                onError: onError
+            )
+            messageActions.insert(title, at: 0)
+            return messageActions
         }
 
         if channel.config.quotesEnabled {

Sources/StreamChatSwiftUI/ChatChannel/Reactions/ReactionsOverlayView.swift

@@ -132,7 +132,7 @@ public struct ReactionsOverlayView<Factory: ViewFactory>: View {
                         x: messageOriginX(proxy: reader)
                     )
                     .overlay(
-                        channel.config.reactionsEnabled ?
+                        (channel.config.reactionsEnabled && !messageDisplayInfo.message.isBounced) ?
                             factory.makeReactionsContentView(
                                 message: viewModel.message,
                                 contentRect: messageDisplayInfo.frame,

Sources/StreamChatSwiftUI/Generated/L10n.swift

@@ -300,6 +300,10 @@ internal enum L10n {
         internal static var confirmationTitle: String { L10n.tr("Localizable", "message.actions.flag.confirmation-title") }
       }
     }
+    internal enum Bounce {
+      /// Message was bounced
+      internal static var title: String { L10n.tr("Localizable", "message.bounce.title") }
+    }
     internal enum Cell {
       /// Pinned by
       internal static var pinnedBy: String { L10n.tr("Localizable", "message.cell.pinnedBy") }

Sources/StreamChatSwiftUI/Resources/en.lproj/Localizable.strings

@@ -106,6 +106,8 @@
 "message.search.title" = "Search";
 "message.search.cancel" = "Cancel";
 
+"message.bounce.title" = "Message was bounced";
+
 "current-selection" = "%d of %d";
 
 "attachment.max-size-exceeded" = "Attachment size exceed the limit.";

StreamChatSwiftUITests/Tests/ChatChannel/MessageActions_Tests.swift

@@ -174,4 +174,39 @@ class MessageActions_Tests: StreamChatTestCase {
         XCTAssert(messageActions[0].title == "Edit Message")
         XCTAssert(messageActions[1].title == "Delete Message")
     }
+    
+    func test_messageActions_bouncedMessage() {
+        // Given
+        let channel = ChatChannel.mockDMChannel()
+        let moderationDetails = MessageModerationDetails(
+            originalText: "Some text",
+            action: .bounce
+        )
+        let message = ChatMessage.mock(
+            id: .unique,
+            cid: channel.cid,
+            text: "Test",
+            author: .mock(id: chatClient.currentUserId!),
+            isBounced: true,
+            moderationsDetails: moderationDetails
+        )
+        let factory = DefaultViewFactory.shared
+
+        // When
+        let messageActions = MessageAction.defaultActions(
+            factory: factory,
+            for: message,
+            channel: channel,
+            chatClient: chatClient,
+            onFinish: { _ in },
+            onError: { _ in }
+        )
+
+        // Then
+        XCTAssert(messageActions.count == 4)
+        XCTAssert(messageActions[0].title == "Message was bounced")
+        XCTAssert(messageActions[1].title == "Resend")
+        XCTAssert(messageActions[2].title == "Edit Message")
+        XCTAssert(messageActions[3].title == "Delete Message")
+    }
 }