Add support for editing comments

Modules/Package.swift

@@ -44,7 +44,7 @@ let package = Package(
         .package(url: "https://github.com/wordpress-mobile/MediaEditor-iOS", branch: "task/spm-support"),
         .package(url: "https://github.com/wordpress-mobile/NSObject-SafeExpectations", from: "0.0.6"),
         .package(url: "https://github.com/wordpress-mobile/NSURL-IDN", branch: "trunk"),
-        .package(url: "https://github.com/wordpress-mobile/WordPressKit-iOS", branch: "wpios-edition"),
+        .package(url: "https://github.com/wordpress-mobile/WordPressKit-iOS", branch: "task/add-remote-comment-update-comment"),
         .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-20250127"),

WordPress/Classes/Extensions/Comment+Interface.swift

@@ -76,4 +76,20 @@ extension Comment {
             }
         }
     }
+
+    // MARK: Helpers
+
+    /// Returns an associated site ID.
+    ///
+    /// - note: The `Comment` class can be used in two different contexts:
+    /// Reader and Site, and this property works accordingly.
+    var associatedSiteID: NSNumber? {
+        if let post = post as? ReaderPost {
+            return post.siteID
+        } else if let blogID = blog?.dotComID {
+            return blogID
+        } else {
+            return nil
+        }
+    }
 }

WordPress/Classes/Services/CommentService.h

@@ -124,7 +124,7 @@ extern NSUInteger const WPTopLevelHierarchicalCommentsPerPage;
 - (void)updateCommentWithID:(NSNumber *)commentID
                      siteID:(NSNumber *)siteID
                     content:(NSString *)content
-                    success:(void (^ _Nullable)(void))success
+                    success:(void (^ _Nullable)(RemoteComment * _Nullable comment))success
                     failure:(void (^ _Nullable)(NSError * _Nullable error))failure;
 
 // Replies

WordPress/Classes/Services/CommentService.m

@@ -666,7 +666,7 @@ - (NSString *)sanitizeCommentContent:(NSString *)string isPrivateSite:(BOOL)isPr
 - (void)updateCommentWithID:(NSNumber *)commentID
                      siteID:(NSNumber *)siteID
                     content:(NSString *)content
-                    success:(void (^)(void))success
+                    success:(void (^)(RemoteComment *comment))success
                     failure:(void (^)(NSError *error))failure
 {
     CommentServiceRemoteREST *remote = [self restRemoteForSite:siteID];

WordPress/Classes/Services/NotificationActionsService.swift

@@ -87,7 +87,7 @@ class NotificationActionsService: CoreDataService {
         block.textOverride = content
 
         // Hit the backend
-        commentService.updateComment(withID: commentID, siteID: siteID, content: content, success: {
+        commentService.updateComment(withID: commentID, siteID: siteID, content: content, success: { _ in
             DDLogInfo("Successfully updated to comment \(siteID).\(commentID)")
             self.invalidateCacheAndForceSyncNotification(with: block)
             completion?(true)

WordPress/Classes/Stores/NoticeStore.swift

@@ -1,5 +1,6 @@
 import Foundation
 import WordPressFlux
+import WordPressShared
 
 /// Notice represents a small notification that that can be displayed within
 /// the app, much like Android toasts or snackbars.
@@ -65,7 +66,6 @@ struct Notice {
         self.actionHandler = actionHandler
         self.style = style
     }
-
 }
 
 extension Notice: Equatable {
@@ -75,6 +75,14 @@ extension Notice: Equatable {
 }
 
 extension Notice {
+    /// Creates a notice with a localized description of the given error.
+    init(error: Error, title: String? = nil) {
+        self.init(
+            title: title ?? SharedStrings.Error.generic,
+            message: error.localizedDescription.stringByDecodingXMLCharacters()
+        )
+    }
+
     func post() {
         ActionDispatcher.dispatch(NoticeAction.post(self))
     }

WordPress/Classes/ViewRelated/Comments/Controllers/CommentDetailViewController.swift

@@ -982,13 +982,10 @@ private extension CommentDetailViewController {
     }
 
     @objc func buttonAddCommentTapped() {
-        guard let viewModel = CommentComposerViewModel(comment: comment) else {
-            return wpAssertionFailure("missing required parameters")
-        }
-        viewModel.save = { [weak self] in
+        let viewModel = CommentCreateViewModel(replyingTo: comment) { [weak self] in
             try await self?.createReply(content: $0)
         }
-        let composerVC = CommentComposerViewController(viewModel: viewModel)
+        let composerVC = CommentCreateViewController(viewModel: viewModel)
         let navigationVC = UINavigationController(rootViewController: composerVC)
         present(navigationVC, animated: true)
     }