From b8860baf49f1da4f6ea9310804c9dbbb687b226d Mon Sep 17 00:00:00 2001
From: Doug <douglase@element.io>
Date: Wed, 1 Jul 2026 15:21:09 +0100
Subject: [PATCH] Rename SearchUsersResultsProxy to SearchUsersResults. It also
 proxies nothing.

---
 ElementX/Sources/Mocks/Generated/GeneratedMocks.swift     | 8 ++++----
 ElementX/Sources/Services/Client/ClientProxy.swift        | 2 +-
 .../Sources/Services/Client/ClientProxyProtocol.swift     | 2 +-
 .../Sources/Services/Users/UserDiscoveryService.swift     | 2 +-
 ElementX/Sources/Services/Users/UserProfile.swift         | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/ElementX/Sources/Mocks/Generated/GeneratedMocks.swift b/ElementX/Sources/Mocks/Generated/GeneratedMocks.swift
index d843851f1..735011584 100644
--- a/ElementX/Sources/Mocks/Generated/GeneratedMocks.swift
+++ b/ElementX/Sources/Mocks/Generated/GeneratedMocks.swift
@@ -3491,14 +3491,14 @@ nonisolated class ClientProxyMock: ClientProxyProtocol, @unchecked Sendable {
     }
 
     private let searchUsersSearchTermLimitReturnValueLock = NSLock()
-    private nonisolated(unsafe) var searchUsersSearchTermLimitUnderlyingReturnValue: Result<SearchUsersResultsProxy, ClientProxyError>!
-    var searchUsersSearchTermLimitReturnValue: Result<SearchUsersResultsProxy, ClientProxyError>! {
+    private nonisolated(unsafe) var searchUsersSearchTermLimitUnderlyingReturnValue: Result<SearchUsersResults, ClientProxyError>!
+    var searchUsersSearchTermLimitReturnValue: Result<SearchUsersResults, ClientProxyError>! {
         get { searchUsersSearchTermLimitReturnValueLock.withLock { searchUsersSearchTermLimitUnderlyingReturnValue } }
         set { searchUsersSearchTermLimitReturnValueLock.withLock { searchUsersSearchTermLimitUnderlyingReturnValue = newValue } }
     }
-    nonisolated(unsafe) var searchUsersSearchTermLimitClosure: ((String, UInt) async -> Result<SearchUsersResultsProxy, ClientProxyError>)?
+    nonisolated(unsafe) var searchUsersSearchTermLimitClosure: ((String, UInt) async -> Result<SearchUsersResults, ClientProxyError>)?
 
-    @concurrent func searchUsers(searchTerm: String, limit: UInt) async -> Result<SearchUsersResultsProxy, ClientProxyError> {
+    @concurrent func searchUsers(searchTerm: String, limit: UInt) async -> Result<SearchUsersResults, ClientProxyError> {
         searchUsersSearchTermLimitCallsCountLock.withLock { searchUsersSearchTermLimitUnderlyingCallsCount += 1 }
         searchUsersSearchTermLimitReceivedArguments = (searchTerm: searchTerm, limit: limit)
         searchUsersSearchTermLimitReceivedInvocationsLock.withLock { searchUsersSearchTermLimitUnderlyingReceivedInvocations.append((searchTerm: searchTerm, limit: limit)) }
diff --git a/ElementX/Sources/Services/Client/ClientProxy.swift b/ElementX/Sources/Services/Client/ClientProxy.swift
index 6ec5c968a..0e9853085 100644
--- a/ElementX/Sources/Services/Client/ClientProxy.swift
+++ b/ElementX/Sources/Services/Client/ClientProxy.swift
@@ -777,7 +777,7 @@ class ClientProxy: ClientProxyProtocol {
                                    append: false)
     }
     
-    func searchUsers(searchTerm: String, limit: UInt) async -> Result<SearchUsersResultsProxy, ClientProxyError> {
+    func searchUsers(searchTerm: String, limit: UInt) async -> Result<SearchUsersResults, ClientProxyError> {
         do {
             return try await .success(.init(sdkResults: client.searchUsers(searchTerm: searchTerm, limit: UInt64(limit))))
         } catch {
diff --git a/ElementX/Sources/Services/Client/ClientProxyProtocol.swift b/ElementX/Sources/Services/Client/ClientProxyProtocol.swift
index cf4cd54a1..50c89589c 100644
--- a/ElementX/Sources/Services/Client/ClientProxyProtocol.swift
+++ b/ElementX/Sources/Services/Client/ClientProxyProtocol.swift
@@ -230,7 +230,7 @@ protocol ClientProxyProtocol: AnyObject {
     
     func setPusher(with configuration: PusherConfiguration) async throws
     
-    func searchUsers(searchTerm: String, limit: UInt) async -> Result<SearchUsersResultsProxy, ClientProxyError>
+    func searchUsers(searchTerm: String, limit: UInt) async -> Result<SearchUsersResults, ClientProxyError>
     
     func profile(for userID: String) async -> Result<UserProfile, ClientProxyError>
     
diff --git a/ElementX/Sources/Services/Users/UserDiscoveryService.swift b/ElementX/Sources/Services/Users/UserDiscoveryService.swift
index 844730e9b..9f008a9eb 100644
--- a/ElementX/Sources/Services/Users/UserDiscoveryService.swift
+++ b/ElementX/Sources/Services/Users/UserDiscoveryService.swift
@@ -32,7 +32,7 @@ final class UserDiscoveryService: UserDiscoveryServiceProtocol {
         }
     }
     
-    private func merge(queriedProfile: UserProfile?, searchResults: SearchUsersResultsProxy) -> [UserProfile] {
+    private func merge(queriedProfile: UserProfile?, searchResults: SearchUsersResults) -> [UserProfile] {
         let searchResults = searchResults.results
         
         guard let queriedProfile else {
diff --git a/ElementX/Sources/Services/Users/UserProfile.swift b/ElementX/Sources/Services/Users/UserProfile.swift
index 43148a6d7..a9ff9905e 100644
--- a/ElementX/Sources/Services/Users/UserProfile.swift
+++ b/ElementX/Sources/Services/Users/UserProfile.swift
@@ -55,12 +55,12 @@ nonisolated struct UserProfile: Hashable, Identifiable {
     }
 }
 
-struct SearchUsersResultsProxy {
+struct SearchUsersResults {
     let results: [UserProfile]
     let limited: Bool
 }
 
-extension SearchUsersResultsProxy {
+extension SearchUsersResults {
     init(sdkResults: MatrixRustSDK.SearchUsersResults) {
         results = sdkResults.results.map(UserProfile.init)
         limited = sdkResults.limited