feat: new show_past argument for list shortcode

Author: dkjensen

includes/shortcodes/wp-zoom-list-shortcode.php

@@ -15,8 +15,9 @@
 function wp_zoom_list_shortcode( $atts, $content = '' ) {
 	$atts = shortcode_atts(
 		array(
-			'type'     => 'webinars',
-			'per_page' => 20,
+			'type'      => 'webinars',
+			'per_page'  => 20,
+			'show_past' => 0,
 		),
 		$atts
 	);
@@ -27,7 +28,7 @@ function wp_zoom_list_shortcode( $atts, $content = '' ) {
 
 	$page     = get_query_var( 'paged', 1 );
 	$per_page = intval( $atts['per_page'] );
-	$data     = wp_zoom_get_occurrences( $atts['type'] );
+	$data     = wp_zoom_get_occurrences( $atts['type'], (bool) $atts['show_past'] );
 	$total    = count( $data );
 
 	if ( $page < 2 ) {

includes/wp-zoom-ajax.php

@@ -48,7 +48,7 @@ function wp_zoom_ajax_get_calendar_webinars() {
 			$response[] = array(
 				'id'    => $webinar['id'],
 				'start' => $webinar['start_time'],
-				'end'   => wp_zoom_format_get_end_date_time( $webinar['start_time'], $webinar['duration'] ),
+				'end'   => wp_zoom_format_end_date_time( $webinar['start_time'], $webinar['duration'] ),
 				'title' => $webinar['topic'],
 				'url'   => $purchase_url,
 			);
@@ -63,7 +63,7 @@ function wp_zoom_ajax_get_calendar_webinars() {
 				$response[] = array(
 					'id'    => $occurrence['occurrence_id'],
 					'start' => $occurrence['start_time'],
-					'end'   => wp_zoom_format_get_end_date_time( $occurrence['start_time'], $occurrence['duration'] ),
+					'end'   => wp_zoom_format_end_date_time( $occurrence['start_time'], $occurrence['duration'] ),
 					'title' => $webinar['topic'],
 					'url'   => $purchase_url,
 				);

includes/wp-zoom-helper-functions.php

@@ -7,6 +7,21 @@
 
 use SeattleWebCo\WPZoom\Cache;
 
+/**
+ * Return a DateTime object with the GMT end time
+ *
+ * @param string  $datetime Date / time to get end.
+ * @param integer $duration Duration in minutes.
+ * @return DateTime
+ */
+function wp_zoom_end_date_time( string $datetime, int $duration ) {
+	$gmt_timezone = new DateTimeZone( 'GMT' );
+	$gmt_datetime = new DateTime( trim( $datetime, 'Z' ), $gmt_timezone );
+	$gmt_datetime->add( DateInterval::createFromDateString( (string) $duration . 'minutes' ) );
+
+	return $gmt_datetime;
+}
+
 /**
  * Format date / time string
  *
@@ -37,7 +52,7 @@ function wp_zoom_format_date_time( string $datetime, string $timezone = '', stri
  * @param integer $duration Duration in minutes.
  * @return string
  */
-function wp_zoom_format_get_end_date_time( string $datetime, int $duration ) {
+function wp_zoom_format_end_date_time( string $datetime, int $duration ) {
 	$gmt_timezone = new DateTimeZone( 'GMT' );
 
 	$gmt_datetime = new DateTime( trim( $datetime, 'Z' ), $gmt_timezone );
@@ -146,10 +161,11 @@ function( &$webinar ) use ( $wp_zoom ) {
 /**
  * Get all occurrences of meetings or webinars merged into an array
  *
- * @param string $type Either webinars or meetings.
+ * @param string  $type Either webinars or meetings.
+ * @param boolean $show_past Whether to show occurrences that have ended.
  * @return array
  */
-function wp_zoom_get_occurrences( $type = 'webinars' ) {
+function wp_zoom_get_occurrences( $type = 'webinars', $show_past = false ) {
 	global $wp_zoom;
 
 	$occurrences = array();
@@ -180,6 +196,17 @@ function( $a, $b ) {
 		}
 	);
 
+	if ( ! $show_past ) {
+		$occurrences = array_filter(
+			$occurrences,
+			function( $occurrence ) {
+				$end = wp_zoom_end_date_time( (string) $occurrence['start_time'], (int) $occurrence['duration'] );
+
+				return $end->getTimestamp() > time();
+			}
+		);
+	}
+
 	return $occurrences;
 }