add week filter

For some reason it doesn't run through sportspress' query parser. i can't figure out why, but this is a way around it.

.github/workflows/release.yml

@@ -0,0 +1,41 @@
+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 release and upload zip
+        uses: softprops/action-gh-release@v2
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{ github.ref_name }}
+          name: ${{ github.ref_name }}
+          generate_release_notes: true
+          files: ${{ steps.build.outputs.zip_path }}

includes/featured-image-generator.php

@@ -6,50 +6,6 @@ Version: 1.0
 Author: Your Name
 */
 
-add_action('save_post_sp_event', 'generate_event_featured_image', 10, 3);
-
-function generate_event_featured_image($post_id, $post) {
-    // Verify post type
-    if ($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];
-
-    // 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;
-
-    $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 image
-    $image = generate_bisected_image($team1_color, $team2_color, $team1_logo, $team2_logo);
-
-    // Upload and set as featured image
-    $attachment_id = upload_image($image, $post_id, $team1_id, $team2_id);
-    set_post_thumbnail($post_id, $attachment_id);
-}
-
 function generate_bisected_image($color1, $color2, $logo1_path, $logo2_path) {
     $width = 1200;
     $height = 628;
@@ -104,8 +60,8 @@ function generate_bisected_image($color1, $color2, $logo1_path, $logo2_path) {
         }
 
         // Center logo 1
-        $logo1_x = ($width / 4) - ($new_logo1_width / 2);
-        $logo1_y = ($height / 2) - ($new_logo1_height / 2);
+        $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);
     }
@@ -134,149 +90,118 @@ function generate_bisected_image($color1, $color2, $logo1_path, $logo2_path) {
         }
 
         // Center logo 2
-        $logo2_x = (3 * $width / 4) - ($new_logo2_width / 2);
-        $logo2_y = ($height / 2) - ($new_logo2_height / 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
 
-    // Save to temp location
-    $temp_file = tempnam(sys_get_temp_dir(), 'event_image');
-    rename($temp_file, $temp_file .= '.png');
-    $temp_file .= '.png';
-    imagepng($image, $temp_file);
+    // Clean up memory
     imagedestroy($image);
 
-    return $temp_file;
+    return $image_data;
+
 }
 
-function debug_to_console($data) {
-    $output = $data;
-    if (is_array($output))
-        $output = implode(',', $output);
+function add_image_generator_endpoint() {
+    add_rewrite_endpoint('head-to-head', EP_ROOT, true);
+}
+add_action('init', 'add_image_generator_endpoint');
 
-    echo "<script>console.log('Debug Objects: " . $output . "' );</script>";
+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 upload_image($file, $post_id, $team1_id, $team2_id) {
-    $filename = 'event-' . $team1_id .'-'. $team2_id . '.png'; // Set custom file name
-    $upload_dir = wp_upload_dir();
-    $file_path = $upload_dir['path'] . '/' . $filename;
+function save_image_to_cache($image_data, $cache_key) {
+    $upload_dir = wp_get_upload_dir();
+    $file_path = $upload_dir['path'] . '/' . $cache_key . '.png';
 
-    // Find existing attachments with the same name and delete them
-    $existing_attachments = get_posts(array(
-        'post_type' => 'attachment',
-        'name' => sanitize_file_name($filename),
-        'posts_per_page' => -1,
-        'post_status' => 'any'
-    ));
-    foreach ($existing_attachments as $attachment) {
-        wp_delete_attachment($attachment->ID, true);
-    }
+    // Assuming $image_data is raw image data
+    file_put_contents($file_path, $image_data);
 
-    $upload_file = wp_upload_bits($filename, null, file_get_contents($file));
-
-    if (!$upload_file['error']) {
-        $wp_filetype = wp_check_filetype($filename, null);
-        $attachment = array(
-            'post_mime_type' => $wp_filetype['type'],
-            'post_title' => sanitize_file_name($filename),
-            'post_content' => '',
-            'post_status' => 'private' // Set the status to private
-        );
-        $attachment_id = wp_insert_attachment($attachment, $upload_file['file'], $post_id);
-        require_once(ABSPATH . 'wp-admin/includes/image.php');
-        $attach_data = wp_generate_attachment_metadata($attachment_id, $upload_file['file']);
-        wp_update_attachment_metadata($attachment_id, $attach_data);
-
-        return $attachment_id;
-    }
-
-    return 0;
-}
-
-// Add menu item to generate images for existing events
-add_action('admin_menu', 'add_generate_images_menu');
-
-function add_generate_images_menu() {
-    add_submenu_page(
-        'tools.php',
-        'Generate Event Images', // Page title
-        'Generate Event Images', // Menu title
-        'manage_options', // Capability
-        'generate-event-images', // Menu slug
-        'generate_images_menu_page' // Function to display page content
-    );
-}
-
-function generate_images_menu_page() {
-    // Check user capabilities
-    if (!current_user_can('manage_options')) {
-        return;
-    }
-
-    // Handle form submission
-    if (isset($_POST['generate_images'])) {
-        $season = isset($_POST['sp_season']) ? sanitize_text_field($_POST['sp_season']) : '';
-        generate_images_for_existing_events($season);
-        echo '<div class="updated"><p>Images generated for selected events.</p></div>';
-    }
-
-    // Get available seasons
-    $seasons = get_terms(array(
-        'taxonomy' => 'sp_season',
-        'hide_empty' => false,
-    ));
-    ?>
-    <div class="wrap">
-        <h1>Generate Event Images</h1>
-        <form method="post" action="">
-            <p>Select a season to generate images for:</p>
-            <select name="sp_season">
-                <option value="">All Seasons</option>
-                <?php
-                foreach ($seasons as $season) {
-                    echo '<option value="' . esc_attr($season->slug) . '">' . esc_html($season->name) . '</option>';
-                }
-                ?>
-            </select>
-            <p><input type="submit" name="generate_images" class="button-primary" value="Generate Images"></p>
-        </form>
-    </div>
-    <?php
-}
-
-function generate_images_for_existing_events($season = '') {
-    $args = array(
-        'post_type' => 'sp_event',
-        'posts_per_page' => -1,
-    );
-
-    // Add season filter if selected
-    if (!empty($season)) {
-        $args['tax_query'] = array(
-            array(
-                'taxonomy' => 'sp_season',
-                'field' => 'slug',
-                'terms' => $season,
-            ),
-        );
-    }
-
-    $events = new WP_Query($args);
-
-    if ($events->have_posts()) {
-        while ($events->have_posts()) {
-            $events->the_post();
-            $post_id = get_the_ID();
-
-            // Ensure no duplicate processing
-            if (has_post_thumbnail($post_id)) continue;
-
-            // Generate the featured image using the existing function
-            generate_event_featured_image($post_id, get_post($post_id), false);
-        }
-        wp_reset_postdata();
-    }
+    return $file_path;
 }

includes/open-graph-tags.php

@@ -0,0 +1,109 @@
+<?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 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 : 'No Venue Specified';
+            $results = $event->results();  // Using SP_Event method
+            $title = get_the_title() . " " . "(" . $publish_date . ")";
+            $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 ) {
+              $description = "POSTPONED" . " - " . $description;
+              $title = "POSTPONED" . " - " . $title;
+            }
+
+            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 );
+
+                $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,
+                ]
+              );              
+                $i++;
+              endforeach;
+              $publish_date = get_the_date('F j, Y', $post);
+              $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})";
+              $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-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');

tonys-sportspress-enhancements.php

@@ -14,4 +14,6 @@
 
 
 // Include other files here
+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';