Merge branch 'wpios-edition' into add-search-param-in-theme-service-remote

Author: pmusolino

Sources/WordPressKit/Models/RemoteBlog.swift

@@ -58,6 +58,8 @@ import Foundation
     /// Blog's total disk quota space used.
     public var quotaSpaceUsed: NSNumber?
 
+    public var isDeleted: Bool
+
     /// Parses details from a JSON dictionary, as returned by the WordPress.com REST API.
     @objc(initWithJSONDictionary:)
     public init(jsonDictionary json: NSDictionary) {
@@ -79,6 +81,7 @@ import Foundation
         self.planActiveFeatures = (json.array(forKeyPath: "plan.features.active") as? [String]) ?? []
         self.quotaSpaceAllowed = json.number(forKeyPath: "quota.space_allowed")
         self.quotaSpaceUsed = json.number(forKeyPath: "quota.space_used")
+        self.isDeleted = json.number(forKey: "is_deleted")?.boolValue == true
     }
 
 }

Sources/WordPressKit/Services/AccountServiceRemoteREST.m

@@ -385,10 +385,14 @@ - (RemoteUser *)remoteUserFromDictionary:(NSDictionary *)dictionary
 - (NSArray *)remoteBlogsFromJSONArray:(NSArray *)jsonBlogs
 {
     NSArray *blogs = jsonBlogs;
-    return [blogs wpkit_map:^id(NSDictionary *jsonBlog) {
+    return [[blogs wpkit_map:^id(NSDictionary *jsonBlog) {
         return [[RemoteBlog alloc] initWithJSONDictionary:jsonBlog];
+    }] wpkit_filter:^BOOL(RemoteBlog *blog) {
+        // 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;
     }];
-    return blogs;
 }
 
 @end