From 33a8f7f7e29057d2f2a8b7fdb98e4e5c5ae17f70 Mon Sep 17 00:00:00 2001
From: olaservo <olahungerford@gmail.com>
Date: Thu, 18 Jun 2026 07:05:08 -0700
Subject: [PATCH 1/3] Add "every N weeks" recurrence cadence

Adds a flexible "Every N weeks on [Day]" recurring-event option alongside
the existing weekly/biweekly/monthly/yearly presets, so templates can repeat
at any week interval (e.g. every 3 weeks).

- Migration: add nullable recurrence_interval_count to events + event_revisions
- Event model: new weekly_n case in recurrence_description /
  recurrence_date_interval (P{n}W) / recurrence_end_datetime (n*5 week
  lookahead); register recurrence_interval_count as editable
- EventController: persist + validate the count (required_if weekly_n) in
  create_event and save_event
- Views: dropdown option + revealed number input, with JS toggle/restore
- Tests: unit coverage for interval, lookahead window, and weekly fallback

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 app/Event.php                                 |  8 +++-
 app/Http/Controllers/EventController.php      |  4 ++
 ...06_10_000000_recurrence_interval_count.php | 38 +++++++++++++++++++
 resources/views/edit-event.blade.php          | 17 +++++++++
 .../views/recurring-event-details.blade.php   |  8 ++++
 tests/Unit/EventTest.php                      | 31 +++++++++++++++
 6 files changed, 105 insertions(+), 1 deletion(-)
 create mode 100644 database/migrations/2026_06_10_000000_recurrence_interval_count.php

diff --git a/app/Event.php b/app/Event.php
index 5b7c586..22298fb 100644
--- a/app/Event.php
+++ b/app/Event.php
@@ -34,7 +34,7 @@ class Event extends Model
         'latitude', 'longitude', 'timezone', 'status',
         'website', 'tickets_url', 'code_of_conduct_url', 'meeting_url', 'video_url', 'notes_url',
         'summary', 'description', 'cover_image', 'unlisted', 'parent_id', 'hide_from_main_feed',
