Merge branch 'github-main'

- Added `asc_generate_sp_event_title()` to format event titles using team names.
- Added `asc_generate_short_date()` for consistent date/time representation.
- Refined title/description to reflect event status (postponed, cancelled, etc.) and venue.
- Handled special outcomes like Technical Forfeit or Forfeit in title.

.github/workflows/release.yml

@@ -0,0 +1,37 @@
+name: Release Plugin Zip
+
+on:
+  push:
+    tags:
+      - "v*"
+
+permissions:
+  contents: write
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Build plugin zip
+        id: build
+        run: |
+          set -euo pipefail
+          PLUGIN_SLUG="${GITHUB_REPOSITORY##*/}"
+          TAG="${GITHUB_REF_NAME}"
+          ZIP_NAME="${PLUGIN_SLUG}-${TAG}.zip"
+
+          mkdir -p dist
+          git archive --format=zip --prefix="${PLUGIN_SLUG}/" -o "dist/${ZIP_NAME}" HEAD
+
+          echo "zip_path=dist/${ZIP_NAME}" >> "$GITHUB_OUTPUT"
+          echo "zip_name=${ZIP_NAME}" >> "$GITHUB_OUTPUT"
+
+      - name: Create or update release and upload zip
+        uses: softprops/action-gh-release@v2
+        with:
+          files: ${{ steps.build.outputs.zip_path }}
+          fail_on_unmatched_files: true

includes/featured-image-generator.php

@@ -0,0 +1,207 @@
+<?php
+/*
+Plugin Name: SP Event Image Generator
+Description: Auto-generates featured images for SP Events by combining team colors and logos.
+Version: 1.0
+Author: Your Name
+*/
+
+function generate_bisected_image($color1, $color2, $logo1_path, $logo2_path) {
+    $width = 1200;
+    $height = 628;
+    $x_margin = 0.1 * ($width / 2); // 10% of half the width
+    $y_margin = 0.1 * $height; // 10% of the height
+    $image = imagecreatetruecolor($width, $height);
+
+    // Allocate colors
+    $rgb1 = sscanf($color1, "#%02x%02x%02x");
+    $rgb2 = sscanf($color2, "#%02x%02x%02x");
+    $color1_alloc = imagecolorallocate($image, $rgb1[0], $rgb1[1], $rgb1[2]);
+    $color2_alloc = imagecolorallocate($image, $rgb2[0], $rgb2[1], $rgb2[2]);
+
+    // Fill halves with a 15-degree angled bisection
+    $points1 = [
+        0, 0, 
+        0, $height,
+        $width*.40, $height, 
+        $width*.60, 0,
+    ];
+    $points2 = [
+        $width, 0, 
+        $width, $height, 
+        $width*.40, $height, 
+        $width*.60, 0,
+    ];
+    imagefilledpolygon($image, $points1, $color1_alloc);
+    imagefilledpolygon($image, $points2, $color2_alloc);
+
+    // Add logos with resizing and positioning if paths are not empty
+    if (!empty($logo1_path)) {
+        $logo1 = imagecreatefrompng($logo1_path);
+        $logo1_width = imagesx($logo1);
+        $logo1_height = imagesy($logo1);
+
+        // Calculate max dimensions for logo 1
+        $max_width = ($width / 2) - (2 * $x_margin);
+        $max_height = $height - (2 * $y_margin);
+
+        // Resize logo 1
+        $new_logo1_width = $logo1_width;
+        $new_logo1_height = $logo1_height;
+        if ($logo1_width > $max_width || $logo1_height > $max_height) {
+            $aspect_ratio1 = $logo1_width / $logo1_height;
+            if ($logo1_width / $max_width > $logo1_height / $max_height) {
+                $new_logo1_width = $max_width;
+                $new_logo1_height = $max_width / $aspect_ratio1;
+            } else {
+                $new_logo1_height = $max_height;
+                $new_logo1_width = $max_height * $aspect_ratio1;
+            }
+        }
+
+        // Center logo 1
+        $logo1_x = (int) ($width / 4) - ($new_logo1_width / 2);
+        $logo1_y = (int) ($height / 2) - ($new_logo1_height / 2);
+        imagecopyresampled($image, $logo1, $logo1_x, $logo1_y, 0, 0, $new_logo1_width, $new_logo1_height, $logo1_width, $logo1_height);
+        imagedestroy($logo1);
+    }
+
+    if (!empty($logo2_path)) {
+        $logo2 = imagecreatefrompng($logo2_path);
+        $logo2_width = imagesx($logo2);
+        $logo2_height = imagesy($logo2);
+
+        // Calculate max dimensions for logo 2
+        $max_width = ($width / 2) - (2 * $x_margin);
+        $max_height = $height - (2 * $y_margin);
+
+        // Resize logo 2
+        $new_logo2_width = $logo2_width;
+        $new_logo2_height = $logo2_height;
+        if ($logo2_width > $max_width || $logo2_height > $max_height) {
+            $aspect_ratio2 = $logo2_width / $logo2_height;
+            if ($logo2_width / $max_width > $logo2_height / $max_height) {
+                $new_logo2_width = $max_width;
+                $new_logo2_height = $max_width / $aspect_ratio2;
+            } else {
+                $new_logo2_height = $max_height;
+                $new_logo2_width = $max_height * $aspect_ratio2;
+            }
+        }
+
+        // Center logo 2
+        $logo2_x = (int) (3 * $width / 4) - ($new_logo2_width / 2);
+        $logo2_y = (int) ($height / 2) - ($new_logo2_height / 2);
+        imagecopyresampled($image, $logo2, $logo2_x, $logo2_y, 0, 0, $new_logo2_width, $new_logo2_height, $logo2_width, $logo2_height);
+        imagedestroy($logo2);
+    }
+
+    // Start output buffering to capture the image data
+    ob_start();
+    imagepng($image); // Output the image as PNG
+    $image_data = ob_get_clean(); // Get the image data from the buffer
+
+    // Clean up memory
+    imagedestroy($image);
+
+    return $image_data;
+
+}
+
+function add_image_generator_endpoint() {
+    add_rewrite_endpoint('head-to-head', EP_ROOT, true);
+}
+add_action('init', 'add_image_generator_endpoint');
+
+function handle_image_request() {
+    if (!isset($_GET['post'])) return;
+    
+    $post_id = $_GET['post'];
+    $post = get_post($post_id);
+
+    // Verify post type
+    if (!$post && $post->post_type !== 'sp_event') return;
+
+    // Get associated teams from post meta
+    $team_ids = get_post_meta($post_id, 'sp_team', false); // false to get an array of values
+
+    // Ensure we have exactly two teams
+    if (count($team_ids) < 2) return;
+
+    $team1_id = $team_ids[0];
+    $team2_id = $team_ids[1];
+
+    $team1 = get_post($team1_id);
+    $team2 = get_post($team2_id);
+    $team1_postmodified = strtotime($team1->post_modified);
+    $team2_postmodified = strtotime($team2->post_modified);
+
+    $cache_key = "team_image_{$team1_id}_{$team1_postmodified}-{$team2_id}_{$team2_postmodified}";
+    $cached_image_path = get_transient($cache_key);
+
+    if ($cached_image_path && file_exists($cached_image_path)) {
+        serve_image($cached_image_path);
+        exit;
+    }
+
+    // Get team colors and logos
+    $team1_colors = get_post_meta($team1_id, 'sp_colors', true);
+    $team2_colors = get_post_meta($team2_id, 'sp_colors', true);
+
+    $default_color = '#FFFFFF'; // Default color (black)
+    $team1_color = !empty($team1_colors['primary']) ? $team1_colors['primary'] : $default_color;
+    $team2_color = !empty($team2_colors['primary']) ? $team2_colors['primary'] : $default_color;
+
+    // Security check for hex color
+    $team1_color = preg_match('/^#[a-fA-F0-9]{6}$/', $team1_color) ? $team1_color : '#FFFFFF';
+    $team2_color = preg_match('/^#[a-fA-F0-9]{6}$/', $team2_color) ? $team2_color : '#FFFFFF';
+
+    $team1_logo_url = get_the_post_thumbnail_url($team1_id, 'full');
+    $team2_logo_url = get_the_post_thumbnail_url($team2_id, 'full');
+
+    // Check if both team colors are default and both logos are empty
+    if (($team1_color === $default_color && empty($team1_logo_url)) && ($team2_color === $default_color && empty($team2_logo_url))) {
+        return; // Do nothing if both teams have no valid color or logo
+    }
+
+    $team1_logo_thumbnail_id = get_post_thumbnail_id($team1_id, 'full');
+    $team2_logo_thumbnail_id = get_post_thumbnail_id($team2_id, 'full');
+    $team1_logo = get_attached_file($team1_logo_thumbnail_id);
+    $team2_logo = get_attached_file($team2_logo_thumbnail_id);
+
+    // Generate the image if no valid cache exists
+    $image_data = generate_bisected_image($team1_color, $team2_color, $team1_logo, $team2_logo);
+    $image_path = save_image_to_cache($image_data, $cache_key);
+    set_transient($cache_key, $image_path, DAY_IN_SECONDS * 30); // Cache for 30 days
+
+    serve_image($image_path);
+
+    exit;
+}
+add_action('template_redirect', 'handle_image_request');
+
+function serve_image($image_path) {
+    header('Content-Type: image/png');
+    if (file_exists($image_path)) {
+        status_header( 200 ); 
+    } else {
+        status_header( 404 );
+        die("Image not found.");
+    }
+
+    // Clear all output buffering to prevent any extra output
+    while (ob_get_level()) {
+        ob_end_clean();
+    }
+    readfile($image_path);
+}
+
+function save_image_to_cache($image_data, $cache_key) {
+    $upload_dir = wp_get_upload_dir();
+    $file_path = $upload_dir['path'] . '/' . $cache_key . '.png';
+
+    // Assuming $image_data is raw image data
+    file_put_contents($file_path, $image_data);
+
+    return $file_path;
+}

