Add nullability annotations to ReaderPost (#25039)

crazytonyli · web-flow · commit aa4119c6314f · 2025-12-01T20:35:38.000Z
* Add nullability annotations to ReaderPost

* Adapt the ReaderPost nullability annotations

* Fix unit tests compilation issues

* Add wpAssert statements
diff --git a/Sources/WordPressData/Objective-C/include/ReaderPost.h b/Sources/WordPressData/Objective-C/include/ReaderPost.h
@@ -2,6 +2,8 @@
 #import <CoreData/CoreData.h>
 #import <WordPressData/BasePost.h>
 
+NS_ASSUME_NONNULL_BEGIN
+
 typedef NS_ENUM(NSUInteger, SourceAttributionStyle) {
     SourceAttributionStyleNone,
     SourceAttributionStylePost,
@@ -20,19 +22,19 @@ extern NSString * const ReaderPostStoredCommentTextKey;
 
 @interface ReaderPost : BasePost
 
-@property (nonatomic, strong) NSString *authorDisplayName;
-@property (nonatomic, strong) NSString *authorEmail;
-@property (nonatomic, strong) NSString *authorURL;
-@property (nonatomic, strong) NSString *siteIconURL;
-@property (nonatomic, strong) NSString *blogName;
-@property (nonatomic, strong) NSString *blogDescription;
-@property (nonatomic, strong) NSString *blogURL;
-@property (nonatomic, strong) NSNumber *commentCount;
+@property (nonatomic, strong, nullable) NSString *authorDisplayName;
+@property (nonatomic, strong, nullable) NSString *authorEmail;
+@property (nonatomic, strong, nullable) NSString *authorURL;
+@property (nonatomic, strong, nullable) NSString *siteIconURL;
+@property (nonatomic, strong, nullable) NSString *blogName;
+@property (nonatomic, strong, nullable) NSString *blogDescription;
+@property (nonatomic, strong, nullable) NSString *blogURL;
+@property (nonatomic, strong, nullable) NSNumber *commentCount;
 @property (nonatomic) BOOL commentsOpen;
-@property (nonatomic, strong) NSString *featuredImage;
-@property (nonatomic, strong) NSNumber *feedID;
-@property (nonatomic, strong) NSNumber *feedItemID;
-@property (nonatomic, strong) NSString *globalID;
+@property (nonatomic, strong, nullable) NSString *featuredImage;
+@property (nonatomic, strong, nullable) NSNumber *feedID;
+@property (nonatomic, strong, nullable) NSNumber *feedItemID;
+@property (nonatomic, strong, nullable) NSString *globalID;
 @property (nonatomic) BOOL isBlogAtomic;
 @property (nonatomic) BOOL isBlogPrivate;
 @property (nonatomic) BOOL isFollowing;
@@ -42,47 +44,47 @@ extern NSString * const ReaderPostStoredCommentTextKey;
 @property (nonatomic) BOOL isSavedForLater;
 @property (nonatomic) BOOL isSeen;
 @property (nonatomic) BOOL isSeenSupported;
-@property (nonatomic, strong) NSNumber *organizationID;
-@property (nonatomic, strong) NSNumber *likeCount;
-@property (nonatomic, strong) NSNumber *score;
-@property (nonatomic, strong) NSNumber *siteID;
+@property (nonatomic) NSNumber *organizationID;
+@property (nonatomic, strong, nullable) NSNumber *likeCount;
+@property (nonatomic, strong, nullable) NSNumber *score;
+@property (nonatomic, strong, nullable) NSNumber *siteID;
 // Normalizes sorting between offset or sortDate depending on the flavor of post.
 // Note that this can store a negative value.
-@property (nonatomic, strong) NSNumber *sortRank;
+@property (nonatomic) NSNumber *sortRank;
 // Normalizes the date to sort by depending on the flavor of post.
-@property (nonatomic, strong) NSDate *sortDate;
-@property (nonatomic, strong) NSString *summary;
-@property (nonatomic, strong) NSSet *comments;
-@property (nonatomic, strong) NSString *tags;
-@property (nonatomic, strong) ReaderAbstractTopic *topic;
-@property (nonatomic, strong) NSSet<ReaderCard *> *card;
+@property (nonatomic, strong, nullable) NSDate *sortDate;
+@property (nonatomic, strong, nullable) NSString *summary;
+@property (nonatomic, strong, nullable) NSSet *comments;
+@property (nonatomic, strong, nullable) NSString *tags;
+@property (nonatomic, strong, nullable) ReaderAbstractTopic *topic;
+@property (nonatomic, strong, nullable) NSSet<ReaderCard *> *card;
 @property (nonatomic) BOOL isLikesEnabled;
 @property (nonatomic) BOOL isSharingEnabled;
 @property (nonatomic) BOOL isSiteBlocked;
-@property (nonatomic, strong) SourcePostAttribution *sourceAttribution;
+@property (nonatomic, strong, nullable) SourcePostAttribution *sourceAttribution;
 @property (nonatomic) BOOL isSubscribedComments;
 @property (nonatomic) BOOL canSubscribeComments;
 @property (nonatomic) BOOL receivesCommentNotifications;
 
-@property (nonatomic, strong) NSString *primaryTag;
-@property (nonatomic, strong) NSString *primaryTagSlug;
+@property (nonatomic, strong, nullable) NSString *primaryTag;
+@property (nonatomic, strong, nullable) NSString *primaryTagSlug;
 @property (nonatomic) BOOL isExternal;
 @property (nonatomic) BOOL isJetpack;
-@property (nonatomic) NSNumber *wordCount;
-@property (nonatomic) NSNumber *readingTime;
-@property (nonatomic, strong) ReaderCrossPostMeta *crossPostMeta;
-@property (nonatomic, strong) NSString *railcar;
+@property (nonatomic, strong, nullable) NSNumber *wordCount;
+@property (nonatomic, strong, nullable) NSNumber *readingTime;
+@property (nonatomic, strong, nullable) ReaderCrossPostMeta *crossPostMeta;
+@property (nonatomic, strong, nullable) NSString *railcar;
 
 // Used for tracking when a post is rendered (displayed), and bumping the train tracks rendered event.
 @property (nonatomic) BOOL rendered;
 
 // When true indicates a post should not be deleted/cleaned-up as its currently being used.
 @property (nonatomic) BOOL inUse;
 
-+ (instancetype)createOrReplaceFromRemotePost:(RemoteReaderPost *)remotePost forTopic:(ReaderAbstractTopic *)topic context:(NSManagedObjectContext *) managedObjectContext;
++ (instancetype)createOrReplaceFromRemotePost:(RemoteReaderPost *)remotePost forTopic:(nullable ReaderAbstractTopic *)topic context:(NSManagedObjectContext *) managedObjectContext;
 
 - (BOOL)contentIncludesFeaturedImage;
-- (NSDictionary *)railcarDictionary;
+- (nullable NSDictionary *)railcarDictionary;
 
 @end
 
@@ -95,3 +97,4 @@ extern NSString * const ReaderPostStoredCommentTextKey;
 
 @end
 
+NS_ASSUME_NONNULL_END
diff --git a/Sources/WordPressData/Swift/ReaderCard+CoreDataClass.swift b/Sources/WordPressData/Swift/ReaderCard+CoreDataClass.swift
@@ -50,7 +50,12 @@ public class ReaderCard: NSManagedObject {
 
         switch remoteCard.type {
         case .post:
-            let post = ReaderPost.createOrReplace(fromRemotePost: remoteCard.post, for: nil, context: context)
+            let post: ReaderPost
+            if let remotePost = remoteCard.post {
+                post = ReaderPost.createOrReplace(fromRemotePost: remotePost, for: nil, context: context)
+            } else {
+                return nil
+            }
 
             // Check if a card already exists with this post to prevent duplicates
             if let existingCard = findExistingCard(with: post, context: context) {
diff --git a/Sources/WordPressData/Swift/ReaderPost+PostContentProvider.swift b/Sources/WordPressData/Swift/ReaderPost+PostContentProvider.swift
@@ -7,7 +7,8 @@ extension ReaderPost {
     }
 
     public var isP2Type: Bool {
-        guard let id = organizationID?.intValue, let type = SiteOrganizationType(rawValue: id) else { return false }
+        let id = organizationID.intValue
+        guard let type = SiteOrganizationType(rawValue: id) else { return false }
         return type == .p2 || type == .automattic
     }
 
diff --git a/Tests/KeystoneTests/Tests/Services/CommentService+RepliesTests.swift b/Tests/KeystoneTests/Tests/Services/CommentService+RepliesTests.swift
@@ -269,11 +269,11 @@ final class CommentService_RepliesTests: CoreDataTestCase {
         }
 
         // All comments are visible
-        XCTAssertEqual(post.comments.count, 24)
-        XCTAssertEqual(post.comments.filter({ ($0 as! Comment).visibleOnReader }).count, 24)
+        XCTAssertEqual(post.comments?.count, 24)
+        XCTAssertEqual(post.comments?.filter({ ($0 as! Comment).visibleOnReader }).count, 24)
 
         // Mark a comment as spam
-        let spamComment = try XCTUnwrap(post.comments.first { ($0 as! Comment).commentID == 428668 }) as! Comment
+        let spamComment = try XCTUnwrap(post.comments?.first { ($0 as! Comment).commentID == 428668 }) as! Comment
         spamComment.status = CommentStatusType.spam.description
         contextManager.saveContextAndWait(mainContext)
 
@@ -282,8 +282,8 @@ final class CommentService_RepliesTests: CoreDataTestCase {
         }
 
         // The spam comment and its two replies are no longer visible
-        XCTAssertEqual(post.comments.count, 24)
-        XCTAssertEqual(post.comments.filter({ ($0 as! Comment).visibleOnReader }).count, 21)
+        XCTAssertEqual(post.comments?.count, 24)
+        XCTAssertEqual(post.comments?.filter({ ($0 as! Comment).visibleOnReader }).count, 21)
     }
 }
 
diff --git a/WordPress/Classes/Services/NotificationSyncMediator.swift b/WordPress/Classes/Services/NotificationSyncMediator.swift
@@ -539,7 +539,7 @@ private extension NotificationSyncMediator {
                 fetchRequest.predicate = NSCompoundPredicate(andPredicateWithSubpredicates: [commentIDPredicate, siteIDPredicate])
                 if let post = try context.fetch(fetchRequest).first {
                     post.isLiked = isLike
-                    post.likeCount = NSNumber(value: post.likeCount.intValue + (post.isLiked ? 1 : -1))
+                    post.likeCount = NSNumber(value: max((post.likeCount?.intValue ?? 0) + (post.isLiked ? 1 : -1), 0))
                 }
             }
             catch {
diff --git a/WordPress/Classes/Services/ReaderPostStreamService.swift b/WordPress/Classes/Services/ReaderPostStreamService.swift
@@ -39,7 +39,7 @@ class ReaderPostStreamService {
                 posts.enumerated().forEach { index, remotePost in
                     let post = ReaderPost.createOrReplace(fromRemotePost: remotePost, for: readerTopic, context: context)
                     // To keep the API order
-                    post?.sortRank = NSNumber(value: Date().timeIntervalSinceReferenceDate - Double(((self.pageNumber * Constants.paginationMultiplier) + index)))
+                    post.sortRank = NSNumber(value: Date().timeIntervalSinceReferenceDate - Double(((self.pageNumber * Constants.paginationMultiplier) + index)))
                 }
 
                 // Clean up
diff --git a/WordPress/Classes/ViewRelated/Comments/Controllers/Create/CommentCreateViewModel.swift b/WordPress/Classes/ViewRelated/Comments/Controllers/Create/CommentCreateViewModel.swift
@@ -34,7 +34,7 @@ final class CommentCreateViewModel {
         wpAssert(siteID != 0, "missing required parameter siteID")
         self._save = save
 
-        self.suggestionsViewModel = SuggestionsListViewModel.make(siteID: post.siteID)
+        self.suggestionsViewModel = SuggestionsListViewModel.make(siteID: self.siteID)
         self.suggestionsViewModel?.enableProminentSuggestions(postAuthorID: post.authorID)
     }
 
diff --git a/WordPress/Classes/ViewRelated/Likes/LikesListController.swift b/WordPress/Classes/ViewRelated/Likes/LikesListController.swift
@@ -129,13 +129,13 @@ class LikesListController: NSObject {
     ///
     init?(tableView: UITableView, post: ReaderPost, delegate: LikesListControllerDelegate? = nil) {
 
-        guard let postID = post.postID else {
+        guard let postID = post.postID, let siteID = post.siteID else {
             return nil
         }
 
         content = .post(id: postID)
         readerPost = post
-        siteID = post.siteID
+        self.siteID = siteID
         self.tableView = tableView
         self.delegate = delegate
 
diff --git a/WordPress/Classes/ViewRelated/Reader/Cards/ReaderCrossPostCell.swift b/WordPress/Classes/ViewRelated/Reader/Cards/ReaderCrossPostCell.swift
@@ -138,13 +138,13 @@ private final class ReaderCrossPostView: UIView {
     }
 
     private func makeHeaderString(for post: ReaderPost) -> NSAttributedString? {
-        guard let meta = post.crossPostMeta else {
+        guard let meta = post.crossPostMeta, let blogURL = post.blogURL else {
             return nil
         }
         let template = meta.commentURL.isEmpty ? Strings.siteTemplate : Strings.commentTemplate
 
         let authorName: NSString = (post.authorForDisplay() ?? "") as NSString
-        let siteName = subdomainNameFromPath(post.blogURL)
+        let siteName = subdomainNameFromPath(blogURL)
         let originName = subdomainNameFromPath(meta.siteURL)
 
         let subtitle = NSString(format: template as NSString, authorName, originName, siteName) as String
diff --git a/WordPress/Classes/ViewRelated/Reader/Comments/ReaderCommentsViewController.swift b/WordPress/Classes/ViewRelated/Reader/Comments/ReaderCommentsViewController.swift
@@ -329,8 +329,8 @@ final class ReaderCommentsViewController: UIViewController, WPContentSyncHelperD
             return wpAssertionFailure("post missing")
         }
         var linkURL = url
-        if let components = URLComponents(string: url.absoluteString), components.host == nil {
-            linkURL = components.url(relativeTo: URL(string: post.blogURL)) ?? linkURL
+        if let components = URLComponents(string: url.absoluteString), components.host == nil, let blogURL = post.blogURL {
+            linkURL = components.url(relativeTo: URL(string: blogURL)) ?? linkURL
         }
         let configuration = WebViewControllerConfiguration(url: linkURL)
         configuration.authenticateWithDefaultAccount()
diff --git a/WordPress/Classes/ViewRelated/Reader/Controllers/ReaderCellConfiguration.swift b/WordPress/Classes/ViewRelated/Reader/Controllers/ReaderCellConfiguration.swift
@@ -14,7 +14,7 @@ final class ReaderCellConfiguration {
             return
         }
         let post = posts[indexPath.row]
-        cell.setSiteName(post.blogName)
+        cell.setSiteName(post.blogName ?? "-")
     }
 
     func configureGapMarker(_ cell: ReaderGapMarkerCell, filling: Bool) {
diff --git a/WordPress/Classes/ViewRelated/Reader/Controllers/ReaderHelpers.swift b/WordPress/Classes/ViewRelated/Reader/Controllers/ReaderHelpers.swift
@@ -219,7 +219,8 @@ struct ReaderNotificationKeys {
         guard
             let siteID = post.siteID,
             let postID = post.postID,
-            let host = NSURL(string: post.blogURL)?.host else {
+            let blogURL = post.blogURL,
+            let host = URL(string: blogURL)?.host() else {
             return
         }
 
diff --git a/WordPress/Classes/ViewRelated/Reader/Controllers/ReaderPostActions/ReaderBlockSiteAction.swift b/WordPress/Classes/ViewRelated/Reader/Controllers/ReaderPostActions/ReaderBlockSiteAction.swift
@@ -11,8 +11,15 @@ final class ReaderBlockSiteAction {
     }
 
     func execute(with post: ReaderPost, context: NSManagedObjectContext, completion: (() -> Void)? = nil, failure: ((Error?) -> Void)? = nil) {
+        guard let siteID = post.siteID else {
+            DispatchQueue.main.async {
+                failure?(nil)
+            }
+            return
+        }
+
         let service = ReaderSiteService(coreDataStack: ContextManager.shared)
-        service.flagSite(withID: post.siteID,
+        service.flagSite(withID: siteID,
                          asBlocked: asBlocked,
                          success: {
                             WPAnalytics.trackReader(.readerBlogBlocked, properties: ["blogId": post.siteID as Any])
diff --git a/WordPress/Classes/ViewRelated/Reader/Controllers/ReaderPostActions/ReaderHeaderAction.swift b/WordPress/Classes/ViewRelated/Reader/Controllers/ReaderPostActions/ReaderHeaderAction.swift
@@ -3,7 +3,9 @@ import WordPressData
 
 final class ReaderHeaderAction {
     func execute(post: ReaderPost, origin: UIViewController, source: ReaderStreamViewController.StatSource? = nil) {
-        let controller = ReaderStreamViewController.controllerWithSiteID(post.siteID, isFeed: post.isExternal)
+        guard let siteID = post.siteID else { return }
+
+        let controller = ReaderStreamViewController.controllerWithSiteID(siteID, isFeed: post.isExternal)
         if let source {
             controller.statSource = source
         }
diff --git a/WordPress/Classes/ViewRelated/Reader/Controllers/ReaderPostBlockingController.swift b/WordPress/Classes/ViewRelated/Reader/Controllers/ReaderPostBlockingController.swift
@@ -115,27 +115,27 @@ final class ReaderPostBlockingController {
     }
 
     @objc private func handleSiteBlockingWillBeginNotification(_ notification: Foundation.Notification) {
-        guard let post = notification.userInfo?[ReaderNotificationKeys.post] as? ReaderPost else {
+        guard let post = notification.userInfo?[ReaderNotificationKeys.post] as? ReaderPost, let siteID = post.siteID else {
             return
         }
-        self.ongoingSitesBlocking.insert(post.siteID)
+        self.ongoingSitesBlocking.insert(siteID)
         self.delegate?.readerSiteBlockingController(self, willBeginBlockingSiteOfPost: post)
     }
 
     @objc private func handleBlockSiteNotification(_ notification: Foundation.Notification) {
-        guard let post = notification.userInfo?[ReaderNotificationKeys.post] as? ReaderPost else {
+        guard let post = notification.userInfo?[ReaderNotificationKeys.post] as? ReaderPost, let siteID = post.siteID else {
             return
         }
-        self.ongoingSitesBlocking.remove(post.siteID)
+        self.ongoingSitesBlocking.remove(siteID)
         self.delegate?.readerSiteBlockingController(self, didBlockSiteOfPost: post, result: .success(()))
     }
 
     @objc private func handleSiteBlockingFailed(_ notification: Foundation.Notification) {
-        guard let post = notification.userInfo?[ReaderNotificationKeys.post] as? ReaderPost else {
+        guard let post = notification.userInfo?[ReaderNotificationKeys.post] as? ReaderPost, let siteID = post.siteID else {
             return
         }
         let error = (notification.userInfo?[ReaderNotificationKeys.error] as? Error) ?? UnknownError()
-        self.ongoingSitesBlocking.remove(post.siteID)
+        self.ongoingSitesBlocking.remove(siteID)
         self.delegate?.readerSiteBlockingController(self, didBlockSiteOfPost: post, result: .failure(error))
     }
 
diff --git a/WordPress/Classes/ViewRelated/Reader/Detail/ReaderDetailCoordinator.swift b/WordPress/Classes/ViewRelated/Reader/Detail/ReaderDetailCoordinator.swift
diff --git a/WordPress/Classes/ViewRelated/Reader/Detail/ReaderDetailViewController.swift b/WordPress/Classes/ViewRelated/Reader/Detail/ReaderDetailViewController.swift
diff --git a/WordPress/Classes/ViewRelated/Reader/Detail/Views/ReaderDetailFeaturedImageView.swift b/WordPress/Classes/ViewRelated/Reader/Detail/Views/ReaderDetailFeaturedImageView.swift
diff --git a/WordPress/Classes/ViewRelated/Reader/Detail/Views/ReaderDetailToolbar.swift b/WordPress/Classes/ViewRelated/Reader/Detail/Views/ReaderDetailToolbar.swift

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,8 @@ extension ReaderPost {`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`public var isP2Type: Bool {`
`10`		`- guard let id = organizationID?.intValue, let type = SiteOrganizationType(rawValue: id) else { return false }`
	`10`	`+ let id = organizationID.intValue`
	`11`	`+ guard let type = SiteOrganizationType(rawValue: id) else { return false }`
`11`	`12`	`return type == .p2 \|\| type == .automattic`
`12`	`13`	`}`
`13`	`14`
Original file line number	Diff line number	Diff line change
`@@ -269,11 +269,11 @@ final class CommentService_RepliesTests: CoreDataTestCase {`
`269`	`269`	`}`
`270`	`270`
`271`	`271`	`// All comments are visible`
`272`		`- XCTAssertEqual(post.comments.count, 24)`
`273`		`- XCTAssertEqual(post.comments.filter({ ($0 as! Comment).visibleOnReader }).count, 24)`
	`272`	`+ XCTAssertEqual(post.comments?.count, 24)`
	`273`	`+ XCTAssertEqual(post.comments?.filter({ ($0 as! Comment).visibleOnReader }).count, 24)`
`274`	`274`
`275`	`275`	`// Mark a comment as spam`
`276`		`- let spamComment = try XCTUnwrap(post.comments.first { ($0 as! Comment).commentID == 428668 }) as! Comment`
	`276`	`+ let spamComment = try XCTUnwrap(post.comments?.first { ($0 as! Comment).commentID == 428668 }) as! Comment`
`277`	`277`	`spamComment.status = CommentStatusType.spam.description`
`278`	`278`	`contextManager.saveContextAndWait(mainContext)`
`279`	`279`
`@@ -282,8 +282,8 @@ final class CommentService_RepliesTests: CoreDataTestCase {`
`282`	`282`	`}`
`283`	`283`
`284`	`284`	`// The spam comment and its two replies are no longer visible`
`285`		`- XCTAssertEqual(post.comments.count, 24)`
`286`		`- XCTAssertEqual(post.comments.filter({ ($0 as! Comment).visibleOnReader }).count, 21)`
	`285`	`+ XCTAssertEqual(post.comments?.count, 24)`
	`286`	`+ XCTAssertEqual(post.comments?.filter({ ($0 as! Comment).visibleOnReader }).count, 21)`
`287`	`287`	`}`
`288`	`288`	`}`
`289`	`289`
Original file line number	Diff line number	Diff line change
`@@ -539,7 +539,7 @@ private extension NotificationSyncMediator {`
`539`	`539`	`fetchRequest.predicate = NSCompoundPredicate(andPredicateWithSubpredicates: [commentIDPredicate, siteIDPredicate])`
`540`	`540`	`if let post = try context.fetch(fetchRequest).first {`
`541`	`541`	`post.isLiked = isLike`
`542`		`- post.likeCount = NSNumber(value: post.likeCount.intValue + (post.isLiked ? 1 : -1))`
	`542`	`+ post.likeCount = NSNumber(value: max((post.likeCount?.intValue ?? 0) + (post.isLiked ? 1 : -1), 0))`
`543`	`543`	`}`
`544`	`544`	`}`
`545`	`545`	`catch {`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ class ReaderPostStreamService {`
`39`	`39`	`posts.enumerated().forEach { index, remotePost in`
`40`	`40`	`let post = ReaderPost.createOrReplace(fromRemotePost: remotePost, for: readerTopic, context: context)`
`41`	`41`	`// To keep the API order`
`42`		`- post?.sortRank = NSNumber(value: Date().timeIntervalSinceReferenceDate - Double(((self.pageNumber * Constants.paginationMultiplier) + index)))`
	`42`	`+ post.sortRank = NSNumber(value: Date().timeIntervalSinceReferenceDate - Double(((self.pageNumber * Constants.paginationMultiplier) + index)))`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`// Clean up`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ final class CommentCreateViewModel {`
`34`	`34`	`wpAssert(siteID != 0, "missing required parameter siteID")`
`35`	`35`	`self._save = save`
`36`	`36`
`37`		`- self.suggestionsViewModel = SuggestionsListViewModel.make(siteID: post.siteID)`
	`37`	`+ self.suggestionsViewModel = SuggestionsListViewModel.make(siteID: self.siteID)`
`38`	`38`	`self.suggestionsViewModel?.enableProminentSuggestions(postAuthorID: post.authorID)`
`39`	`39`	`}`
`40`	`40`
Original file line number	Diff line number	Diff line change
`@@ -138,13 +138,13 @@ private final class ReaderCrossPostView: UIView {`
`138`	`138`	`}`
`139`	`139`
`140`	`140`	`private func makeHeaderString(for post: ReaderPost) -> NSAttributedString? {`
`141`		`- guard let meta = post.crossPostMeta else {`
	`141`	`+ guard let meta = post.crossPostMeta, let blogURL = post.blogURL else {`
`142`	`142`	`return nil`
`143`	`143`	`}`
`144`	`144`	`let template = meta.commentURL.isEmpty ? Strings.siteTemplate : Strings.commentTemplate`
`145`	`145`
`146`	`146`	`let authorName: NSString = (post.authorForDisplay() ?? "") as NSString`
`147`		`- let siteName = subdomainNameFromPath(post.blogURL)`
	`147`	`+ let siteName = subdomainNameFromPath(blogURL)`
`148`	`148`	`let originName = subdomainNameFromPath(meta.siteURL)`
`149`	`149`
`150`	`150`	`let subtitle = NSString(format: template as NSString, authorName, originName, siteName) as String`
Original file line number	Diff line number	Diff line change
`@@ -329,8 +329,8 @@ final class ReaderCommentsViewController: UIViewController, WPContentSyncHelperD`
`329`	`329`	`return wpAssertionFailure("post missing")`
`330`	`330`	`}`
`331`	`331`	`var linkURL = url`
`332`		`- if let components = URLComponents(string: url.absoluteString), components.host == nil {`
`333`		`- linkURL = components.url(relativeTo: URL(string: post.blogURL)) ?? linkURL`
	`332`	`+ if let components = URLComponents(string: url.absoluteString), components.host == nil, let blogURL = post.blogURL {`
	`333`	`+ linkURL = components.url(relativeTo: URL(string: blogURL)) ?? linkURL`
`334`	`334`	`}`
`335`	`335`	`let configuration = WebViewControllerConfiguration(url: linkURL)`
`336`	`336`	`configuration.authenticateWithDefaultAccount()`