Skip to content

SES-4151 - User without display name does not show up in mention list #1339

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

SES-4151 - User without display name does not show up in mention list #1339

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
94 changes: 70 additions & 24 deletions app/src/main/java/org/thoughtcrime/securesms/conversation/v2/mention/MentionViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ import kotlinx.coroutines.withContext
import network.loki.messenger.R
import network.loki.messenger.libsession_util.allWithStatus
import org.session.libsession.messaging.contacts.Contact
import org.session.libsession.messaging.utilities.UpdateMessageBuilder.usernameUtils
import org.session.libsession.utilities.ConfigFactoryProtocol
import org.session.libsignal.utilities.AccountId
import org.session.libsignal.utilities.IdPrefix
Expand Down Expand Up @@ -101,14 +102,22 @@ class MentionViewModel(

val memberIDs = when {
recipient.isLegacyGroupRecipient -> {
groupDatabase.getGroupMemberAddresses(recipient.address.toGroupString(), false)
groupDatabase.getGroupMemberAddresses(
recipient.address.toGroupString(),
false
)
.map { it.toString() }
}

recipient.isGroupV2Recipient -> {
storage.getMembers(recipient.address.toString()).map { it.accountId() }
}

recipient.isCommunityRecipient -> mmsDatabase.getRecentChatMemberIDs(threadID, 20)
recipient.isCommunityRecipient -> mmsDatabase.getRecentChatMemberIDs(
threadID,
20
)

recipient.isContactRecipient -> listOf(recipient.address.toString())
else -> listOf()
}
Expand Down Expand Up @@ -151,30 +160,54 @@ class MentionViewModel(
requireNotNull(storage.getUserPublicKey())
}

(sequenceOf(
Member(
publicKey = myId,
name = application.getString(R.string.you),
isModerator = myId in moderatorIDs,
isMe = true
)
) + contactDatabase.getContacts(memberIDs)
.asSequence()
.filter { it.accountID != myId }
.map { contact ->
Member(
publicKey = contact.accountID,
name = contact.displayName(contactContext),
isModerator = contact.accountID in moderatorIDs,
isMe = false
)
})
//This is you in the tag list
val selfMember = buildMember(
myId,
application.getString(R.string.you),
myId in moderatorIDs,
true
)

// Other members from this groupv2
val otherMembers = if (recipient.isGroupV2Recipient) {
val groupId = AccountId(recipient.address.toString())

// Get members of the group
val rawMembers = configFactory.withGroupConfigs(groupId) {
it.groupMembers.allWithStatus()
}

rawMembers
.filter { (member, _) -> member.accountId() != myId }
.map { (member) ->
val id = member.accountId()
val name = usernameUtils
.getContactNameWithAccountID(
id,
groupId
) // returns contact name or blank
.takeIf { it.isNotBlank() } ?: id // fallback to id
buildMember(id, name, id in moderatorIDs, false)
}
} else {
// Fallback to only local contacts
contactDatabase.getContacts(memberIDs)
.asSequence()
.filter { it.accountID != myId }
.map { contact ->
val id = contact.accountID
val name = contact.displayName(contactContext)
.takeIf { it.isNotBlank() } ?: id
buildMember(id, name, id in moderatorIDs, false)
}
}

(sequenceOf(selfMember) + otherMembers)
.toList()
}
.flowOn(dispatcher)
.stateIn(viewModelScope, SharingStarted.WhileSubscribed(10_000L), null)


@OptIn(ExperimentalCoroutinesApi::class)
val autoCompleteState: StateFlow<AutoCompleteState> = editable
.observeMentionSearchQuery()
Expand All @@ -192,7 +225,12 @@ class MentionViewModel(
val filtered = if (query.query.isBlank()) {
members.mapTo(mutableListOf()) { Candidate(it, it.name, 0) }
} else {
members.mapNotNullTo(mutableListOf()) { searchAndHighlight(it, query.query) }
members.mapNotNullTo(mutableListOf()) {
searchAndHighlight(
it,
query.query
)
}
}

filtered.sortWith(Candidate.MENTION_LIST_COMPARATOR)
Expand All @@ -202,6 +240,13 @@ class MentionViewModel(
}
.stateIn(viewModelScope, SharingStarted.WhileSubscribed(), AutoCompleteState.Idle)

private fun buildMember(
id: String,
name: String,
isModerator: Boolean,
isMe: Boolean
) = Member(publicKey = id, name = name, isModerator = isModerator, isMe = isMe)

private fun searchAndHighlight(
haystack: Member,
needle: String
Expand All @@ -226,11 +271,12 @@ class MentionViewModel(
fun onCandidateSelected(candidatePublicKey: String) {
val query = editable.mentionSearchQuery ?: return
val autoCompleteState = autoCompleteState.value as? AutoCompleteState.Result ?: return
val candidate = autoCompleteState.members.find { it.member.publicKey == candidatePublicKey } ?: return
val candidate =
autoCompleteState.members.find { it.member.publicKey == candidatePublicKey } ?: return

editable.addMention(
candidate.member,
query.mentionSymbolStartAt .. (query.mentionSymbolStartAt + query.query.length + 1)
query.mentionSymbolStartAt..(query.mentionSymbolStartAt + query.query.length + 1)
)
}

Expand Down