Sulkta-OSS/element-x-ada
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Introduce MatrixClient.isMe for checking sessionID

Browse source
This commit is contained in:
Chris Smith 2023-07-07 11:50:32 +01:00
parent 3e087c06da
commit 303a0a6677
6 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
libraries/usersearch/impl/src/main/kotlin/io/element/android/libraries/usersearch/impl/MatrixUserRepository.kt
View file

@ -32,15 +32,13 @@ import javax.inject.Inject
@ContributesBinding(SessionScope::class)
class MatrixUserRepository @Inject constructor(
client: MatrixClient,
private val client: MatrixClient,
private val dataSource: UserListDataSource
) : UserRepository {
private val sessionId = client.sessionId
override suspend fun search(query: String): Flow<List<UserSearchResult>> = flow {
// Manually add a fake result with the matrixId, if provided and not the local user
val isAnotherUsersId = query != sessionId.value && MatrixPatterns.isUserId(query)
val isAnotherUsersId = MatrixPatterns.isUserId(query) && !client.isMe(UserId(query))
if (isAnotherUsersId) {
emit(listOf(UserSearchResult(MatrixUser(UserId(query)))))
}
@ -51,7 +49,7 @@ class MatrixUserRepository @Inject constructor(
val results = dataSource
.search(query, MAXIMUM_SEARCH_RESULTS)
.filter { it.userId != sessionId }
.filter { !client.isMe(it.userId) }
.map { UserSearchResult(it) }
.toMutableList()