Merge branch 'develop' into swift-6

Author: laevandus

CHANGELOG.md

@@ -5,10 +5,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ### ✅ Added
 - Add extra data to user display info [#819](https://github.com/GetStream/stream-chat-swiftui/pull/819)
+- Make message spacing in message list configurable [#830](https://github.com/GetStream/stream-chat-swiftui/pull/830)
 ### 🐞 Fixed
 - Fix swipe to reply enabled when quoting a message is disabled [#824](https://github.com/GetStream/stream-chat-swiftui/pull/824)
 - Fix mark unread action not removed when read events are disabled [#823](https://github.com/GetStream/stream-chat-swiftui/pull/823)
 - Fix user mentions not working when commands are disabled [#826](https://github.com/GetStream/stream-chat-swiftui/pull/826)
+- Fix edit message action shown when user does not have permissions [#835](https://github.com/GetStream/stream-chat-swiftui/pull/835)
 
 # [4.78.0](https://github.com/GetStream/stream-chat-swiftui/releases/tag/4.78.0)
 _April 24, 2025_

Sources/StreamChatSwiftUI/ChatChannel/MessageList/MessageContainerView.swift

@@ -33,7 +33,13 @@ public struct MessageContainerView<Factory: ViewFactory>: View {
     @GestureState private var offset: CGSize = .zero
 
     private let replyThreshold: CGFloat = 60
-    private let paddingValue: CGFloat = 8
+    private var paddingValue: CGFloat {
+        utils.messageListConfig.messagePaddings.singleBottom
+    }
+    
+    private var groupMessageInterItemSpacing: CGFloat {
+        utils.messageListConfig.messagePaddings.groupBottom
+    }
 
     var isSwipeToReplyPossible: Bool {
         message.isInteractionEnabled && channel.canQuoteMessage
@@ -275,7 +281,7 @@ public struct MessageContainerView<Factory: ViewFactory>: View {
             topReactionsShown && !isMessagePinned ? messageListConfig.messageDisplayOptions.reactionsTopPadding(message) : 0
         )
         .padding(.horizontal, messageListConfig.messagePaddings.horizontal)
-        .padding(.bottom, showsAllInfo || isMessagePinned ? paddingValue : 2)
+        .padding(.bottom, showsAllInfo || isMessagePinned ? paddingValue : groupMessageInterItemSpacing)
         .padding(.top, isLast ? paddingValue : 0)
         .background(isMessagePinned ? Color(colors.pinnedBackground) : nil)
         .padding(.bottom, isMessagePinned ? paddingValue / 2 : 0)

Sources/StreamChatSwiftUI/ChatChannel/MessageList/MessageListConfig.swift

@@ -110,13 +110,19 @@ public struct MessagePaddings {
     /// Horizontal padding for messages.
     public let horizontal: CGFloat
     public let quotedViewPadding: CGFloat
+    public let singleBottom: CGFloat
+    public let groupBottom: CGFloat
 
     public init(
         horizontal: CGFloat = 8,
-        quotedViewPadding: CGFloat = 8
+        quotedViewPadding: CGFloat = 8,
+        singleBottom: CGFloat = 8,
+        groupBottom: CGFloat = 2
     ) {
         self.horizontal = horizontal
         self.quotedViewPadding = quotedViewPadding
+        self.singleBottom = singleBottom
+        self.groupBottom = groupBottom
     }
 }
 

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

@@ -145,16 +145,18 @@ public extension MessageAction {
             }
         }
 
-        if message.isSentByCurrentUser {
-            if message.poll == nil && message.giphyAttachments.isEmpty {
+        if message.poll == nil, message.giphyAttachments.isEmpty {
+            if channel.canUpdateAnyMessage || channel.canUpdateOwnMessage && message.isSentByCurrentUser {
                 let editAction = editMessageAction(
                     for: message,
                     channel: channel,
                     onFinish: onFinish
                 )
                 messageActions.append(editAction)
             }
-
+        }
+        
+        if message.isSentByCurrentUser {
             let deleteAction = deleteMessageAction(
                 for: message,
                 channel: channel,

StreamChatSwiftUITests/Tests/ChatChannel/MessageActions_Tests.swift

@@ -323,12 +323,64 @@ import XCTest
         XCTAssertEqual(messageActions[3].title, "Copy Message")
         XCTAssertEqual(messageActions[4].title, "Delete Message")
     }
+    
+    func test_messageActions_currentUser_editingDisabledWhenNoUpdateCapabilities() {
+        // Given
+        let channel = ChatChannel.mockDMChannel(ownCapabilities: [])
+        let message = ChatMessage.mock(
+            id: .unique,
+            cid: channel.cid,
+            text: "Test",
+            author: .mock(id: chatClient.currentUserId!),
+            isSentByCurrentUser: true
+        )
+        let factory = DefaultViewFactory.shared
+        
+        // When
+        let messageActions = MessageAction.defaultActions(
+            factory: factory,
+            for: message,
+            channel: channel,
+            chatClient: chatClient,
+            onFinish: { _ in },
+            onError: { _ in }
+        )
+        
+        // Then
+        XCTAssertFalse(messageActions.contains(where: { $0.title == "Edit Message" }))
+    }
+    
+    func test_messageActions_otherUser_editingEnabledWhenUpdateAnyMessageCapability() {
+        // Given
+        let channel = ChatChannel.mockDMChannel(ownCapabilities: [.updateAnyMessage])
+        let message = ChatMessage.mock(
+            id: .unique,
+            cid: channel.cid,
+            text: "Test",
+            author: .mock(id: .unique),
+            isSentByCurrentUser: false
+        )
+        let factory = DefaultViewFactory.shared
+        
+        // When
+        let messageActions = MessageAction.defaultActions(
+            factory: factory,
+            for: message,
+            channel: channel,
+            chatClient: chatClient,
+            onFinish: { _ in },
+            onError: { _ in }
+        )
+        
+        // Then
+        XCTAssertTrue(messageActions.contains(where: { $0.title == "Edit Message" }))
+    }
 
     // MARK: - Private
 
     private var mockDMChannel: ChatChannel {
         ChatChannel.mockDMChannel(
-            ownCapabilities: [.sendMessage, .uploadFile, .pinMessage, .readEvents]
+            ownCapabilities: [.updateOwnMessage, .sendMessage, .uploadFile, .pinMessage, .readEvents]
         )
     }
 }