Merge remote-tracking branch 'origin/feature/drop-yap-database-support' into feature/groups-rebuild-part-2

# Conflicts:
#	SessionMessagingKit/Database/Models/SessionThread.swift
pull/941/head
Morgan Pretty 1 year ago
commit b89a4d3aeb

@ -380,31 +380,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(

Loading…
Cancel
Save