Display author for P2 posts

Author: kean

WordPress/Classes/ViewRelated/Reader/ReaderPostCellViewModel.swift

@@ -22,17 +22,22 @@ final class ReaderPostCellViewModel {
     weak var viewController: ReaderStreamViewController?
 
     let post: ReaderPost?
-    private var followCommentsService: FollowCommentsService?
     private var faviconTask: Task<Void, Never>?
 
     deinit {
         faviconTask?.cancel()
     }
 
-    init(post: ReaderPost) {
+    init(post: ReaderPost, topic: ReaderAbstractTopic?) {
         self.post = post
 
-        self.author = post.blogNameForDisplay() ?? ""
+        let isP2 = (topic as? ReaderSiteTopic)?.isP2Type == true
+
+        if isP2 {
+            self.author = post.authorDisplayName ?? ""
+        } else {
+            self.author = post.blogNameForDisplay() ?? ""
+        }
         self.time = post.dateForDisplay()?.toShortString() ?? "–"
         self.title = post.titleForDisplay() ?? ""
         self.details = post.contentPreviewForDisplay() ?? ""
@@ -47,8 +52,10 @@ final class ReaderPostCellViewModel {
         self.likeCount = post.likeCount?.intValue ?? 0
         self.isLiked = post.isLiked()
 
-        if let avatarURL = post.siteIconForDisplay(ofSize: Int(ReaderPostCell.avatarSize)) {
-            self.avatarURL = avatarURL
+        if isP2 {
+            self.avatarURL = post.authorAvatarURL.flatMap(URL.init)
+        } else if let avatarURL = post.siteIconForDisplay(ofSize: Int(ReaderPostCell.avatarSize)) {
+                self.avatarURL = avatarURL
         } else if let blogURL = post.blogURL.flatMap(URL.init) {
             if let faviconURL = FaviconService.shared.cachedFavicon(forURL: blogURL) {
                 self.avatarURL = faviconURL

WordPress/Classes/ViewRelated/Reader/ReaderStreamViewController.swift

@@ -1527,7 +1527,7 @@ extension ReaderStreamViewController: WPTableViewHandlerDelegate {
         }
 
         let cell = tableConfiguration.postCell(in: tableView, for: indexPath)
-        let viewModel = ReaderPostCellViewModel(post: post)
+        let viewModel = ReaderPostCellViewModel(post: post, topic: readerTopic)
         viewModel.viewController = self
         cell.configure(with: viewModel, isCompact: traitCollection.horizontalSizeClass == .compact, isSeparatorHidden: !showsSeparator)
         return cell