Update fields that now became accessible as properties

Author: kean

WordPress/Classes/Models/ReaderPost.h

@@ -83,10 +83,14 @@ extern NSString * const ReaderPostStoredCommentTextKey;
 + (instancetype)createOrReplaceFromRemotePost:(RemoteReaderPost *)remotePost forTopic:(ReaderAbstractTopic *)topic context:(NSManagedObjectContext *) managedObjectContext;
 
 - (BOOL)isCrossPost;
-- (BOOL)isPrivate;
 - (BOOL)isP2Type;
 - (NSString *)authorString;
 - (BOOL)contentIncludesFeaturedImage;
+- (NSURL *)siteIconForDisplayOfSize:(NSInteger)size;
+- (SourceAttributionStyle)sourceAttributionStyle;
+- (NSString *)sourceAuthorNameForDisplay;
+- (NSURL *)sourceAvatarURLForDisplay;
+- (NSString *)sourceBlogNameForDisplay;
 - (BOOL)isSourceAttributionWPCom;
 - (NSDictionary *)railcarDictionary;
 

WordPress/Classes/Models/ReaderPost.m

@@ -237,16 +237,6 @@ - (BOOL)isCrossPost
     return self.crossPostMeta != nil;
 }
 
-- (BOOL)isAtomic
-{
-    return self.isBlogAtomic;
-}
-
-- (BOOL)isPrivate
-{
-    return self.isBlogPrivate;
-}
-
 - (BOOL)isP2Type
 {
     NSInteger orgID = [self.organizationID intValue];
@@ -431,7 +421,7 @@ - (NSDictionary *)railcarDictionary
     return nil;
 }
 
