Implemented mentioned users in sent message

Author: martinmitrevski

Sources/StreamChatSwiftUI/ChatChannel/Composer/MessageComposerViewModel.swift

@@ -53,6 +53,7 @@ open class MessageComposerViewModel: ObservableObject {
                 }
                 selectedRangeLocation = 0
                 suggestions = [String: Any]()
+                mentionedUsers = Set<ChatUser>()
             }
         }
     }
@@ -136,6 +137,8 @@ open class MessageComposerViewModel: ObservableObject {
             with: channelController
         )
 
+    private(set) var mentionedUsers = Set<ChatUser>()
+    
     private var messageText: String {
         if let composerCommand = composerCommand,
            let displayInfo = composerCommand.displayInfo,
@@ -187,6 +190,9 @@ open class MessageComposerViewModel: ObservableObject {
             }
         }
 
+        clearRemovedMentions()
+        let mentionedUserIds = mentionedUsers.map(\.id)
+        
         if let editedMessage = editedMessage {
             edit(message: editedMessage, completion: completion)
             return
@@ -213,6 +219,7 @@ open class MessageComposerViewModel: ObservableObject {
                 messageController.createNewReply(
                     text: messageText,
                     attachments: attachments,
+                    mentionedUserIds: mentionedUserIds,
                     showReplyInChannel: showReplyInChannel,
                     quotedMessageId: quotedMessage?.id
                 ) { [weak self] in
@@ -227,6 +234,7 @@ open class MessageComposerViewModel: ObservableObject {
                 channelController.createNewMessage(
                     text: messageText,
                     attachments: attachments,
+                    mentionedUserIds: mentionedUserIds,
                     quotedMessageId: quotedMessage?.id
                 ) { [weak self] in
                     switch $0 {
@@ -404,16 +412,40 @@ open class MessageComposerViewModel: ObservableObject {
         command: Binding<ComposerCommand?>,
         extraData: [String: Any]
     ) {
+        let commandId = command.wrappedValue?.id
         commandsHandler.handleCommand(
             for: text,
             selectedRangeLocation: selectedRangeLocation,
             command: command,
             extraData: extraData
         )
+        checkForMentionedUsers(
+            commandId: commandId,
+            extraData: extraData
+        )
     }
 
     // MARK: - private
 
+    private func checkForMentionedUsers(
+        commandId: String?,
+        extraData: [String: Any]
+    ) {
+        guard commandId == "mentions",
+              let user = extraData["chatUser"] as? ChatUser else {
+            return
+        }
+        mentionedUsers.insert(user)
+    }
+    
+    private func clearRemovedMentions() {
+        for user in mentionedUsers {
+            if !text.contains("@\(user.mentionText)") {
+                mentionedUsers.remove(user)
+            }
+        }
+    }
+    
     private func edit(
         message: ChatMessage,
         completion: @escaping () -> Void
@@ -443,6 +475,7 @@ open class MessageComposerViewModel: ObservableObject {
         addedFileURLs = []
         addedCustomAttachments = []
         composerCommand = nil
+        mentionedUsers = Set<ChatUser>()
         clearText()
     }
 

Sources/StreamChatSwiftUI/ChatChannel/Composer/Suggestions/InstantCommands/TwoStepMentionCommand.swift

@@ -88,14 +88,6 @@ open class TwoStepMentionCommand: CommandHandler {
         selectedUser != nil
     }
 
-    private func mentionText(for user: ChatUser) -> String {
-        if let name = user.name, !name.isEmpty {
-            return "\(mentionSymbol)\(name)"
-        } else {
-            return "\(mentionSymbol)\(user.id)"
-        }
-    }
-    
     public func commandHandler(for command: ComposerCommand) -> CommandHandler? {
         if let selectedUser = selectedUser,
            command.typingSuggestion.text != "\(mentionSymbol)\(selectedUser.mentionText)" {

StreamChatSwiftUITests/Tests/ChatChannel/MessageComposerViewModel_Tests.swift

@@ -490,6 +490,68 @@ class MessageComposerViewModel_Tests: StreamChatTestCase {
         XCTAssert(viewModel.addedAssets.isEmpty)
     }
 
+    func test_messageComposerVM_mentionUsers() {
+        // Given
+        let viewModel = makeComposerViewModel()
+        let command = ComposerCommand(
+            id: "mentions",
+            typingSuggestion: TypingSuggestion(text: "Hey @Martin", locationRange: NSRange(location: 0, length: 11)),
+            displayInfo: nil
+        )
+        let user = ChatUser.mock(id: .unique, name: "Martin")
+        
+        // When
+        viewModel.handleCommand(
+            for: .constant("Hey @Martin"),
+            selectedRangeLocation: .constant(11),
+            command: .constant(command),
+            extraData: ["chatUser": user]
+        )
+        
+        // Then
+        XCTAssert(viewModel.mentionedUsers.count == 1)
+        XCTAssert(viewModel.mentionedUsers.first?.name == "Martin")
+    }
+    
+    func test_messageComposerVM_noMentionedUsers() {
+        // Given
+        let viewModel = makeComposerViewModel()
+        
+        // When
+        viewModel.handleCommand(
+            for: .constant("Hey Martin"),
+            selectedRangeLocation: .constant(10),
+            command: .constant(nil),
+            extraData: [:]
+        )
+        
+        // Then
+        XCTAssert(viewModel.mentionedUsers.isEmpty)
+    }
+    
+    func test_messageComposerVM_mentionedUsersClearText() {
+        // Given
+        let viewModel = makeComposerViewModel()
+        let command = ComposerCommand(
+            id: "mentions",
+            typingSuggestion: TypingSuggestion(text: "Hey @Martin", locationRange: NSRange(location: 0, length: 11)),
+            displayInfo: nil
+        )
+        let user = ChatUser.mock(id: .unique, name: "Martin")
+        
+        // When
+        viewModel.handleCommand(
+            for: .constant("Hey @Martin"),
+            selectedRangeLocation: .constant(11),
+            command: .constant(command),
+            extraData: ["chatUser": user]
+        )
+        viewModel.text = ""
+        
+        // Then
+        XCTAssert(viewModel.mentionedUsers.isEmpty)
+    }
+    
     // MARK: - private
 
     private func makeComposerViewModel() -> MessageComposerViewModel {