|
|
@ -55,17 +55,16 @@ extension ConfigurationMessage {
|
|
|
|
|
|
|
|
|
|
|
|
return (
|
|
|
|
return (
|
|
|
|
// Skip the current user
|
|
|
|
// Skip the current user
|
|
|
|
contact.sessionID != currentUserPublicKey && (
|
|
|
|
contact.sessionID != currentUserPublicKey &&
|
|
|
|
|
|
|
|
// Contacts which have visible threads
|
|
|
|
|
|
|
|
TSContactThread.fetch(uniqueId: threadID, transaction: transaction)?.shouldBeVisible == true && (
|
|
|
|
|
|
|
|
|
|
|
|
// Include already approved contacts
|
|
|
|
// Include already approved contacts
|
|
|
|
contact.isApproved ||
|
|
|
|
contact.isApproved ||
|
|
|
|
contact.didApproveMe ||
|
|
|
|
contact.didApproveMe ||
|
|
|
|
|
|
|
|
|
|
|
|
// Sync blocked contacts
|
|
|
|
// Sync blocked contacts
|
|
|
|
SSKEnvironment.shared.blockingManager.isRecipientIdBlocked(contact.sessionID) ||
|
|
|
|
SSKEnvironment.shared.blockingManager.isRecipientIdBlocked(contact.sessionID)
|
|
|
|
|
|
|
|
|
|
|
|
// Contacts which have visible threads (sanity check - should be included as already approved)
|
|
|
|
|
|
|
|
TSContactThread.fetch(uniqueId: threadID, transaction: transaction)?.shouldBeVisible == true
|
|
|
|
|
|
|
|
)
|
|
|
|
)
|
|
|
|
)
|
|
|
|
)
|
|
|
|
}
|
|
|
|
}
|
|
|
|