ehealthsolutions/element-x-ios
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-ios.git synced 2026-11-03 06:55:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename UserProfileProxy to UserProfile. It's a pure struct and proxies nothing.

Browse Source 
Also remove the redundant `userID` property given `id` already exists (for Identifiable conformance).
This commit is contained in:
Doug
2026-07-01 15:18:03 +01:00
committed by Doug
parent bdf53b64a8
commit 3ef66cdd05
55 changed files with 203 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElementX/Sources/Services/Users/UserDiscoveryService.swift
+6 -6
View File
@@ -15,7 +15,7 @@ final class UserDiscoveryService: UserDiscoveryServiceProtocol {
self.clientProxy = clientProxy
}
func searchProfiles(with searchQuery: String) async -> Result<[UserProfileProxy], UserDiscoveryErrorType> {
func searchProfiles(with searchQuery: String) async -> Result<[UserProfile], UserDiscoveryErrorType> {
async let queriedProfile = profileIfPossible(with: searchQuery)
do {
@@ -32,7 +32,7 @@ final class UserDiscoveryService: UserDiscoveryServiceProtocol {
}
}
private func merge(queriedProfile: UserProfileProxy?, searchResults: SearchUsersResultsProxy) -> [UserProfileProxy] {
private func merge(queriedProfile: UserProfile?, searchResults: SearchUsersResultsProxy) -> [UserProfile] {
let searchResults = searchResults.results
guard let queriedProfile else {
@@ -40,13 +40,13 @@ final class UserDiscoveryService: UserDiscoveryServiceProtocol {
}
let filteredSearchResult = searchResults.filter {
$0.userID != queriedProfile.userID
$0.id != queriedProfile.id
}
return [queriedProfile] + filteredSearchResult
}
private func profileIfPossible(with searchQuery: String) async -> UserProfileProxy? {
private func profileIfPossible(with searchQuery: String) async -> UserProfile? {
guard searchQuery.isMatrixIdentifier, searchQuery != clientProxy.userID else {
return nil
}
@@ -57,9 +57,9 @@ final class UserDiscoveryService: UserDiscoveryServiceProtocol {
return getProfileResult ?? .init(userID: searchQuery)
}
private func filterAccountOwner(_ profiles: [UserProfileProxy]) -> [UserProfileProxy] {
private func filterAccountOwner(_ profiles: [UserProfile]) -> [UserProfile] {
let accountOwnerID = clientProxy.userID
return profiles.filter { $0.userID != accountOwnerID }
return profiles.filter { $0.id != accountOwnerID }
}
}