includes/open-graph-tags.php

@@ -0,0 +1,187 @@
+<?php
+/*
+Plugin Name: Custom Open Graph Tags with SportsPress Integration
+Description: Adds custom Open Graph tags to posts based on their type, specifically handling sp_event post types with methods from the SportsPress SP_Event class.
+Version: 1.0
+Author: Your Name
+*/
+
+add_action('wp_head', 'custom_open_graph_tags_with_sportspress_integration');
+
+function asc_generate_sp_event_title( $post ) {
+  // See https://github.com/ThemeBoy/SportsPress/blob/770fa8c6654d7d6648791e877709c2428677635b/includes/admin/post-types/class-sp-admin-cpt-event.php#L99C40-L99C55
+	if ( is_numeric( $post ) ) {
+		$post = get_post( $post );
+	}
+	if ( ! $post || $post->post_type !== 'sp_event' ) {
+		return get_the_title();
+	}
+
+	$teams = get_post_meta( $post->ID, 'sp_team', false );
+	$teams = array_filter( $teams );
+
+	$team_names = array();
+	foreach ( $teams as $team ) {
+		while ( is_array( $team ) ) {
+			$team = array_shift( array_filter( $team ) );
+		}
+		if ( $team > 0 ) {
+			$team_names[] = sp_team_short_name( $team );
+		}
+	}
+
+	$team_names = array_unique( $team_names );
+
+	if ( get_option( 'sportspress_event_reverse_teams', 'no' ) === 'yes' ) {
+		$team_names = array_reverse( $team_names );
+	}
+
+	$delimiter = ' ' . get_option( 'sportspress_event_teams_delimiter', 'vs' ) . ' ';
+
+	return implode( $delimiter, $team_names );
+}
+
+function asc_generate_short_date( $post, $withTime = true ) {
+  $formatted_date =  get_the_date('D n/j/y', $post);
+
+  if (!$withTime){
+    return $formatted_date;
+  } 
+
+  if (  get_the_date('i', $post) == "00") {
+    $formatted_time = get_the_date('gA', $post);
+  } else {
+    $formatted_time = get_the_date('g:iA', $post);
+  }
+  return $formatted_date . " " . $formatted_time ;
+
+}
+
+function custom_open_graph_tags_with_sportspress_integration() {
+    if (is_single()) {
+        global $post;
+        if ($post->post_type === 'sp_event') {
+            // Instantiate SP_Event object
+            $event = new SP_Event($post->ID);
+
+            // Fetch details using SP_Event methods
+            $publish_date = get_the_date('F j, Y', $post);
+            $venue_terms = get_the_terms($post->ID, 'sp_venue');
+            $venue_name = $venue_terms ? $venue_terms[0]->name : 'Venue TBD';
+            $results = $event->results();  // Using SP_Event method
+            $title = asc_generate_sp_event_title($post);
+            $sp_status = get_post_meta( $post->ID, 'sp_status', true );
+            $status = $event->status();  // Using SP_Event method
+            $publish_date_and_time = get_the_date('F j, Y g:i A', $post);
+            $description = "{$publish_date_and_time} at {$venue_name}.";
+            
+            if ( 'postponed' == $sp_status || 'cancelled' == $sp_status || 'tbd' == $sp_status) {
+              $description = strtoupper($sp_status) . " — " . $description;
+              $title = strtoupper($sp_status) . " — " . $title . " — " . asc_generate_short_date($post) . " — " . $venue_name;
+            }
+
+            if ( 'future' == $status ) {
+              $description = $description;
+              $title = $title . " — " . asc_generate_short_date($post) . " — " . $venue_name;
+            }
+
+            if ( 'results' == $status ) { // checks if there is a final score
+              // Get event result data
+              $data = $event->results();
+
+              // The first row should be column labels
+              $labels = $data[0];
+
+              // Remove the first row to leave us with the actual data
+              unset( $data[0] );
+
+              $data = array_filter( $data );
+
+              if ( empty( $data ) ) {
+                return false;
+              }
+
+              // Initialize
+              $i          = 0;
+              $result_string = '';
+              $title_string = '';
+
+              // Reverse teams order if the option "Events > Teams > Order > Reverse order" is enabled.
+              $reverse_teams = get_option( 'sportspress_event_reverse_teams', 'no' ) === 'yes' ? true : false;
+              if ( $reverse_teams ) {
+                $data = array_reverse( $data, true );
+              }
+
+              $teams_result_array = [];
+
+              foreach ( $data as $team_id => $result ) :
+                  $outcomes       = array();
+                  $result_outcome = sp_array_value( $result, 'outcome' );
+                  if ( ! is_array( $result_outcome ) ) :
+                    $outcomes = array( '&mdash;' );
+                  else :
+                    foreach ( $result_outcome as $outcome ) :
+                      $the_outcome = get_page_by_path( $outcome, OBJECT, 'sp_outcome' );
+                      if ( is_object( $the_outcome ) ) :
+                        $outcomes[] = $the_outcome->post_title;
+                      endif;
+                    endforeach;
+                  endif;
+              
+                unset( $result['outcome'] );
+              
+                $team_name = sp_team_short_name( $team_id );
+                $team_abbreviation = sp_team_abbreviation( $team_id );
+
+                $outcome_abbreviation = get_post_meta( $the_outcome->ID, 'sp_abbreviation', true );
+                if ( ! $outcome_abbreviation ) {
+                  $outcome_abbreviation = sp_substr( $the_outcome->post_title, 0, 1 );
+                }
+                
+                array_push($teams_result_array, [
+                  "result" => $result,
+                  "outcome" => $the_outcome->post_title,
+                  "outcome_abbreviation" => $outcome_abbreviation,
+                  "team_name" => $team_name,
+                  "team_abbreviation" => $team_abbreviation
+                ]
+              );              
+                $i++;
+              endforeach;
+              $publish_date = asc_generate_short_date($post, false);
+
+              $special_result_suffix_abbreviation = '';
+              $special_result_suffix= '';
+
+              foreach ( $teams_result_array as $team ) {
+                  $outcome_abbreviation = strtoupper( $team['outcome_abbreviation'] ); // Normalize case
+
+                  if ( $outcome_abbreviation === 'TF-W' ) {
+                    $special_result_suffix_abbreviation = 'TF-W';
+                    $special_result_suffix = 'Technical Forfeit Win';
+                    break;
+                  } elseif ( $outcome_abbreviation === 'TF-L' ) {
+                    $special_result_suffix_abbreviation = 'TF';
+                    $special_result_suffix = 'Technical Forfeit';
+                    break;
+                  } elseif ( $outcome_abbreviation === 'F-W' || $outcome_abbreviation === 'F-L' ) {
+                    $special_result_suffix_abbreviation = 'Forfeit';
+                    $special_result_suffix = 'Forfeit';
+                    break;
+                  }
+              }
+
+              $title = "{$teams_result_array[0]['team_name']} {$teams_result_array[0]['result']['r']}-{$teams_result_array[1]['result']['r']} {$teams_result_array[1]['team_name']} — {$publish_date}" . ($special_result_suffix ? "({$special_result_suffix_abbreviation})" : "");
+              $description .= " " . "{$teams_result_array[0]['team_name']} ({$teams_result_array[0]['outcome']}), {$teams_result_array[1]['team_name']} ({$teams_result_array[1]['outcome']})." ;
+            }
+            $description .= " " . $post->post_content;
+            $image = get_site_url() . "/head-to-head?post={$post->ID}";
+            echo '<meta property="og:type" content="article" />' . "\n";
+            echo '<meta property="og:image" content="'. $image . '" />' . "\n";
+            echo '<meta property="og:title" content="' . $title . '" />' . "\n";
+            echo '<meta property="og:description" content="' . $description . '" />' . "\n";
+            echo '<meta property="og:url" content="' . get_permalink() . '" />' . "\n";
+        }
+    }
+}
+?>

