Add code to guess if the user is restoring and turn off EBT to work a…

…round #847
planetary-social · Nov 23, 2022 · a23392b · a23392b
1 parent a10f879
commit a23392b
Show file tree

Hide file tree

Showing 52 changed files with 132 additions and 65 deletions.
diff --git a/GoSSB/Sources/api-ios.go b/GoSSB/Sources/api-ios.go
@@ -269,7 +269,7 @@ func ssbBotInit(config string, notifyBlobReceivedFn uintptr, notifyNewBearerToke
 			// TODO: make version that prints bytes "unhumanized" so that we can count them
 			return countconn.WrapConn(level.Debug(log), c), nil
 		}),
-		mksbot.DisableEBT(false),
+		mksbot.DisableEBT(cfg.DisableEBT),
 		mksbot.WithPublicAuthorizer(newAcceptAllAuthorizer()),
 	}
 

diff --git a/Source/Bot/Bot.swift b/Source/Bot/Bot.swift
@@ -120,8 +120,14 @@ protocol Bot: AnyObject {
     /// whose data is contained in `AppConfiguration`.
     /// - Parameter queue: The queue that `completion` will be called on.
     /// - Parameter config: An object containing high-level parameters like the user's keys and the network key.
+    /// - Parameter fromOnboarding: A flag that should be true if the user is logging in from the onboarding flow.
     /// - Parameter completion: A handler that will be called with the result of the operation.
-    func login(queue: DispatchQueue, config: AppConfiguration, completion: @escaping ErrorCompletion)
+    func login(
+        queue: DispatchQueue,
+        config: AppConfiguration,
+        fromOnboarding: Bool,
+        completion: @escaping ErrorCompletion
+    )
     func logout(completion: @escaping ErrorCompletion)
 
     // MARK: Invites
@@ -317,13 +323,13 @@ extension Bot {
         }
     }
 
