Rename is_public to is_publicly_viewable and number_of_public_posts t…

…o number_of_publicly_viewable_posts

src/builders/indexable-author-builder.php

@@ -100,10 +100,10 @@ public function build( $user_id, Indexable $indexable ) {
  }
 
  public function set_aggregate_values( Indexable $indexable ) {
- $aggregates = $this->get_public_post_archive_aggregates( $indexable->object_id );
- $indexable->object_published_at = $aggregates->first_published_at;
- $indexable->object_last_modified = max($indexable->object_last_modified, $aggregates->most_recent_last_modified);
- $indexable->number_of_public_posts = $aggregates->number_of_public_posts;
+ $aggregates  = $this->get_public_post_archive_aggregates( $indexable->object_id );
+ $indexable->object_published_at  = $aggregates->first_published_at;
+ $indexable->object_last_modified  = max( $indexable->object_last_modified, $aggregates->most_recent_last_modified );
+ $indexable->number_of_publicly_viewable_posts = $aggregates->number_of_public_posts;
 
  return $indexable;
  }
@@ -181,7 +181,7 @@ protected function find_alternative_image( Indexable $indexable ) {
  */
  protected function get_public_post_archive_aggregates( $author_id ) {
  $post_statuses = $this->post_helper->get_public_post_statuses();
- $post_types = $this->author_archive->get_author_archive_post_types();
+ $post_types  = $this->author_archive->get_author_archive_post_types();
  // TODO DIEDE: Protected pages krijgen _geen_ noindex. en staan gewoon in het author archive. moeten die meegeteld worden?
  // Private werkt wel zoals verwacht.
 

src/builders/indexable-home-page-builder.php

@@ -96,7 +96,8 @@ public function build( $indexable ) {
  $indexable->description = \get_bloginfo( 'description' );
  }
 
- $indexable->is_robots_noindex = \get_option( 'blog_public' ) === '0';
+ $indexable->is_robots_noindex = \get_option( 'blog_public' ) === '0';
+ $indexable->is_publicly_viewable = true;
 
  $indexable->open_graph_title = $this->options->get( 'open_graph_frontpage_title' );
  $indexable->open_graph_image = $this->options->get( 'open_graph_frontpage_image' );
@@ -122,10 +123,10 @@ public function build( $indexable ) {
  }
 
  public function set_aggregate_values( Indexable $indexable ) {
- $aggregates = $this->get_public_post_archive_aggregates();
- $indexable->object_published_at = $aggregates->first_published_at;
- $indexable->object_last_modified = $aggregates->most_recent_last_modified;
- $indexable->number_of_public_posts = $aggregates->number_of_public_posts;
+ $aggregates  = $this->get_public_post_archive_aggregates();
+ $indexable->object_published_at  = $aggregates->first_published_at;
+ $indexable->object_last_modified  = $aggregates->most_recent_last_modified;
+ $indexable->number_of_publicly_viewable_posts = $aggregates->number_of_public_posts;
 
  return $indexable;
  }

src/builders/indexable-post-builder.php

@@ -154,7 +154,8 @@ public function build( $post_id, $indexable ) {
  $indexable->object_last_modified = $post->post_modified_gmt;
  $indexable->object_published_at = $post->post_date_gmt;
 
- $indexable->number_of_public_posts = 0;
+ $indexable->number_of_publicly_viewable_posts = 0;
+ $indexable->is_publicly_viewable = \is_post_publicly_viewable( $post );
 
  $indexable->version = $this->version;
 
@@ -177,34 +178,6 @@ protected function get_permalink( $post_type, $post_id ) {
  return \wp_get_attachment_url( $post_id );
  }
 
- /**
- * Determines the value of is_public.
- *
- * @param Indexable $indexable The indexable.
- *
- * @return bool|null Whether the post type is public. Null if no override is set.
- */
- protected function is_accessible_post( $indexable ) {
- return is_post_type_viewable($indexable->object_sub_type) && is_post_status_viewable($indexable->post_status);
- }
-
- /**
- * Determines the value of is_public for attachments.
- *
- * @param Indexable $indexable The indexable.
- *
- * @return bool|null False when it has no parent. Null when it has a parent.
- */
- protected function is_public_attachment( $indexable ) {
- // If the attachment has no parent, it should not be public.
- if ( empty( $indexable->post_parent ) ) {
- return false;
- }
-
- // If the attachment has a parent, the is_public should be NULL.
- return null;
- }
-
  /**
  * Converts the meta robots noindex value to the indexable value.
  *

src/builders/indexable-post-type-archive-builder.php

@@ -83,6 +83,11 @@ public function build( $post_type, Indexable $indexable ) {
  $indexable->is_robots_noindex = (bool) $this->options->get( 'noindex-ptarchive-' . $post_type );
  $indexable->blog_id = \get_current_blog_id();
 
+ $post_type_object = get_post_type_object( $post_type );
+ if ( $post_type_object !== null ) {
+ $indexable->is_publicly_viewable = $post_type_object->has_archive && $post_type_object->rewrite !== false;
+ }
+
  $indexable = $this->set_aggregate_values( $indexable );
 
  $indexable->version = $this->version;
@@ -91,10 +96,10 @@ public function build( $post_type, Indexable $indexable ) {
  }
 
  public function set_aggregate_values( Indexable $indexable ) {
- $aggregates = $this->get_public_post_archive_aggregates( $indexable->object_sub_type );
- $indexable->object_published_at = $aggregates->published_at;
- $indexable->object_last_modified = $aggregates->last_modified;
- $indexable->number_of_public_posts = $aggregates->number_of_public_posts;
+ $aggregates  = $this->get_public_post_archive_aggregates( $indexable->object_sub_type );
+ $indexable->object_published_at  = $aggregates->published_at;
+ $indexable->object_last_modified  = $aggregates->last_modified;
+ $indexable->number_of_publicly_viewable_posts = $aggregates->number_of_public_posts;
 
  return $indexable;
  }

src/builders/indexable-system-page-builder.php

@@ -65,12 +65,13 @@ public function __construct(
  * @return Indexable The extended indexable.
  */
  public function build( $object_sub_type, Indexable $indexable ) {
- $indexable->object_type = 'system-page';
- $indexable->object_sub_type = $object_sub_type;
- $indexable->title = $this->options->get( static::OPTION_MAPPING[ $object_sub_type ]['title'] );
- $indexable->is_robots_noindex = true;
- $indexable->number_of_public_posts = 0;
- $indexable->blog_id = \get_current_blog_id();
+ $indexable->object_type = 'system-page';
+ $indexable->object_sub_type = $object_sub_type;
+ $indexable->title = $this->options->get( static::OPTION_MAPPING[ $object_sub_type ]['title'] );
+ $indexable->is_robots_noindex = true;
+ $indexable->number_of_publicly_viewable_posts = 0;
+ $indexable->is_publicly_viewable = true;
+ $indexable->blog_id = \get_current_blog_id();
 
  if ( \array_key_exists( 'breadcrumb_title', static::OPTION_MAPPING[ $object_sub_type ] ) ) {
  $indexable->breadcrumb_title = $this->options->get( static::OPTION_MAPPING[ $object_sub_type ]['breadcrumb_title'] );

src/builders/indexable-term-builder.php

@@ -97,11 +97,12 @@ public function build( $term_id, $indexable ) {
 
  $term_meta = $this->taxonomy_helper->get_term_meta( $term );
 
- $indexable->object_id = $term_id;
- $indexable->object_type = 'term';
- $indexable->object_sub_type = $term->taxonomy;
- $indexable->permalink = $term_link;
- $indexable->blog_id = \get_current_blog_id();
+ $indexable->object_id = $term_id;
+ $indexable->object_type = 'term';
+ $indexable->object_sub_type = $term->taxonomy;
+ $indexable->permalink = $term_link;
+ $indexable->blog_id = \get_current_blog_id();
+ $indexable->is_publicly_viewable = is_taxonomy_viewable( $term->taxonomy );
 
  $indexable->primary_focus_keyword_score = $this->get_keyword_score(
  $this->get_meta_value( 'wpseo_focuskw', $term_meta ),
@@ -138,10 +139,10 @@ public function build( $term_id, $indexable ) {
  }
 
  public function set_aggregate_values( Indexable $indexable ) {
- $aggregates = $this->get_public_post_archive_aggregates( $indexable->object_id, $indexable->object_sub_type );
- $indexable->object_published_at = $aggregates->first_published_at;
- $indexable->object_last_modified = $aggregates->most_recent_last_modified;
- $indexable->number_of_public_posts = $aggregates->number_of_public_posts;
+ $aggregates  = $this->get_public_post_archive_aggregates( $indexable->object_id, $indexable->object_sub_type );
+ $indexable->object_published_at  = $aggregates->first_published_at;
+ $indexable->object_last_modified  = $aggregates->most_recent_last_modified;
+ $indexable->number_of_publicly_viewable_posts = $aggregates->number_of_public_posts;
 
  return $indexable;
  }

src/models/indexable.php

@@ -61,7 +61,9 @@
  *
  * @property bool $is_protected
  * @property string $post_status
- * @property int $number_of_public_posts
+ *
+ * @property int $number_of_publicly_viewable_posts
+ * @property bool $is_publicly_viewable
  *
  * @property int $blog_id
  *
@@ -108,6 +110,7 @@ class Indexable extends Model {
  'is_robots_noimageindex',
  'is_robots_nosnippet',
  'is_cornerstone',
+ 'is_publicly_viewable',
  'is_protected',
  'calculated_no_index',
  ];
@@ -131,12 +134,12 @@ class Indexable extends Model {
  'blog_id',
  'estimated_reading_time_minutes',
  'version',
- 'number_of_public_posts',
+ 'number_of_publicly_viewable_posts',
  ];
 
  protected $deprecated_columns = [
- 'has_public_posts' => 'number_of_public_posts',
- 'is_public',
+ 'has_public_posts' => 'number_of_publicly_viewable_posts',
+ 'is_public' => 'is_publicly_viewable',
  ];
 
  /**