Merge branch 'develop' into rnmobile/refactor/gallery-as-nested-image…

…-blocks-editor-settings_v2 # Conflicts: # WordPressKit.podspec
wordpress-mobile · Sep 2, 2021 · fb9d7dc · fb9d7dc
2 parents 9131068 + b622fd0
commit fb9d7dc
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 44 deletions.
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
@@ -20,7 +20,7 @@ steps:
   #################
   # Validate Podspec
   #################
-  - label: "🔬 Validating Podspec"
+  - label: "🔬 Validate Podspec"
     key: "validate"
     command: "validate_podspec"
     env: *common_env

diff --git a/.circleci/config.yml b/.circleci/config.yml
diff --git a/README.md b/README.md
@@ -1,7 +1,5 @@
 #  WordPressKit for iOS
 
-[![CircleCI](https://circleci.com/gh/wordpress-mobile/WordPressKit-iOS.svg?style=svg)](https://circleci.com/gh/wordpress-mobile/WordPressKit-iOS)
-
 ## About
 
 WordPressKit offers a clean and simple WordPress.com and WordPress.org API.

diff --git a/WordPressKit.podspec b/WordPressKit.podspec
@@ -2,7 +2,8 @@
 
 Pod::Spec.new do |s|
   s.name          = 'WordPressKit'
-  s.version       = '4.41.0-beta.2'
+  s.version       = '4.41.0-beta.3'
+
   s.summary       = 'WordPressKit offers a clean and simple WordPress.com and WordPress.org API.'
   s.description   = <<-DESC
                     This framework encapsulates all of the networking calls and entity parsers required to interact

diff --git a/WordPressKit/AccountSettingsRemote.swift b/WordPressKit/AccountSettingsRemote.swift
@@ -152,7 +152,7 @@ public class AccountSettingsRemote: ServiceRemoteWordPressComREST {
 
         wordPressComRestApi.POST(path, parameters: nil) { _, _ in
             success()
-        } failure: { error, response in
+        } failure: { error, _ in
             failure(error)
         }
     }

diff --git a/WordPressKit/CommentServiceRemoteREST.m b/WordPressKit/CommentServiceRemoteREST.m
@@ -118,9 +118,13 @@ - (void)updateComment:(RemoteComment *)comment
                                      withVersion:ServiceRemoteWordPressComRESTApiVersion_1_1];
 
     NSDictionary *parameters = @{
-                                 @"content": comment.content,
-                                 @"context": @"edit",
-                                 };
+        @"content": comment.content,
+        @"author": comment.author,
+        @"author_email": comment.authorEmail,
+        @"author_url": comment.authorUrl,
+        @"context": @"edit",
+    };
+
     [self.wordPressComRestApi POST:requestUrl
                         parameters:parameters
                            success:^(id responseObject, NSHTTPURLResponse *httpResponse) {

diff --git a/WordPressKit/CommentServiceRemoteXMLRPC.m b/WordPressKit/CommentServiceRemoteXMLRPC.m
@@ -119,11 +119,21 @@ - (void)updateComment:(RemoteComment *)comment
 {
     NSParameterAssert(comment.commentID != nil);
     NSNumber *commentID = comment.commentID;
+
+    NSDictionary *commentDictionary = @{
+        @"content": comment.content,
+        @"author": comment.author,
+        @"author_email": comment.authorEmail,
+        @"author_url": comment.authorUrl,
+    };
+
     NSArray *extraParameters = @[
                                  comment.commentID,
-                                 @{@"content": comment.content},
+                                 commentDictionary,
                                  ];
+
     NSArray *parameters = [self XMLRPCArgumentsWithExtra:extraParameters];
+
     [self.api callMethod:@"wp.editComment"
               parameters:parameters
                  success:^(id responseObject, NSHTTPURLResponse *httpResponse) {

diff --git a/WordPressKitTests/AccountSettingsRemoteTests.swift b/WordPressKitTests/AccountSettingsRemoteTests.swift
@@ -321,7 +321,7 @@ class AccountSettingsRemoteTests: RemoteTestCase, RESTTestable {
         remote.closeAccount {
             XCTFail("Closing account unexpectedly succeded")
             expectation.fulfill()
-        } failure: { error in
+        } failure: { _ in
             expectation.fulfill()
         }