moved mentionText in extension

Author: martinmitrevski

Sources/StreamChatSwiftUI/ChatChannel/Composer/MessageComposerViewModel.swift

@@ -378,14 +378,6 @@ public class MessageComposerViewModel: ObservableObject {
 
     // MARK: - private
 
-    private func mentionText(for user: ChatUser) -> String {
-        if let name = user.name, !name.isEmpty {
-            return name
-        } else {
-            return user.id
-        }
-    }
-    
     private func edit(
         message: ChatMessage,
         completion: @escaping () -> Void

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

@@ -72,7 +72,7 @@ open class TwoStepMentionCommand: CommandHandler {
 
         selectedUser = chatUser
 
-        let mentionText = self.mentionText(for: chatUser)
+        let mentionText = "\(mentionSymbol)\(chatUser.mentionText)"
         let newText = (text.wrappedValue as NSString).replacingCharacters(
             in: typingSuggestionValue.locationRange,
             with: mentionText
@@ -98,7 +98,7 @@ open class TwoStepMentionCommand: CommandHandler {
 
     public func commandHandler(for command: ComposerCommand) -> CommandHandler? {
         if let selectedUser = selectedUser,
-           command.typingSuggestion.text != mentionText(for: selectedUser) {
+           command.typingSuggestion.text != "\(mentionSymbol)\(selectedUser.mentionText)" {
             self.selectedUser = nil
         }
         return command.id == id ? self : nil

Sources/StreamChatSwiftUI/ChatChannel/Composer/Suggestions/Mentions/MentionsCommandHandler.swift

@@ -62,7 +62,7 @@ public struct MentionsCommandHandler: CommandHandler {
             return
         }
 
-        let mentionText = self.mentionText(for: chatUser)
+        let mentionText = chatUser.mentionText
         let newText = (text.wrappedValue as NSString).replacingCharacters(
             in: typingSuggestionValue.locationRange,
             with: mentionText
@@ -149,15 +149,7 @@ public struct MentionsCommandHandler: CommandHandler {
             sort: [.init(key: .name, isAscending: true)]
         )
     }
-        
-    private func mentionText(for user: ChatUser) -> String {
-        if let name = user.name, !name.isEmpty {
-            return name
-        } else {
-            return user.id
-        }
-    }
-
+    
     private func searchAllUsers(for typingMention: String) -> Future<SuggestionInfo, Error> {
         Future { promise in
             let query = queryForMentionSuggestionsSearch(typingMention: typingMention)

Sources/StreamChatSwiftUI/ChatChannel/Utils/ChatChannelExtensions.swift

@@ -31,3 +31,14 @@ extension ChatChannel {
         DateUtils.timeAgo
     }
 }
+
+extension ChatUser {
+    
+    var mentionText: String {
+        if let name = self.name, !name.isEmpty {
+            return name
+        } else {
+            return id
+        }
+    }
+}