includes/sp-event-admin-week-filter.php

@@ -0,0 +1,220 @@
+<?php
+/**
+ * Admin week filter for SportsPress events.
+ *
+ * Adds a week selector in wp-admin for `sp_event` and filters events by
+ * Monday-start week (Monday 00:00:00 through Sunday 23:59:59).
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * Parse an ISO week input (e.g. 2026-W07) from the request.
+ *
+ * @return array{year:int,week:int}|null
+ */
+function tony_sportspress_parse_admin_week_filter() {
+	if ( empty( $_GET['sp_week_filter'] ) ) {
+		return null;
+	}
+
+	$raw = sanitize_text_field( wp_unslash( $_GET['sp_week_filter'] ) );
+	if ( ! preg_match( '/^(\d{4})-W(0[1-9]|[1-4][0-9]|5[0-3])$/', $raw, $matches ) ) {
+		return null;
+	}
+
+	$year = (int) $matches[1];
+	$week = (int) $matches[2];
+
+	return array(
+		'year' => $year,
+		'week' => $week,
+	);
+}
+
+/**
+ * Render week filter control in event admin list.
+ *
+ * @param string $post_type Current post type.
+ */
+function tony_sportspress_render_admin_week_filter( $post_type ) {
+	if ( 'sp_event' !== $post_type ) {
+		return;
+	}
+
+	$value = '';
+	if ( ! empty( $_GET['sp_week_filter'] ) ) {
+		$value = sanitize_text_field( wp_unslash( $_GET['sp_week_filter'] ) );
+	}
+
+	$summary_text = __( 'Select a week', 'tonys-sportspress-enhancements' );
+	$parsed       = tony_sportspress_parse_admin_week_filter();
+	if ( is_array( $parsed ) ) {
+		$timezone = wp_timezone();
+		$monday   = ( new DateTimeImmutable( 'now', $timezone ) )->setISODate( $parsed['year'], $parsed['week'], 1 )->setTime( 0, 0, 0 );
+		$sunday   = $monday->modify( '+6 days' )->setTime( 23, 59, 59 );
+		/* translators: 1: Monday label/date, 2: Sunday label/date. */
+		$summary_text = sprintf(
+			__( '%1$s to %2$s', 'tonys-sportspress-enhancements' ),
+			wp_date( 'D M j, Y', $monday->getTimestamp(), $timezone ),
+			wp_date( 'D M j, Y', $sunday->getTimestamp(), $timezone )
+		);
+	}
+	?>
+	<label for="sp_week_filter" class="screen-reader-text"><?php esc_html_e( 'Filter by week', 'tonys-sportspress-enhancements' ); ?></label>
+	<input
+		type="week"
+		id="sp_week_filter"
+		name="sp_week_filter"
+		class="sp-week-filter-field"
+		value="<?php echo esc_attr( $value ); ?>"
+		title="<?php esc_attr_e( 'Week (Monday start)', 'tonys-sportspress-enhancements' ); ?>"
+	/>
+	<span id="sp-week-filter-summary" class="sp-week-filter-summary"><?php echo esc_html( $summary_text ); ?></span>
+	<?php
+}
+add_action( 'restrict_manage_posts', 'tony_sportspress_render_admin_week_filter' );
+
+/**
+ * Add responsive admin styles so filters stay visible on narrow widths.
+ */
+function tony_sportspress_admin_week_filter_styles() {
+	$screen = get_current_screen();
+	if ( ! $screen || 'edit-sp_event' !== $screen->id ) {
+		return;
+	}
+	?>
+	<style>
+		@media (max-width: 1200px) {
+			.post-type-sp_event .tablenav.top .alignleft.actions:not(.bulkactions) {
+				display: flex;
+				flex-wrap: wrap;
+				gap: 6px;
+				align-items: center;
+			}
+			.post-type-sp_event .tablenav.top .alignleft.actions:not(.bulkactions) > * {
+				float: none;
+				margin-right: 0;
+			}
+			.post-type-sp_event .tablenav.top .alignleft.actions:not(.bulkactions) .sp-week-filter-field {
+				min-width: 145px;
+			}
+			.post-type-sp_event .tablenav.top .alignleft.actions:not(.bulkactions) .sp-week-filter-summary {
+				display: block;
+				width: 100%;
+				margin-top: 2px;
+				color: #50575e;
+				font-size: 12px;
+				line-height: 1.4;
+			}
+		}
+	</style>
+	<?php
+}
+add_action( 'admin_head-edit.php', 'tony_sportspress_admin_week_filter_styles' );
+
+/**
+ * Update week summary text when week input changes.
+ */
+function tony_sportspress_admin_week_filter_script() {
+	$screen = get_current_screen();
+	if ( ! $screen || 'edit-sp_event' !== $screen->id ) {
+		return;
+	}
+	?>
+	<script>
+	(function() {
+		const input = document.getElementById('sp_week_filter');
+		const summary = document.getElementById('sp-week-filter-summary');
+		if (!input || !summary) {
+			return;
+		}
+
+		function updateSummary() {
+			const raw = (input.value || '').trim();
+			const match = raw.match(/^(\d{4})-W(\d{2})$/);
+			if (!match) {
+				summary.textContent = 'Select a week';
+				return;
+			}
+
+			const year = parseInt(match[1], 10);
+			const week = parseInt(match[2], 10);
+
+			const jan4 = new Date(Date.UTC(year, 0, 4));
+			const jan4Day = jan4.getUTCDay() || 7;
+			const mondayWeek1 = new Date(jan4);
+			mondayWeek1.setUTCDate(jan4.getUTCDate() - jan4Day + 1);
+
+			const monday = new Date(mondayWeek1);
+			monday.setUTCDate(mondayWeek1.getUTCDate() + (week - 1) * 7);
+			const sunday = new Date(monday);
+			sunday.setUTCDate(monday.getUTCDate() + 6);
+
+			const fmt = new Intl.DateTimeFormat(undefined, {
+				weekday: 'short',
+				month: 'short',
+				day: 'numeric',
+				year: 'numeric',
+				timeZone: 'UTC'
+			});
+
+			summary.textContent = fmt.format(monday) + ' to ' + fmt.format(sunday);
+		}
+
+		input.addEventListener('change', updateSummary);
+		updateSummary();
+	})();
+	</script>
+	<?php
+}
+add_action( 'admin_footer-edit.php', 'tony_sportspress_admin_week_filter_script' );
+
+/**
+ * Apply Monday-start week date query to event admin list.
+ *
+ * @param WP_Query $query Main query.
+ */
+function tony_sportspress_apply_admin_week_filter( $query ) {
+	if ( ! is_admin() || ! $query->is_main_query() ) {
+		return;
+	}
+
+	$post_type = $query->get( 'post_type' );
+	if ( 'sp_event' !== $post_type ) {
+		return;
+	}
+
+	$parsed = tony_sportspress_parse_admin_week_filter();
+	if ( null === $parsed ) {
+		return;
+	}
+
+	$timezone = wp_timezone();
+	$monday   = ( new DateTimeImmutable( 'now', $timezone ) )->setISODate( $parsed['year'], $parsed['week'], 1 )->setTime( 0, 0, 0 );
+	$sunday   = $monday->modify( '+6 days' )->setTime( 23, 59, 59 );
+
+	$date_query = $query->get( 'date_query' );
+	if ( ! is_array( $date_query ) ) {
+		$date_query = array();
+	}
+
+	$date_query[] = array(
+		'after'     => array(
+			'year'  => (int) $monday->format( 'Y' ),
+			'month' => (int) $monday->format( 'n' ),
+			'day'   => (int) $monday->format( 'j' ),
+		),
+		'before'    => array(
+			'year'  => (int) $sunday->format( 'Y' ),
+			'month' => (int) $sunday->format( 'n' ),
+			'day'   => (int) $sunday->format( 'j' ),
+		),
+		'inclusive' => true,
+	);
+
+	$query->set( 'date_query', $date_query );
+}
+add_action( 'pre_get_posts', 'tony_sportspress_apply_admin_week_filter' );

