diff --git a/Modules/Sources/WordPressReader/ReaderPostParser.swift b/Modules/Sources/WordPressReader/ReaderPostParser.swift index f27009052113..2e89877e1644 100644 --- a/Modules/Sources/WordPressReader/ReaderPostParser.swift +++ b/Modules/Sources/WordPressReader/ReaderPostParser.swift @@ -4,6 +4,12 @@ import SwiftSoup public enum ReaderPostParser { public enum InteractiveElement: Sendable { case gallery(Gallery) + case mention(Mention) + } + + public struct Mention: Sendable { + public let handle: String + public let url: URL } public struct Gallery: Sendable { @@ -53,7 +59,7 @@ public enum ReaderPostParser { public let width: Int } - /// Parses post HTML and returns interactive elements (galleries). + /// Parses post HTML and returns interactive elements. public static func parse(_ html: String) -> [InteractiveElement] { guard let document = try? SwiftSoup.parse(html) else { return [] @@ -61,6 +67,10 @@ public enum ReaderPostParser { var elements: [InteractiveElement] = [] + if let anchors = try? document.select("a[data-type=fragment-mention][data-username][href]") { + elements.append(contentsOf: anchors.compactMap(parseMention(from:)).map(InteractiveElement.mention)) + } + // Supported gallery selectors (order matters for specificity) let selectors = [ "figure.wp-block-gallery", @@ -86,6 +96,21 @@ public enum ReaderPostParser { return elements } + private static func parseMention(from anchor: Element) -> Mention? { + guard let handle = try? anchor.attr("data-username").trimmingCharacters(in: .whitespacesAndNewlines), + !handle.isEmpty, + let href = try? anchor.attr("href"), + !href.isEmpty, + let url = URL(string: href), + let scheme = url.scheme?.lowercased(), + scheme == "http" || scheme == "https" + else { + return nil + } + + return Mention(handle: handle, url: url) + } + private static func parseImages(from container: Element) -> [GalleryImage] { guard let imgElements = try? container.select("img") else { return [] @@ -95,8 +120,9 @@ public enum ReaderPostParser { private static func parseImage(from img: Element) -> GalleryImage? { guard let srcString = try? img.attr("src"), - !srcString.isEmpty, - let src = URL(string: srcString) else { + !srcString.isEmpty, + let src = URL(string: srcString) + else { return nil } @@ -141,8 +167,9 @@ public enum ReaderPostParser { private static func parseSize(_ value: String) -> CGSize? { let parts = value.split(separator: ",") guard parts.count == 2, - let width = Double(parts[0].trimmingCharacters(in: .whitespaces)), - let height = Double(parts[1].trimmingCharacters(in: .whitespaces)) else { + let width = Double(parts[0].trimmingCharacters(in: .whitespaces)), + let height = Double(parts[1].trimmingCharacters(in: .whitespaces)) + else { return nil } return CGSize(width: width, height: height) @@ -150,16 +177,18 @@ public enum ReaderPostParser { /// Parses srcset string (e.g. "url1 300w, url2 600w") into entries. private static func parseSrcset(_ value: String) -> [SrcsetEntry] { - value.split(separator: ",").compactMap { entry in - let parts = entry.trimmingCharacters(in: .whitespaces).split(separator: " ") - guard parts.count == 2, - let url = URL(string: String(parts[0])), - let widthStr = parts[1].dropLast().description.nilIfEmpty, - let width = Int(widthStr) else { - return nil + value.split(separator: ",") + .compactMap { entry in + let parts = entry.trimmingCharacters(in: .whitespaces).split(separator: " ") + guard parts.count == 2, + let url = URL(string: String(parts[0])), + let widthStr = parts[1].dropLast().description.nilIfEmpty, + let width = Int(widthStr) + else { + return nil + } + return SrcsetEntry(url: url, width: width) } - return SrcsetEntry(url: url, width: width) - } } } diff --git a/Modules/Tests/WordPressReaderTests/ReaderPostParserTests.swift b/Modules/Tests/WordPressReaderTests/ReaderPostParserTests.swift index 975d89f91156..a39e464b5225 100644 --- a/Modules/Tests/WordPressReaderTests/ReaderPostParserTests.swift +++ b/Modules/Tests/WordPressReaderTests/ReaderPostParserTests.swift @@ -9,42 +9,42 @@ struct ReaderPostParserTests { @Test func parseWPBlockGalleryWithThreeImages() { let html = """ -
-
- Sunset over mountains +
+
+ Sunset over mountains +
+
+ Forest trail +
+
+ +
-
- Forest trail -
-
- -
-
- """ + """ let elements = ReaderPostParser.parse(html) #expect(elements.count == 1) @@ -88,19 +88,19 @@ struct ReaderPostParserTests { @Test func parseJetpackTiledGalleryBlock() { let html = """ -
-
-
- - +
+
+
+ + +
-
-
- """ +
+ """ let elements = ReaderPostParser.parse(html) #expect(elements.count == 1) @@ -118,18 +118,18 @@ struct ReaderPostParserTests { @Test func parseJetpackTiledGalleryClassic() { let html = """ -
-
-
- -
-
- +
+
+
+ +
+
+ +
-
- """ + """ let elements = ReaderPostParser.parse(html) #expect(elements.count == 1) @@ -147,21 +147,21 @@ struct ReaderPostParserTests { @Test func parseClassicGalleryShortcode() { let html = """ -
-
-
- -
-
-
-
- -
-
-
- """ +
+
+
+ +
+
+
+
+ +
+
+
+ """ let elements = ReaderPostParser.parse(html) #expect(elements.count == 1) @@ -179,8 +179,8 @@ struct ReaderPostParserTests { @Test func parseHTMLWithNoGalleries() { let html = """ -

Just a regular paragraph with an image.

- """ +

Just a regular paragraph with an image.

+ """ let elements = ReaderPostParser.parse(html) #expect(elements.isEmpty) @@ -190,28 +190,29 @@ struct ReaderPostParserTests { @Test func parseMultipleGalleries() throws { let html = """ -

Some text

-
-
- -
-
-

More text

-
-
- +

Some text

+
+
+ +
-
- +

More text

+
+
+ +
+
+ +
-
- """ + """ let elements = ReaderPostParser.parse(html) try #require(elements.count == 2) guard case .gallery(let gallery1) = elements[0], - case .gallery(let gallery2) = elements[1] else { + case .gallery(let gallery2) = elements[1] + else { Issue.record("Expected gallery elements") return } @@ -223,13 +224,13 @@ struct ReaderPostParserTests { @Test func parseSrcsetWithSingleEntry() { let html = """ -
-
- +
+
+ +
-
- """ + """ let elements = ReaderPostParser.parse(html) guard case .gallery(let gallery) = elements.first else { @@ -267,13 +268,112 @@ struct ReaderPostParserTests { @Test func parseImageWithMissingSrc() { let html = """ -
-
- +
+
+ +
-
- """ + """ let elements = ReaderPostParser.parse(html) #expect(elements.isEmpty) } + + // MARK: - Mentions + + @Test func parseMention() { + let html = """ + @example-user + """ + + let elements = ReaderPostParser.parse(html) + + guard case .mention(let mention) = elements.first else { + Issue.record("Expected mention element") + return + } + #expect(elements.count == 1) + #expect(mention.handle == "example-user") + #expect(mention.url.absoluteString == "https://example.wordpress.com/mentions/example-user/") + } + + @Test func parseMentionOnlyAcceptsHTTPURLs() { + let html = """ + @http + @https + @ftp + @email + @custom + """ + + let mentions = ReaderPostParser.parse(html) + .compactMap { element -> ReaderPostParser.Mention? in + guard case .mention(let mention) = element else { + return nil + } + return mention + } + + #expect(mentions.map(\.handle) == ["http", "https"]) + } + + @Test func ignoreLinksWithoutCompleteMentionMetadata() { + let html = """ +

@plain-text

+ @url-only + @wrong-type + @empty-handle + @missing-href + @relative-url + """ + + #expect(ReaderPostParser.parse(html).isEmpty) + } + + @Test func parseDuplicateMentionsAndMentionInsideGallery() { + let html = """ + @person +
+
+ +
+ @person +
+
+
+ """ + + let elements = ReaderPostParser.parse(html) + let mentions = elements.compactMap { element -> ReaderPostParser.Mention? in + guard case .mention(let mention) = element else { + return nil + } + return mention + } + let galleries = elements.compactMap { element -> ReaderPostParser.Gallery? in + guard case .gallery(let gallery) = element else { + return nil + } + return gallery + } + + #expect(mentions.count == 2) + #expect(galleries.count == 1) + } } diff --git a/Tests/KeystoneTests/Tests/Reader/ReaderDetailCoordinatorTests.swift b/Tests/KeystoneTests/Tests/Reader/ReaderDetailCoordinatorTests.swift index eb73f6ba7c43..8aa97b137956 100644 --- a/Tests/KeystoneTests/Tests/Reader/ReaderDetailCoordinatorTests.swift +++ b/Tests/KeystoneTests/Tests/Reader/ReaderDetailCoordinatorTests.swift @@ -86,7 +86,11 @@ class ReaderDetailCoordinatorTests: CoreDataTestCase { let serviceMock = ReaderPostServiceMock() let viewMock = ReaderDetailViewMock() let postSharingControllerMock = PostSharingControllerMock() - let coordinator = ReaderDetailCoordinator(readerPostService: serviceMock, sharingController: postSharingControllerMock, view: viewMock) + let coordinator = ReaderDetailCoordinator( + readerPostService: serviceMock, + sharingController: postSharingControllerMock, + view: viewMock + ) coordinator.post = post coordinator.share(fromView: button) @@ -129,6 +133,37 @@ class ReaderDetailCoordinatorTests: CoreDataTestCase { XCTAssertTrue(presentedViewController is WebKitViewController) } + @MainActor + func testResolveMentionProfilesDeduplicatesHandles() async { + let post = makeMentionPost() + let profileService = ReaderUserProfileServiceMock() + let coordinator = ReaderDetailCoordinator( + readerUserProfileService: profileService, + view: ReaderDetailViewMock() + ) + coordinator.post = post + + await coordinator.resolveMentionProfiles(for: post) + + XCTAssertEqual(profileService.requestedHandles, ["example-user"]) + } + + @MainActor + func testResolveMentionProfilesSkipsNonWordPressComPost() async { + let post = makeMentionPost() + post.isWPCom = false + let profileService = ReaderUserProfileServiceMock() + let coordinator = ReaderDetailCoordinator( + readerUserProfileService: profileService, + view: ReaderDetailViewMock() + ) + coordinator.post = post + + await coordinator.resolveMentionProfiles(for: post) + + XCTAssertTrue(profileService.requestedHandles.isEmpty) + } + /// Tell the view to scroll when URL is a hash link /// func testScrollWhenUrlIsHash() { @@ -156,6 +191,24 @@ class ReaderDetailCoordinatorTests: CoreDataTestCase { func makeReaderPost() -> ReaderPost { ReaderPostBuilder(mainContext).build() } + + private var mentionURL: URL { + URL(string: "https://example.wordpress.com/mentions/example-user/")! + } + + private func makeMentionPost() -> ReaderPost { + let post = makeReaderPost() + post.isWPCom = true + post.content = """ + @example-user + @example-user + """ + return post + } } // MARK: - Private Helpers @@ -175,7 +228,13 @@ private class ReaderPostServiceMock: ReaderPostService { super.init(coreDataStack: ContextManager.forTesting()) } - override func fetchPost(_ postID: UInt, forSite siteID: UInt, isFeed: Bool, success: ((ReaderPost?) -> Void)!, failure: ((Error?) -> Void)!) { + override func fetchPost( + _ postID: UInt, + forSite siteID: UInt, + isFeed: Bool, + success: ((ReaderPost?) -> Void)!, + failure: ((Error?) -> Void)! + ) { didCallFetchPostWithPostID = postID didCallFetchPostWithSiteID = siteID didCallFetchPostWithIsFeed = isFeed @@ -193,6 +252,15 @@ private class ReaderPostServiceMock: ReaderPostService { } } +private final class ReaderUserProfileServiceMock: ReaderUserProfileService { + private(set) var requestedHandles: [String] = [] + + func fetchProfile(handle: String) async -> ReaderUserProfile? { + requestedHandles.append(handle) + return nil + } +} + private class ReaderDetailViewMock: UIViewController, ReaderDetailView { var didCallRenderWithPost: ReaderPost? var didCallShowError = false @@ -208,7 +276,7 @@ private class ReaderDetailViewMock: UIViewController, ReaderDetailView { } get { - return _navigationController + _navigationController } } @@ -232,15 +300,19 @@ private class ReaderDetailViewMock: UIViewController, ReaderDetailView { didCallScrollToWith = to } - func updateHeader() { } + func updateHeader() {} func updateLikesView(with viewModel: ReaderDetailLikesViewModel) {} - func updateComments(_ comments: [Comment], totalComments: Int) { } + func updateComments(_ comments: [Comment], totalComments: Int) {} - func renderRelatedPosts(_ posts: [RemoteReaderSimplePost]) { } + func renderRelatedPosts(_ posts: [RemoteReaderSimplePost]) {} - override func present(_ viewControllerToPresent: UIViewController, animated flag: Bool, completion: (() -> Void)? = nil) { + override func present( + _ viewControllerToPresent: UIViewController, + animated flag: Bool, + completion: (() -> Void)? = nil + ) { didCallPresentWith = viewControllerToPresent } } @@ -250,7 +322,11 @@ private class PostSharingControllerMock: PostSharingController { var didCallShareReaderPostWithView: UIPopoverPresentationControllerSourceItem? var didCallShareReaderPostWithViewController: UIViewController? - override func shareReaderPost(_ post: ReaderPost, fromAnchor anchor: UIPopoverPresentationControllerSourceItem, inViewController viewController: UIViewController) { + override func shareReaderPost( + _ post: ReaderPost, + fromAnchor anchor: UIPopoverPresentationControllerSourceItem, + inViewController viewController: UIViewController + ) { didCallShareReaderPostWith = post didCallShareReaderPostWithView = anchor didCallShareReaderPostWithViewController = viewController diff --git a/Tests/KeystoneTests/WordPressUnitTests.xctestplan b/Tests/KeystoneTests/WordPressUnitTests.xctestplan index 37631fa902df..6de2a5b829ad 100644 --- a/Tests/KeystoneTests/WordPressUnitTests.xctestplan +++ b/Tests/KeystoneTests/WordPressUnitTests.xctestplan @@ -66,6 +66,13 @@ "name" : "WordPressUIUnitTests" } }, + { + "target" : { + "containerPath" : "container:..\/Modules", + "identifier" : "WordPressReaderTests", + "name" : "WordPressReaderTests" + } + }, { "target" : { "containerPath" : "container:WordPress.xcodeproj", diff --git a/WordPress/Classes/ViewRelated/Comments/Views/Detail/CommentContentTableViewCell.swift b/WordPress/Classes/ViewRelated/Comments/Views/Detail/CommentContentTableViewCell.swift index 951e4338c43e..d204e5a3674b 100644 --- a/WordPress/Classes/ViewRelated/Comments/Views/Detail/CommentContentTableViewCell.swift +++ b/WordPress/Classes/ViewRelated/Comments/Views/Detail/CommentContentTableViewCell.swift @@ -4,7 +4,6 @@ import WordPressUI import WordPressReader import Gravatar import Combine -import SwiftUI final class CommentContentTableViewCell: UITableViewCell, NibReusable { // all the available images for the accessory button. @@ -575,16 +574,10 @@ private extension CommentContentTableViewCell { return } let viewModel = ReaderUserProfileViewModel(comment: comment) - let profileVC = UIHostingController(rootView: ReaderUserProfileView(viewModel: viewModel)) - let navigationVC = UINavigationController(rootViewController: profileVC) - profileVC.navigationItem.leftBarButtonItem = UIBarButtonItem( - systemItem: .close, - primaryAction: .init { [weak profileVC] _ in - profileVC?.presentingViewController?.dismiss(animated: true) - } - ) - navigationVC.sheetPresentationController?.detents = [.medium()] - window?.topmostPresentedViewController?.present(navigationVC, animated: true) + guard let presentingViewController = window?.topmostPresentedViewController else { + return + } + ReaderUserProfilePresenter.present(viewModel, from: presentingViewController) } @objc func accessoryButtonTapped() { diff --git a/WordPress/Classes/ViewRelated/Reader/Detail/ReaderDetailCoordinator.swift b/WordPress/Classes/ViewRelated/Reader/Detail/ReaderDetailCoordinator.swift index c81667b9eb06..d31215af61f8 100644 --- a/WordPress/Classes/ViewRelated/Reader/Detail/ReaderDetailCoordinator.swift +++ b/WordPress/Classes/ViewRelated/Reader/Detail/ReaderDetailCoordinator.swift @@ -34,8 +34,9 @@ class ReaderDetailCoordinator { // Comment fragments have the form #comment-50484 // If one is present, we'll extract the ID and return it. if let fragment = postURL?.fragment, - fragment.hasPrefix("comment-"), - let idString = fragment.components(separatedBy: "comment-").last { + fragment.hasPrefix("comment-"), + let idString = fragment.components(separatedBy: "comment-").last + { return Int(idString) } @@ -54,6 +55,8 @@ class ReaderDetailCoordinator { return ReaderPostParser.parse(content) }() + private var mentionProfiles: [String: ReaderUserProfile] = [:] + private var likesAvatarURLs: [String]? /// An authenticator to ensure any request made to WP sites is properly authenticated @@ -88,12 +91,15 @@ class ReaderDetailCoordinator { /// Reader Link Router private let readerLinkRouter: UniversalLinkRouter + /// Reader User Profile Service + private let readerUserProfileService: ReaderUserProfileService + /// Reader View private weak var view: ReaderDetailView? /// Reader View Controller private var viewController: UIViewController? { - return view as? UIViewController + view as? UIViewController } /// A post ID to fetch @@ -120,14 +126,17 @@ class ReaderDetailCoordinator { /// Initialize the Reader Detail Coordinator /// /// - Parameter service: a Reader Post Service - init(coreDataStack: CoreDataStack = ContextManager.shared, - readerPostService: ReaderPostService = ReaderPostService(coreDataStack: ContextManager.shared), - topicService: ReaderTopicService = ReaderTopicService(coreDataStack: ContextManager.shared), - postService: PostService = PostService(managedObjectContext: ContextManager.shared.mainContext), - commentService: CommentService = CommentService(coreDataStack: ContextManager.shared), - sharingController: PostSharingController = PostSharingController(), - readerLinkRouter: UniversalLinkRouter = UniversalLinkRouter(routes: UniversalLinkRouter.readerRoutes), - view: ReaderDetailView) { + init( + coreDataStack: CoreDataStack = ContextManager.shared, + readerPostService: ReaderPostService = ReaderPostService(coreDataStack: ContextManager.shared), + topicService: ReaderTopicService = ReaderTopicService(coreDataStack: ContextManager.shared), + postService: PostService = PostService(managedObjectContext: ContextManager.shared.mainContext), + commentService: CommentService = CommentService(coreDataStack: ContextManager.shared), + sharingController: PostSharingController = PostSharingController(), + readerLinkRouter: UniversalLinkRouter = UniversalLinkRouter(routes: UniversalLinkRouter.readerRoutes), + readerUserProfileService: ReaderUserProfileService? = nil, + view: ReaderDetailView + ) { self.coreDataStack = coreDataStack self.readerPostService = readerPostService self.topicService = topicService @@ -135,6 +144,9 @@ class ReaderDetailCoordinator { self.commentService = commentService self.sharingController = sharingController self.readerLinkRouter = readerLinkRouter + self.readerUserProfileService = + readerUserProfileService + ?? WordPressComReaderUserProfileService(coreDataStack: coreDataStack) self.view = view } @@ -171,22 +183,56 @@ class ReaderDetailCoordinator { // Fetch a full page of Likes but only return the `maxAvatarsDisplayed` number. // That way the first page will already be cached if the user displays the full Likes list. - postService.getLikesFor(postID: postID, siteID: siteID, success: { [weak self] users, _, _ in - guard let self else { return } - - var filteredUsers = users - if let account = try? WPAccount.lookupDefaultWordPressComAccount(in: ContextManager.shared.mainContext), - let userID = account.userID?.int64Value, - let userIndex = filteredUsers.firstIndex(where: { $0.userID == userID }) { - filteredUsers.remove(at: userIndex) + postService.getLikesFor( + postID: postID, + siteID: siteID, + success: { [weak self] users, _, _ in + guard let self else { return } + + var filteredUsers = users + if let account = try? WPAccount.lookupDefaultWordPressComAccount(in: ContextManager.shared.mainContext), + let userID = account.userID?.int64Value, + let userIndex = filteredUsers.firstIndex(where: { $0.userID == userID }) + { + filteredUsers.remove(at: userIndex) + } + + self.likesAvatarURLs = filteredUsers.prefix(ReaderDetailLikesView.maxAvatarsDisplayed).map(\.avatarUrl) + self.updateLikesView() + self.startObservingLikes() + }, + failure: { error in + DDLogError("Error fetching Likes for post detail: \(String(describing: error?.localizedDescription))") + } + ) + } + + @MainActor + func resolveMentionProfiles(for post: ReaderPost) async { + guard post.isWPCom, let content = post.content else { + return + } + + let mentions = ReaderPostParser.parse(content) + .compactMap { element -> ReaderPostParser.Mention? in + guard case .mention(let mention) = element else { + return nil + } + return mention } - self.likesAvatarURLs = filteredUsers.prefix(ReaderDetailLikesView.maxAvatarsDisplayed).map(\.avatarUrl) - self.updateLikesView() - self.startObservingLikes() - }, failure: { error in - DDLogError("Error fetching Likes for post detail: \(String(describing: error?.localizedDescription))") - }) + var requestedHandles = Set() + // Posts typically have few mentions, so resolving them sequentially keeps this simple without meaningful delay. + for mention in mentions { + let key = Self.normalizedMentionHandle(mention.handle) + guard mentionProfiles[key] == nil, requestedHandles.insert(key).inserted else { + continue + } + + if let profile = await readerUserProfileService.fetchProfile(handle: mention.handle) { + mentionProfiles[key] = profile + } + } } private func startObservingLikes() { @@ -194,12 +240,14 @@ class ReaderDetailCoordinator { return wpAssertionFailure("post missing") } - likesObserver = Publishers.CombineLatest( - post.publisher(for: \.likeCount, options: [.new]).removeDuplicates(), - post.publisher(for: \.isLiked, options: [.new]).removeDuplicates() - ).sink { [weak self] _, _ in - self?.updateLikesView() - } + likesObserver = + Publishers.CombineLatest( + post.publisher(for: \.likeCount, options: [.new]).removeDuplicates(), + post.publisher(for: \.isLiked, options: [.new]).removeDuplicates() + ) + .sink { [weak self] _, _ in + self?.updateLikesView() + } } private func updateLikesView() { @@ -208,7 +256,9 @@ class ReaderDetailCoordinator { let viewModel = ReaderDetailLikesViewModel( likeCount: post.likeCount?.intValue ?? 0, avatarURLs: likesAvatarURLs, - selfLikeAvatarURL: post.isLiked ? try? WPAccount.lookupDefaultWordPressComAccount(in: ContextManager.shared.mainContext)?.avatarURL : nil + selfLikeAvatarURL: post.isLiked + ? try? WPAccount.lookupDefaultWordPressComAccount(in: ContextManager.shared.mainContext)?.avatarURL + : nil ) view?.updateLikesView(with: viewModel) } @@ -216,13 +266,16 @@ class ReaderDetailCoordinator { /// Fetch Comments for the current post. /// func fetchComments(for post: ReaderPost) { - commentService.syncHierarchicalComments(for: post, - topLevelComments: commentsDisplayed, - success: { [weak self] _, totalComments in - self?.updateCommentsFor(post: post, totalComments: totalComments?.intValue ?? 0) - }, failure: { error in - DDLogError("Failed fetching post detail comments: \(String(describing: error))") - }) + commentService.syncHierarchicalComments( + for: post, + topLevelComments: commentsDisplayed, + success: { [weak self] _, totalComments in + self?.updateCommentsFor(post: post, totalComments: totalComments?.intValue ?? 0) + }, + failure: { error in + DDLogError("Failed fetching post detail comments: \(String(describing: error))") + } + ) } func updateCommentsFor(post: ReaderPost, totalComments: Int) { @@ -272,7 +325,10 @@ class ReaderDetailCoordinator { if let blogID = sourceAttribution.blogID { let controller = ReaderStreamViewController.controllerWithSiteID(blogID, isFeed: false) - controller.trackingContext.source = ScreenTrackingSource(ScreenID.Reader.article, component: ElementID.Reader.articleHeaderSiteName) + controller.trackingContext.source = ScreenTrackingSource( + ScreenID.Reader.article, + component: ElementID.Reader.articleHeaderSiteName + ) viewController?.navigationController?.pushViewController(controller, animated: true) return } @@ -305,17 +361,40 @@ class ReaderDetailCoordinator { let urlString = url.absoluteString for element in interactiveElements { if case .gallery(let gallery) = element, - let index = gallery.images.firstIndex(where: { $0.src.absoluteString == urlString }) { + let index = gallery.images.firstIndex(where: { $0.src.absoluteString == urlString }) + { return (gallery, index) } } return nil } + private func findMention(matching url: URL) -> ReaderPostParser.Mention? { + let urlString = url.absoluteString + for element in interactiveElements { + if case .mention(let mention) = element, mention.url.absoluteString == urlString { + return mention + } + } + return nil + } + + private func presentMentionProfile(_ profile: ReaderUserProfile) { + guard let viewController else { + return + } + ReaderUserProfilePresenter.present( + ReaderUserProfileViewModel(profile: profile), + from: viewController + ) + } + private func presentGallery(_ gallery: ReaderPostParser.Gallery, startingAt index: Int) { WPAnalytics.trackReader(.readerArticleImageTapped) let host = post.map(MediaHost.init) - let maxDimension = Int(max(UIScreen.main.bounds.width, UIScreen.main.bounds.height) * min(UIScreen.main.scale, 2)) + let maxDimension = Int( + max(UIScreen.main.bounds.width, UIScreen.main.bounds.height) * min(UIScreen.main.scale, 2) + ) let assets = gallery.images.map { image in let sourceURL = image.bestURL(maxDimension: maxDimension) ?? image.originalFileURL ?? image.src let previewURL = image.srcset.min(by: { $0.width < $1.width })?.url @@ -354,7 +433,8 @@ class ReaderDetailCoordinator { /// - Parameter completion: a completion block func storeAuthenticationCookies(in webView: WKWebView, completion: @escaping () -> Void) { guard let authenticator, - let postURL = permaLinkURL else { + let postURL = permaLinkURL + else { completion() return } @@ -371,16 +451,19 @@ class ReaderDetailCoordinator { /// - Parameter siteID: a site identification /// - Parameter isFeed: a Boolean indicating if the site is an external feed (not hosted at WPcom and not using Jetpack) private func fetch(postID: NSNumber, siteID: NSNumber, isFeed: Bool) { - readerPostService.fetchPost(postID.uintValue, - forSite: siteID.uintValue, - isFeed: isFeed, - success: { [weak self] post in - self?.post = post - self?.renderPostAndBumpStats() - }, failure: { [weak self] error in - self?.postURL == nil ? self?.showError(error: error) : self?.view?.showErrorWithWebAction(error: error) - self?.reportPostLoadFailure() - }) + readerPostService.fetchPost( + postID.uintValue, + forSite: siteID.uintValue, + isFeed: isFeed, + success: { [weak self] post in + self?.post = post + self?.renderPostAndBumpStats() + }, + failure: { [weak self] error in + self?.postURL == nil ? self?.showError(error: error) : self?.view?.showErrorWithWebAction(error: error) + self?.reportPostLoadFailure() + } + ) } /// Requests a ReaderPost from the service and updates the View. @@ -389,11 +472,12 @@ class ReaderDetailCoordinator { /// - Parameter url: a post URL private func fetch(_ url: URL) { readerPostService.resolvePostUrl(url) { [weak self] resolvedPost in - self?.fetch( - postID: NSNumber(value: resolvedPost.postId), - siteID: NSNumber(value: resolvedPost.siteId), - isFeed: false - ) + self? + .fetch( + postID: NSNumber(value: resolvedPost.postId), + siteID: NSNumber(value: resolvedPost.siteId), + isFeed: false + ) } failure: { [weak self] error in DDLogError("Error fetching post for detail: \(String(describing: error.localizedDescription))") self?.showError(error: error) @@ -404,8 +488,9 @@ class ReaderDetailCoordinator { private func showError(error: Error?) { let errorMessage: String? = { guard let error = error as? NSError, - error.domain == WordPressComRestApiEndpointError.errorDomain, - error.code == WordPressComRestApiErrorCode.authorizationRequired.rawValue else { + error.domain == WordPressComRestApiEndpointError.errorDomain, + error.code == WordPressComRestApiErrorCode.authorizationRequired.rawValue + else { return nil } return Strings.fetchDetailFromPrivateBlogErrorMessage @@ -430,11 +515,17 @@ class ReaderDetailCoordinator { return } - readerPostService.toggleSeen(for: post, success: { - NotificationCenter.default.post(name: .ReaderPostSeenToggled, - object: nil, - userInfo: [ReaderNotificationKeys.post: post]) - }, failure: nil) + readerPostService.toggleSeen( + for: post, + success: { + NotificationCenter.default.post( + name: .ReaderPostSeenToggled, + object: nil, + userInfo: [ReaderNotificationKeys.post: post] + ) + }, + failure: nil + ) } /// If the loaded URL contains a hash/anchor then jump to that spot in the post content @@ -459,7 +550,10 @@ class ReaderDetailCoordinator { } let controller = ReaderStreamViewController.controllerWithSiteID(siteID, isFeed: post.isExternal) - controller.trackingContext.source = ScreenTrackingSource(ScreenID.Reader.article, component: ElementID.Reader.articleHeaderSiteName) + controller.trackingContext.source = ScreenTrackingSource( + ScreenID.Reader.article, + component: ElementID.Reader.articleHeaderSiteName + ) viewController?.navigationController?.pushViewController(controller, animated: true) let properties = ReaderHelpers.statsPropertiesForPost(post, andValue: post.blogURL as AnyObject?, forKey: "URL") @@ -468,7 +562,10 @@ class ReaderDetailCoordinator { private func showTopic(_ topic: String) { let controller = ReaderStreamViewController.controllerWithTagSlug(topic) - controller.trackingContext.source = ScreenTrackingSource(ScreenID.Reader.article, component: ElementID.Reader.tagChip) + controller.trackingContext.source = ScreenTrackingSource( + ScreenID.Reader.article, + component: ElementID.Reader.tagChip + ) viewController?.navigationController?.pushViewController(controller, animated: true) } @@ -485,10 +582,17 @@ class ReaderDetailCoordinator { } let controller = ReaderStreamViewController.controllerWithTagSlug(primaryTagSlug) - controller.trackingContext.source = ScreenTrackingSource(ScreenID.Reader.article, component: ElementID.Reader.tagChip) + controller.trackingContext.source = ScreenTrackingSource( + ScreenID.Reader.article, + component: ElementID.Reader.tagChip + ) viewController?.navigationController?.pushViewController(controller, animated: true) - let properties = ReaderHelpers.statsPropertiesForPost(post, andValue: post.primaryTagSlug as AnyObject?, forKey: "tag") + let properties = ReaderHelpers.statsPropertiesForPost( + post, + andValue: post.primaryTagSlug as AnyObject?, + forKey: "tag" + ) WPAppAnalytics.track(.readerTagPreviewed, withProperties: properties) } @@ -506,15 +610,22 @@ class ReaderDetailCoordinator { // post URL or the webview's baseURL, scroll within the document. // In-document anchors (e.g. footnotes) resolve against the baseURL, // so we need to check both. - let isInDocumentAnchor = permaLinkURL?.isHostAndPathEqual(to: url) == true || ReaderWebView.baseURL.isHostAndPathEqual(to: url) + let isInDocumentAnchor = + permaLinkURL?.isHostAndPathEqual(to: url) == true || ReaderWebView.baseURL.isHostAndPathEqual(to: url) if let hash = URLComponents(url: url, resolvingAgainstBaseURL: true)?.fragment, isInDocumentAnchor { view?.scroll(to: hash) + } else if let mention = findMention(matching: url) { + if let profile = mentionProfiles[Self.normalizedMentionHandle(mention.handle)] { + presentMentionProfile(profile) + } else { + WPAnalytics.trackReader(.readerArticleLinkTapped) + presentWebViewController(url) + } } else if let (gallery, index) = findGallery(containing: url) { presentGallery(gallery, startingAt: index) - } else if url.pathExtension.contains("gif") || - url.pathExtension.contains("jpg") || - url.pathExtension.contains("jpeg") || - url.pathExtension.contains("png") { + } else if url.pathExtension.contains("gif") || url.pathExtension.contains("jpg") + || url.pathExtension.contains("jpeg") || url.pathExtension.contains("png") + { presentImage(url) } else if url.query?.contains("wp-story") ?? false { presentWebViewController(url) @@ -529,6 +640,10 @@ class ReaderDetailCoordinator { } } + private static func normalizedMentionHandle(_ handle: String) -> String { + handle.lowercased() + } + /// Called after the webView fully loads func webViewDidLoad() { scrollToHashIfNeeded() @@ -539,18 +654,21 @@ class ReaderDetailCoordinator { return } - ReaderFollowAction().execute(with: post, - context: coreDataStack.mainContext, - completion: { [weak self] follow in - ReaderHelpers.dispatchToggleFollowSiteMessage(post: post, follow: follow, success: true) - self?.view?.updateHeader() - completion() - }, - failure: { [weak self] follow, _ in - ReaderHelpers.dispatchToggleFollowSiteMessage(post: post, follow: follow, success: false) - self?.view?.updateHeader() - completion() - }) + ReaderFollowAction() + .execute( + with: post, + context: coreDataStack.mainContext, + completion: { [weak self] follow in + ReaderHelpers.dispatchToggleFollowSiteMessage(post: post, follow: follow, success: true) + self?.view?.updateHeader() + completion() + }, + failure: { [weak self] follow, _ in + ReaderHelpers.dispatchToggleFollowSiteMessage(post: post, follow: follow, success: false) + self?.view?.updateHeader() + completion() + } + ) } private func selectedUrlIsCrossPost(_ url: URL) -> Bool { @@ -558,10 +676,11 @@ class ReaderDetailCoordinator { let characterSet = CharacterSet(charactersIn: "/") guard let post, - post.isCrossPost, - let crossPostMeta = post.crossPostMeta, - let crossPostURL = URL(string: crossPostMeta.postURL.trimmingCharacters(in: characterSet)), - let selectedURL = URL(string: url.absoluteString.trimmingCharacters(in: characterSet)) else { + post.isCrossPost, + let crossPostMeta = post.crossPostMeta, + let crossPostURL = URL(string: crossPostMeta.postURL.trimmingCharacters(in: characterSet)), + let selectedURL = URL(string: url.absoluteString.trimmingCharacters(in: characterSet)) + else { return false } @@ -631,7 +750,9 @@ class ReaderDetailCoordinator { } let isOfflineView = ReachabilityUtils.isInternetReachable() ? "no" : "yes" - let detailType = readerPost.topic?.type == ReaderSiteTopic.TopicType ? DetailAnalyticsConstants.TypePreviewSite : DetailAnalyticsConstants.TypeNormal + let detailType = + readerPost.topic?.type == ReaderSiteTopic.TopicType + ? DetailAnalyticsConstants.TypePreviewSite : DetailAnalyticsConstants.TypeNormal var properties = ReaderHelpers.statsPropertiesForPost(readerPost, andValue: nil, forKey: nil) properties[DetailAnalyticsConstants.TypeKey] = detailType @@ -640,12 +761,12 @@ class ReaderDetailCoordinator { // Track related post tapped if let simplePost = remoteSimplePost { switch simplePost.postType { - case .local: - WPAnalytics.track(.readerRelatedPostFromSameSiteClicked, properties: properties) - case .global: - WPAnalytics.track(.readerRelatedPostFromOtherSiteClicked, properties: properties) - default: - DDLogError("Unknown related post type: \(String(describing: simplePost.postType))") + case .local: + WPAnalytics.track(.readerRelatedPostFromSameSiteClicked, properties: properties) + case .global: + WPAnalytics.track(.readerRelatedPostFromOtherSiteClicked, properties: properties) + default: + DDLogError("Unknown related post type: \(String(describing: simplePost.postType))") } } diff --git a/WordPress/Classes/ViewRelated/Reader/Detail/ReaderDetailViewController.swift b/WordPress/Classes/ViewRelated/Reader/Detail/ReaderDetailViewController.swift index 8191c8b9ea70..2a61439a1a4a 100644 --- a/WordPress/Classes/ViewRelated/Reader/Detail/ReaderDetailViewController.swift +++ b/WordPress/Classes/ViewRelated/Reader/Detail/ReaderDetailViewController.swift @@ -95,7 +95,7 @@ class ReaderDetailViewController: UIViewController, ReaderDetailView { /// The post being shown @objc var post: ReaderPost? { - return coordinator?.post + coordinator?.post } /// The URL to a post can change – we might set it when we instantiate the controller, but then when we fetch the details from the server, we know @@ -114,7 +114,7 @@ class ReaderDetailViewController: UIViewController, ReaderDetailView { } override var hidesBottomBarWhenPushed: Bool { - set { } + set {} get { true } } @@ -197,13 +197,19 @@ class ReaderDetailViewController: UIViewController, ReaderDetailView { navigationController?.interactivePopGestureRecognizer?.delegate = self // When comments are moderated or edited from the Comments view, update the Comments snippet here. - NotificationCenter.default.addObserver(self, selector: #selector(fetchComments), name: .ReaderCommentModifiedNotification, object: nil) + NotificationCenter.default.addObserver( + self, + selector: #selector(fetchComments), + name: .ReaderCommentModifiedNotification, + object: nil + ) // In the `scrollViewDidScroll` function, "toolbar hidden" is toggled repeatedly when the scroll view in the // middle of scrolling animation. This debouncer is introduced to avoid toggling // `navigationController.toolbarHidden`, which causes inifity loops. // Sentry issue: https://a8c.sentry.io/issues/6884521550 - toolbarHiddenDebounceCancellable = toolbarHiddenDebouncer + toolbarHiddenDebounceCancellable = + toolbarHiddenDebouncer .removeDuplicates() .debounce(for: .milliseconds(100), scheduler: DispatchQueue.main) .sink { [weak self] isHidden in @@ -247,6 +253,10 @@ class ReaderDetailViewController: UIViewController, ReaderDetailView { } func render(_ post: ReaderPost) { + Task { @MainActor [weak coordinator] in + await coordinator?.resolveMentionProfiles(for: post) + } + configureDiscoverAttribution(post) toolbar.configure(for: post, in: self) @@ -257,15 +267,17 @@ class ReaderDetailViewController: UIViewController, ReaderDetailView { checkTranslationAvailability() if let postURLString = post.permaLink, - let postURL = URL(string: postURLString) { + let postURL = URL(string: postURLString) + { webView.postURL = postURL } webView.isP2 = post.isP2Type - coordinator?.storeAuthenticationCookies(in: webView) { [weak self] in - self?.showPostContent(post) - } + coordinator? + .storeAuthenticationCookies(in: webView) { [weak self] in + self?.showPostContent(post) + } navigateToCommentIfNecessary() } @@ -302,17 +314,22 @@ class ReaderDetailViewController: UIViewController, ReaderDetailView { private func navigateToCommentIfNecessary() { if let post, - let commentID = coordinator?.commentID, - !hasAutomaticallyTriggeredCommentAction { + let commentID = coordinator?.commentID, + !hasAutomaticallyTriggeredCommentAction + { hasAutomaticallyTriggeredCommentAction = true - ReaderCommentAction().execute( - post: post, - origin: self, - navigateToCommentID: commentID, - source: .postDetails, - trackingSource: ScreenTrackingSource(ScreenID.Reader.article, component: ElementID.Reader.commentsSection) - ) + ReaderCommentAction() + .execute( + post: post, + origin: self, + navigateToCommentID: commentID, + source: .postDetails, + trackingSource: ScreenTrackingSource( + ScreenID.Reader.article, + component: ElementID.Reader.commentsSection + ) + ) } } @@ -334,7 +351,7 @@ class ReaderDetailViewController: UIViewController, ReaderDetailView { } else { NSLayoutConstraint.activate([ activityIndicator.centerXAnchor.constraint(equalTo: webView.centerXAnchor), - activityIndicator.topAnchor.constraint(equalTo: webView.topAnchor, constant: 64), + activityIndicator.topAnchor.constraint(equalTo: webView.topAnchor, constant: 64) ]) } activityIndicator.startAnimating() @@ -390,14 +407,17 @@ class ReaderDetailViewController: UIViewController, ReaderDetailView { /// Scroll the content to a given #hash /// func scroll(to hash: String) { - webView.evaluateJavaScript("document.getElementById('\(hash)').offsetTop", completionHandler: { [weak self] height, _ in - guard let self, let height = height as? CGFloat else { - return - } + webView.evaluateJavaScript( + "document.getElementById('\(hash)').offsetTop", + completionHandler: { [weak self] height, _ in + guard let self, let height = height as? CGFloat else { + return + } - let y = height + self.webView.frame.origin.y - self.scrollView.adjustedContentInset.top - self.scrollView.setContentOffset(CGPoint(x: 0, y: y), animated: true) - }) + let y = height + self.webView.frame.origin.y - self.scrollView.adjustedContentInset.top + self.scrollView.setContentOffset(CGPoint(x: 0, y: y), animated: true) + } + ) } func updateHeader() { @@ -425,7 +445,7 @@ class ReaderDetailViewController: UIViewController, ReaderDetailView { // Moderated comments could still be cached, so filter out non-approved comments. let approvedStatus = Comment.descriptionFor(.approved) - let approvedComments = comments.filter({ $0.status == approvedStatus}) + let approvedComments = comments.filter({ $0.status == approvedStatus }) // Set the delegate here so the table isn't shown until fetching is complete. commentsTableView.delegate = commentsTableViewDelegate @@ -524,7 +544,8 @@ class ReaderDetailViewController: UIViewController, ReaderDetailView { private func observeWebViewHeight() { scrollObserver = webView.scrollView.observe(\.contentSize, options: .new) { [weak self] _, change in guard let self, - let height = change.newValue?.height else { + let height = change.newValue?.height + else { return } @@ -532,19 +553,22 @@ class ReaderDetailViewController: UIViewController, ReaderDetailView { /// (except for a few times when it returns a very big weird number) /// We use that value so the content is not displayed with weird empty space at the bottom /// - self.webView.evaluateJavaScript("document.body.scrollHeight", completionHandler: { [weak self] webViewHeight, _ in - guard let self else { return } - guard let webViewHeight = webViewHeight as? CGFloat else { - self.webViewHeight.constant = height - return + self.webView.evaluateJavaScript( + "document.body.scrollHeight", + completionHandler: { [weak self] webViewHeight, _ in + guard let self else { return } + guard let webViewHeight = webViewHeight as? CGFloat else { + self.webViewHeight.constant = height + return + } + + /// The display setting's custom size is applied through the HTML's initial-scale property + /// in the meta tag. The `scrollHeight` value seems to return the height as if it's at 1.0 scale, + /// so we'll need to add the custom scale into account. + let scaledWebViewHeight = round(webViewHeight * self.displaySetting.size.scale) + self.webViewHeight.constant = min(scaledWebViewHeight, height) } - - /// The display setting's custom size is applied through the HTML's initial-scale property - /// in the meta tag. The `scrollHeight` value seems to return the height as if it's at 1.0 scale, - /// so we'll need to add the custom scale into account. - let scaledWebViewHeight = round(webViewHeight * self.displaySetting.size.scale) - self.webViewHeight.constant = min(scaledWebViewHeight, height) - }) + ) } } @@ -597,12 +621,18 @@ class ReaderDetailViewController: UIViewController, ReaderDetailView { private func configureCommentsTable() { commentsTableView.separatorStyle = .none commentsTableView.backgroundColor = .clear - commentsTableView.register(ReaderDetailCommentsHeader.defaultNib, - forHeaderFooterViewReuseIdentifier: ReaderDetailCommentsHeader.defaultReuseID) - commentsTableView.register(CommentContentTableViewCell.defaultNib, - forCellReuseIdentifier: CommentContentTableViewCell.defaultReuseID) - commentsTableView.register(ReaderDetailNoCommentCell.defaultNib, - forCellReuseIdentifier: ReaderDetailNoCommentCell.defaultReuseID) + commentsTableView.register( + ReaderDetailCommentsHeader.defaultNib, + forHeaderFooterViewReuseIdentifier: ReaderDetailCommentsHeader.defaultReuseID + ) + commentsTableView.register( + CommentContentTableViewCell.defaultNib, + forCellReuseIdentifier: CommentContentTableViewCell.defaultReuseID + ) + commentsTableView.register( + ReaderDetailNoCommentCell.defaultNib, + forCellReuseIdentifier: ReaderDetailNoCommentCell.defaultReuseID + ) } // Translation framework doesn't support UIKit, so we have to jump through the hoops. @@ -700,10 +730,14 @@ class ReaderDetailViewController: UIViewController, ReaderDetailView { relatedPostsTableView.separatorStyle = .none relatedPostsTableView.backgroundColor = .clear - relatedPostsTableView.register(ReaderRelatedPostsCell.defaultNib, - forCellReuseIdentifier: ReaderRelatedPostsCell.defaultReuseID) - relatedPostsTableView.register(ReaderRelatedPostsSectionHeaderView.defaultNib, - forHeaderFooterViewReuseIdentifier: ReaderRelatedPostsSectionHeaderView.defaultReuseID) + relatedPostsTableView.register( + ReaderRelatedPostsCell.defaultNib, + forCellReuseIdentifier: ReaderRelatedPostsCell.defaultReuseID + ) + relatedPostsTableView.register( + ReaderRelatedPostsSectionHeaderView.defaultNib, + forHeaderFooterViewReuseIdentifier: ReaderRelatedPostsSectionHeaderView.defaultReuseID + ) relatedPostsTableView.dataSource = self relatedPostsTableView.delegate = self @@ -740,15 +774,19 @@ class ReaderDetailViewController: UIViewController, ReaderDetailView { } private func configureNotifications() { - NotificationCenter.default.addObserver(self, - selector: #selector(siteBlocked(_:)), - name: .ReaderSiteBlocked, - object: nil) + NotificationCenter.default.addObserver( + self, + selector: #selector(siteBlocked(_:)), + name: .ReaderSiteBlocked, + object: nil + ) - NotificationCenter.default.addObserver(self, - selector: #selector(userBlocked(_:)), - name: .ReaderUserBlockingDidEnd, - object: nil) + NotificationCenter.default.addObserver( + self, + selector: #selector(userBlocked(_:)), + name: .ReaderUserBlockingDidEnd, + object: nil + ) } @objc private func userBlocked(_ notification: Foundation.Notification) { @@ -775,11 +813,14 @@ class ReaderDetailViewController: UIViewController, ReaderDetailView { } @objc func didTapDisplaySettingButton() { - let viewController = ReaderDisplaySettingViewController(initialSetting: displaySetting, - source: .readerPostNavBar) { [weak self] newSetting in + let viewController = ReaderDisplaySettingViewController( + initialSetting: displaySetting, + source: .readerPostNavBar + ) { [weak self] newSetting in // no need to refresh if there are no changes to the display setting. guard let self, - newSetting != self.displaySetting else { + newSetting != self.displaySetting + else { return } @@ -803,7 +844,11 @@ class ReaderDetailViewController: UIViewController, ReaderDetailView { /// - Parameter siteID: a site identification /// - Parameter isFeed: a Boolean indicating if the site is an external feed (not hosted at WPcom and not using Jetpack) /// - Returns: A `ReaderDetailViewController` instance - @objc class func controllerWithPostID(_ postID: NSNumber, siteID: NSNumber, isFeed: Bool = false) -> ReaderDetailViewController { + @objc class func controllerWithPostID( + _ postID: NSNumber, + siteID: NSNumber, + isFeed: Bool = false + ) -> ReaderDetailViewController { let controller = ReaderDetailViewController.loadFromStoryboard() let coordinator = ReaderDetailCoordinator(view: controller) coordinator.set(postID: postID, siteID: siteID, isFeed: isFeed) @@ -858,9 +903,10 @@ class ReaderDetailViewController: UIViewController, ReaderDetailView { /// - Returns: A `ReaderDetailViewController` instance @objc class func controllerWithPost(_ post: ReaderPost) -> ReaderDetailViewController { if post.sourceAttributionStyle() == .post, - let sourceAttribution = post.sourceAttribution, - let postID = sourceAttribution.postID, - let blogID = sourceAttribution.blogID { + let sourceAttribution = post.sourceAttribution, + let postID = sourceAttribution.postID, + let blogID = sourceAttribution.blogID + { return ReaderDetailViewController.controllerWithPostID(postID, siteID: blogID) } else if post.isCrossPost, let crossPostMeta = post.crossPostMeta { return ReaderDetailViewController.controllerWithPostID(crossPostMeta.postID, siteID: crossPostMeta.siteID) @@ -883,10 +929,12 @@ class ReaderDetailViewController: UIViewController, ReaderDetailView { guard let post else { return } - NotificationCenter.default.addObserver(self, - selector: #selector(handleObjectsChange(_:)), - name: NSNotification.Name.NSManagedObjectContextObjectsDidChange, - object: post.managedObjectContext) + NotificationCenter.default.addObserver( + self, + selector: #selector(handleObjectsChange(_:)), + name: NSNotification.Name.NSManagedObjectContextObjectsDidChange, + object: post.managedObjectContext + ) } @objc func handleObjectsChange(_ notification: Foundation.Notification) { @@ -943,7 +991,7 @@ extension ReaderDetailViewController: UIScrollViewDelegate { extension ReaderDetailViewController: StoryboardLoadable { static var defaultStoryboardName: String { - return "ReaderDetailViewController" + "ReaderDetailViewController" } } @@ -952,15 +1000,20 @@ extension ReaderDetailViewController: StoryboardLoadable { extension ReaderDetailViewController: UITableViewDataSource, UITableViewDelegate { func numberOfSections(in tableView: UITableView) -> Int { - return relatedPosts.count + relatedPosts.count } func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int { - return relatedPosts[section].posts.count + relatedPosts[section].posts.count } func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell { - guard let cell = tableView.dequeueReusableCell(withIdentifier: ReaderRelatedPostsCell.defaultReuseID, for: indexPath) as? ReaderRelatedPostsCell else { + guard + let cell = tableView.dequeueReusableCell( + withIdentifier: ReaderRelatedPostsCell.defaultReuseID, + for: indexPath + ) as? ReaderRelatedPostsCell + else { fatalError("Expected RelatedPostsTableViewCell with identifier: \(ReaderRelatedPostsCell.defaultReuseID)") } @@ -982,12 +1035,15 @@ extension ReaderDetailViewController: UITableViewDataSource, UITableViewDelegate } func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat { - return UITableView.automaticDimension + UITableView.automaticDimension } func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? { guard let title = getSectionTitle(for: relatedPosts[section].postType), - let header = tableView.dequeueReusableHeaderFooterView(withIdentifier: ReaderRelatedPostsSectionHeaderView.defaultReuseID) as? ReaderRelatedPostsSectionHeaderView else { + let header = tableView.dequeueReusableHeaderFooterView( + withIdentifier: ReaderRelatedPostsSectionHeaderView.defaultReuseID + ) as? ReaderRelatedPostsSectionHeaderView + else { return UIView(frame: .zero) } @@ -1005,7 +1061,7 @@ extension ReaderDetailViewController: UITableViewDataSource, UITableViewDelegate } func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat { - return ReaderRelatedPostsSectionHeaderView.height + ReaderRelatedPostsSectionHeaderView.height } func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) { @@ -1016,7 +1072,11 @@ extension ReaderDetailViewController: UITableViewDataSource, UITableViewDelegate guard let controller = ReaderDetailViewController.controllerWithSimplePost(post) else { return } - controller.trackingContext.source = ScreenTrackingSource(ScreenID.Reader.article, component: ElementID.Reader.relatedPosts, position: indexPath.row) + controller.trackingContext.source = ScreenTrackingSource( + ScreenID.Reader.article, + component: ElementID.Reader.relatedPosts, + position: indexPath.row + ) navigationController?.pushViewController(controller, animated: true) } @@ -1045,8 +1105,11 @@ extension ReaderDetailViewController: ReaderDisplaySettingStoreDelegate { // MARK: - UIGestureRecognizerDelegate extension ReaderDetailViewController: UIGestureRecognizerDelegate { - func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldBeRequiredToFailBy otherGestureRecognizer: UIGestureRecognizer) -> Bool { - return true + func gestureRecognizer( + _ gestureRecognizer: UIGestureRecognizer, + shouldBeRequiredToFailBy otherGestureRecognizer: UIGestureRecognizer + ) -> Bool { + true } } @@ -1061,7 +1124,11 @@ extension ReaderDetailViewController: ReaderCardDiscoverAttributionViewDelegate // MARK: - Transitioning Delegate extension ReaderDetailViewController: UIViewControllerTransitioningDelegate { - public func presentationController(forPresented presented: UIViewController, presenting: UIViewController?, source: UIViewController) -> UIPresentationController? { + public func presentationController( + forPresented presented: UIViewController, + presenting: UIViewController?, + source: UIViewController + ) -> UIPresentationController? { guard presented is FancyAlertViewController else { return nil } @@ -1081,7 +1148,11 @@ extension ReaderDetailViewController: WKNavigationDelegate { hideLoading() } - func webView(_ webView: WKWebView, decidePolicyFor navigationAction: WKNavigationAction, decisionHandler: @escaping (WKNavigationActionPolicy) -> Void) { + func webView( + _ webView: WKWebView, + decidePolicyFor navigationAction: WKNavigationAction, + decisionHandler: @escaping (WKNavigationActionPolicy) -> Void + ) { if navigationAction.navigationType == .linkActivated { if let url = navigationAction.request.url { coordinator?.handle(url) @@ -1126,8 +1197,14 @@ private extension ReaderDetailViewController { } struct LoadingText { - static let errorLoadingTitle = NSLocalizedString("Error Loading Post", comment: "Text displayed when load post fails.") - static let errorLoadingPostURLButtonTitle = NSLocalizedString("Open in browser", comment: "Button title to load a post in an in-app web view") + static let errorLoadingTitle = NSLocalizedString( + "Error Loading Post", + comment: "Text displayed when load post fails." + ) + static let errorLoadingPostURLButtonTitle = NSLocalizedString( + "Open in browser", + comment: "Button title to load a post in an in-app web view" + ) } } @@ -1146,14 +1223,16 @@ private extension ReaderDetailViewController { func showTranslationSpinner() { guard var items = navigationItem.rightBarButtonItems, - !items.contains(translationSpinner) else { return } + !items.contains(translationSpinner) + else { return } items.append(translationSpinner) navigationItem.setRightBarButtonItems(items, animated: true) } func hideTranslationSpinner() { guard var items = navigationItem.rightBarButtonItems, - let index = items.firstIndex(of: translationSpinner) else { return } + let index = items.firstIndex(of: translationSpinner) + else { return } items.remove(at: index) navigationItem.setRightBarButtonItems(items, animated: true) } @@ -1197,14 +1276,17 @@ private extension ReaderDetailViewController { func moreButtonItem(enabled: Bool = true) -> UIBarButtonItem? { let button = UIBarButtonItem(image: UIImage(systemName: "ellipsis"), menu: nil) - button.menu = UIMenu(options: .displayInline, children: [ - UIDeferredMenuElement.uncached { [weak self, weak button] callback in - guard let self, let button else { - return callback([]) + button.menu = UIMenu( + options: .displayInline, + children: [ + UIDeferredMenuElement.uncached { [weak self, weak button] callback in + guard let self, let button else { + return callback([]) + } + callback(self.makeMoreMenu(button)) } - callback(self.makeMoreMenu(button)) - } - ]) + ] + ) button.accessibilityLabel = Strings.moreButtonAccessibilityLabel button.isEnabled = enabled return button @@ -1219,19 +1301,26 @@ private extension ReaderDetailViewController { topic: nil, anchor: anchor, viewController: self - ).makeMenu() + ) + .makeMenu() if ReaderDisplaySettings.customizationEnabled { - elements.append(UIAction(title: Strings.displaySettingsLabel, image: UIImage(systemName: "textformat.size")) { [weak self] _ in - self?.didTapDisplaySettingButton() - }) + elements.append( + UIAction(title: Strings.displaySettingsLabel, image: UIImage(systemName: "textformat.size")) { + [weak self] _ in + self?.didTapDisplaySettingButton() + } + ) } return elements } func shareButtonItem(enabled: Bool = true) -> UIBarButtonItem? { - let button = barButtonItem(with: UIImage(named: "wpl-share") ?? UIImage(), action: #selector(didTapShareButton(_:))) + let button = barButtonItem( + with: UIImage(named: "wpl-share") ?? UIImage(), + action: #selector(didTapShareButton(_:)) + ) button.accessibilityLabel = SharedStrings.Button.share button.isEnabled = enabled @@ -1268,7 +1357,8 @@ extension ReaderDetailViewController { static let displaySettingsLabel = NSLocalizedString( "readerDetail.displaySettingButton.displaySettingsLabel", value: "Reading Preferences", - comment: "Spoken accessibility label for the Reading Preferences menu.") + comment: "Spoken accessibility label for the Reading Preferences menu." + ) static let safariButtonAccessibilityLabel = NSLocalizedString( "readerDetail.safariButton.accessibilityLabel", value: "Open in Safari", @@ -1301,12 +1391,16 @@ extension ReaderDetailViewController: BorderedButtonTableViewCellDelegate { return } - ReaderCommentAction().execute( - post: post, - origin: self, - source: .postDetailsComments, - trackingSource: ScreenTrackingSource(ScreenID.Reader.article, component: ElementID.Reader.commentsSection) - ) + ReaderCommentAction() + .execute( + post: post, + origin: self, + source: .postDetailsComments, + trackingSource: ScreenTrackingSource( + ScreenID.Reader.article, + component: ElementID.Reader.commentsSection + ) + ) } func buttonLeaveCommentTapped(replyingTo comment: Comment?) { diff --git a/WordPress/Classes/ViewRelated/Reader/User/ReaderUserProfileService.swift b/WordPress/Classes/ViewRelated/Reader/User/ReaderUserProfileService.swift new file mode 100644 index 000000000000..650d2a654fcc --- /dev/null +++ b/WordPress/Classes/ViewRelated/Reader/User/ReaderUserProfileService.swift @@ -0,0 +1,77 @@ +import Foundation +import WordPressData +import WordPressKit + +struct ReaderUserProfile: Equatable { + let username: String + let displayName: String + let avatarURL: URL? + let siteURL: URL? +} + +protocol ReaderUserProfileService { + func fetchProfile(handle: String) async -> ReaderUserProfile? +} + +final class WordPressComReaderUserProfileService: ReaderUserProfileService { + private let wordPressComRestApi: WordPressComRestApi? + + init(coreDataStack: CoreDataStack) { + self.wordPressComRestApi = coreDataStack.performQuery { context in + try? WPAccount.defaultWordPressComAccountRestAPI(in: context) + } + } + + init(wordPressComRestApi: WordPressComRestApi?) { + self.wordPressComRestApi = wordPressComRestApi + } + + func fetchProfile(handle: String) async -> ReaderUserProfile? { + guard let wordPressComRestApi, + let encodedHandle = handle.addingPercentEncoding(withAllowedCharacters: Self.handleAllowedCharacters) + else { + return nil + } + + let result = await wordPressComRestApi.perform( + .get, + URLString: "rest/v1.1/users/\(encodedHandle)", + parameters: ["meta": "site"] + ) + guard case .success(let response) = result else { + return nil + } + return Self.mapProfile(from: response.body, requestedHandle: handle) + } + + private static let handleAllowedCharacters = CharacterSet.alphanumerics.union( + CharacterSet(charactersIn: "-._~") + ) + + private static func mapProfile(from response: AnyObject, requestedHandle: String) -> ReaderUserProfile? { + guard let response = response as? [String: Any], + let username = response["user_login"] as? String, + username.caseInsensitiveCompare(requestedHandle) == .orderedSame + else { + return nil + } + + let displayName = (response["display_name"] as? String)? + .trimmingCharacters(in: .whitespacesAndNewlines) + let avatarURL = (response["avatar_URL"] as? String).flatMap(URL.init(string:)) + let siteURL = (response["primary_blog"] as? [String: Any])?["URL"] as? String + + return ReaderUserProfile( + username: username, + displayName: displayName?.nilIfEmpty ?? username, + avatarURL: avatarURL, + siteURL: siteURL.flatMap(URL.init(string:)) + ) + } +} + +private extension String { + var nilIfEmpty: String? { + isEmpty ? nil : self + } +} diff --git a/WordPress/Classes/ViewRelated/Reader/User/ReaderUserProfileView.swift b/WordPress/Classes/ViewRelated/Reader/User/ReaderUserProfileView.swift index 781d42cea6bf..3e11819a5a4f 100644 --- a/WordPress/Classes/ViewRelated/Reader/User/ReaderUserProfileView.swift +++ b/WordPress/Classes/ViewRelated/Reader/User/ReaderUserProfileView.swift @@ -1,4 +1,5 @@ import SwiftUI +import UIKit import WordPressData import WordPressUI @@ -32,7 +33,11 @@ struct ReaderUserProfileView: View { private var header: some View { VStack(spacing: 12) { - AvatarView(style: .single(viewModel.avatarURL), diameter: 72, placeholderImage: Image("gravatar").resizable()) + AvatarView( + style: .single(viewModel.avatarURL), + diameter: 72, + placeholderImage: Image("gravatar").resizable() + ) VStack(alignment: .leading, spacing: 3) { HStack(alignment: .firstTextBaseline, spacing: 8) { @@ -56,6 +61,27 @@ struct ReaderUserProfileViewModel { self.name = comment.author self.siteURL = URL(string: comment.author_url) } + + init(profile: ReaderUserProfile) { + self.avatarURL = profile.avatarURL + self.name = profile.displayName + self.siteURL = profile.siteURL + } +} + +enum ReaderUserProfilePresenter { + static func present(_ viewModel: ReaderUserProfileViewModel, from presentingViewController: UIViewController) { + let profileViewController = UIHostingController(rootView: ReaderUserProfileView(viewModel: viewModel)) + let navigationController = UINavigationController(rootViewController: profileViewController) + profileViewController.navigationItem.leftBarButtonItem = UIBarButtonItem( + systemItem: .close, + primaryAction: .init { [weak profileViewController] _ in + profileViewController?.presentingViewController?.dismiss(animated: true) + } + ) + navigationController.sheetPresentationController?.detents = [.medium()] + presentingViewController.present(navigationController, animated: true) + } } private enum Strings {