This commit is contained in:
Ryan ZHAO 2023-11-14 09:56:34 +11:00
parent 3d566c1923
commit 39c9ec7357
2 changed files with 0 additions and 53 deletions

View File

@ -462,34 +462,6 @@ public extension SessionThread {
)
}
func isMessageRequestFromCommunity(_ db: Database, openGroupId: String) -> Bool {
var isMessageRequestFromCommunity: Bool = false
if let currentUserBlinded15PublicKey: String = Self.getUserHexEncodedBlindedKey(
db,
threadId: openGroupId,
threadVariant: .community,
blindingPrefix: .blinded15
) {
isMessageRequestFromCommunity = isMessageRequestFromCommunity || ((try? Interaction
.filter(Interaction.Columns.threadId == self.id)
.filter(Interaction.Columns.openGroupWhisperTo == currentUserBlinded15PublicKey)
.isNotEmpty(db)) ?? false)
}
if let currentUserBlinded25PublicKey: String = Self.getUserHexEncodedBlindedKey(
db,
threadId: openGroupId,
threadVariant: .community,
blindingPrefix: .blinded25
) {
isMessageRequestFromCommunity = isMessageRequestFromCommunity || ((try? Interaction
.filter(Interaction.Columns.threadId == self.id)
.filter(Interaction.Columns.openGroupWhisperTo == currentUserBlinded25PublicKey)
.isNotEmpty(db)) ?? false)
}
return isMessageRequestFromCommunity
}
func isNoteToSelf(_ db: Database? = nil) -> Bool {
return (
variant == .contact &&

View File

@ -370,31 +370,6 @@ public final class OpenGroupManager {
}
}
private func cleanMessageRequests(
_ db: Database,
openGroupId: String,
openGroupServer: String?,
calledFromConfigHandling: Bool,
using dependencies: Dependencies = Dependencies()
) {
// Remove threads with only message requests from open group
_ = try? SessionThread
.filter(SessionThread.isMessageRequest(userPublicKey: getUserHexEncodedPublicKey(db, using: dependencies)))
.fetchAll(db)
.filter { $0.isMessageRequestFromCommunity(db, openGroupId: openGroupId)}
.map { try $0.delete(db)}
if !calledFromConfigHandling, let server: String = openGroupServer {
//Remove inbox messages
if let data = try? OpenGroupAPI.preparedClearInbox(db, on: server) {
OpenGroupAPI
.send(data: data)
.map { _ in [server: true] }
.sinkUntilComplete()
}
}
}
// MARK: - Response Processing
internal static func handleCapabilities(