-- (void) didSave {
+- (void)didSave {
     [super didSave];
 
     // A ReaderCard can have either a post, or a list of topics, but not both.

WordPress/Classes/Networking/MediaHost+ReaderPost.swift

@@ -9,7 +9,7 @@ extension MediaHost {
     }
 
     init(with post: ReaderPost, failure: (ReaderPostError) -> ()) {
-        let isAccessibleThroughWPCom = post.isWPCom() || post.isJetpack()
+        let isAccessibleThroughWPCom = post.isWPCom || post.isJetpack
 
         // This is the only way in which we can obtain the username and authToken here.
         // It'd be nice if all data was associated with an account instead, for transparency
@@ -22,9 +22,9 @@ extension MediaHost {
 
         self.init(
             isAccessibleThroughWPCom: isAccessibleThroughWPCom,
-            isPrivate: post.isPrivate(),
-            isAtomic: post.isAtomic(),
-            siteID: post.siteID()?.intValue,
+            isPrivate: post.isBlogPrivate,
+            isAtomic: post.isBlogAtomic,
+            siteID: post.siteID?.intValue,
             username: username,
             authToken: authToken,
             failure: { error in

WordPress/Classes/Services/CommentService.m

@@ -684,7 +684,7 @@ - (void)replyToPost:(ReaderPost *)post
 {
     // Create and optimistically save a comment, based on the current wpcom acct
     // post and content provided.
-    BOOL isPrivateSite = post.isPrivate;
+    BOOL isPrivateSite = post.isBlogPrivate;
     [self createHierarchicalCommentWithContent:content withParent:nil postObjectID:post.objectID siteID:post.siteID completion:^(NSManagedObjectID *commentID) {
         if (!commentID) {
             NSError *error = [NSError errorWithDomain:WKErrorDomain code:WKErrorUnknown userInfo:@{NSDebugDescriptionErrorKey: @"Failed to create a comment for a post"}];
@@ -737,7 +737,7 @@ - (void)replyToHierarchicalCommentWithID:(NSNumber *)commentID
 {
     // Create and optimistically save a comment, based on the current wpcom acct
     // post and content provided.
-    BOOL isPrivateSite = post.isPrivate;
+    BOOL isPrivateSite = post.isBlogPrivate;
     [self createHierarchicalCommentWithContent:content withParent:nil postObjectID:post.objectID siteID:post.siteID completion:^(NSManagedObjectID *commentObjectID) {
         if (!commentObjectID) {
             NSError *error = [NSError errorWithDomain:WKErrorDomain code:WKErrorUnknown userInfo:@{NSDebugDescriptionErrorKey: @"Failed to create a comment for a post"}];
@@ -1204,7 +1204,7 @@ - (BOOL)mergeHierarchicalComments:(NSArray *)comments forPage:(NSUInteger)page f
 
         comment.depth = ancestors.count;
         comment.post = post;
-        comment.content = [self sanitizeCommentContent:comment.content isPrivateSite:post.isPrivate];
+        comment.content = [self sanitizeCommentContent:comment.content isPrivateSite:post.isBlogPrivate];
         [commentsToKeep addObject:comment];
     }
 

WordPress/Classes/ViewRelated/Comments/Views/Detail/ContentRenderer/RichCommentContentRenderer.swift

@@ -75,7 +75,7 @@ private extension RichCommentContentRenderer {
                 // We'll log the error, so we know it's there, but we won't halt execution.
                 WordPressAppDelegate.crashLogging?.logError(error)
             })
-        } else if let post = comment.post as? ReaderPost, post.isPrivate() {
+        } else if let post = comment.post as? ReaderPost, post.isBlogPrivate {
             return MediaHost(with: post, failure: { error in
                 // We'll log the error, so we know it's there, but we won't halt execution.
                 WordPressAppDelegate.crashLogging?.logError(error)

WordPress/Classes/ViewRelated/Reader/Cards/ReaderPostCellViewModel.swift

@@ -115,9 +115,9 @@ struct ReaderPostToolbarViewModel {
             isBookmarked: post.isSavedForLater,
             isCommentsEnabled: post.isCommentsEnabled,
             commentCount: post.commentCount?.intValue ?? 0,
-            isLikesEnabled: post.isLikesEnabled(),
+            isLikesEnabled: post.isLikesEnabled,
             likeCount: post.likeCount?.intValue ?? 0,
-            isLiked: post.isLiked()
+            isLiked: post.isLiked
         )
     }
 }

WordPress/Classes/ViewRelated/Reader/Controllers/ReaderHelpers.swift

@@ -226,7 +226,7 @@ struct ReaderNotificationKeys {
 
         // If the user is an admin on the post's site do not bump the page view unless
         // the the post is private.
-        if !post.isPrivate() && isUserAdminOnSiteWithID(siteID) {
+        if !post.isBlogPrivate && isUserAdminOnSiteWithID(siteID) {
             return
         }
 

WordPress/Classes/ViewRelated/Reader/Detail/Views/ReaderDetailToolbar.swift

@@ -259,7 +259,7 @@ class ReaderDetailToolbar: UIView, NibLoadable {
             return
         }
 
-        reblogButton.isEnabled = ReaderHelpers.isLoggedIn() && !post.isPrivate()
+        reblogButton.isEnabled = ReaderHelpers.isLoggedIn() && !post.isBlogPrivate
         WPStyleGuide.applyReaderReblogActionButtonStyle(reblogButton, showTitle: false)
 
         configureActionButtonStyle(reblogButton)

WordPress/Classes/ViewRelated/Reader/ReaderPost+Display.swift

@@ -3,10 +3,10 @@ import Foundation
 extension ReaderPost {
 
     var isCommentsEnabled: Bool {
-        let usesWPComAPI = isWPCom() || isJetpack()
-        let commentCount = commentCount()?.intValue ?? 0
+        let usesWPComAPI = isWPCom || isJetpack
+        let commentCount = commentCount?.intValue ?? 0
         let hasComments = commentCount > 0
 
-        return usesWPComAPI && (commentsOpen() || hasComments)
+        return usesWPComAPI && (commentsOpen || hasComments)
     }
 }