includes/sp-event-has-outcome-filter.php

@@ -1,101 +0,0 @@
-<?php
-
-/*
-Enhances the post management for 'sp_event' custom post type by adding custom
-filters for events with or without outcomes
-*/
-
-/**
- * Generates a meta query argument array for filtering 'sp_event' custom posts based on the presence or absence of outcomes.
- *
- * @param bool $has_outcome Whether to filter events with outcomes (true) or without outcomes (false). Default is true.
- *
- * @return array Meta query argument array for WP_Query.
- */
-function get_sp_event_has_outcome_meta_query_args($has_outcome = true): array
-{
-    if ($has_outcome) {
-        return [
-            "relation" => "AND",
-            [
-                "key" => "sp_results",
-                "value" => '"outcome"',
-                "compare" => "LIKE",
-            ],
-            [
-                "key" => "sp_results",
-                "value" => 's:7:"outcome";a:0:{}', // i.e. a blank outcome
-                "compare" => "NOT LIKE",
-            ],
-        ];
-    } elseif (!$has_outcome) {
-        return [
-            "relation" => "OR",
-            [
-                "key" => "sp_results",
-                "value" => '"outcome"',
-                "compare" => "NOT LIKE",
-            ],
-            [
-                "key" => "sp_results",
-                "value" => 's:7:"outcome";a:0:{}', // i.e. a blank outcome
-                "compare" => "LIKE",
-            ],
-        ];
-    }
-}
-
-// Add the custom filter dropdown
-function outcome_filter_dropdown()
-{
-    $current_screen = get_current_screen();
-
-    if ($current_screen->id == "edit-sp_event") {
-        if (isset($_GET["has-outcome"])) {
-            switch ($_GET["has-outcome"]) {
-                case 'true':
-                    $selected="has-outcome";break;
-                case 'false':
-                    $selected="has-no-outcome";break;
-                case '':
-                    $selected='';break;
-            }
-        }; ?>
-            <select name="has-outcome">
-            <option value="" <?php selected(
-                "",
-                $selected
-            ); ?>>All Outcomes</option>
-            <option value="false" <?php selected(
-                "has-no-outcome",
-                $selected
-            ); ?>>Missing Outcome</option>
-            <option value="true" <?php selected(
-                "has-outcome",
-                $selected
-            ); ?>>Has Outcome</option>
-            </select>
-            <?php
-    }
-}
-
-add_action("restrict_manage_posts", "outcome_filter_dropdown");
-
-// Modify the query based on the selected filter
-function outcome_filter_query($query)
-{
-    global $pagenow;
-
-    if ($pagenow == "edit.php" && isset($_GET["has-outcome"]) ) {
-        if ($_GET["has-outcome"] == "false") {
-            $meta_query = get_sp_event_has_outcome_meta_query_args(false);
-            $query->set("meta_query", $meta_query);
-        }
-        elseif ($_GET["has-outcome"] == "true") {
-            $meta_query = get_sp_event_has_outcome_meta_query_args(true);
-            $query->set("meta_query", $meta_query);
-        }
-    }
-}
-
-add_action("pre_get_posts", "outcome_filter_query");

