Fix graph filters

CHANGELOG.md

@@ -1,3 +1,21 @@
+= 0.9.5 =
+
+Fixed:
+
+* Post-type filters intruduced in v0.9.4 now also affect the graph results.
+
+= 0.9.4 =
+
+Enhancements:
+
+* Added a setting to include post types, we default to `post` and `page` and you can add others as you wish.
+
+Fixed:
+
+* Completing the last badge wouldn't ever work, fixed.
+* Fixed some bugs around detecting badges being "had".
+* Replaced links to the site with shortlinks, so we can change them as needed without doing a release.
+
 = 0.9.3 =
 
 Security:

classes/widgets/class-published-content-density.php

@@ -81,9 +81,26 @@ public function get_chart_args() {
 			],
 			'count_callback' => [ $this, 'count_density' ],
 			'compound'       => false,
+			'filter_results' => [ $this, 'filter_activities' ],
 		];
 	}
 
+	/**
+	 * Callback to filter the activities.
+	 *
+	 * @param \Progress_Planner\Activities\Content[] $activities The activities array.
+	 *
+	 * @return \Progress_Planner\Activities\Content[]
+	 */
+	public function filter_activities( $activities ) {
+		return array_filter(
+			$activities,
+			function ( $activity ) {
+				return \in_array( $activity->get_post()->post_type, Content_Helpers::get_post_types_names(), true );
+			}
+		);
+	}
+
 	/**
 	 * Callback to count the words in the activities.
 	 *
@@ -129,14 +146,15 @@ public function get_all_activities_density() {
 		// Get the all-time average.
 		static $density;
 		if ( null === $density ) {
-			$density = $this->count_density(
+			$activities = $this->filter_activities(
 				\progress_planner()->get_query()->query_activities(
 					[
 						'category' => 'content',
 						'type'     => 'publish',
 					]
 				)
 			);
+			$density    = $this->count_density( $activities );
 		}
 		return $density;
 	}

classes/widgets/class-published-content.php

@@ -129,20 +129,37 @@ public function get_stats() {
 	 */
 	public function get_chart_args() {
 		return [
-			'query_params' => [
+			'query_params'   => [
 				'category' => 'content',
 				'type'     => 'publish',
 			],
-			'dates_params' => [
+			'dates_params'   => [
 				'start'     => \DateTime::createFromFormat( 'Y-m-d', \gmdate( 'Y-m-01' ) )->modify( $this->get_range() ),
 				'end'       => new \DateTime(),
 				'frequency' => $this->get_frequency(),
 				'format'    => 'M',
 			],
-			'chart_params' => [
+			'chart_params'   => [
 				'type' => 'line',
 			],
-			'compound'     => false,
+			'compound'       => false,
+			'filter_results' => [ $this, 'filter_activities' ],
 		];
 	}
+
+	/**
+	 * Callback to filter the activities.
+	 *
+	 * @param \Progress_Planner\Activities\Content[] $activities The activities array.
+	 *
+	 * @return \Progress_Planner\Activities\Content[]
+	 */
+	public function filter_activities( $activities ) {
+		return array_filter(
+			$activities,
+			function ( $activity ) {
+				return \in_array( $activity->get_post()->post_type, Content_Helpers::get_post_types_names(), true );
+			}
+		);
+	}
 }

readme.txt

@@ -78,6 +78,12 @@ https://youtu.be/e1bmxZYyXFY
 
 == Upgrade Notice ==
 
+= 0.9.5 =
+
+Fixed:
+
+* Post-type filters intruduced in v0.9.4 now also affect the graph results.
+
 = 0.9.4 =
 
 Enhancements: