Skip to content

Site Settings API: Expose show_context and show_date options #28305

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
ivan-ottinger merged 9 commits into from
Jan 13, 2023
Merged

Site Settings API: Expose show_context and show_date options #28305

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c71a069
[not verified] Site Settings API: Expose related posts
mashikag Jan 10, 2023
ac9f5db
[not verified] Site Settings API: Expose related posts option
mashikag Jan 10, 2023
cfbfdf5
[not verified] changelog
mashikag Jan 10, 2023
08acfc5
[not verified] Fix return value on related posts option update
mashikag Jan 10, 2023
7943eb9
[not verified] Handle undefined or options
mashikag Jan 10, 2023
1b4bf8a
[not verified] Remove unnecassary bool cast
mashikag Jan 10, 2023
0d07867
[not verified] Update projects/plugins/jetpack/changelog/update-expos…
mashikag Jan 10, 2023
d3a108c
[not verified] Bring back the bool cast
mashikag Jan 10, 2023
2968458
[not verified] Fix up some options assignments
mashikag Jan 11, 2023
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
4 changes: 4 additions & 0 deletions projects/plugins/jetpack/changelog/update-expose-related-posts-show-date-option
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: minor
Type: other

Site Settings API: Expose Jetpack's related posts 'show_date' and 'show_context' options
23 changes: 18 additions & 5 deletions projects/plugins/jetpack/json-endpoints/class.wpcom-json-api-site-settings-endpoint.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@
'blog_public' => '(string) Site visibility; -1: private, 0: discourage search engines, 1: allow search engines',
'jetpack_sync_non_public_post_stati' => '(bool) allow sync of post and pages with non-public posts stati',
'jetpack_relatedposts_enabled' => '(bool) Enable related posts?',
'jetpack_relatedposts_show_context' => '(bool) Show post\'s tags and category in related posts?',
'jetpack_relatedposts_show_date' => '(bool) Show date in related posts?',
'jetpack_relatedposts_show_headline' => '(bool) Show headline in related posts?',
'jetpack_relatedposts_show_thumbnails' => '(bool) Show thumbnails in related posts?',
'jetpack_protect_whitelist' => '(array) List of IP addresses to whitelist',
Expand Down Expand Up @@ -356,17 +358,19 @@ public function get_settings_response() {
$response[ $key ] = array(
// also exists as "options".
'admin_url' => get_admin_url(),
'default_ping_status' => (bool) ( 'closed' !== get_option( 'default_ping_status' ) ),
'default_comment_status' => (bool) ( 'closed' !== get_option( 'default_comment_status' ) ),
'default_ping_status' => 'closed' !== get_option( 'default_ping_status' ),
'default_comment_status' => 'closed' !== get_option( 'default_comment_status' ),

// new stuff starts here.
'instant_search_enabled' => (bool) get_option( 'instant_search_enabled' ),
'blog_public' => (int) get_option( 'blog_public' ),
'jetpack_sync_non_public_post_stati' => (bool) Jetpack_Options::get_option( 'sync_non_public_post_stati' ),
'jetpack_relatedposts_allowed' => (bool) $this->jetpack_relatedposts_supported(),
'jetpack_relatedposts_enabled' => (bool) $jetpack_relatedposts_options['enabled'],
'jetpack_relatedposts_show_headline' => (bool) isset( $jetpack_relatedposts_options['show_headline'] ) ? $jetpack_relatedposts_options['show_headline'] : false,
'jetpack_relatedposts_show_thumbnails' => (bool) isset( $jetpack_relatedposts_options['show_thumbnails'] ) ? $jetpack_relatedposts_options['show_thumbnails'] : false,
'jetpack_relatedposts_show_context' => ! empty( $jetpack_relatedposts_options['show_context'] ),
'jetpack_relatedposts_show_date' => ! empty( $jetpack_relatedposts_options['show_date'] ),
'jetpack_relatedposts_show_headline' => ! empty( $jetpack_relatedposts_options['show_headline'] ),
'jetpack_relatedposts_show_thumbnails' => ! empty( $jetpack_relatedposts_options['show_thumbnails'] ),
'jetpack_search_enabled' => (bool) $jetpack_search_active,
'jetpack_search_supported' => (bool) $jetpack_search_supported,
'default_category' => (int) get_option( 'default_category' ),
Expand Down Expand Up @@ -645,6 +649,8 @@ public function update_settings() {
$updated[ $key ] = (bool) $value;
break;
case 'jetpack_relatedposts_enabled':
case 'jetpack_relatedposts_show_context':
case 'jetpack_relatedposts_show_date':
case 'jetpack_relatedposts_show_thumbnails':
case 'jetpack_relatedposts_show_headline':
if ( ! $this->jetpack_relatedposts_supported() ) {
Expand Down Expand Up @@ -1071,7 +1077,14 @@ function ( &$value ) {
$old_relatedposts_options = Jetpack_Options::get_option( 'relatedposts' );
if ( Jetpack_Options::update_option( 'relatedposts', $jetpack_relatedposts_options ) ) {
foreach ( $jetpack_relatedposts_options as $key => $value ) {
if ( isset( $old_relatedposts_options[ $key ] ) && $value !== $old_relatedposts_options[ $key ] ) {
if ( in_array( $key, array( 'show_context', 'show_date' ), true ) ) {
$has_initialized_option = ! isset( $old_relatedposts_options[ $key ] ) && $value;
$has_updated_option = isset( $old_relatedposts_options[ $key ] ) && $value !== $old_relatedposts_options[ $key ];

if ( $has_initialized_option || $has_updated_option ) {
$updated[ 'jetpack_relatedposts_' . $key ] = (bool) $value;
}
} elseif ( isset( $old_relatedposts_options[ $key ] ) && $value !== $old_relatedposts_options[ $key ] ) {
$updated[ 'jetpack_relatedposts_' . $key ] = $value;
}
}
Expand Down
2 changes: 2 additions & 0 deletions projects/plugins/jetpack/json-endpoints/class.wpcom-json-api-site-settings-v1-2-endpoint.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@
'blog_public' => '(string) Site visibility; -1: private, 0: discourage search engines, 1: allow search engines',
'jetpack_sync_non_public_post_stati' => '(bool) allow sync of post and pages with non-public posts stati',
'jetpack_relatedposts_enabled' => '(bool) Enable related posts?',
'jetpack_relatedposts_show_context' => '(bool) Show post\'s tags and category in related posts?',
'jetpack_relatedposts_show_date' => '(bool) Show date in related posts?',
'jetpack_relatedposts_show_headline' => '(bool) Show headline in related posts?',
'jetpack_relatedposts_show_thumbnails' => '(bool) Show thumbnails in related posts?',
'instant_search_enabled' => '(bool) Enable the new Jetpack Instant Search interface',
Expand Down
2 changes: 2 additions & 0 deletions projects/plugins/jetpack/json-endpoints/class.wpcom-json-api-site-settings-v1-3-endpoint.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@
'blog_public' => '(string) Site visibility; -1: private, 0: discourage search engines, 1: allow search engines',
'jetpack_sync_non_public_post_stati' => '(bool) allow sync of post and pages with non-public posts stati',
'jetpack_relatedposts_enabled' => '(bool) Enable related posts?',
'jetpack_relatedposts_show_context' => '(bool) Show post\'s tags and category in related posts?',
'jetpack_relatedposts_show_date' => '(bool) Show date in related posts?',
'jetpack_relatedposts_show_headline' => '(bool) Show headline in related posts?',
'jetpack_relatedposts_show_thumbnails' => '(bool) Show thumbnails in related posts?',
'instant_search_enabled' => '(bool) Enable the new Jetpack Instant Search interface',
Expand Down
2 changes: 2 additions & 0 deletions projects/plugins/jetpack/json-endpoints/class.wpcom-json-api-site-settings-v1-4-endpoint.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@
'blog_public' => '(string) Site visibility; -1: private, 0: discourage search engines, 1: allow search engines',
'jetpack_sync_non_public_post_stati' => '(bool) allow sync of post and pages with non-public posts stati',
'jetpack_relatedposts_enabled' => '(bool) Enable related posts?',
'jetpack_relatedposts_show_context' => '(bool) Show post\'s tags and category in related posts?',
'jetpack_relatedposts_show_date' => '(bool) Show date in related posts?',
'jetpack_relatedposts_show_headline' => '(bool) Show headline in related posts?',
'jetpack_relatedposts_show_thumbnails' => '(bool) Show thumbnails in related posts?',
'instant_search_enabled' => '(bool) Enable the new Jetpack Instant Search interface',
Expand Down
2 changes: 2 additions & 0 deletions ...gins/jetpack/tests/php/json-api/test-class.wpcom-json-api-site-settings-v1-4-endpoint.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,8 @@ public function make_post_request( $setting ) {
'blog_public' => '(string) Site visibility; -1: private, 0: discourage search engines, 1: allow search engines',
'jetpack_sync_non_public_post_stati' => '(bool) allow sync of post and pages with non-public posts stati',
'jetpack_relatedposts_enabled' => '(bool) Enable related posts?',
'jetpack_relatedposts_show_context' => '(bool) Show post\'s tags and category in related posts?',
'jetpack_relatedposts_show_date' => '(bool) Show date in related posts?',
'jetpack_relatedposts_show_headline' => '(bool) Show headline in related posts?',
'jetpack_relatedposts_show_thumbnails' => '(bool) Show thumbnails in related posts?',
'instant_search_enabled' => '(bool) Enable the new Jetpack Instant Search interface',
Expand Down