Merge pull request #418 from oxen-io/polling-limit

Limit Polling After Long Inactivity
This commit is contained in:
Niels Andriesse 2021-05-24 16:40:43 +10:00 committed by GitHub
commit 16e6c968f7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 3 deletions

View File

@ -4,11 +4,19 @@ import SessionSnodeKit
@objc(SNOpenGroupAPIV2)
public final class OpenGroupAPIV2 : NSObject {
private static var authTokenPromises: [String:Promise<String>] = [:]
private static var hasPerformedInitialPoll: [String:Bool] = [:]
private static var hasUpdatedLastOpenDate = false
public static let workQueue = DispatchQueue(label: "OpenGroupAPIV2.workQueue", qos: .userInitiated) // It's important that this is a serial queue
public static var moderators: [String:[String:Set<String>]] = [:] // Server URL to room ID to set of moderator IDs
public static var defaultRoomsPromise: Promise<[Info]>?
public static var groupImagePromises: [String:Promise<Data>] = [:]
private static let timeSinceLastOpen: TimeInterval = {
guard let lastOpen = UserDefaults.standard[.lastOpen] else { return .greatestFiniteMagnitude }
let now = Date()
return now.timeIntervalSince(lastOpen)
}()
// MARK: Settings
public static let defaultServer = "http://116.203.70.33"
public static let defaultServerPublicKey = "a03c383cf63c3c4efe67acc52112a6dd734b3a946b9545f488aaa93da7991238"
@ -144,14 +152,20 @@ public final class OpenGroupAPIV2 : NSObject {
let rooms = storage.getAllV2OpenGroups().values.filter { $0.server == server }.map { $0.room }
var body: [JSON] = []
var authTokenPromises: [String:Promise<String>] = [:]
let useMessageLimit = (hasPerformedInitialPoll[server] != true && timeSinceLastOpen > OpenGroupPollerV2.maxInactivityPeriod)
hasPerformedInitialPoll[server] = true
if !hasUpdatedLastOpenDate {
UserDefaults.standard[.lastOpen] = Date()
hasUpdatedLastOpenDate = true
}
for room in rooms {
authTokenPromises[room] = getAuthToken(for: room, on: server)
var json: JSON = [ "room_id" : room ]
if let lastMessageServerID = storage.getLastMessageServerID(for: room, on: server) {
json["from_message_server_id"] = lastMessageServerID
json["from_message_server_id"] = useMessageLimit ? nil : lastMessageServerID
}
if let lastDeletionServerID = storage.getLastDeletionServerID(for: room, on: server) {
json["from_deletion_server_id"] = lastDeletionServerID
json["from_deletion_server_id"] = useMessageLimit ? nil : lastDeletionServerID
}
body.append(json)
}

View File

@ -9,6 +9,7 @@ public final class OpenGroupPollerV2 : NSObject {
// MARK: Settings
private let pollInterval: TimeInterval = 4
static let maxInactivityPeriod: Double = 14 * 24 * 60 * 60
// MARK: Lifecycle
public init(for server: String) {

View File

@ -14,6 +14,7 @@ public enum SNUserDefaults {
case lastDisplayNameUpdate
case lastProfilePictureUpdate
case lastOpenGroupImageUpdate
case lastOpen
}
public enum Double : Swift.String {