discourse · jjaffeux · Aug 26, 2025 · Jul 21, 2025 · Aug 8, 2025 · Aug 11, 2025
diff --git a/app/assets/javascripts/discourse/app/components/modal/download-calendar.gjs b/app/assets/javascripts/discourse/app/components/modal/download-calendar.gjs
@@ -30,7 +30,7 @@ export default class DownloadCalendar extends Component {
         this.args.model.calendar.title,
         this.args.model.calendar.dates,
         {
-          recurrenceRule: this.args.model.calendar.recurrenceRule,
+          rrule: this.args.model.calendar.rrule,
           location: this.args.model.calendar.location,
           details: this.args.model.calendar.details,
         }
@@ -40,7 +40,7 @@ export default class DownloadCalendar extends Component {
         this.args.model.calendar.title,
         this.args.model.calendar.dates,
         {
-          recurrenceRule: this.args.model.calendar.recurrenceRule,
+          rrule: this.args.model.calendar.rrule,
           location: this.args.model.calendar.location,
           details: this.args.model.calendar.details,
         }

diff --git a/app/assets/javascripts/discourse/app/lib/download-calendar.js b/app/assets/javascripts/discourse/app/lib/download-calendar.js
@@ -49,8 +49,8 @@ export function downloadGoogle(title, dates, options = {}) {
       )}`
     );
 
-    if (options.recurrenceRule) {
-      link.searchParams.append("recur", `RRULE:${options.recurrenceRule}`);
+    if (options.rrule) {
+      link.searchParams.append("recur", `RRULE:${options.rrule}`);
     }
 
     if (options.location) {
@@ -88,7 +88,7 @@ export function generateIcsData(title, dates, options = {}) {
         `DTSTAMP:${moment().utc().format("YMMDDTHHmmss")}Z\n` +
         `DTSTART:${startDate.utc().format("YMMDDTHHmmss")}Z\n` +
         `DTEND:${endDate.utc().format("YMMDDTHHmmss")}Z\n` +
-        (options.recurrenceRule ? `RRULE:${options.recurrenceRule}\n` : ``) +
+        (options.rrule ? `RRULE:${options.rrule}\n` : ``) +
         (options.location ? `LOCATION:${options.location}\n` : ``) +
         (options.details ? `DESCRIPTION:${options.details}\n` : ``) +
         `SUMMARY:${title}\n` +
@@ -106,7 +106,7 @@ function _displayModal(title, dates, options = {}) {
       calendar: {
         title,
         dates,
-        recurrenceRule: options.recurrenceRule,
+        rrule: options.rrule,
         location: options.location,
         details: options.details,
       },

diff --git a/app/assets/javascripts/discourse/app/lib/plugin-api.gjs b/app/assets/javascripts/discourse/app/lib/plugin-api.gjs
@@ -2457,7 +2457,7 @@ class PluginApi {
    *       endsAt: "2021-10-12T16:00:00.000Z",
    *     },
    *   ],
-   *   { recurrenceRule: "FREQ=DAILY;BYDAY=MO,TU,WE,TH,FR", location: "Paris", details: "Foo" }
+   *   { rrule: "FREQ=DAILY;BYDAY=MO,TU,WE,TH,FR", location: "Paris", details: "Foo" }
    * );
    * ```
    */

diff --git a/app/assets/javascripts/discourse/app/static/full-calendar-bundle.js b/app/assets/javascripts/discourse/app/static/full-calendar-bundle.js
@@ -2,3 +2,5 @@ export { Calendar } from "@fullcalendar/core";
 export { default as DayGrid } from "@fullcalendar/daygrid";
 export { default as TimeGrid } from "@fullcalendar/timegrid";
 export { default as List } from "@fullcalendar/list";
+export { default as RRULE } from "@fullcalendar/rrule";
+export { default as MomentTimezone } from "@fullcalendar/moment-timezone";
diff --git a/app/assets/javascripts/discourse/package.json b/app/assets/javascripts/discourse/package.json
@@ -23,6 +23,8 @@
     "@fullcalendar/core": "^6.1.18",
     "@fullcalendar/daygrid": "^6.1.18",
     "@fullcalendar/list": "^6.1.18",
+    "@fullcalendar/moment-timezone": "^6.1.19",
+    "@fullcalendar/rrule": "^6.1.18",
     "@fullcalendar/timegrid": "^6.1.18",
     "@glimmer/syntax": "0.93.1",
     "@highlightjs/cdn-assets": "11.11.1",
@@ -58,7 +60,8 @@
     "prosemirror-schema-list": "^1.5.1",
     "prosemirror-state": "^1.4.3",
     "prosemirror-transform": "^1.10.4",
-    "prosemirror-view": "^1.40.0"
+    "prosemirror-view": "^1.40.0",
+    "rrule": "^2.8.1"
   },
   "devDependencies": {
     "@babel/core": "^7.28.3",

diff --git a/app/assets/javascripts/discourse/tests/unit/lib/download-calendar-test.js b/app/assets/javascripts/discourse/tests/unit/lib/download-calendar-test.js
@@ -33,7 +33,7 @@ module("Unit | Utility | download-calendar", function (hooks) {
         },
       ],
       {
-        recurrenceRule: "FREQ=DAILY;BYDAY=MO,TU,WE,TH,FR",
+        rrule: "FREQ=DAILY;BYDAY=MO,TU,WE,TH,FR",
         location: "Paris",
         details: "Good soup",
       }
@@ -74,7 +74,7 @@ END:VCALENDAR`
           endsAt: "2021-10-12T16:00:00.000Z",
         },
       ],
-      { recurrenceRule: "FREQ=DAILY;BYDAY=MO,TU,WE,TH,FR" }
+      { rrule: "FREQ=DAILY;BYDAY=MO,TU,WE,TH,FR" }
     );
     assert.strictEqual(
       data,
@@ -121,7 +121,7 @@ END:VCALENDAR`
           endsAt: "2021-10-12T16:00:00.000Z",
         },
       ],
