Exclude unactive Jetpack sites

Author: crazytonyli

Sources/WordPressKit/Models/RemoteBlog.swift

@@ -37,9 +37,12 @@ import Foundation
     /// Features available for the current blog's plan.
     public var planActiveFeatures = [String]()
 
-    /// Indicates whether it's a jetpack site, or not.
+    /// Indicates whether the jetpack connection is active.
     public var jetpack: Bool = false
 
+    /// Indicates whether it's a Jetpack connected site.
+    public var jetpackConnection: Bool = false
+
     /// Boolean indicating whether the current user has Admin privileges, or not.
     public var isAdmin: Bool = false
 
@@ -70,6 +73,7 @@ import Foundation
         self.url = json.string(forKey: "URL") ?? ""
         self.xmlrpc = json.string(forKeyPath: "meta.links.xmlrpc")
         self.jetpack = json.number(forKey: "jetpack")?.boolValue ?? false
+        self.jetpackConnection = json.number(forKey: "jetpack_connection")?.boolValue ?? false
         self.icon = json.string(forKeyPath: "icon.img")
         self.capabilities = json.object(forKey: "capabilities") as? [String: Bool] ?? [:]
         self.isAdmin = json.number(forKeyPath: "capabilities.manage_options")?.boolValue ?? false

Sources/WordPressKit/Services/AccountServiceRemoteREST.m

@@ -391,7 +391,16 @@ - (NSArray *)remoteBlogsFromJSONArray:(NSArray *)jsonBlogs
         // Exclude deleted sites from query result, since the app does not handle deleted sites properly.
         // I tried to use query arguments `site_visibility=visible` and `site_activity=active`, but neither excludes
         // deleted sites.
-        return !blog.isDeleted;
+        if (blog.isDeleted) {
+            return false;
+        }
+
+        // Exclude sites that are connected via Jetpack, but without an active Jetpack connection.
+        if (blog.jetpackConnection && !blog.jetpack) {
+            return false;
+        }
+
+        return true;
     }];
 }