Skip to content

A platform for community discussion. Free, open, simple.

FIX: Expand recurring events in ICS feed (#38762)

Rafael dos Santos Silvaba307b382f6b
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
index 586c944c13a..249a449fcb7 100644
--- a/plugins/discourse-calendar/app/controllers/discourse_post_event/events_controller.rb
+++ b/plugins/discourse-calendar/app/controllers/discourse_post_event/events_controller.rb
@@ -23,6 +23,27 @@ module DiscoursePostEvent
respond_to do |format|
format.ics do
+ after_time = filtered_events_params[:after]&.to_datetime || Time.current
+ before_time = filtered_events_params[:before]&.to_datetime || 1.year.from_now
+
+ @ics_events =
+ @events.flat_map do |event|
+ if event.recurring?
+ expanded =
+ DiscoursePostEvent::Action::ExpandOccurrences.call(
+ event: event,
+ after: after_time,
+ before: before_time,
+ limit: 52,
+ )
+ expanded[:occurrences].map { |occ| { event: event, **occ } }
+ else
+ [{ event: event, starts_at: event.starts_at, ends_at: event.ends_at }]
+ end
+ end
+
+ @ics_events = @ics_events.sort_by { |e| e[:starts_at] || Time.current }.first(500)
+
filename = "events-#{Digest::SHA1.hexdigest(@events.map(&:id).sort.join("-"))}.ics"
response.headers["Content-Disposition"] = "attachment; filename=\"#{filename}\""
end
diff --git a/plugins/discourse-calendar/app/views/discourse_post_event/events/index.ics.erb b/plugins/discourse-calendar/app/views/discourse_post_event/events/index.ics.erb
index 9dc26c110a9..b012059555a 100644
--- a/plugins/discourse-calendar/app/views/discourse_post_event/events/index.ics.erb
+++ b/plugins/discourse-calendar/app/views/discourse_post_event/events/index.ics.erb
@@ -1,13 +1,16 @@
BEGIN:VCALENDAR
VERSION:2.0
PRODID:-//Discourse//<%= Discourse.current_hostname %>//<%= Discourse.full_version %>//EN
-<%- @events.each do |event| -%>
-<%- next if event.starts_at.nil? -%>
+<%- @ics_events.each do |entry| -%>
+<%- event = entry[:event] -%>
+<%- starts_at = entry[:starts_at] -%>
+<%- ends_at = entry[:ends_at] -%>
+<%- next if starts_at.nil? -%>
BEGIN:VEVENT
-UID:calendar_event_#<%= event.id %>@<%= Discourse.current_hostname %>
+UID:calendar_event_#<%= event.id %>_<%= starts_at.to_i %>@<%= Discourse.current_hostname %>
DTSTAMP:<%= Time.now.utc.strftime("%Y%m%dT%H%M%SZ") %>
-DTSTART:<%= event.starts_at.strftime("%Y%m%dT%H%M%SZ") %>
-DTEND:<%= event.ends_at.presence ? event.ends_at.strftime("%Y%m%dT%H%M%SZ") : (event.starts_at + 1.hour).strftime("%Y%m%dT%H%M%SZ") %>
+DTSTART:<%= starts_at.utc.strftime("%Y%m%dT%H%M%SZ") %>
+DTEND:<%= ends_at.presence ? ends_at.utc.strftime("%Y%m%dT%H%M%SZ") : (starts_at + 1.hour).utc.strftime("%Y%m%dT%H%M%SZ") %>
SUMMARY:<%= IcalEncoder.encode(event.name.presence || event.post.topic.title) %>
<%- if event.location.present? -%>LOCATION:<%= IcalEncoder.encode(event.location) %>
<%- end -%>
diff --git a/plugins/discourse-calendar/spec/requests/events_controller_spec.rb b/plugins/discourse-calendar/spec/requests/events_controller_spec.rb
index 83b297b38c2..8b6b975e78d 100644
--- a/plugins/discourse-calendar/spec/requests/events_controller_spec.rb
+++ b/plugins/discourse-calendar/spec/requests/events_controller_spec.rb
@@ -131,6 +131,40 @@ module DiscoursePostEvent
expect(body).not_to include("SUMMARY:Old Event")
end
+ it "expands recurring events into multiple occurrences" do
+ Fabricate(
+ :event,
+ original_starts_at: 1.day.from_now,
+ original_ends_at: 1.day.from_now + 1.hour,
+ recurrence: "every_week",
+ name: "Weekly Standup",
+ )
+
+ get "/discourse-post-event/events.ics"
+
+ expect(response.status).to eq(200)
+ body = response.body
+ occurrences = body.scan("SUMMARY:Weekly Standup").size
+ expect(occurrences).to be > 1
+ expect(occurrences).to be <= 52
+ end
+
+ it "gives recurring and non-recurring events unique UIDs" do
+ Fabricate(
+ :event,
+ original_starts_at: 1.day.from_now,
+ recurrence: "every_week",
+ name: "Recurring",
+ )
+ Fabricate(:event, original_starts_at: 2.days.from_now, name: "One-off")
+
+ get "/discourse-post-event/events.ics"
+
+ body = response.body
+ uids = body.scan(/^UID:(.+)$/).flatten
+ expect(uids.size).to eq(uids.uniq.size)
+ end
+
it "skips events with nil starts_at in ics feed" do
event = Fabricate(:event, original_starts_at: 1.day.from_now, name: "Valid Event")