Add "Discussion" to "Post Settings" (#24948)

* Add discussion settings

* Add dotcom encoder

* Add initial Discussion Settings implementation

* Update the Dotcom encoder

* Update PostDiscussionSettingsView design

* Add support for self-hosted sites

* Update release notes

* Show discussion settings before format

* Cleanup

* Move RemotePostDiscussionState to WordPressKit

* Fix remotePostFromXMLRPCDictionary missing comments and pings status

Author: kean

Modules/Sources/WordPressKit/RemotePostParameters.swift

@@ -23,6 +23,7 @@ public struct RemotePostCreateParameters: Equatable {
     public var tags: [String] = []
     public var categoryIDs: [Int] = []
     public var metadata: Set<RemotePostMetadataItem> = []
+    public var discussion: RemotePostDiscussionSettings = .default
 
     public init(type: String, status: String) {
         self.type = type
@@ -53,10 +54,20 @@ public struct RemotePostUpdateParameters: Equatable {
     public var tags: [String]?
     public var categoryIDs: [Int]?
     public var metadata: Set<RemotePostMetadataItem>?
+    public var discussion: RemotePostDiscussionSettings?
 
     public init() {}
 }
 
+public enum RemotePostDiscussionState: String, CaseIterable {
+    case open = "open"
+    case closed = "closed"
+
+    init(isOpen: Bool) {
+        self = isOpen ? .open : .closed
+    }
+}
+
 public struct RemotePostMetadataItem: Hashable {
     public var id: String?
     public var key: String?
@@ -69,6 +80,18 @@ public struct RemotePostMetadataItem: Hashable {
     }
 }
 
+public struct RemotePostDiscussionSettings: Hashable {
+    public var allowComments: Bool
+    public var allowPings: Bool
+
+    public static let `default` = RemotePostDiscussionSettings(allowComments: true, allowPings: true)
+
+    public init(allowComments: Bool, allowPings: Bool) {
+        self.allowComments = allowComments
+        self.allowPings = allowPings
+    }
+}
+
 // MARK: - Diff
 
 extension RemotePostCreateParameters {
@@ -118,6 +141,9 @@ extension RemotePostCreateParameters {
         if Set(previous.categoryIDs) != Set(categoryIDs) {
             changes.categoryIDs = categoryIDs
         }
+        if previous.discussion != discussion {
+            changes.discussion = discussion
+        }
         if previous.metadata != metadata {
             changes.metadata = metadata
         }
@@ -168,6 +194,9 @@ extension RemotePostCreateParameters {
         if let categoryIDs = changes.categoryIDs {
             self.categoryIDs = categoryIDs
         }
+        if let discussion = changes.discussion {
+            self.discussion = discussion
+        }
         if let metadata = changes.metadata {
             self.metadata = metadata
         }
@@ -193,6 +222,7 @@ private enum RemotePostWordPressComCodingKeys: String, CodingKey {
     case format
     case isSticky = "sticky"
     case categoryIDs = "categories_by_id"
+    case discussion
     case metadata
 
     static let postTags = "post_tag"
@@ -232,6 +262,9 @@ struct RemotePostCreateParametersWordPressComEncoder: Encodable {
         if parameters.isSticky {
             try container.encode(parameters.isSticky, forKey: .isSticky)
         }
+        if parameters.discussion != .default {
+            try container.encode(RemotePostDiscussionSettingsWordPressComEncoder(discussion: parameters.discussion), forKey: .discussion)
+        }
     }
 }
 
@@ -259,6 +292,21 @@ struct RemotePostUpdateParametersWordPressComMetadata: Encodable {
     }
 }
 
+struct RemotePostDiscussionSettingsWordPressComEncoder: Encodable {
+    var discussion: RemotePostDiscussionSettings
+
+    private enum CodingKeys: String, CodingKey {
+        case commenets = "comments_open"
+        case pings = "pings_open"
+    }
+
+    func encode(to encoder: any Encoder) throws {
+        var container = encoder.container(keyedBy: CodingKeys.self)
+        try container.encodeIfPresent(discussion.allowComments, forKey: .commenets)
+        try container.encodeIfPresent(discussion.allowPings, forKey: .pings)
+    }
+}
+
 struct RemotePostUpdateParametersWordPressComEncoder: Encodable {
     let parameters: RemotePostUpdateParameters
 
@@ -294,6 +342,9 @@ struct RemotePostUpdateParametersWordPressComEncoder: Encodable {
         }
         try container.encodeIfPresent(parameters.categoryIDs, forKey: .categoryIDs)
         try container.encodeIfPresent(parameters.isSticky, forKey: .isSticky)
+        if let discussion = parameters.discussion {
+            try container.encode(RemotePostDiscussionSettingsWordPressComEncoder(discussion: discussion), forKey: .discussion)
+        }
     }
 }
 
@@ -317,6 +368,8 @@ private enum RemotePostXMLRPCCodingKeys: String, CodingKey {
     case format = "post_format"
     case isSticky = "sticky"
     case metadata = "custom_fields"
+    case commentStatus = "comment_status"
+    case pingStatus = "ping_status"
 
     static let taxonomyTag = "post_tag"
     static let taxonomyCategory = "category"
@@ -356,6 +409,10 @@ struct RemotePostCreateParametersXMLRPCEncoder: Encodable {
         if parameters.isSticky {
             try container.encode(parameters.isSticky, forKey: .isSticky)
         }
+        if parameters.discussion != .default {
+            try container.encode(RemotePostDiscussionState(isOpen: parameters.discussion.allowComments).rawValue, forKey: .commentStatus)
+            try container.encode(RemotePostDiscussionState(isOpen: parameters.discussion.allowPings).rawValue, forKey: .pingStatus)
+        }
     }
 }
 
@@ -395,6 +452,10 @@ struct RemotePostUpdateParametersXMLRPCEncoder: Encodable {
             try container.encode([RemotePostXMLRPCCodingKeys.taxonomyCategory: categoryIDs], forKey: .terms)
         }
         try container.encodeIfPresent(parameters.isSticky, forKey: .isSticky)
+        if let discussion = parameters.discussion {
+            try container.encode(RemotePostDiscussionState(isOpen: discussion.allowComments).rawValue, forKey: .commentStatus)
+            try container.encode(RemotePostDiscussionState(isOpen: discussion.allowPings).rawValue, forKey: .pingStatus)
+        }
     }
 }
 

Modules/Sources/WordPressKitObjC/PostServiceRemoteXMLRPC.m

@@ -334,6 +334,9 @@ + (RemotePost *)remotePostFromXMLRPCDictionary:(NSDictionary *)xmlrpcDictionary
     post.tags = [self tagsFromXMLRPCTermsArray:terms];
     post.categories = [self remoteCategoriesFromXMLRPCTermsArray:terms];
 
+    post.commentsStatus = [xmlrpcDictionary stringForKey:@"comment_status"];
+    post.pingsStatus = [xmlrpcDictionary stringForKey:@"ping_status"];
+
     post.isStickyPost = [xmlrpcDictionary numberForKeyPath:@"sticky"];
 
     // Pick an image to use for display

RELEASE-NOTES.txt

@@ -4,6 +4,7 @@
 * [*] Add "Publish Date" back to "Post Settings" for draft and pending posts [#24939]
 * [*] Use "Menlo" font for the password field to make it easier to distinguish between characters like `0` and `0`  [#24939]
 * [*] Add "Access" section to "Post Settings" [#24942]
+* [*] Add "Discussion" to "Post Settings" [#24948]
 * [*] Add "File Size" to Site Media Details [#24947]
 * [*] Add "Email to Subscribers" row to "Publishing" sheet [#24946]
 

Sources/WordPressData/Swift/Post+CoreDataProperties.swift

@@ -1,5 +1,6 @@
 import Foundation
 import CoreData
+import WordPressKit
 
 public extension Post {
 
@@ -27,3 +28,15 @@ public extension Post {
     @NSManaged func addCategories(_ values: Set<PostCategory>)
     @NSManaged func removeCategories(_ values: Set<PostCategory>)
 }
+
+extension Post {
+    public var allowComments: Bool {
+        get { commentsStatus != RemotePostDiscussionState.closed.rawValue }
+        set { commentsStatus = (newValue ? RemotePostDiscussionState.open : .closed).rawValue }
+    }
+
+    public var allowPings: Bool {
+        get { pingsStatus != RemotePostDiscussionState.closed.rawValue }
+        set { pingsStatus = (newValue ? RemotePostDiscussionState.open : .closed).rawValue }
+    }
+}

Sources/WordPressData/Swift/RemotePostCreateParameters+Helpers.swift

@@ -33,6 +33,10 @@ extension RemotePostCreateParameters {
             metadata = Set(Self.generateRemoteMetadata(for: post).compactMap { dictionary -> RemotePostMetadataItem? in
                 return PostHelper.mapDictionaryToMetadataItems(dictionary)
             })
+            discussion = RemotePostDiscussionSettings(
+                allowComments: post.allowComments,
+                allowPings: post.allowPings
+            )
         default:
             break
         }

WordPress/Classes/ViewRelated/Post/PostSettings/PostDiscussionSettingsView.swift

@@ -0,0 +1,79 @@
+import SwiftUI
+
+struct PostDiscussionSettingsView: View {
+    @Binding var postSettings: PostSettings
+
+    var body: some View {
+        Form {
+            // Comments Section
+            Section {
+                Toggle(Strings.allowCommentsLabel, isOn: $postSettings.allowComments)
+                    .accessibilityIdentifier("post_discussion_allow_comments_toggle")
+            } footer: {
+                Text(commentsFooterText)
+            }
+
+            // Pingbacks Section
+            Section {
+                Toggle(Strings.allowPingsLabel, isOn: $postSettings.allowPings)
+                    .accessibilityIdentifier("post_discussion_allow_pings_toggle")
+            } footer: {
+                Link(destination: Strings.pingbacksLearnMoreURL) {
+                    (Text(Strings.learnMorePingbacksText) + Text(" ") + Text(Image(systemName: "link")))
+                        .font(.footnote)
+                }
+                .accessibilityIdentifier("post_discussion_pingbacks_learn_more_button")
+            }
+        }
+        .navigationTitle(Strings.discussionTitle)
+        .navigationBarTitleDisplayMode(.inline)
+    }
+
+    private var commentsFooterText: String {
+        if postSettings.allowComments {
+            return Strings.commentsEnabledFooter
+        } else {
+            return Strings.commentsDisabledFooter
+        }
+    }
+}
+
+private enum Strings {
+    static let discussionTitle = NSLocalizedString(
+        "postDiscussion.title",
+        value: "Discussion",
+        comment: "Navigation title for post discussion settings"
+    )
+
+    static let allowCommentsLabel = NSLocalizedString(
+        "postDiscussion.allowComments.label",
+        value: "Allow Comments",
+        comment: "Toggle label for allowing comments on post"
+    )
+
+    static let allowPingsLabel = NSLocalizedString(
+        "postDiscussion.allowPings.label",
+        value: "Allow Pingbacks",
+        comment: "Toggle label for allowing pings/trackbacks on post"
+    )
+
+    static let commentsEnabledFooter = NSLocalizedString(
+        "postDiscussion.comments.enabled.footer",
+        value: "Visitors can add new comments and replies.",
+        comment: "Footer text when comments are enabled"
+    )
+
+    static let commentsDisabledFooter = NSLocalizedString(
+        "postDiscussion.comments.disabled.footer",
+        value: "Visitors cannot add new comments or replies. Existing comments remain visible.",
+        comment: "Footer text when comments are disabled"
+    )
+
+    static let pingbacksLearnMoreURL = URL(string: "https://wordpress.org/documentation/article/trackbacks-and-pingbacks/")!
+
+    static let learnMorePingbacksText = NSLocalizedString(
+        "postDiscussion.pingbacks.learnMore.text",
+        value: "Learn more about pingbacks & trackbacks",
+        comment: "Link text for learning more about pingbacks and trackbacks"
+    )
+}

WordPress/Classes/ViewRelated/Post/PostSettings/PostSettings.swift

@@ -27,6 +27,9 @@ struct PostSettings: Hashable {
     var postFormat: String?
     var isStickyPost = false
     var sharing: PostSocialSharingSettings?
+    var accessLevel: JetpackPostAccessLevel?
+    var allowComments = true
+    var allowPings = true
 
     // MARK: - Page-specific
     var parentPageID: Int?
@@ -61,6 +64,10 @@ struct PostSettings: Hashable {
             categoryIDs = Set((post.categories ?? []).compactMap {
                 $0.categoryID?.intValue
             })
+            sharing = PostSocialSharingSettings.make(for: post)
+            accessLevel = metadata.accessLevel ?? .everybody
+            allowComments = post.allowComments
+            allowPings = post.allowPings
         case let page as Page:
             parentPageID = page.parentID?.intValue
         default:
@@ -144,6 +151,14 @@ struct PostSettings: Hashable {
                 post.isStickyPost = isStickyPost
             }
 
+            // Update discussion settings
+            if post.allowComments != allowComments {
+                post.allowComments = allowComments
+            }
+            if post.allowPings != allowPings {
+                post.allowPings = allowPings
+            }
+
             if let sharing {
                 for connection in sharing.services.flatMap(\.connections) {
                     let keyringID = NSNumber(value: connection.keyringID)

WordPress/Classes/ViewRelated/Post/PostSettings/PostSettingsView.swift

@@ -371,6 +371,7 @@ struct PostSettingsFormContentView: View {
                 pendingReviewRow
             }
             if viewModel.isPost {
+                discussionRow
                 postFormatRow
             }
             if !viewModel.isPost {
@@ -392,6 +393,14 @@ struct PostSettingsFormContentView: View {
         }
     }
 
+    private var discussionRow: some View {
+        NavigationLink {
+            PostDiscussionSettingsView(postSettings: $viewModel.settings)
+        } label: {
+            SettingsRow(Strings.discussionLabel, value: viewModel.settings.allowComments ? Strings.discussionOpen : Strings.discussionClosed)
+        }
+    }
+
     private var parentPageRow: some View {
         NavigationLink {
             if let page = viewModel.post as? Page {
@@ -587,6 +596,23 @@ private enum Strings {
         value: "Post Format",
         comment: "Label for the post format field. Should be the same as WP core."
     )
+    static let discussionLabel = NSLocalizedString(
+        "postSettings.discussion.label",
+        value: "Discussion",
+        comment: "Label for the discussion settings field in Post Settings"
+    )
+
+    static let discussionOpen = NSLocalizedString(
+        "postSettings.discussion.open",
+        value: "Open",
+        comment: "Status text when discussion (comments) is enabled"
+    )
+
+    static let discussionClosed = NSLocalizedString(
+        "postSettings.discussion.closed",
+        value: "Closed",
+        comment: "Status text when discussion (comments) is disabled"
+    )
 
     static let parentPageLabel = NSLocalizedString(
         "postSettings.parentPage.label",