includes/sp-event-has-outcome.php

@@ -1,105 +0,0 @@
-<?php
-
-/*
-Enhances the post management for 'sp_event' custom post type by adding custom
-filters for events with or without outcomes
-*/
-
-/**
- * Generates a meta query argument array for filtering 'sp_event' custom posts based on the presence or absence of outcomes.
- *
- * @param bool $has_outcome Whether to filter events with outcomes (true) or without outcomes (false). Default is true.
- *
- * @return array Meta query argument array for WP_Query.
- */
-function get_sp_event_has_outcome_meta_query_args($has_outcome = true): array
-{
-    if ($has_outcome) {
-        return [
-            "relation" => "AND",
-            [
-                "key" => "sp_results",
-                "value" => '"outcome"',
-                "compare" => "LIKE",
-            ],
-            [
-                "key" => "sp_results",
-                "value" => 's:7:"outcome";a:0:{}', // i.e. a blank outcome
-                "compare" => "NOT LIKE",
-            ],
-        ];
-    } elseif (!$has_outcome) {
-        return [
-            "relation" => "OR",
-            [
-                "key" => "sp_results",
-                "value" => '"outcome"',
-                "compare" => "NOT LIKE",
-            ],
-            [
-                "key" => "sp_results",
-                "value" => 's:7:"outcome";a:0:{}', // i.e. a blank outcome
-                "compare" => "LIKE",
-            ],
-        ];
-    }
-}
-
-add_filter("views_edit-sp_event", "wp37_sp_event_does_not_have_outcome_filter");
-function wp37_sp_event_does_not_have_outcome_filter($views)
-
-{
-    if (is_admin() && $_GET["post_type"] == "sp_event") {
-        global $wp_query;
-        $filter_name = "Missing Results";
-
-        $result = new WP_Query([
-            "post_type" => "sp_event",
-            "meta_query" => [get_sp_event_has_outcome_meta_query_args(false)],
-        ]);
-
-        // $link = add_query_arg("sp_event_has_outcome", "false");
-        $link="#";
-        // $link = admin_url( "edit.php?post_type=sp_event&sp_event_has_outcome=false" );
-
-        $sp_event_has_outcome =
-            get_query_var("sp_event_has_outcome") === "false";
-        $class = $sp_event_has_outcome === true ? ' class="current"' : "";
-        $views["sp_event_does_not_have_outcome"] = sprintf(
-            '<a href="%s"' . $class . ">" . $filter_name . " (%d)",
-            $link,
-            $result->found_posts
-        );
-
-        return $views;
-    }
-}
-
-add_action("init", "wpse246143_register_sp_event_has_outcome");
-function wpse246143_register_sp_event_has_outcome()
-{
-    global $wp;
-    $wp->add_query_var("sp_event_has_outcome");
-}
-
-add_action("parse_query", "wpse246143_map_sp_event_has_outcome");
-function wpse246143_map_sp_event_has_outcome($wp_query)
-{
-    if (
-        isset($wp_query->query["post_type"]) and
-        $wp_query->query["post_type"] == "sp_event" and
-        $wp_query->get("sp_event_has_outcome")
-    ) {
-        $sp_event_has_outcome =
-            get_query_var("sp_event_has_outcome") === "true";
-
-        if ($sp_event_has_outcome) {
-            $meta_query = get_sp_event_has_outcome_meta_query_args(true);
-        } elseif (!$sp_event_has_outcome) {
-            $meta_query = get_sp_event_has_outcome_meta_query_args(false);
-        }
-
-        $wp_query->set("meta_query", $meta_query);
-    }
-}
-

