#1098 - Working real user suggestion inside the main application.

2026-04-20 16:42:44 +02:00 · 2021-10-05 14:30:31 +03:00
parent 388e521a89
commit 71667de9b1
12 changed files with 191 additions and 57 deletions
@@ -19,6 +19,13 @@
 import Foundation
 import Combine

+@available(iOS 14.0, *)
+struct UserSuggestionServiceItem: UserSuggestionItemProtocol {
+    let userId: String
+    let displayName: String?
+    let avatarUrl: String?
+}
+
@available(iOS 14.0, *)
 class UserSuggestionService: UserSuggestionServiceProtocol {
    
@@ -29,10 +36,12 @@ class UserSuggestionService: UserSuggestionServiceProtocol {
    private let room: MXRoom
    
    private var suggestionItems: [UserSuggestionItemProtocol] = []
+    private var roomJoinedMembers: [MXRoomMember] = []
    
    // MARK: Public
    
    var items: CurrentValueSubject<[UserSuggestionItemProtocol], Never>
+    var currentTextTrigger: String?
    
    // MARK: - Setup
    
@@ -40,26 +49,64 @@ class UserSuggestionService: UserSuggestionServiceProtocol {
        self.room = room
        self.items = CurrentValueSubject([])
        
-        generateUsersWithCount(10)
-        items.send(suggestionItems)
+        self.room.members { [weak self] members in
+            guard let self = self, let joinedMembers = members?.joinedMembers else {
+                return
+            }
+            
+            self.roomJoinedMembers = joinedMembers
+            
+            self.suggestionItems = joinedMembers.map { member in
+                UserSuggestionServiceItem(userId: member.userId, displayName: member.displayname, avatarUrl: member.avatarUrl)
+            }
+        } lazyLoadedMembers: { [weak self] lazyMembers in
+            guard let self = self, let joinedMembers = lazyMembers?.joinedMembers else {
+                return
+            }
+            
+            self.roomJoinedMembers = joinedMembers
+            
+            self.suggestionItems = joinedMembers.map { member in
+                UserSuggestionServiceItem(userId: member.userId, displayName: member.displayname, avatarUrl: member.avatarUrl)
+            }
+        } failure: { error in
+            MXLog.error("[UserSuggestionService] Failed loading room with error: \(String(describing: error))")
+        }
    }
    
-    func processPartialUserName(_ userName: String) {
-        guard userName.count > 0 else {
-            items.send(suggestionItems)
+    func roomMemberForIdentifier(_ identifier: String) -> MXRoomMember? {
+        return roomJoinedMembers.filter { $0.userId == identifier }.first
+    }
+    
+    // MARK: - UserSuggestionServiceProtocol
+    
+    func processTextMessage(_ textMessage: String) {
+        items.send([])
+        currentTextTrigger = nil
+        
+        guard textMessage.count > 0 else {
            return
        }
        
+        let components = textMessage.components(separatedBy: .whitespaces)
+        
+        guard let lastComponent = components.last else {
+            return
+        }
+        
+        guard lastComponent.hasPrefix("@") else {
+            return
+        }
+        
+        currentTextTrigger = lastComponent
+        
+        var partialName = lastComponent
+        partialName.removeFirst()
+        
        items.send(suggestionItems.filter({ userSuggestion in
-            return (userSuggestion.displayName?.lowercased().range(of: userName.lowercased()) != .none)
+            let containedInUsername = userSuggestion.userId.lowercased().range(of: partialName.lowercased()) != .none
+            let containedInDisplayName = (userSuggestion.displayName ?? "").lowercased().range(of: partialName.lowercased()) != .none
+            return (containedInUsername || containedInDisplayName)
        }))
    }
-    
-    private func generateUsersWithCount(_ count: UInt) {
-        suggestionItems.removeAll()
-        for _ in 0..<count {
-            let identifier = "@" + UUID().uuidString
-            suggestionItems.append(MockUserSuggestionServiceItem(userId: identifier, displayName: identifier, avatarUrl: "mxc://matrix.org/VyNYAgahaiAzUoOeZETtQ"))
-        }
-    }
 }
@@ -36,8 +36,8 @@ enum MockUserSuggestionScreenState: MockScreenState, CaseIterable {
        
        let listViewModel = UserSuggestionViewModel.makeUserSuggestionViewModel(userSuggestionService: service)
        
-        let viewModel = UserSuggestionListWithInputViewModel(listViewModel: listViewModel) { partialUserName in
-            service.processPartialUserName(partialUserName)
+        let viewModel = UserSuggestionListWithInputViewModel(listViewModel: listViewModel) { textMessage in
+            service.processTextMessage(textMessage)
        }
        
        return (
@@ -38,14 +38,29 @@ class MockUserSuggestionService: UserSuggestionServiceProtocol {
        items.send(suggestionItems)
    }
    
-    func processPartialUserName(_ userName: String) {
-        guard userName.count > 0 else {
-            items.send(suggestionItems)
+    func processTextMessage(_ textMessage: String) {
+        
+        items.send([])
+        
+        guard textMessage.count > 0 else {
            return
        }
        
+        let components = textMessage.components(separatedBy: .whitespaces)
+        
+        guard let lastComponent = components.last else {
+            return
+        }
+        
+        guard lastComponent.hasPrefix("@") else {
+            return
+        }
+        
+        var partialName = lastComponent
+        partialName.removeFirst()
+        
        items.send(suggestionItems.filter({ userSuggestion in
-            return (userSuggestion.displayName?.lowercased().range(of: userName.lowercased()) != .none)
+            return (userSuggestion.displayName?.lowercased().range(of: partialName.lowercased()) != .none)
        }))
    }
    
@@ -31,7 +31,7 @@ protocol UserSuggestionServiceProtocol {
    
    var items: CurrentValueSubject<[UserSuggestionItemProtocol], Never> { get }
    
-    func processPartialUserName(_ userName: String)
+    func processTextMessage(_ textMessage: String)
 }

 // MARK: Avatarable