Skip to content

Commit 5eeaec0

Browse files
committed
chore(fc): ensure getUsersFromIds maintains positioning of sort order
Signed-off-by: Brandon McAnsh <git@bmcreations.dev>
1 parent f916b1b commit 5eeaec0

1 file changed

Lines changed: 4 additions & 0 deletions

File tree

  • services/flipchat/chat/src/main/kotlin/xyz/flipchat/services/internal/db

services/flipchat/chat/src/main/kotlin/xyz/flipchat/services/internal/db/UserDao.kt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import androidx.room.Query
77
import com.getcode.model.ID
88
import com.getcode.utils.base58
99
import kotlinx.coroutines.flow.Flow
10+
import kotlinx.coroutines.flow.map
1011
import xyz.flipchat.services.data.MemberIdentity
1112
import xyz.flipchat.services.domain.model.people.FlipchatUser
1213
import xyz.flipchat.services.domain.model.people.FlipchatUserWithSocialProfiles
@@ -39,5 +40,8 @@ interface UserDao {
3940
fun getUsersFrom(userIds: List<String>): Flow<List<FlipchatUserWithSocialProfiles>>
4041
fun getUsersFromIds(userIds: List<ID>): Flow<List<FlipchatUserWithSocialProfiles>> {
4142
return getUsersFrom(userIds.map { it.base58 })
43+
.map { users ->
44+
users.sortedBy { userIds.indexOf(it.user.id) }
45+
}
4246
}
4347
}

0 commit comments

Comments
 (0)