includes/sp-event-permalink.php

@@ -0,0 +1,89 @@
+<?php
+/*
+Plugin Name: Custom Event Permalinks
+Description: Adds a custom permalink structure for the sp_event post type.
+Version: 1.0
+Author: Your Name
+*/
+
+if ( ! defined( 'ABSPATH' ) ) {
+    exit; // Exit if accessed directly
+}
+
+// Register custom rewrite rules
+function custom_event_rewrite_rules() {
+    add_rewrite_rule(
+        '(?:event|game)/.*?[/]?([0-9]+)[/]?$',
+        'index.php?post_type=sp_event&p=$matches[1]',
+        'top'
+    );
+}
+add_action('init', 'custom_event_rewrite_rules');
+
+// Customize the permalink structure
+function custom_event_permalink($permalink, $post) {
+    if ($post->post_type !== 'sp_event') {
+        return $permalink;
+    }
+
+    $event = new SP_Event($post->ID);
+    $teams = get_post_meta($post->ID,'sp_team', false);
+    $format = get_post_meta($post->ID,'sp_format', true);
+    sort($teams);
+    $seasons = get_the_terms($post->ID, 'sp_season', true );
+    if ($seasons) {
+      $seasons_slug = implode(
+        "-",
+        array_map(function($season){return $season->slug;},$seasons),
+      );
+    } else {
+      $seasons_slug = "no-season";
+    };
+
+    // Get the teams associated with the event
+    $team_1 = get_post($teams[0]);
+    $team_2 = get_post($teams[1]);
+
+    switch ($format) {
+      case 'league':
+          $format_string = 'game';
+          break;
+      case 'tournament':
+          $format_string = 'game';
+          break;
+      case 'friendly':
+          $format_string = 'event';
+          break;
+      default:
+          $format_string = 'event';
+          break;
+  }
+
+    if ($team_1 && $team_2) {
+        $permalink = home_url($format_string ."/". $seasons_slug . '/' . $team_1->post_name . '-' . $team_2->post_name . '/' . $post->ID);
+    }
+
+    return $permalink;
+}
+add_filter('post_type_link', 'custom_event_permalink', 10, 2);
+
+// Flush rewrite rules on activation and deactivation
+function custom_event_rewrite_flush() {
+    custom_event_rewrite_rules();
+    flush_rewrite_rules();
+}
+register_activation_hook(__FILE__, 'custom_event_rewrite_flush');
+register_deactivation_hook(__FILE__, 'flush_rewrite_rules');
+
+// Modify the query to handle custom permalinks and include future posts
+function custom_event_parse_request($query) {
+  $post_type = sp_array_value( $query->query, 'post_type', null );
+  if (isset($query->query_vars['post_type']) && $query->query_vars['post_type'] === 'sp_event') {
+      if (isset($query->query_vars['p'])) {
+          $query->set('post_type', 'sp_event');
+          $query->set('p', $query->query_vars['p']);
+          $query->set('post_status', array('publish', 'future'));
+      }
+  }
+}
+add_action('pre_get_posts', 'custom_event_parse_request');

includes/sp-event-status-filter.php