-      { recurrenceRule: "FREQ=DAILY;BYDAY=MO,TU,WE,TH,FR" }
+      { rrule: "FREQ=DAILY;BYDAY=MO,TU,WE,TH,FR" }
     );
     assert.true(
       window.open.calledWith(

diff --git a/app/assets/stylesheets/common/float-kit/d-tooltip.scss b/app/assets/stylesheets/common/float-kit/d-tooltip.scss
@@ -69,7 +69,7 @@
 
     &[data-placement^="top"] {
       .arrow {
-        bottom: -10px;
+        bottom: -11px;
         rotate: 180deg;
       }
     }
@@ -82,21 +82,21 @@
 
     &[data-placement^="bottom"] {
       .arrow {
-        top: -10px;
+        top: -11px;
       }
     }
 
     &[data-placement^="right"] {
       .arrow {
         rotate: -90deg;
-        left: -10px;
+        left: -11px;
       }
     }
 
     &[data-placement^="left"] {
       .arrow {
         rotate: 90deg;
-        right: -10px;
+        right: -11px;
       }
     }
   }

diff --git a/docs/CHANGELOG-JAVASCRIPT-PLUGIN-API.md b/docs/CHANGELOG-JAVASCRIPT-PLUGIN-API.md
@@ -109,7 +109,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [1.24.0] - 2024-01-08
 
-- Added `addAdminSidebarSectionLink` which is used to add a link to a specific admin sidebar section, as a replacement for the `admin-menu` plugin outlet. 
+- Added `addAdminSidebarSectionLink` which is used to add a link to a specific admin sidebar section, as a replacement for the `admin-menu` plugin outlet.
 
 ## [1.23.0] - 2024-01-03
 
@@ -154,7 +154,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
-- Added `recurrenceRule` option to `downloadCalendar`, this can be used to set recurring events in the calendar. Rule syntax can be found at https://datatracker.ietf.org/doc/html/rfc5545#section-3.3.10.
+- Added `rrule` option to `downloadCalendar`, this can be used to set recurring events in the calendar. Rule syntax can be found at https://datatracker.ietf.org/doc/html/rfc5545#section-3.3.10.
 
 ## [1.15.0] - 2023-10-18
 

diff --git a/plugins/discourse-calendar/app/controllers/discourse_post_event/events_controller.rb b/plugins/discourse-calendar/app/controllers/discourse_post_event/events_controller.rb
@@ -9,12 +9,12 @@ def index
         )
 
       # The detailed serializer is currently not used anywhere in the frontend, but available via API
-      serializer = params[:include_details] == "true" ? EventSerializer : EventSummarySerializer
+      serializer = params[:include_details] == "true" ? EventSerializer : BasicEventSerializer
 
       render json:
                ActiveModel::ArraySerializer.new(
                  @events,
-                 each_serializer: serializer,
+                 each_serializer: BasicEventSerializer,
                  scope: guardian,
                ).as_json
     end
@@ -124,6 +124,8 @@ def filtered_events_params
         :limit,
         :before,
         :attending_user,
+        :before,
+        :after,
       )
     end
   end

diff --git a/plugins/discourse-calendar/app/models/discourse_post_event/event.rb b/plugins/discourse-calendar/app/models/discourse_post_event/event.rb
@@ -59,40 +59,19 @@ def create_or_update_event_date
 
       return if !starts_at_changed && !ends_at_changed
 
-      event_dates.update_all(finished_at: Time.current)
       set_next_date
     end
 
     def set_next_date
