Merge branch 'develop' into issue/stats_timezone

Author: ScoutHarris

WordPressKit/DomainsServiceRemote.swift

@@ -39,6 +39,7 @@ public class DomainsServiceRemote: ServiceRemoteWordPressComREST {
         case includeWordPressDotCom
         case onlyWordPressDotCom
         case wordPressDotComAndDotBlogSubdomains
+        case whitelistedTopLevelDomains([String])
 
         fileprivate func parameters() -> [String: AnyObject] {
             switch self {
@@ -54,6 +55,8 @@ public class DomainsServiceRemote: ServiceRemoteWordPressComREST {
                         "vendor": "dot" as AnyObject,
                         "only_wordpressdotcom": true as AnyObject,
                         "include_wordpressdotcom": true as AnyObject]
+            case .whitelistedTopLevelDomains(let whitelistedTLDs):
+                return ["tlds": whitelistedTLDs.joined(separator: ",") as AnyObject]
             }
         }
     }

WordPressKit/PostServiceRemoteREST.m

@@ -438,8 +438,9 @@ - (RemotePost *)remotePostFromJSONDictionary:(NSDictionary *)jsonPost {
         post.pathForDisplayImage = post.postThumbnailPath;
     } else {
         // parse contents for a suitable image
-        if (!post.pathForDisplayImage) {
-            post.pathForDisplayImage = [DisplayableImageHelper searchPostContentForImageToDisplay:post.content];
+        post.pathForDisplayImage = [DisplayableImageHelper searchPostContentForImageToDisplay:post.content];
+        if ([post.pathForDisplayImage length] == 0) {
+            post.pathForDisplayImage = [DisplayableImageHelper searchPostAttachmentsForImageToDisplay:[jsonPost dictionaryForKey:@"attachments"] existingInContent:post.content];
         }
     }