-        'recurrence_interval',
+        'recurrence_interval', 'recurrence_interval_count',
     ];
 
     public static function slug_from_name($name) {
@@ -424,6 +424,8 @@ public function recurrence_description() {
                 return 'Every week on '.$start->format('l').'s';
             case 'biweekly_dow':
                 return 'Every other week on '.$start->format('l').'s';
+            case 'weekly_n':
+                return 'Every '.$this->recurrence_interval_count.' weeks on '.$start->format('l').'s';
             case 'monthly_date':
                 return 'Every month on the '.$start->format('dS');
             case 'yearly':
@@ -440,6 +442,8 @@ public function recurrence_date_interval() {
                 return new DateInterval('P1W');
             case 'biweekly_dow':
                 return new DateInterval('P2W');
+            case 'weekly_n':
+                return new DateInterval('P'.((int)$this->recurrence_interval_count ?: 1).'W');
             case 'monthly_date':
                 return new DateInterval('P1M');
             case 'yearly':
@@ -458,6 +462,8 @@ public function recurrence_end_datetime() {
                 return $now->add(new DateInterval('P5W'));
             case 'biweekly_dow':
                 return $now->add(new DateInterval('P9W'));
+            case 'weekly_n':
+                return $now->add(new DateInterval('P'.(((int)$this->recurrence_interval_count ?: 1) * 5).'W'));
             case 'monthly_date':
                 return $now->add(new DateInterval('P4M'));
             case 'yearly':
diff --git a/app/Http/Controllers/EventController.php b/app/Http/Controllers/EventController.php
index c2a33bd..180d839 100644
--- a/app/Http/Controllers/EventController.php
+++ b/app/Http/Controllers/EventController.php
@@ -65,6 +65,7 @@ public function create_event(Request $request) {
             'name' => 'required',
             'start_date' => 'required|date_format:Y-m-d',
             'status' => 'in:'.implode(',', array_keys(Event::$STATUSES)),
+            'recurrence_interval_count' => 'required_if:recurrence_interval,weekly_n|nullable|integer|min:1|max:52',
         ]);
 
         $event = new Event();
@@ -75,6 +76,7 @@ public function create_event(Request $request) {
         if(request('is_template')) {
             $event->is_template = true;
             $event->recurrence_interval = request('recurrence_interval');
+            $event->recurrence_interval_count = request('recurrence_interval_count') ?: null;
             $event->key = '';
         }
 
@@ -244,6 +246,7 @@ public function save_event(Request $request, Event $event) {
             'name' => 'required',
             'start_date' => 'required|date_format:Y-m-d',
             'status' => 'in:'.implode(',', array_keys(Event::$STATUSES)),
+            'recurrence_interval_count' => 'required_if:recurrence_interval,weekly_n|nullable|integer|min:1|max:52',
         ]);
 
         if($event->fields_from_ics) {
@@ -312,6 +315,7 @@ public function save_event(Request $request, Event $event) {
         // Allow event templates to change the recurrence property
         if($event->is_template) {
             $event->recurrence_interval = request('recurrence_interval');
+            $event->recurrence_interval_count = request('recurrence_interval_count') ?: null;
         }
 
         $event->last_modified_by = Auth::user()->id;
diff --git a/database/migrations/2026_06_10_000000_recurrence_interval_count.php b/database/migrations/2026_06_10_000000_recurrence_interval_count.php
new file mode 100644
index 0000000..4a88cee
--- /dev/null
+++ b/database/migrations/2026_06_10_000000_recurrence_interval_count.php
@@ -0,0 +1,38 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('events', function (Blueprint $table) {
+            $table->unsignedInteger('recurrence_interval_count')->nullable();
+        });
+        Schema::table('event_revisions', function (Blueprint $table) {
+            $table->unsignedInteger('recurrence_interval_count')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('events', function (Blueprint $table) {
+            $table->dropColumn('recurrence_interval_count');
+        });
+        Schema::table('event_revisions', function (Blueprint $table) {
+            $table->dropColumn('recurrence_interval_count');
+        });
+    }
+};
diff --git a/resources/views/edit-event.blade.php b/resources/views/edit-event.blade.php
index 12f446c..f554989 100644
--- a/resources/views/edit-event.blade.php
+++ b/resources/views/edit-event.blade.php
@@ -246,6 +246,13 @@
     <script>
     $(function(){
         var selected_recurrence_interval;
+        var selected_recurrence_interval_count;
+        function toggle_count() {
+            if($("select[name=recurrence_interval]").val() == 'weekly_n')
+                $("#recurrence_count_field").show();
+            else
+                $("#recurrence_count_field").hide();
+        }
         function reload_recurrence_menu() {
             $.post("/event/{{ $event->id }}/recurring/details", {
                 _token: csrf_token(),
@@ -259,8 +266,18 @@ function reload_recurrence_menu() {
                     $("select[name=recurrence_interval]").val("{{ $event->recurrence_interval ?: 'weekly_dow' }}");
                 }
 
+                if(selected_recurrence_interval_count) {
+                    $("input[name=recurrence_interval_count]").val(selected_recurrence_interval_count);
+                }
+                toggle_count();
+
                 $("select[name=recurrence_interval]").on('change', function(){
                     selected_recurrence_interval = $(this).val();
+                    toggle_count();
+                });
+
+                $("input[name=recurrence_interval_count]").on('change', function(){
+                    selected_recurrence_interval_count = $(this).val();
                 });
             });
         }
diff --git a/resources/views/recurring-event-details.blade.php b/resources/views/recurring-event-details.blade.php
index 9cc3418..0cc6e6a 100644
--- a/resources/views/recurring-event-details.blade.php
+++ b/resources/views/recurring-event-details.blade.php
@@ -5,9 +5,17 @@
             <select name="recurrence_interval">
                 <option value="weekly_dow">Every Week on {{ $recur_dow }}</option>
                 <option value="biweekly_dow">Every Other Week on {{ $recur_dow }}</option>
+                <option value="weekly_n">Every N Weeks on {{ $recur_dow }}</option>
                 <option value="monthly_date">Every Month on the {{ $recur_date }}</option>
                 <option value="yearly">Every Year on {{ $recur_month_date }}</option>
             </select>
         </div>
     </div>
 </div>
+<div class="field" id="recurrence_count_field" style="display:none;">
+    <label class="label">Repeat every how many weeks?</label>
+    <div class="control">
+        <input type="number" class="input" name="recurrence_interval_count"
+               min="1" max="52" value="{{ $event->recurrence_interval_count ?: 3 }}">
+    </div>
+</div>
diff --git a/tests/Unit/EventTest.php b/tests/Unit/EventTest.php
index 9b076fa..c476c00 100644
--- a/tests/Unit/EventTest.php
+++ b/tests/Unit/EventTest.php
@@ -174,4 +174,35 @@ public function testIsPastNoEndTime() {
         $now = new DateTime('2024-12-01T17:31:00');
         $this->assertTrue($event->is_past($now));
     }
+
+    public function testRecurrenceEveryNWeeksInterval() {
+        $event = new Event;
+        $event->start_date = '2024-01-01'; // a Monday
+        $event->recurrence_interval = 'weekly_n';
+        $event->recurrence_interval_count = 3;
+
+        // 'P3W' is normalized to 21 days internally
+        $this->assertEquals(21, $event->recurrence_date_interval()->d);
+        $this->assertEquals('Every 3 weeks on Mondays', $event->recurrence_description());
+    }
+
+    public function testRecurrenceEveryNWeeksEndWindow() {
+        $event = new Event;
+        $event->start_date = '2024-01-01';
+        $event->recurrence_interval = 'weekly_n';
+        $event->recurrence_interval_count = 3;
+
+        // Lookahead is count * 5 weeks = 15 weeks = 105 days ahead of "now"
+        $now = new DateTime();
+        $end = $event->recurrence_end_datetime();
+        $this->assertEquals(105, $now->diff($end)->days);
+    }
+
+    public function testRecurrenceEveryNWeeksFallsBackToWeekly() {
+        $event = new Event;
+        $event->start_date = '2024-01-01';
+        $event->recurrence_interval = 'weekly_n';
+        // No count set: should behave as every 1 week (7 days), not crash
+        $this->assertEquals(7, $event->recurrence_date_interval()->d);
+    }
 }

From d6298ba49533db195f5aff19152b6d522120d5fa Mon Sep 17 00:00:00 2001
From: olaservo <olahungerford@gmail.com>
Date: Thu, 18 Jun 2026 07:12:47 -0700
Subject: [PATCH 2/3] Clear recurrence_interval_count on generated instances

Generated recurrence instances are replicated from the template, which
also copied recurrence_interval_count. The instance's recurrence_interval
was already nulled, so the leftover count was an orphan value (never read,
since all recurrence methods guard on recurrence_interval). Null it
alongside recurrence_interval for consistent instance data.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 app/Event.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/Event.php b/app/Event.php
index 22298fb..b531eb4 100644
--- a/app/Event.php
+++ b/app/Event.php
@@ -502,6 +502,7 @@ public function create_upcoming_recurrences() {
                     $copy->start_date = $date->format('Y-m-d');
                     $copy->is_template = false;
                     $copy->recurrence_interval = null;
+                    $copy->recurrence_interval_count = null;
                     $copy->sort_date = $copy->sort_date();
                     $copy->reset_live_event_stats();
 

From e2a2dd878a7b8cbd9d91565e70fa0c3c7b0460f5 Mon Sep 17 00:00:00 2001
From: olaservo <olahungerford@gmail.com>
Date: Sat, 20 Jun 2026 21:11:01 -0700
Subject: [PATCH 3/3] Only persist recurrence_interval_count for weekly_n
 templates

The count input in the recurring-event details form submits even when
hidden, so saving a template with a non-weekly_n cadence stored a stray
count. Null it out unless the interval is weekly_n, and fall back to 1
in the description when the count is missing.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 app/Event.php                            | 2 +-
 app/Http/Controllers/EventController.php | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/Event.php b/app/Event.php
index b531eb4..7301fc6 100644
--- a/app/Event.php
+++ b/app/Event.php
@@ -425,7 +425,7 @@ public function recurrence_description() {
             case 'biweekly_dow':
                 return 'Every other week on '.$start->format('l').'s';
             case 'weekly_n':
-                return 'Every '.$this->recurrence_interval_count.' weeks on '.$start->format('l').'s';
+                return 'Every '.((int)$this->recurrence_interval_count ?: 1).' weeks on '.$start->format('l').'s';
             case 'monthly_date':
                 return 'Every month on the '.$start->format('dS');
             case 'yearly':
diff --git a/app/Http/Controllers/EventController.php b/app/Http/Controllers/EventController.php
index 180d839..c00757b 100644
--- a/app/Http/Controllers/EventController.php
+++ b/app/Http/Controllers/EventController.php
@@ -76,7 +76,9 @@ public function create_event(Request $request) {
         if(request('is_template')) {
             $event->is_template = true;
             $event->recurrence_interval = request('recurrence_interval');
-            $event->recurrence_interval_count = request('recurrence_interval_count') ?: null;
+            $event->recurrence_interval_count = request('recurrence_interval') === 'weekly_n'
+                ? (request('recurrence_interval_count') ?: null)
+                : null;
             $event->key = '';
         }
 
@@ -315,7 +317,9 @@ public function save_event(Request $request, Event $event) {
         // Allow event templates to change the recurrence property
         if($event->is_template) {
             $event->recurrence_interval = request('recurrence_interval');
-            $event->recurrence_interval_count = request('recurrence_interval_count') ?: null;
+            $event->recurrence_interval_count = request('recurrence_interval') === 'weekly_n'
+                ? (request('recurrence_interval_count') ?: null)
+                : null;
         }
 
         $event->last_modified_by = Auth::user()->id;