Skip to content

Fix an issue with parent page ID removal #796

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 23, 2024
Merged

Fix an issue with parent page ID removal #796

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b5cf427
Fix an issue with parent page ID removal not working
kean Apr 23, 2024
7d8cbdf
Update CHANGELOG
kean Apr 23, 2024
1a0955f
Update the rest of the endpoints
kean Apr 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ _None._
### Bug Fixes

- Fix encoding for some fields in the new XMLRPC endpoints [#786]
- Fix an issue with parent page removal in new `PostServiceRemoteExtended` [#796]

### Internal Changes

Expand Down
36 changes: 16 additions & 20 deletions Sources/WordPressKit/Models/RemotePostParameters.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,9 +219,7 @@ struct RemotePostCreateParametersWordPressComEncoder: Encodable {
}

// Pages
if let parentPageID = parameters.parentPageID {
try container.encodeIfPresent(parentPageID, forKey: .parentPageID)
}
try container.encodeIfPresent(parameters.parentPageID, forKey: .parentPageID)

// Posts
try container.encodeIfPresent(parameters.format, forKey: .format)
Expand Down Expand Up @@ -297,12 +295,7 @@ struct RemotePostUpdateParametersWordPressComEncoder: Encodable {
try container.encodeIfPresent(parameters.excerpt, forKey: .excerpt)
try container.encodeIfPresent(parameters.slug, forKey: .slug)
if let value = parameters.featuredImageID {
if let featuredImageID = value {
try container.encode(featuredImageID, forKey: .featuredImageID)
} else {
// Passing `null` doesn't work.
try container.encode("", forKey: .featuredImageID)
}
try container.encodeNullableID(value, forKey: .featuredImageID)
}
if let metadata = parameters.metadata, !metadata.isEmpty {
let metadata = metadata.map(RemotePostUpdateParametersWordPressComMetadata.init)
Expand All @@ -311,7 +304,7 @@ struct RemotePostUpdateParametersWordPressComEncoder: Encodable {

// Pages
if let parentPageID = parameters.parentPageID {
try container.encodeIfPresent(parentPageID, forKey: .parentPageID)
try container.encodeNullableID(parentPageID, forKey: .parentPageID)
}

// Posts
Expand Down Expand Up @@ -370,9 +363,7 @@ struct RemotePostCreateParametersXMLRPCEncoder: Encodable {
}

// Pages
if let parentPageID = parameters.parentPageID {
try container.encodeIfPresent(parentPageID, forKey: .parentPageID)
}
try container.encodeIfPresent(parameters.parentPageID, forKey: .parentPageID)

// Posts
try container.encodeIfPresent(parameters.format, forKey: .format)
Expand Down Expand Up @@ -403,12 +394,7 @@ struct RemotePostUpdateParametersXMLRPCEncoder: Encodable {
try container.encodeStringIfPresent(parameters.excerpt, forKey: .excerpt)
try container.encodeStringIfPresent(parameters.slug, forKey: .slug)
if let value = parameters.featuredImageID {
if let featuredImageID = value {
try container.encode(featuredImageID, forKey: .featuredImageID)
} else {
// Passing `null` doesn't work.
try container.encode("", forKey: .featuredImageID)
}
try container.encodeNullableID(value, forKey: .featuredImageID)
}
if let metadata = parameters.metadata, !metadata.isEmpty {
let metadata = metadata.map(RemotePostUpdateParametersXMLRPCMetadata.init)
Expand All @@ -417,7 +403,7 @@ struct RemotePostUpdateParametersXMLRPCEncoder: Encodable {

// Pages
if let parentPageID = parameters.parentPageID {
try container.encodeIfPresent(parentPageID, forKey: .parentPageID)
try container.encodeNullableID(parentPageID, forKey: .parentPageID)
}

// Posts
Expand Down Expand Up @@ -449,4 +435,14 @@ private extension KeyedEncodingContainer {
guard let value else { return }
try encode(value ?? "", forKey: key)
}

/// - note: Some IDs are passed as integers, but, to reset them, you need to pass
/// an empty string (passing `nil` does not work)
mutating func encodeNullableID(_ value: Int?, forKey key: Key) throws {
if let value {
try encode(value, forKey: key)
} else {
try encode("", forKey: key)
}
}
}