Skip to content

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

FEATURE: support `after=now` for dynamic ICS calendar subscriptions (#38534)

Rafael dos Santos Silva98c79a5ef5e8
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 3fb03ec57a3..44efc166dbb 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1928,10 +1928,15 @@ class UsersController < ApplicationController
end
end
format.ics do
+ bookmark_query = Bookmark.with_reminders.where(user_id: user.id)
+
+ if params[:after].present?
+ after_date = params[:after] == "now" ? Time.current : params[:after].to_datetime
+ bookmark_query = bookmark_query.where("reminder_at >= ?", after_date)
+ end
+
@bookmark_reminders =
- Bookmark
- .with_reminders
- .where(user_id: user.id)
+ bookmark_query
.order(:reminder_at)
.map do |bookmark|
bookmark.registered_bookmarkable.serializer.new(
diff --git a/plugins/discourse-calendar/lib/discourse_post_event/event_finder.rb b/plugins/discourse-calendar/lib/discourse_post_event/event_finder.rb
index a81d91d6d5f..a36594a56e4 100644
--- a/plugins/discourse-calendar/lib/discourse_post_event/event_finder.rb
+++ b/plugins/discourse-calendar/lib/discourse_post_event/event_finder.rb
@@ -91,8 +91,8 @@ module DiscoursePostEvent
def self.filter_by_dates(events, params)
return events if params[:before].blank? && params[:after].blank?
- before_date = params[:before]&.to_datetime
- after_date = params[:after]&.to_datetime
+ before_date = params[:before] == "now" ? Time.current : params[:before]&.to_datetime
+ after_date = params[:after] == "now" ? Time.current : params[:after]&.to_datetime
recurring_scope = build_recurring_date_scope(after_date, before_date)
non_recurring_scope = build_non_recurring_date_scope(after_date, before_date)
diff --git a/plugins/discourse-calendar/plugin.rb b/plugins/discourse-calendar/plugin.rb
index 9f482baa529..0a5859f0b11 100644
--- a/plugins/discourse-calendar/plugin.rb
+++ b/plugins/discourse-calendar/plugin.rb
@@ -143,6 +143,12 @@ after_initialize do
::ActionController::Base.prepend_view_path File.expand_path("../app/views", __FILE__)
+ add_api_parameter_route(
+ methods: :get,
+ actions: "discourse_post_event/events#index",
+ formats: :ics,
+ )
+
reloadable_patch do
ExportCsvController.prepend(DiscoursePostEvent::ExportCsvControllerExtension)
Jobs::ExportCsvFile.prepend(DiscoursePostEvent::ExportPostEventCsvReportExtension)
diff --git a/plugins/discourse-calendar/spec/lib/discourse_post_event/event_finder_spec.rb b/plugins/discourse-calendar/spec/lib/discourse_post_event/event_finder_spec.rb
index c3fa8bfe517..5800a5b6648 100644
--- a/plugins/discourse-calendar/spec/lib/discourse_post_event/event_finder_spec.rb
+++ b/plugins/discourse-calendar/spec/lib/discourse_post_event/event_finder_spec.rb
@@ -222,6 +222,17 @@ describe DiscoursePostEvent::EventFinder do
end
end
+ describe "with after=now" do
+ let!(:past_event) { Fabricate(:event, original_starts_at: 2.hours.ago) }
+ let!(:future_event) { Fabricate(:event, original_starts_at: 2.hours.from_now) }
+
+ it "resolves 'now' to the current time" do
+ results = finder.search(current_user, { after: "now" })
+ expect(results).not_to include(past_event)
+ expect(results).to include(future_event)
+ end
+ end
+
describe "expired events" do
let!(:expired_event) do
Fabricate(:event, original_starts_at: 2.hours.ago, original_ends_at: 1.hour.ago)