Implement a new CommentServiceRemote that uses .org REST API (#24555)

* Update wordpress-rs

* Move getting avatar URL function

* Prevent creating WordPressSite instances for WP.com sites

* Implement a new `CommentServiceRemote` that uses .org REST API

* Fix a compiling issue in the Keystone target

Author: crazytonyli

Modules/Package.resolved

@@ -54,7 +54,7 @@ let package = Package(
         ),
         .package(url: "https://github.com/zendesk/support_sdk_ios", from: "8.0.3"),
         // We can't use wordpress-rs branches nor commits here. Only tags work.
-        .package(url: "https://github.com/Automattic/wordpress-rs", revision: "alpha-20250513"),
+        .package(url: "https://github.com/Automattic/wordpress-rs", revision: "alpha-20250520"),
         .package(url: "https://github.com/wordpress-mobile/GutenbergKit", revision: "fdfe788530bbff864ce7147b5a68608d7025e078"),
         .package(
             url: "https://github.com/Automattic/color-studio",

Modules/Package.swift

@@ -0,0 +1,15 @@
+import Foundation
+import WordPressAPI
+import WordPressAPIInternal
+
+extension Dictionary where Key == UserAvatarSize, Value == WpResponseString {
+
+    public func avatarURL() -> URL? {
+        guard let url = self[.size96] ?? self[.size48] ?? self[.size24], let url else {
+            return nil
+        }
+
+        return URL(string: url)
+    }
+
+}

Modules/Sources/WordPressCore/Extensions/Avatar.swift

@@ -86,19 +86,11 @@ private extension DisplayUser {
             firstName: user.firstName,
             lastName: user.lastName,
             displayName: user.name,
-            profilePhotoUrl: Self.profilePhotoUrl(for: user),
+            profilePhotoUrl: user.avatarUrls?.avatarURL(),
             role: role,
             emailAddress: user.email,
             websiteUrl: user.link,
             biography: user.description
         )
     }
-
-    static func profilePhotoUrl(for user: UserWithEditContext) -> URL? {
-        guard let url = user.avatarUrls?[.size96] ?? user.avatarUrls?[.size48] ?? user.avatarUrls?[.size24], let url else {
-            return nil
-        }
-
-        return URL(string: url)
-    }
 }

Modules/Sources/WordPressCore/Users/UserService.swift

@@ -183,9 +183,9 @@ public enum WordPressSite {
     case selfHosted(blogId: TaggedManagedObjectID<Blog>, apiRootURL: ParsedUrl, username: String, authToken: String)
 
     public init(blog: Blog) throws {
-        if let account = blog.account {
-            let authToken = try account.authToken ?? WPAccount.token(forUsername: account.username)
-            self = .dotCom(siteId: blog.dotComID?.intValue ?? 0, authToken: authToken)
+        if let _ = blog.account {
+            // WP.com support is not ready yet.
+            throw NSError(domain: "WordPressAPI", code: 0)
         } else {
             let url = try blog.restApiRootURL ?? blog.getUrl().appending(path: "wp-json").absoluteString
             let apiRootURL = try ParsedUrl.parse(input: url)

Sources/WordPressData/Swift/Blog+SelfHosted.swift

@@ -1,3 +1,6 @@
+import Foundation
+import WordPressData
+
 /// Encapsulates actions related to fetching reply comments.
 ///
 extension CommentService {
@@ -74,6 +77,32 @@ extension CommentService {
             self.coreDataStack.save(context, completion: completion, on: .main)
         }
     }
+
+    // The app may display `RemoteComment.postTitle` on comments list. However, the comments endpoint in the .org
+    // REST API does not return post title. This function prefetchs the associated posts and saves them locally if
+    // they don't already exist.
+    @objc(fetchPostsIfNeededForComments:inBlog:)
+    public func fetchPostsIfNeeded(for comments: [RemoteComment], in blog: Blog) {
+        // Find posts that do not exists locally.
+        let postIds = comments
+            .reduce(into: Set<NSNumber>()) { result, comment in
+                if let postId = comment.postID, comment.postTitle == nil {
+                    result.insert(postId)
+                }
+            }
+            .filter { postId in
+                blog.lookupPost(withID: postId, in: blog.managedObjectContext!) == nil
+            }
+
+        let blogId = TaggedManagedObjectID(blog)
+        DDLogInfo("Pre-fetching \(postIds.count) posts...")
+        Task {
+            let repository = PostRepository()
+            for postId in postIds {
+                _ = try? await repository.getPost(withID: postId, from: blogId)
+            }
+        }
+    }
 }
 
 private extension CommentService {

WordPress/Classes/Services/CommentService+Swift.swift

@@ -175,6 +175,8 @@ - (void)syncCommentsForBlog:(Blog *)blog
                 fetchedComments = [self filterUnrepliedComments:comments forAuthor:author];
             }
             [self mergeComments:fetchedComments forBlog:blog purgeExisting:YES];
+            [self fetchPostsIfNeededForComments:fetchedComments inBlog:blog];
+
             blog.lastCommentsSync = [NSDate date];
         } completion:^{
             [[self class] stopSyncingCommentsForBlog:blogID];