-      next_dates = calculate_next_date
-      return if !next_dates
+      next_date_result = calculate_next_date
 
-      date_args = { starts_at: next_dates[:starts_at], ends_at: next_dates[:ends_at] }
-      if next_dates[:ends_at] && next_dates[:ends_at] < Time.current
-        date_args[:finished_at] = next_dates[:ends_at]
-      end
-
-      existing_date = event_dates.find_by(starts_at: date_args[:starts_at])
-
-      if existing_date && existing_date.ends_at == date_args[:ends_at] &&
-           existing_date.finished_at == date_args[:finished_at]
-        # exact same state in DB, this is a dupe call, return early
-        return
-      end
-
-      if existing_date
-        existing_date.update!(date_args)
-      else
-        event_dates.create!(date_args)
-      end
-
-      invitees.where.not(status: Invitee.statuses[:going]).update_all(status: nil, notified: false)
-
-      if !next_dates[:rescheduled]
-        notify_invitees!
-        notify_missing_invitees!
-      end
+      return event_dates.update_all(finished_at: Time.current) if next_date_result.nil?
 
+      starts_at, ends_at = next_date_result
+      finish_previous_event_dates(starts_at) if dates_changed?
+      upsert_event_date(starts_at, ends_at)
+      reset_invitee_notifications
+      notify_if_new_event
       publish_update!
     end
 
@@ -400,27 +379,71 @@ def chat_channel_sync
     end
 
     def calculate_next_date
-      if self.recurrence.blank? || original_starts_at > Time.current
-        return { starts_at: original_starts_at, ends_at: original_ends_at, rescheduled: false }
+      if recurrence.blank? || original_starts_at > Time.current
+        return original_starts_at, original_ends_at
       end
 
-      next_starts_at =
-        RRuleGenerator.generate(
-          starts_at: original_starts_at.in_time_zone(timezone),
-          timezone:,
-          recurrence:,
-          recurrence_until:,
-        ).first
-      return unless next_starts_at
-
-      if original_ends_at
-        difference = original_ends_at - original_starts_at
-        next_ends_at = next_starts_at + difference.seconds
+      next_starts_at = calculate_next_recurring_date
+      return nil unless next_starts_at
+
+      next_ends_at = original_ends_at ? next_starts_at + event_duration : nil
+      [next_starts_at, next_ends_at]
+    end
+
+    private
+
+    def dates_changed?
+      saved_change_to_original_starts_at || saved_change_to_original_ends_at
+    end
+
+    def finish_previous_event_dates(current_starts_at)
+      existing_date = event_dates.find_by(starts_at: current_starts_at)
+      event_dates
+        .where.not(id: existing_date&.id)
+        .where(finished_at: nil)
+        .update_all(finished_at: Time.current)
+    end
+
+    def upsert_event_date(starts_at, ends_at)
+      finished_at = ends_at && ends_at < Time.current ? ends_at : nil
+
+      existing_date = event_dates.find_by(starts_at:)
+
+      if existing_date
+        # Only update if something actually changed
+        unless existing_date.ends_at == ends_at && existing_date.finished_at == finished_at
+          existing_date.update!(ends_at:, finished_at:)
+        end
       else
-        next_ends_at = nil
+        event_dates.create!(starts_at:, ends_at:, finished_at:)
       end
+    end
+
+    def reset_invitee_notifications
+      invitees.where.not(status: Invitee.statuses[:going]).update_all(status: nil, notified: false)
+    end
+
+    def notify_if_new_event
+      is_generating_future_recurrence = recurrence.present? && original_starts_at <= Time.current
+
+      unless is_generating_future_recurrence
+        notify_invitees!
+        notify_missing_invitees!
+      end
+    end
+
+    def calculate_next_recurring_date
+      RRuleGenerator.generate(
+        starts_at: original_starts_at.in_time_zone(timezone),
+        timezone: timezone,
+        recurrence: recurrence,
+        recurrence_until: recurrence_until,
+        dtstart: original_starts_at.in_time_zone(timezone),
+      ).first
+    end
 
-      { starts_at: next_starts_at, ends_at: next_ends_at, rescheduled: true }
+    def event_duration
+      original_ends_at - original_starts_at
     end
   end
 end
-Original file line number
+Diff line change
@@ Expand Up / @@ -2457,7 +2457,7 @@ class PluginApi { @@
        *       endsAt: "2021-10-12T16:00:00.000Z",
        *     },
        *   ],
-       *   { recurrenceRule: "FREQ=DAILY;BYDAY=MO,TU,WE,TH,FR", location: "Paris", details: "Foo" }
+       *   { rrule: "FREQ=DAILY;BYDAY=MO,TU,WE,TH,FR", location: "Paris", details: "Foo" }
        * );
        * ```
        */
@@ Expand Down @@