-    func login(config: AppConfiguration, completion: @escaping ErrorCompletion) {
-        self.login(queue: .main, config: config, completion: completion)
+    func login(config: AppConfiguration, fromOnboarding: Bool, completion: @escaping ErrorCompletion) {
+        self.login(queue: .main, config: config, fromOnboarding: fromOnboarding, completion: completion)
     }
 
-    func login(config: AppConfiguration) async throws {
+    func login(config: AppConfiguration, fromOnboarding: Bool) async throws {
         let error: Error? = await withCheckedContinuation { continuation in
-            self.login(config: config) { error in
+            self.login(config: config, fromOnboarding: fromOnboarding) { error in
                 continuation.resume(with: .success(error))
             }
         }

diff --git a/Source/Bot/Operations/LoginOperation.swift b/Source/Bot/Operations/LoginOperation.swift
@@ -31,7 +31,7 @@ class LoginOperation: AsynchronousOperation {
             self.success = true
             self.finish()
         } else {
-            Bots.current.login(config: configuration) { [weak self] (error) in
+            Bots.current.login(config: configuration, fromOnboarding: false) { [weak self] (error) in
                 if let strongSelf = self, !strongSelf.isCancelled {
                     self?.success = ((error as? BotError) == .alreadyLoggedIn) || error == nil
                     self?.error = error

diff --git a/Source/Controller/Beta1MigrationController.swift b/Source/Controller/Beta1MigrationController.swift
@@ -102,8 +102,6 @@ class Beta1MigrationController: ObservableObject, Beta1MigrationViewModel {
             hostingController.modalTransitionStyle = .crossDissolve
         }
         await appController.present(hostingController, animated: true)
-
-        bot.isRestoring = true
 
         if !userDefaults.bool(forKey: beta1MigrationStartKey) {
             try await bot.dropDatabase(for: appConfiguration)
@@ -116,7 +114,8 @@ class Beta1MigrationController: ObservableObject, Beta1MigrationViewModel {
             controller.progress = userDefaults.float(forKey: beta1MigrationProgress)
         }
 
-        try await bot.login(config: appConfiguration)
+        try await bot.login(config: appConfiguration, fromOnboarding: false)
+        bot.isRestoring = true
         await controller.bindProgress(to: bot)
 
         return true

diff --git a/Source/Controller/Fix814AccountsHelper.swift b/Source/Controller/Fix814AccountsHelper.swift
@@ -83,7 +83,7 @@ enum Fix814AccountsHelper {
             newConfiguration.bot = bot
             newConfiguration.ssbNetwork = Environment.Networks.mainNet
 
-            try await bot.login(config: newConfiguration)
+            try await bot.login(config: newConfiguration, fromOnboarding: false)
 
             // copy published messages
             for message in publishedMessages {

diff --git a/Source/Controller/LaunchViewController.swift b/Source/Controller/LaunchViewController.swift
@@ -123,7 +123,7 @@ class LaunchViewController: UIViewController {
                 guard configuration.network != nil else { return }
                 guard let bot = configuration.bot else { return }
 
-                try await bot.login(config: configuration)
+                try await bot.login(config: configuration, fromOnboarding: false)
             } catch {
                 self.handleLoginFailure(with: error, configuration: configuration)
             }

diff --git a/Source/FakeBot/FakeBot.swift b/Source/FakeBot/FakeBot.swift
@@ -170,7 +170,12 @@ class FakeBot: Bot {
         completion(nil, FakeBotError.runtimeError("TODO:createSecret"))
     }
 
-    func login(queue: DispatchQueue, config: AppConfiguration, completion: @escaping ErrorCompletion) {
+    func login(
+        queue: DispatchQueue,
+        config: AppConfiguration,
+        fromOnboarding: Bool,
+        completion: @escaping ErrorCompletion
+    ) {
         self._network = config.network?.string
         self._identity = config.secret.identity
         queue.async {

diff --git a/Source/GoBot/GoBot.swift b/Source/GoBot/GoBot.swift
@@ -177,6 +177,18 @@ class GoBot: Bot {
 
         Analytics.shared.trackDidDropDatabase()
     }
+
+    private func guessIfRestoring() throws -> Bool {
+        guard database.isOpen(),
+            let config = config else {
+            throw BotError.notLoggedIn
+        }
+
+        let numberOfPublishedMessagesInViewDB = try database.numberOfMessages(for: config.identity)
+        let numberOfPublishedMessagesInAppConfig = config.numberOfPublishedMessages
+        return numberOfPublishedMessagesInViewDB == 0 ||
+            numberOfPublishedMessagesInViewDB < numberOfPublishedMessagesInAppConfig
+    }
 
     // MARK: Login/Logout
 
@@ -192,7 +204,12 @@ class GoBot: Bot {
         completion(secret, nil)
     }
 
-    func login(queue: DispatchQueue, config: AppConfiguration, completion: @escaping ErrorCompletion) {
+    func login(
+        queue: DispatchQueue,
+        config: AppConfiguration,
+        fromOnboarding isLoggingInFromOnboarding: Bool = false,
+        completion: @escaping ErrorCompletion
+    ) {
         guard let network = config.network else {
             queue.async { completion(BotError.invalidAppConfiguration) }
             return
@@ -224,6 +241,8 @@ class GoBot: Bot {
                 path: repoPrefix,
                 user: secret.identity
             )
+
+            isRestoring = isLoggingInFromOnboarding ? false : try guessIfRestoring()
         } catch {
             queue.async { completion(error) }
             return
@@ -237,7 +256,8 @@ class GoBot: Bot {
                 network: network,
                 hmacKey: hmacKey,
                 secret: secret,
-                pathPrefix: repoPrefix
+                pathPrefix: repoPrefix,
+                disableEBT: self.isRestoring // This is a terrible hack to work around #847
             )
 
             defer {

diff --git a/Source/GoBot/GoBotInternal.swift b/Source/GoBot/GoBotInternal.swift
@@ -92,6 +92,9 @@ private struct GoBotConfig: Encodable {
     let SchemaVersion: UInt
 
     let ServicePubs: [Identity]? // identities of services which supply planetary specific services
+
+    /// Disables EBT replication if true. Part of a workaround for #847.
+    let DisableEBT: Bool
 
     #if DEBUG
     let Testing = true
@@ -132,7 +135,13 @@ class GoBotInternal {
 
     // MARK: login / logout
 
-    func login(network: NetworkKey, hmacKey: HMACKey?, secret: Secret, pathPrefix: String) -> Error? {
+    func login(
+        network: NetworkKey,
+        hmacKey: HMACKey?,
+        secret: Secret,
+        pathPrefix: String,
+        disableEBT: Bool
+    ) -> Error? {
         if self.isRunning {
             guard self.logout() == true else {
                 return GoBotError.duringProcessing("failure during logging out previous session", GoBotError.alreadyStarted)
@@ -155,7 +164,9 @@ class GoBotInternal {
             ListenAddr: listenAddr,
             Hops: 1,
             SchemaVersion: ViewDatabase.schemaVersion,
-            ServicePubs: servicePubs)
+            ServicePubs: servicePubs,
+            DisableEBT: disableEBT
+        )
 
         let enc = JSONEncoder()
         var cfgStr: String

diff --git a/Source/Localization/af-ZA.lproj/Generated.strings b/Source/Localization/af-ZA.lproj/Generated.strings
@@ -327,7 +327,7 @@
 "Error.invalidRoomURL" = "Could not parse invitation.";
 "Error.invalidRoomInvitationOrAddress" = "Planetary does not recognize this as a valid room invitation or address.";
 "Error.notLoggedIn" = "The operation could not be completed because no user is logged in.";
-"Error.alreadyJoinedRoom" = "You are already a member of this room.";
+"Error.alreadyJoinedRoom" = "You are already a member of this room";
 
 "Channel.one" = "channel";
 "Channel.many" = "channels";

diff --git a/Source/Localization/ar-SA.lproj/Generated.strings b/Source/Localization/ar-SA.lproj/Generated.strings
@@ -327,7 +327,7 @@
 "Error.invalidRoomURL" = "Could not parse invitation.";
 "Error.invalidRoomInvitationOrAddress" = "Planetary does not recognize this as a valid room invitation or address.";
 "Error.notLoggedIn" = "The operation could not be completed because no user is logged in.";
-"Error.alreadyJoinedRoom" = "You are already a member of this room.";
+"Error.alreadyJoinedRoom" = "You are already a member of this room";
 
 "Channel.one" = "channel";
 "Channel.many" = "channels";

diff --git a/Source/Localization/ca-ES.lproj/Generated.strings b/Source/Localization/ca-ES.lproj/Generated.strings
@@ -327,7 +327,7 @@
 "Error.invalidRoomURL" = "Could not parse invitation.";
 "Error.invalidRoomInvitationOrAddress" = "Planetary does not recognize this as a valid room invitation or address.";
 "Error.notLoggedIn" = "The operation could not be completed because no user is logged in.";
-"Error.alreadyJoinedRoom" = "You are already a member of this room.";
+"Error.alreadyJoinedRoom" = "You are already a member of this room";
 
 "Channel.one" = "channel";
 "Channel.many" = "channels";

diff --git a/Source/Localization/cs-CZ.lproj/Generated.strings b/Source/Localization/cs-CZ.lproj/Generated.strings
@@ -327,7 +327,7 @@
 "Error.invalidRoomURL" = "Could not parse invitation.";
 "Error.invalidRoomInvitationOrAddress" = "Planetary does not recognize this as a valid room invitation or address.";
 "Error.notLoggedIn" = "The operation could not be completed because no user is logged in.";
-"Error.alreadyJoinedRoom" = "You are already a member of this room.";
+"Error.alreadyJoinedRoom" = "You are already a member of this room";
 
 "Channel.one" = "channel";
 "Channel.many" = "channels";

diff --git a/Source/Localization/da-DK.lproj/Generated.strings b/Source/Localization/da-DK.lproj/Generated.strings
@@ -327,7 +327,7 @@
 "Error.invalidRoomURL" = "Could not parse invitation.";
 "Error.invalidRoomInvitationOrAddress" = "Planetary does not recognize this as a valid room invitation or address.";
 "Error.notLoggedIn" = "The operation could not be completed because no user is logged in.";
-"Error.alreadyJoinedRoom" = "You are already a member of this room.";
+"Error.alreadyJoinedRoom" = "You are already a member of this room";
 
 "Channel.one" = "channel";
 "Channel.many" = "channels";

diff --git a/Source/Localization/de-DE.lproj/Generated.strings b/Source/Localization/de-DE.lproj/Generated.strings
@@ -327,7 +327,7 @@
 "Error.invalidRoomURL" = "Could not parse invitation.";
 "Error.invalidRoomInvitationOrAddress" = "Planetary does not recognize this as a valid room invitation or address.";
 "Error.notLoggedIn" = "The operation could not be completed because no user is logged in.";
-"Error.alreadyJoinedRoom" = "You are already a member of this room.";
+"Error.alreadyJoinedRoom" = "You are already a member of this room";
 
 "Channel.one" = "Kanal";
 "Channel.many" = "Kanäle";

diff --git a/Source/Localization/el-GR.lproj/Generated.strings b/Source/Localization/el-GR.lproj/Generated.strings
@@ -327,7 +327,7 @@
 "Error.invalidRoomURL" = "Could not parse invitation.";
 "Error.invalidRoomInvitationOrAddress" = "Planetary does not recognize this as a valid room invitation or address.";
 "Error.notLoggedIn" = "The operation could not be completed because no user is logged in.";
-"Error.alreadyJoinedRoom" = "You are already a member of this room.";
+"Error.alreadyJoinedRoom" = "You are already a member of this room";
 
 "Channel.one" = "channel";
 "Channel.many" = "channels";

diff --git a/Source/Localization/en-US.lproj/Generated.strings b/Source/Localization/en-US.lproj/Generated.strings
@@ -327,7 +327,7 @@
 "Error.invalidRoomURL" = "Could not parse invitation.";
 "Error.invalidRoomInvitationOrAddress" = "Planetary does not recognize this as a valid room invitation or address.";
 "Error.notLoggedIn" = "The operation could not be completed because no user is logged in.";
-"Error.alreadyJoinedRoom" = "You are already a member of this room.";
+"Error.alreadyJoinedRoom" = "You are already a member of this room";
 
 "Channel.one" = "channel";
 "Channel.many" = "channels";

diff --git a/Source/Localization/en.lproj/Generated.strings b/Source/Localization/en.lproj/Generated.strings
@@ -327,7 +327,7 @@
 "Error.invalidRoomURL" = "Could not parse invitation.";
 "Error.invalidRoomInvitationOrAddress" = "Planetary does not recognize this as a valid room invitation or address.";
 "Error.notLoggedIn" = "The operation could not be completed because no user is logged in.";
-"Error.alreadyJoinedRoom" = "You are already a member of this room.";
+"Error.alreadyJoinedRoom" = "You are already a member of this room";
 
 "Channel.one" = "channel";
 "Channel.many" = "channels";

diff --git a/Source/Localization/es-AR.lproj/Generated.strings b/Source/Localization/es-AR.lproj/Generated.strings
@@ -327,7 +327,7 @@
 "Error.invalidRoomURL" = "Could not parse invitation.";
 "Error.invalidRoomInvitationOrAddress" = "Planetary does not recognize this as a valid room invitation or address.";
 "Error.notLoggedIn" = "The operation could not be completed because no user is logged in.";
-"Error.alreadyJoinedRoom" = "You are already a member of this room.";
+"Error.alreadyJoinedRoom" = "You are already a member of this room";
 
 "Channel.one" = "hashtag";
 "Channel.many" = "hashtags";

diff --git a/Source/Localization/es-ES.lproj/Generated.strings b/Source/Localization/es-ES.lproj/Generated.strings
@@ -327,7 +327,7 @@
 "Error.invalidRoomURL" = "No se pudo analizar tu invitación.";
 "Error.invalidRoomInvitationOrAddress" = "Planetary does not recognize this as a valid room invitation or address.";
 "Error.notLoggedIn" = "La operación no pudo ser completada porque no hay ningún usuario conectado.";
-"Error.alreadyJoinedRoom" = "You are already a member of this room.";
+"Error.alreadyJoinedRoom" = "You are already a member of this room";
 
 "Channel.one" = "etiqueta";
 "Channel.many" = "etiquetas";

diff --git a/Source/Localization/es-UY.lproj/Generated.strings b/Source/Localization/es-UY.lproj/Generated.strings
@@ -327,7 +327,7 @@
 "Error.invalidRoomURL" = "No se pudo interpretar la invitación.";
 "Error.invalidRoomInvitationOrAddress" = "Planetary no reconoce esto como una invitación o dirección válida de la sala.";
 "Error.notLoggedIn" = "La operación no pudo ser completada porque no hay ningún usuario conectado.";
-"Error.alreadyJoinedRoom" = "You are already a member of this room.";
+"Error.alreadyJoinedRoom" = "You are already a member of this room";
 
 "Channel.one" = "hashtag";
 "Channel.many" = "hashtags";

diff --git a/Source/Localization/es.lproj/Generated.strings b/Source/Localization/es.lproj/Generated.strings
@@ -327,7 +327,7 @@
 "Error.invalidRoomURL" = "Could not parse invitation.";
 "Error.invalidRoomInvitationOrAddress" = "Planetary does not recognize this as a valid room invitation or address.";
 "Error.notLoggedIn" = "The operation could not be completed because no user is logged in.";
-"Error.alreadyJoinedRoom" = "You are already a member of this room.";
+"Error.alreadyJoinedRoom" = "You are already a member of this room";
 
 "Channel.one" = "etiqueta";
 "Channel.many" = "etiquetas";

diff --git a/Source/Localization/fi-FI.lproj/Generated.strings b/Source/Localization/fi-FI.lproj/Generated.strings
@@ -327,7 +327,7 @@
 "Error.invalidRoomURL" = "Could not parse invitation.";
 "Error.invalidRoomInvitationOrAddress" = "Planetary does not recognize this as a valid room invitation or address.";
 "Error.notLoggedIn" = "The operation could not be completed because no user is logged in.";
-"Error.alreadyJoinedRoom" = "You are already a member of this room.";
+"Error.alreadyJoinedRoom" = "You are already a member of this room";
 
 "Channel.one" = "channel";
 "Channel.many" = "channels";

diff --git a/Source/Localization/fr-FR.lproj/Generated.strings b/Source/Localization/fr-FR.lproj/Generated.strings
@@ -327,7 +327,7 @@
 "Error.invalidRoomURL" = "Could not parse invitation.";
 "Error.invalidRoomInvitationOrAddress" = "Planetary does not recognize this as a valid room invitation or address.";
 "Error.notLoggedIn" = "The operation could not be completed because no user is logged in.";
-"Error.alreadyJoinedRoom" = "You are already a member of this room.";
+"Error.alreadyJoinedRoom" = "You are already a member of this room";
 
 "Channel.one" = "channel";
 "Channel.many" = "channels";

diff --git a/Source/Localization/he-IL.lproj/Generated.strings b/Source/Localization/he-IL.lproj/Generated.strings
@@ -327,7 +327,7 @@
 "Error.invalidRoomURL" = "Could not parse invitation.";
 "Error.invalidRoomInvitationOrAddress" = "Planetary does not recognize this as a valid room invitation or address.";
 "Error.notLoggedIn" = "The operation could not be completed because no user is logged in.";
-"Error.alreadyJoinedRoom" = "You are already a member of this room.";
+"Error.alreadyJoinedRoom" = "You are already a member of this room";
 
 "Channel.one" = "channel";
 "Channel.many" = "channels";

diff --git a/Source/Localization/hu-HU.lproj/Generated.strings b/Source/Localization/hu-HU.lproj/Generated.strings
@@ -327,7 +327,7 @@
 "Error.invalidRoomURL" = "Could not parse invitation.";
 "Error.invalidRoomInvitationOrAddress" = "Planetary does not recognize this as a valid room invitation or address.";
 "Error.notLoggedIn" = "The operation could not be completed because no user is logged in.";
-"Error.alreadyJoinedRoom" = "You are already a member of this room.";
+"Error.alreadyJoinedRoom" = "You are already a member of this room";
 
 "Channel.one" = "channel";
 "Channel.many" = "channels";

diff --git a/Source/Localization/it-IT.lproj/Generated.strings b/Source/Localization/it-IT.lproj/Generated.strings
@@ -327,7 +327,7 @@
 "Error.invalidRoomURL" = "Could not parse invitation.";
 "Error.invalidRoomInvitationOrAddress" = "Planetary does not recognize this as a valid room invitation or address.";
 "Error.notLoggedIn" = "The operation could not be completed because no user is logged in.";
-"Error.alreadyJoinedRoom" = "You are already a member of this room.";
+"Error.alreadyJoinedRoom" = "You are already a member of this room";
 
 "Channel.one" = "channel";
 "Channel.many" = "channels";

diff --git a/Source/Localization/ja-JP.lproj/Generated.strings b/Source/Localization/ja-JP.lproj/Generated.strings
@@ -327,7 +327,7 @@
 "Error.invalidRoomURL" = "Could not parse invitation.";
 "Error.invalidRoomInvitationOrAddress" = "Planetary does not recognize this as a valid room invitation or address.";
 "Error.notLoggedIn" = "The operation could not be completed because no user is logged in.";
-"Error.alreadyJoinedRoom" = "You are already a member of this room.";
+"Error.alreadyJoinedRoom" = "You are already a member of this room";
 
 "Channel.one" = "channel";
 "Channel.many" = "channels";

diff --git a/Source/Localization/ko-KR.lproj/Generated.strings b/Source/Localization/ko-KR.lproj/Generated.strings
@@ -327,7 +327,7 @@
 "Error.invalidRoomURL" = "Could not parse invitation.";
 "Error.invalidRoomInvitationOrAddress" = "Planetary does not recognize this as a valid room invitation or address.";
 "Error.notLoggedIn" = "The operation could not be completed because no user is logged in.";
-"Error.alreadyJoinedRoom" = "You are already a member of this room.";
+"Error.alreadyJoinedRoom" = "You are already a member of this room";
 
 "Channel.one" = "channel";
 "Channel.many" = "channels";

diff --git a/Source/Localization/mi-NZ.lproj/Generated.strings b/Source/Localization/mi-NZ.lproj/Generated.strings
@@ -327,7 +327,7 @@
 "Error.invalidRoomURL" = "Could not parse invitation.";
 "Error.invalidRoomInvitationOrAddress" = "Planetary does not recognize this as a valid room invitation or address.";
 "Error.notLoggedIn" = "The operation could not be completed because no user is logged in.";
-"Error.alreadyJoinedRoom" = "You are already a member of this room.";
+"Error.alreadyJoinedRoom" = "You are already a member of this room";
 
 "Channel.one" = "channel";
 "Channel.many" = "channels";

diff --git a/Source/Localization/nl-NL.lproj/Generated.strings b/Source/Localization/nl-NL.lproj/Generated.strings
@@ -327,7 +327,7 @@
 "Error.invalidRoomURL" = "Could not parse invitation.";
 "Error.invalidRoomInvitationOrAddress" = "Planetary does not recognize this as a valid room invitation or address.";
 "Error.notLoggedIn" = "The operation could not be completed because no user is logged in.";
-"Error.alreadyJoinedRoom" = "You are already a member of this room.";
+"Error.alreadyJoinedRoom" = "You are already a member of this room";
 
 "Channel.one" = "channel";
 "Channel.many" = "channels";

diff --git a/Source/Localization/no-NO.lproj/Generated.strings b/Source/Localization/no-NO.lproj/Generated.strings
@@ -327,7 +327,7 @@
 "Error.invalidRoomURL" = "Could not parse invitation.";
 "Error.invalidRoomInvitationOrAddress" = "Planetary does not recognize this as a valid room invitation or address.";
 "Error.notLoggedIn" = "The operation could not be completed because no user is logged in.";
-"Error.alreadyJoinedRoom" = "You are already a member of this room.";
+"Error.alreadyJoinedRoom" = "You are already a member of this room";
 
 "Channel.one" = "channel";
 "Channel.many" = "channels";