@@ -1,58 +0,0 @@
-<?php
-
-/*
-Enhances the post management for 'sp_event' custom post type by adding custom
-filters for event status
-*/
-
-// Add the custom filter dropdown
-function sp_status_filter_dropdown()
-{
-    $current_screen = get_current_screen();
-
-    if ($current_screen->id == "edit-sp_event") {
-        $selected = isset($_GET["sp_status"]) ? $_GET["sp_status"] : ""; ?>
-            <select name="sp_status">
-            <option value="" <?php selected(
-                "",
-                $selected
-            ); ?>>All Status</option>
-            <option value="ok" <?php selected(
-                "ok",
-                $selected
-            ); ?>>On Time</option>
-            <option value="tbd" <?php selected(
-                "tbd",
-                $selected
-            ); ?>>TBD</option>
-            <option value="postponed" <?php selected(
-                "postponed",
-                $selected
-            ); ?>>Postponed</option>
-            <option value="canceled" <?php selected(
-                "canceled",
-                $selected
-            ); ?>>Canceled</option>
-            </select>
-            <?php
-    }
-}
-
-add_action("restrict_manage_posts", "sp_status_filter_dropdown");
-
-// Modify the query based on the selected filter
-function sp_status_filter_query($query)
-{
-    global $pagenow;
-
-    if ($pagenow == "edit.php" && isset($_GET["sp_status"]) && $_GET["sp_status"] != '' ) {
-        $query->set("meta_query", [[
-            "key" => "sp_status",
-            "value" => $_GET["sp_status"],
-            "compare" => "=",
-        ]]
-    );
-    }
-}
-
-add_action("pre_get_posts", "sp_status_filter_query");

includes/timeframe-filter.php

@@ -1,70 +0,0 @@
-<?php
-/*
-Enhances the post management by adding custom providing a dropdown to 
-filter events based on different timeframes.
-*/
-// Add the custom filter dropdown
-function timeframe_filter_dropdown()
-{
-    $current_screen = get_current_screen();
-
-    if ($current_screen->id == "edit-sp_event") {
-        $selected = isset($_GET["timeframe"]) ? $_GET["timeframe"] : ""; ?>
-            <select name="timeframe">
-            <option value="" <?php selected(
-                "",
-                $selected
-            ); ?>>All Timeframe</option>
-            <option value="last3days" <?php selected(
-                "last3days",
-                $selected
-            ); ?>>Last 3 Days</option>
-            <option value="last7days" <?php selected(
-                "last7days",
-                $selected
-            ); ?>>Last 7 Days</option>
-            <option value="plusminus3days" <?php selected(
-                "plusminus3days",
-                $selected
-            ); ?>>+/- 3 Days</option>
-            </select>
-            <?php
-    }
-}
-
-add_action("restrict_manage_posts", "timeframe_filter_dropdown");
-
-// Modify the query based on the selected filter
-function timeframe_filter_query($query)
-{
-    global $pagenow;
-
-    if ($pagenow == "edit.php" && isset($_GET["timeframe"]) ) {
-        if ($_GET["timeframe"] == "last3days") {
-            $date_query = [
-                [
-                    "after" => date("Y-m-d", strtotime("-3 days")),
-                ],
-            ];
-        } elseif ($_GET["timeframe"] == "last7days") {
-            $date_query = [
-                [
-                    "after" => date("Y-m-d", strtotime("-1 week")),
-                ],
-            ];
-        } elseif ($_GET["timeframe"] == "plusminus3days") {
-            $date_query = [
-                [
-                    "after" => date("Y-m-d", strtotime("-3 days")),
-                    "before" => date("Y-m-d", strtotime("+3 days")),
-                ],
-            ];
-        } 
-
-        if (!$_GET["timeframe"] == "") {
-            $query->set("date_query", $date_query);
-        }
-    }
-}
-
-add_action("pre_get_posts", "timeframe_filter_query");

install-plugin.sh

@@ -1,27 +0,0 @@
-#!/bin/bash
-DOCKER_RUN_SCRIPT=../selig/cmbabaseball/docker-run.sh
-
-# Check if the number of arguments is less than 1 (i.e., PLUGIN_NAME is not provided)
-if [ "$#" -lt 1 ]; then
-    echo "Error: PLUGIN_NAME argument is missing."
-    echo "Usage: $0 PLUGIN_NAME"
-    exit 1
-fi
-
-# Assign the first argument to PLUGIN_NAME variable
-PLUGIN_NAME="$1"
-PLUGIN_ZIP_FILENAME="${PLUGIN_NAME}_$(date +"%y%m%d-%H%M%S").zip"
-TMPFILE=${TMPDIR}${PLUGIN_ZIP_FILENAME}
-
-echo "Installing plugin $PLUGIN_NAME using ${DOCKER_RUN_SCRIPT} via $TMPFILE"
-
-# Continue with your script...
-cd src/plugins/${PLUGIN_NAME} && zip -r ../../../dist/${PLUGIN_ZIP_FILENAME}  . && cd ../../.. && \
-cp ./dist/${PLUGIN_ZIP_FILENAME} ${TMPFILE} &&
-${DOCKER_RUN_SCRIPT} \
-  -v ${TMPFILE}:/${PLUGIN_ZIP_FILENAME} \
-  wordpress:cli \
-  wp plugin install /${PLUGIN_ZIP_FILENAME} --force --skip-plugins --activate
-
-# End of the script
-

readme.md

