Merge pull request #690 from mpretty-cyro/fix/filter-unblinded-mentions

Updated open groups to filter the mentions list based on blinding
pull/692/head
Morgan Pretty 2 years ago committed by GitHub
commit ab95841f6c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -386,6 +386,16 @@ public class ConversationViewModel: OWSAudioPlayerDelegate {
case .openGroup:
let profile: TypedTableAlias<Profile> = TypedTableAlias()
let capabilities: Set<Capability.Variant> = (try? Capability
.select(.variant)
.filter(Capability.Columns.openGroupServer == threadData.openGroupServer)
.asRequest(of: Capability.Variant.self)
.fetchSet(db))
.defaulting(to: [])
let targetPrefix: SessionId.Prefix = (capabilities.contains(.blind) ?
.blinded :
.standard
)
return try Interaction
.select(
@ -401,6 +411,7 @@ public class ConversationViewModel: OWSAudioPlayerDelegate {
.joining(
required: Interaction.profile
.aliased(profile)
.filter(Profile.Columns.id.like("\(targetPrefix.rawValue)%"))
// Note: LIKE is case-insensitive in SQLite
.filter(
query.count < 2 || (

Loading…
Cancel
Save