diff --git a/SessionMessagingKit/Jobs/Types/DisappearingMessagesJob.swift b/SessionMessagingKit/Jobs/Types/DisappearingMessagesJob.swift index 3d87d1e3f..e2843c425 100644 --- a/SessionMessagingKit/Jobs/Types/DisappearingMessagesJob.swift +++ b/SessionMessagingKit/Jobs/Types/DisappearingMessagesJob.swift @@ -118,7 +118,6 @@ public extension DisappearingMessagesJob { serverHashes: expirationInfos.map { $0.serverHash }, shortenOnly: true ).map { results in - print("Ryan Test expire: \(results)") var unchangedMessages: [String: UInt64] = [:] results.forEach { _, result in guard let unchanged = result.unchanged else { return } @@ -135,17 +134,6 @@ public extension DisappearingMessagesJob { .updateAll(db, Interaction.Columns.expiresInSeconds.set(to: expiresInSeconds)) } }.retainUntilComplete() - - SnodeAPI.getSwarm(for: userPublicKey) - .then2 { swarm -> Promise in - guard let snode = swarm.randomElement() else { return Promise(error: StorageError.objectNotFound) } - - return SnodeAPI.getExpiries(from: snode, associatedWith: getUserHexEncodedPublicKey(db), of: expirationInfos.map { $0.serverHash }) - .map{ result in - print("Ryan Test get_expiries: \(result)") - } - }.retainUntilComplete() - } return updateNextRunIfNeeded(db) diff --git a/SessionSnodeKit/SnodeAPI.swift b/SessionSnodeKit/SnodeAPI.swift index 47a226cc5..c3e5921cc 100644 --- a/SessionSnodeKit/SnodeAPI.swift +++ b/SessionSnodeKit/SnodeAPI.swift @@ -510,7 +510,7 @@ public final class SnodeAPI { // Make the request let parameters: JSON = [ - "pubKey": publicKey, + "pubkey": publicKey, "messages": serverHashes, "timestamp": timestamp, "pubkey_ed25519": ed25519PublicKey, @@ -599,7 +599,7 @@ public final class SnodeAPI { // Make the request let parameters: JSON = [ - "pubKey": Features.useTestnet ? publicKey.removingIdPrefixIfNeeded() : publicKey, + "pubKey": Features.useTestnet ? publicKey.removingIdPrefixIfNeeded() : publicKey, // NOTE: Capital "K" "namespace": namespace, "lastHash": lastHash, "timestamp": timestamp, @@ -640,7 +640,7 @@ public final class SnodeAPI { // Make the request var parameters: JSON = [ - "pubKey": (Features.useTestnet ? publicKey.removingIdPrefixIfNeeded() : publicKey), + "pubKey": (Features.useTestnet ? publicKey.removingIdPrefixIfNeeded() : publicKey), // NOTE: Capital "K" "lastHash": lastHash ] diff --git a/SessionUtilitiesKit/General/Features.swift b/SessionUtilitiesKit/General/Features.swift index e4f8088a9..d23dabef6 100644 --- a/SessionUtilitiesKit/General/Features.swift +++ b/SessionUtilitiesKit/General/Features.swift @@ -2,5 +2,5 @@ @objc(SNFeatures) public final class Features : NSObject { public static let useOnionRequests = true - public static let useTestnet = true + public static let useTestnet = false }