From b91dccf467688dbfcc7de4e17b8100adc43d0a28 Mon Sep 17 00:00:00 2001 From: Jeremy Massel <1123407+jkmassel@users.noreply.github.com> Date: Fri, 13 Nov 2026 15:38:43 -0600 Subject: [PATCH 1/3] Update wordpress-rs to the trunk build with the support ticket ID fix Pins wordpress-rs to its trunk-build snapshot of 39cefd51, which reads a numeric zendesk_ticket_id when creating a support bot conversation. Comment author avatar URLs are now optional in wordpress-rs, so use optional chaining where the app reads them. --- Modules/Package.resolved | 3 +-- Modules/Package.swift | 2 +- Modules/Sources/WordPressComments/Models/CommentDetail.swift | 4 ++-- .../Sources/WordPressComments/Models/CommentListItem.swift | 2 +- Package.resolved | 3 +-- .../Classes/Services/CommentServiceRemoteCoreRESTAPI.swift | 4 ++-- 6 files changed, 8 insertions(+), 10 deletions(-) diff --git a/Modules/Package.resolved b/Modules/Package.resolved index 80be5211a6a1..4825ab3e2c44 100644 --- a/Modules/Package.resolved +++ b/Modules/Package.resolved @@ -327,8 +327,7 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/automattic/wordpress-rs", "state" : { - "revision" : "68a8ab594578f2b3e058460e5a944176af20399b", - "version" : "0.9.1" + "revision" : "b1b20dd147fe3059865664bbac46f200b8524104" } }, { diff --git a/Modules/Package.swift b/Modules/Package.swift index e3bbed259a48..3befaafd884a 100644 --- a/Modules/Package.swift +++ b/Modules/Package.swift @@ -66,7 +66,7 @@ let package = Package( .package(url: "https://github.com/wordpress-mobile/GutenbergKit", from: "0.20.0-alpha.2"), .package( url: "https://github.com/automattic/wordpress-rs", - exact: "0.9.1" + revision: "b1b20dd147fe3059865664bbac46f200b8524104" ), .package( url: "https://github.com/Automattic/color-studio", diff --git a/Modules/Sources/WordPressComments/Models/CommentDetail.swift b/Modules/Sources/WordPressComments/Models/CommentDetail.swift index 2dfdc1abac20..5ec3bb22140b 100644 --- a/Modules/Sources/WordPressComments/Models/CommentDetail.swift +++ b/Modules/Sources/WordPressComments/Models/CommentDetail.swift @@ -27,7 +27,7 @@ struct CommentDetail: Equatable, Sendable { self.init( id: comment.id, authorName: comment.authorName, - avatarURL: comment.authorAvatarUrls.avatarURL, + avatarURL: comment.authorAvatarUrls?.avatarURL, authorURL: comment.authorUrl, authorEmail: nil, authorIP: nil, @@ -46,7 +46,7 @@ struct CommentDetail: Equatable, Sendable { self.init( id: comment.id, authorName: comment.authorName, - avatarURL: comment.authorAvatarUrls.avatarURL, + avatarURL: comment.authorAvatarUrls?.avatarURL, authorURL: comment.authorUrl, authorEmail: comment.authorEmail, authorIP: comment.authorIp, diff --git a/Modules/Sources/WordPressComments/Models/CommentListItem.swift b/Modules/Sources/WordPressComments/Models/CommentListItem.swift index 1b559d698ed8..0096a7be2a73 100644 --- a/Modules/Sources/WordPressComments/Models/CommentListItem.swift +++ b/Modules/Sources/WordPressComments/Models/CommentListItem.swift @@ -47,7 +47,7 @@ struct CommentListItem: Identifiable, Equatable, Sendable { init(comment: CommentWithViewContext) { id = comment.id authorName = comment.authorName.nonEmptyString() ?? Strings.anonymousAuthor - avatarURL = comment.authorAvatarUrls.avatarURL + avatarURL = comment.authorAvatarUrls?.avatarURL postID = comment.post snippet = Self.snippet(fromHTML: comment.content.rendered) date = comment.dateGmt diff --git a/Package.resolved b/Package.resolved index 406b2c01b346..b006347b8133 100644 --- a/Package.resolved +++ b/Package.resolved @@ -327,8 +327,7 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/automattic/wordpress-rs", "state" : { - "revision" : "68a8ab594578f2b3e058460e5a944176af20399b", - "version" : "0.9.1" + "revision" : "b1b20dd147fe3059865664bbac46f200b8524104" } }, { diff --git a/WordPress/Classes/Services/CommentServiceRemoteCoreRESTAPI.swift b/WordPress/Classes/Services/CommentServiceRemoteCoreRESTAPI.swift index 1221661d0572..8c48054a8db6 100644 --- a/WordPress/Classes/Services/CommentServiceRemoteCoreRESTAPI.swift +++ b/WordPress/Classes/Services/CommentServiceRemoteCoreRESTAPI.swift @@ -141,7 +141,7 @@ private extension RemoteComment { self.authorID = NSNumber(value: comment.author) self.author = comment.authorName self.authorUrl = comment.authorUrl - self.authorAvatarURL = comment.authorAvatarUrls.avatarURL()?.absoluteString + self.authorAvatarURL = comment.authorAvatarUrls?.avatarURL()?.absoluteString self.content = comment.content.rendered self.date = comment.dateGmt self.link = comment.link @@ -169,7 +169,7 @@ private extension RemoteComment { self.author = comment.authorName self.authorEmail = comment.authorEmail self.authorUrl = comment.authorUrl - self.authorAvatarURL = comment.authorAvatarUrls.avatarURL()?.absoluteString + self.authorAvatarURL = comment.authorAvatarUrls?.avatarURL()?.absoluteString self.authorIP = comment.authorIp self.content = comment.content.raw self.rawContent = comment.content.raw From 6f4a1a36dfe63d62917aeb774d29004072b3be4d Mon Sep 17 00:00:00 2001 From: Jeremy Massel <1123407+jkmassel@users.noreply.github.com> Date: Fri, 13 Nov 2026 16:03:36 -0600 Subject: [PATCH 2/3] Pin wordpress-rs to the current trunk-build commit trunk-build is force-pushed on every wordpress-rs trunk merge, so the previous commit is no longer on any branch and CI can't fetch it. --- Modules/Package.resolved | 2 +- Modules/Package.swift | 2 +- Package.resolved | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Modules/Package.resolved b/Modules/Package.resolved index 4825ab3e2c44..5fe5b16ac8a6 100644 --- a/Modules/Package.resolved +++ b/Modules/Package.resolved @@ -327,7 +327,7 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/automattic/wordpress-rs", "state" : { - "revision" : "b1b20dd147fe3059865664bbac46f200b8524104" + "revision" : "8e619ff1dfed123d9d321ac73285048fa9f627a4" } }, { diff --git a/Modules/Package.swift b/Modules/Package.swift index 3befaafd884a..d659f9887e97 100644 --- a/Modules/Package.swift +++ b/Modules/Package.swift @@ -66,7 +66,7 @@ let package = Package( .package(url: "https://github.com/wordpress-mobile/GutenbergKit", from: "0.20.0-alpha.2"), .package( url: "https://github.com/automattic/wordpress-rs", - revision: "b1b20dd147fe3059865664bbac46f200b8524104" + revision: "8e619ff1dfed123d9d321ac73285048fa9f627a4" ), .package( url: "https://github.com/Automattic/color-studio", diff --git a/Package.resolved b/Package.resolved index b006347b8133..1b27e22782cb 100644 --- a/Package.resolved +++ b/Package.resolved @@ -327,7 +327,7 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/automattic/wordpress-rs", "state" : { - "revision" : "b1b20dd147fe3059865664bbac46f200b8524104" + "revision" : "8e619ff1dfed123d9d321ac73285048fa9f627a4" } }, { From 08a97a11d91abfdd05758f958ea58400176df0c9 Mon Sep 17 00:00:00 2001 From: Jeremy Massel <1123407+jkmassel@users.noreply.github.com> Date: Tue, 17 Nov 2026 20:11:17 -0600 Subject: [PATCH 3/3] Update wordpress-rs to 0.11.0 0.11.0 is the first release with the support ticket ID fix, so pin to it instead of the trunk-build snapshot. Nothing else in the release needed changes in the app. --- Modules/Package.resolved | 3 ++- Modules/Package.swift | 2 +- Package.resolved | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Modules/Package.resolved b/Modules/Package.resolved index 5fe5b16ac8a6..7a0b36bc43b4 100644 --- a/Modules/Package.resolved +++ b/Modules/Package.resolved @@ -327,7 +327,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/automattic/wordpress-rs", "state" : { - "revision" : "8e619ff1dfed123d9d321ac73285048fa9f627a4" + "revision" : "ab374f1da6eb2e762ca9c179d615cf33a34a6c6a", + "version" : "0.11.0" } }, { diff --git a/Modules/Package.swift b/Modules/Package.swift index bf4502ce294a..e6ff532938ad 100644 --- a/Modules/Package.swift +++ b/Modules/Package.swift @@ -66,7 +66,7 @@ let package = Package( .package(url: "https://github.com/wordpress-mobile/GutenbergKit", from: "0.20.0-alpha.2"), .package( url: "https://github.com/automattic/wordpress-rs", - revision: "8e619ff1dfed123d9d321ac73285048fa9f627a4" + exact: "0.11.0" ), .package( url: "https://github.com/Automattic/color-studio", diff --git a/Package.resolved b/Package.resolved index 1b27e22782cb..f6553b98adc7 100644 --- a/Package.resolved +++ b/Package.resolved @@ -327,7 +327,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/automattic/wordpress-rs", "state" : { - "revision" : "8e619ff1dfed123d9d321ac73285048fa9f627a4" + "revision" : "ab374f1da6eb2e762ca9c179d615cf33a34a6c6a", + "version" : "0.11.0" } }, {