@@ -0,0 +1,37 @@
+# Tony's SportsPress Enhancements
+
+Suite of enhancements for the SportsPress plugin, including custom event permalinks, Open Graph tags, and automatic featured image generation for events.
+
+## Description
+
+Tony's SportsPress Enhancements is a collection of add-ons for the [SportsPress](https://wordpress.org/plugins/sportspress/) plugin. It provides:
+
+- **Custom event permalinks** for `sp_event` post types, including season and team slugs.
+- **Open Graph meta tags** for events, with dynamic titles, descriptions, and images.
+- **Automatic featured image generation** for events, combining team colors and logos into a shareable image.
+
+## Features
+
+- Custom rewrite rules and permalinks for SportsPress events.
+- Open Graph integration for better social sharing.
+- Dynamic, cached event images based on team data.
+- Compatible with WordPress 4.5+ and PHP 5.6+.
+
+## Installation
+
+1. Upload the plugin files to the `/wp-content/plugins/tonys-sportspress-enhancements/` directory, or install via the WordPress plugin repository.
+2. Activate the plugin through the 'Plugins' menu in WordPress.
+3. Make sure the [SportsPress](https://wordpress.org/plugins/sportspress/) plugin is installed and activated.
+
+## Frequently Asked Questions
+
+**Q: Does this plugin require SportsPress?**  
+A: Yes, it extends the functionality of the SportsPress plugin.
+
+**Q: How are event images generated?**  
+A: When an event is viewed or shared, a featured image is generated using the primary colors and logos of the participating teams.
+
+
+---
+
+*This plugin is not affiliated with or endorsed by ThemeBoy or the official SportsPress plugin.*

readme.txt

@@ -1,115 +0,0 @@
-=== Tonys Sportspress Enhancements ===
-Contributors: (this should be a list of wordpress.org userid's)
-Donate link: https://example.com/
-Tags: comments, spam
-Requires at least: 4.5
-Tested up to: 6.5.3
-Requires PHP: 5.6
-Stable tag: 0.1.0
-License: GPLv2 or later
-License URI: https://www.gnu.org/licenses/gpl-2.0.html
-
-Here is a short description of the plugin.  This should be no more than 150 characters.  No markup here.
-
-== Description ==
-
-This is the long description.  No limit, and you can use Markdown (as well as in the following sections).
-
-For backwards compatibility, if this section is missing, the full length of the short description will be used, and
-Markdown parsed.
-
-A few notes about the sections above:
-
-*   "Contributors" is a comma separated list of wp.org/wp-plugins.org usernames
-*   "Tags" is a comma separated list of tags that apply to the plugin
-*   "Requires at least" is the lowest version that the plugin will work on
-*   "Tested up to" is the highest version that you've *successfully used to test the plugin*. Note that it might work on
-higher versions... this is just the highest one you've verified.
-*   Stable tag should indicate the Subversion "tag" of the latest stable version, or "trunk," if you use `/trunk/` for
-stable.
-
-    Note that the `readme.txt` of the stable tag is the one that is considered the defining one for the plugin, so
-if the `/trunk/readme.txt` file says that the stable tag is `4.3`, then it is `/tags/4.3/readme.txt` that'll be used
-for displaying information about the plugin.  In this situation, the only thing considered from the trunk `readme.txt`
-is the stable tag pointer.  Thus, if you develop in trunk, you can update the trunk `readme.txt` to reflect changes in
-your in-development version, without having that information incorrectly disclosed about the current stable version
-that lacks those changes -- as long as the trunk's `readme.txt` points to the correct stable tag.
-
-    If no stable tag is provided, it is assumed that trunk is stable, but you should specify "trunk" if that's where
-you put the stable version, in order to eliminate any doubt.
-
-== Installation ==
-
-This section describes how to install the plugin and get it working.
-
-e.g.
-
-1. Upload `plugin-name.php` to the `/wp-content/plugins/` directory
-1. Activate the plugin through the 'Plugins' menu in WordPress
-1. Place `<?php do_action('plugin_name_hook'); ?>` in your templates
-
-== Frequently Asked Questions ==
-
-= A question that someone might have =
-
-An answer to that question.
-
-= What about foo bar? =
-
-Answer to foo bar dilemma.
-
-== Screenshots ==
-
-1. This screen shot description corresponds to screenshot-1.(png|jpg|jpeg|gif). Note that the screenshot is taken from
-the /assets directory or the directory that contains the stable readme.txt (tags or trunk). Screenshots in the /assets
-directory take precedence. For example, `/assets/screenshot-1.png` would win over `/tags/4.3/screenshot-1.png`
-(or jpg, jpeg, gif).
-2. This is the second screen shot
-
-== Changelog ==
-
-= 1.0 =
-* A change since the previous version.
-* Another change.
-
-= 0.5 =
-* List versions from most recent at top to oldest at bottom.
-
-== Upgrade Notice ==
-
-= 1.0 =
-Upgrade notices describe the reason a user should upgrade.  No more than 300 characters.
-
-= 0.5 =
-This version fixes a security related bug.  Upgrade immediately.
-
-== Arbitrary section ==
-
-You may provide arbitrary sections, in the same format as the ones above.  This may be of use for extremely complicated
-plugins where more information needs to be conveyed that doesn't fit into the categories of "description" or
-"installation."  Arbitrary sections will be shown below the built-in sections outlined above.
-
-== A brief Markdown Example ==
-
-Ordered list:
-
-1. Some feature
-1. Another feature
-1. Something else about the plugin
-
-Unordered list:
-
-* something
-* something else
-* third thing
-
-Here's a link to [WordPress](https://wordpress.org/ "Your favorite software") and one to [Markdown's Syntax Documentation][markdown syntax].
-Titles are optional, naturally.
-
-[markdown syntax]: https://daringfireball.net/projects/markdown/syntax
-            "Markdown is what the parser uses to process much of the readme file"
-
-Markdown uses email style notation for blockquotes and I've been told:
-> Asterisks for *emphasis*. Double it up  for **strong**.
-
-`<?php code(); // goes in backticks ?>`

tonys-sportspress-enhancements.php

@@ -1,20 +1,19 @@
 <?php
 /**
  * Plugin Name:     Tonys SportsPress Enhancements
- * Plugin URI:      PLUGIN SITE HERE
+ * Plugin URI:      https://github.com/anthonyscorrea/tonys-sportspress-enhancements
  * Description:     Suite of SportsPress Enhancements
- * Author:          YOUR NAME HERE
- * Author URI:      YOUR SITE HERE
+ * Author:          Tony Correa
+ * Author URI:      https://github.com/anthonyscorrea/
  * Text Domain:     tonys-sportspress-enhancements
  * Domain Path:     /languages
- * Version:         0.1.0
+ * Version:         0.1.2
  *
  * @package         Tonys_Sportspress_Enhancements
  */
 
 
 // Include other files here
-// require_once plugin_dir_path(__FILE__) . 'includes/sp-event-has-outcome.php';
-require_once plugin_dir_path(__FILE__) . 'includes/sp-event-has-outcome-filter.php';
-require_once plugin_dir_path(__FILE__) . 'includes/timeframe-filter.php';
-require_once plugin_dir_path(__FILE__) . 'includes/sp-event-status-filter.php';
+require_once plugin_dir_path(__FILE__) . 'includes/open-graph-tags.php';
+require_once plugin_dir_path(__FILE__) . 'includes/featured-image-generator.php';
+require_once plugin_dir_path(__FILE__) . 'includes/sp-event-permalink.php';require_once plugin_dir_path(__FILE__) . 'includes/sp-event-admin-week-filter.php';