A platform for community discussion. Free, open, simple.
FEAT: add all_day option to calendar events (#38511)
Bannon Tannerc557cafe4387
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.rbindex 80d60f36d3a..586c944c13a 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@@ -182,6 +182,7 @@ module DiscoursePostEventdef format_time(event, time)return nil unless time+ return time.utc.strftime("%Y-%m-%d") if event.all_dayif event.show_local_timetime.in_time_zone(event.timezone).strftime("%Y-%m-%dT%H:%M:%S")diff --git a/plugins/discourse-calendar/app/models/discourse_post_event/event.rb b/plugins/discourse-calendar/app/models/discourse_post_event/event.rbindex d9a5efcd851..6419e8725ec 100644--- a/plugins/discourse-calendar/app/models/discourse_post_event/event.rb+++ b/plugins/discourse-calendar/app/models/discourse_post_event/event.rb@@ -52,6 +52,11 @@ module DiscoursePostEventtopic_id: self.post.topic_id,name: TOPIC_POST_EVENT_ENDS_AT,).delete_all++ TopicCustomField.where(+ topic_id: self.post.topic_id,+ name: TOPIC_POST_EVENT_ALL_DAY,+ ).delete_allendend@@ -133,7 +138,10 @@ module DiscoursePostEventdef on_going_event_inviteesreturn [] if self.starts_at.nil? # Can't determine ongoing status without start time- return [] if !self.ends_at && self.starts_at < Time.now+ if !self.ends_at && self.starts_at < Time.now &&+ (!self.all_day || self.starts_at.end_of_day <= Time.now)+ return []+ endif self.ends_atextended_ends_at =@@ -329,6 +337,19 @@ module DiscoursePostEventparsed_recurrence_until =event_params[:"recurrence-until"] ? tz.parse(event_params[:"recurrence-until"]) : nil+ parsed_all_day = event_params[:"all-day"] == "true"+ if parsed_all_day+ parsed_starts_at = Time.utc(*event_params[:start].split("-").map(&:to_i))+ parsed_ends_at =+ (+ if event_params[:end]+ Time.utc(*event_params[:end].split("-").map(&:to_i)).end_of_day+ else+ nil+ end+ )+ end+params = {name: event_params[:name],original_starts_at: parsed_starts_at,@@ -347,6 +368,7 @@ module DiscoursePostEventclosed: event_params[:closed] || false,chat_enabled: event_params[:"chat-enabled"]&.downcase == "true",max_attendees: event_params[:"max-attendees"]&.to_i,+ all_day: parsed_all_day,}params[:custom_fields] = {}@@ -421,7 +443,8 @@ module DiscoursePostEventnext_starts_at = calculate_next_recurring_datereturn nil unless next_starts_at- event_duration = original_ends_at ? original_ends_at - original_starts_at : 3600+ event_duration =+ original_ends_at ? original_ends_at - original_starts_at : (all_day ? 86_400 : 3600)next_ends_at = next_starts_at + event_duration[next_starts_at, next_ends_at]end@@ -435,7 +458,8 @@ module DiscoursePostEventnext_starts_at = calculate_next_recurring_date_from(from_time)return nil unless next_starts_at- event_duration = original_ends_at ? original_ends_at - original_starts_at : 3600+ event_duration =+ original_ends_at ? original_ends_at - original_starts_at : (all_day ? 86_400 : 3600)next_ends_at = next_starts_at + event_duration{ starts_at: next_starts_at, ends_at: next_ends_at }end@@ -556,4 +580,5 @@ end# recurrence_until :datetime# show_local_time :boolean default(FALSE), not null# max_attendees :integer+# all_day :boolean default(FALSE), not null#diff --git a/plugins/discourse-calendar/app/models/discourse_post_event/event_date.rb b/plugins/discourse-calendar/app/models/discourse_post_event/event_date.rbindex ba0f558fc46..e200eead41f 100644--- a/plugins/discourse-calendar/app/models/discourse_post_event/event_date.rb+++ b/plugins/discourse-calendar/app/models/discourse_post_event/event_date.rb@@ -20,7 +20,7 @@ module DiscoursePostEventSQLend- after_commit :upsert_topic_custom_field, on: %i[create]+ after_commit :upsert_topic_custom_field, on: %i[create update]def upsert_topic_custom_fieldif self.event.post && self.event.post.is_first_post?TopicCustomField.upsert(@@ -44,6 +44,17 @@ module DiscoursePostEvent},unique_by: "idx_topic_custom_fields_topic_post_event_ends_at",)++ TopicCustomField.upsert(+ {+ topic_id: self.event.post.topic_id,+ name: TOPIC_POST_EVENT_ALL_DAY,+ value: self.event.all_day || false,+ created_at: Time.now,+ updated_at: Time.now,+ },+ unique_by: "idx_topic_custom_fields_topic_post_event_all_day",+ )endenddiff --git a/plugins/discourse-calendar/app/serializers/discourse_post_event/basic_event_serializer.rb b/plugins/discourse-calendar/app/serializers/discourse_post_event/basic_event_serializer.rbindex 1af4f1d5673..c875f0c1126 100644--- a/plugins/discourse-calendar/app/serializers/discourse_post_event/basic_event_serializer.rb+++ b/plugins/discourse-calendar/app/serializers/discourse_post_event/basic_event_serializer.rb@@ -14,7 +14,8 @@ module DiscoursePostEvent:timezone,:post,:duration,- :occurrences+ :occurrences,+ :all_daydef category_idobject.post.topic.category_id@@ -62,6 +63,8 @@ module DiscoursePostEventenddef starts_at+ return object.starts_at&.utc&.strftime("%Y-%m-%d") if object.all_day+if object.recurring? && object.recurrence_until.present? &&object.recurrence_until < Time.currentreturn nil@@ -77,6 +80,8 @@ module DiscoursePostEventenddef ends_at+ return object.ends_at&.utc&.strftime("%Y-%m-%d") if object.all_day+if object.recurring? && object.recurrence_until.present? &&object.recurrence_until < Time.currentreturn nildiff --git a/plugins/discourse-calendar/assets/javascripts/discourse/components/discourse-post-event/dates.gjs b/plugins/discourse-calendar/assets/javascripts/discourse/components/discourse-post-event/dates.gjsindex cca488ef901..58c856320f7 100644--- a/plugins/discourse-calendar/assets/javascripts/discourse/components/discourse-post-event/dates.gjs+++ b/plugins/discourse-calendar/assets/javascripts/discourse/components/discourse-post-event/dates.gjs@@ -167,6 +167,26 @@ export default class DiscoursePostEventDates extends Component {return;}+ if (this.args.event.allDay) {+ const start = moment(this.args.event.startsAt, "YYYY-MM-DD");+ const includeStartYear = !start.isSame(moment(), "year");+ const startFormat = includeStartYear ? "ddd, MMM D, YYYY" : "ddd, MMM D";+ let dates = start.format(startFormat);++ if (this.args.event.endsAt) {+ const end = moment(this.args.event.endsAt, "YYYY-MM-DD");+ if (!end.isSame(start, "day")) {+ const includeEndYear =+ !end.isSame(moment(), "year") || !end.isSame(start, "year");+ const endFormat = includeEndYear ? "ddd, MMM D, YYYY" : "ddd, MMM D";+ dates += ` → ${end.format(endFormat)}`;+ }+ }++ this.htmlDates = trustHTML(dates);+ return;+ }+if (this.siteSettings.discourse_local_dates_enabled) {const bbcode = this.datesBBCode.join("<span> → </span>");const result = await cook(bbcode);diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/components/discourse-post-event/index.gjs b/plugins/discourse-calendar/assets/javascripts/discourse/components/discourse-post-event/index.gjsindex b999f161858..4c4bf80a39b 100644--- a/plugins/discourse-calendar/assets/javascripts/discourse/components/discourse-post-event/index.gjs+++ b/plugins/discourse-calendar/assets/javascripts/discourse/components/discourse-post-event/index.gjs@@ -54,7 +54,9 @@ export default class DiscoursePostEvent extends Component {});getDisplayTime(time) {- if (this.event.showLocalTime) {+ if (this.event.allDay) {+ return moment(time, "YYYY-MM-DD");+ } else if (this.event.showLocalTime) {return moment.tz(time, this.event.timezone || "UTC");} else {return momentdiff --git a/plugins/discourse-calendar/assets/javascripts/discourse/components/event-date.gjs b/plugins/discourse-calendar/assets/javascripts/discourse/components/event-date.gjsindex 76cdc5be0fc..8ed7149c9a8 100644--- a/plugins/discourse-calendar/assets/javascripts/discourse/components/event-date.gjs+++ b/plugins/discourse-calendar/assets/javascripts/discourse/components/event-date.gjs@@ -99,6 +99,9 @@ export default class EventDate extends Component {}_parsedDate(date) {+ if (this.args.topic.event_all_day) {+ return moment(date, "YYYY-MM-DD");+ }const timezone = this.args.topic.event_show_local_time? this.args.topic.event_timezone: moment.tz.guess();diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/components/modal/post-event-builder.gjs b/plugins/discourse-calendar/assets/javascripts/discourse/components/modal/post-event-builder.gjsindex be868259d4e..0a8e43696c3 100644--- a/plugins/discourse-calendar/assets/javascripts/discourse/components/modal/post-event-builder.gjs+++ b/plugins/discourse-calendar/assets/javascripts/discourse/components/modal/post-event-builder.gjs@@ -32,14 +32,30 @@ export default class PostEventBuilder extends Component {@tracked isSaving = false;@tracked maxAttendeesInput = this.args.model.event.maxAttendees;- @tracked startsAt = moment(this.event.startsAt).tz(- this.event.timezone || "UTC"- );+ @tracked allDay = this.event.allDay || false;+ @tracked startsAt = this.#initStartsAt();+ @tracked endsAt = this.#initEndsAt();- @tracked- endsAt =- this.event.endsAt &&- moment(this.event.endsAt).tz(this.event.timezone || "UTC");+ #initStartsAt() {+ if (this.event.allDay) {+ return moment(this.event.startsAt, "YYYY-MM-DD");+ }+ return moment(this.event.startsAt).tz(this.event.timezone || "UTC");+ }++ #initEndsAt() {+ if (!this.event.endsAt) {+ return null;+ }+ if (this.event.allDay) {+ return moment(this.event.endsAt, "YYYY-MM-DD");+ }+ return moment(this.event.endsAt).tz(this.event.timezone || "UTC");+ }++ get showTime() {+ return !this.allDay;+ }get isEditing() {return this.args.model.event.id || this.args.model.onUpdate;@@ -197,6 +213,21 @@ export default class PostEventBuilder extends Component {this.endsAt = dates.to;}+ @action+ setAllDay(e) {+ this.allDay = e.target.checked;+ this.event.allDay = e.target.checked;+ if (e.target.checked) {+ // snap times to start/end of day in the event's timezone+ if (this.startsAt) {+ this.startsAt = this.startsAt.clone().startOf("day");+ }+ if (this.endsAt) {+ this.endsAt = this.endsAt.clone().endOf("day");+ }+ }+ }+@actiononChangeStatus(newStatus) {this.event.rawInvitees = [];@@ -385,9 +416,29 @@ export default class PostEventBuilder extends Component {@to={{this.endsAt}}@timezone={{@model.event.timezone}}@onChange={{this.onChangeDates}}+ @showFromTime={{this.showTime}}+ @showToTime={{this.showTime}}/></EventField>+ <EventField+ @label="discourse_post_event.builder_modal.all_day.label"+ class="all-day"+ >+ <label class="checkbox-label">+ <input+ type="checkbox"+ checked={{this.allDay}}+ {{on "input" this.setAllDay}}+ />+ <span class="message">+ {{i18n+ "discourse_post_event.builder_modal.all_day.description"+ }}+ </span>+ </label>+ </EventField>+<EventField@label="discourse_post_event.builder_modal.name.label"class="name"diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/components/upcoming-events-calendar.gjs b/plugins/discourse-calendar/assets/javascripts/discourse/components/upcoming-events-calendar.gjsindex 2b41f729361..575d8fa7a77 100644--- a/plugins/discourse-calendar/assets/javascripts/discourse/components/upcoming-events-calendar.gjs+++ b/plugins/discourse-calendar/assets/javascripts/discourse/components/upcoming-events-calendar.gjs@@ -88,12 +88,22 @@ export default class UpcomingEventsCalendar extends Component {backgroundColor = `#${categoryColor}`;}+ const isAllDay =+ event.allDay || !isNotFullDayEvent(moment(startsAt), moment(endsAt));++ // FullCalendar treats end as exclusive for allDay events,+ // so add one day to make the end date inclusive+ let calendarEnd = endsAt || startsAt;+ if (isAllDay && calendarEnd) {+ calendarEnd = moment(calendarEnd).add(1, "day").format("YYYY-MM-DD");+ }+return {extendedProps: { postEvent: event },title: formatEventName(event, this.currentUser?.user_option?.timezone),start: startsAt,- end: endsAt || startsAt,- allDay: !isNotFullDayEvent(moment(startsAt), moment(endsAt)),+ end: calendarEnd,+ allDay: isAllDay,url: getURL(`/t/-/${post?.topic?.id}/${post?.post_number}`),backgroundColor,};diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/components/upcoming-events-list.gjs b/plugins/discourse-calendar/assets/javascripts/discourse/components/upcoming-events-list.gjsindex c14d9bc8253..867d1e4698b 100644--- a/plugins/discourse-calendar/assets/javascripts/discourse/components/upcoming-events-list.gjs+++ b/plugins/discourse-calendar/assets/javascripts/discourse/components/upcoming-events-list.gjs@@ -163,8 +163,14 @@ export default class UpcomingEventsList extends Component {}formatDateRange(event) {- const start = new Date(event.starts_at);- const end = new Date(event.ends_at);+ // Date-only strings (all-day events) must be parsed as local dates;+ // new Date("YYYY-MM-DD") treats them as UTC, shifting the day in western timezones+ const start = event.all_day+ ? new Date(event.starts_at + "T00:00:00")+ : new Date(event.starts_at);+ const end = event.all_day+ ? new Date(event.ends_at + "T00:00:00")+ : new Date(event.ends_at);return new Intl.DateTimeFormat(moment.locale(), {month: "long",day: "numeric",diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/lib/raw-event-helper.js b/plugins/discourse-calendar/assets/javascripts/discourse/lib/raw-event-helper.jsindex c543810e653..48e6f17a549 100644--- a/plugins/discourse-calendar/assets/javascripts/discourse/lib/raw-event-helper.js+++ b/plugins/discourse-calendar/assets/javascripts/discourse/lib/raw-event-helper.js@@ -3,7 +3,9 @@ export function buildParams(startsAt, endsAt, event, siteSettings) {const eventTz = event.timezone || "UTC";- params.start = moment(startsAt).tz(eventTz).format("YYYY-MM-DD HH:mm");+ params.start = event.allDay+ ? moment(startsAt).format("YYYY-MM-DD")+ : moment(startsAt).tz(eventTz).format("YYYY-MM-DD HH:mm");if (event.isClosed) {params.closed = "true";@@ -59,8 +61,14 @@ export function buildParams(startsAt, endsAt, event, siteSettings) {params.maxAttendees = `${event.maxAttendees}`;}+ if (event.allDay) {+ params.allDay = "true";+ }+if (endsAt) {- params.end = moment(endsAt).tz(eventTz).format("YYYY-MM-DD HH:mm");+ params.end = event.allDay+ ? moment(endsAt).format("YYYY-MM-DD")+ : moment(endsAt).tz(eventTz).format("YYYY-MM-DD HH:mm");}if (event.status === "private") {diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/models/discourse-post-event-event.js b/plugins/discourse-calendar/assets/javascripts/discourse/models/discourse-post-event-event.jsindex 887411ca6d7..e90c1274fba 100644--- a/plugins/discourse-calendar/assets/javascripts/discourse/models/discourse-post-event-event.js+++ b/plugins/discourse-calendar/assets/javascripts/discourse/models/discourse-post-event-event.js@@ -29,6 +29,7 @@ export default class DiscoursePostEventEvent {@tracked categoryId;@tracked startsAt;@tracked endsAt;+ @tracked allDay;@tracked duration;@tracked rawInvitees;@tracked location;@@ -66,6 +67,7 @@ export default class DiscoursePostEventEvent {this.categoryId = args.category_id;this.startsAt = args.starts_at;this.endsAt = args.ends_at;+ this.allDay = args.all_day || false;this.duration = args.duration;this.rawInvitees = args.raw_invitees;this.sampleInvitees = args.sample_invitees || [];@@ -154,6 +156,7 @@ export default class DiscoursePostEventEvent {this.name = event.name;this.startsAt = event.startsAt;this.endsAt = event.endsAt;+ this.allDay = event.allDay;this.duration = event.duration;this.location = event.location;this.url = event.url;diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/pre-initializers/rich-editor-extension.js b/plugins/discourse-calendar/assets/javascripts/discourse/pre-initializers/rich-editor-extension.jsindex 521a465d6e5..2197f1ae84a 100644--- a/plugins/discourse-calendar/assets/javascripts/discourse/pre-initializers/rich-editor-extension.js+++ b/plugins/discourse-calendar/assets/javascripts/discourse/pre-initializers/rich-editor-extension.js@@ -20,6 +20,7 @@ export const EVENT_ATTRIBUTES = {recurrence: { default: null },recurrenceUntil: { default: null },chatEnabled: { default: null },+ allDay: { default: null },};/** @type {RichEditorExtension} */diff --git a/plugins/discourse-calendar/config/locales/client.en.yml b/plugins/discourse-calendar/config/locales/client.en.ymlindex bbbfbe17f71..c259538d440 100644--- a/plugins/discourse-calendar/config/locales/client.en.yml+++ b/plugins/discourse-calendar/config/locales/client.en.yml@@ -460,6 +460,9 @@ en:timezone:label: Timezoneremove_timezone: No timezone (UTC)+ all_day:+ label: "All day event"+ description: "An all-day event will not have specific times, just a date. The event will run from the start of the day to the end of the day."reminders:label: "Reminders"types:diff --git a/plugins/discourse-calendar/db/migrate/20260311021412_add_all_day_to_discourse_post_event_events.rb b/plugins/discourse-calendar/db/migrate/20260311021412_add_all_day_to_discourse_post_event_events.rbnew file mode 100644index 00000000000..b5547106511--- /dev/null+++ b/plugins/discourse-calendar/db/migrate/20260311021412_add_all_day_to_discourse_post_event_events.rb@@ -0,0 +1,7 @@+# frozen_string_literal: true++class AddAllDayToDiscoursePostEventEvents < ActiveRecord::Migration[8.0]+ def change+ add_column :discourse_post_event_events, :all_day, :boolean, default: false, null: false+ end+enddiff --git a/plugins/discourse-calendar/db/migrate/20260311161955_add_topic_custom_field_all_day_index.rb b/plugins/discourse-calendar/db/migrate/20260311161955_add_topic_custom_field_all_day_index.rbnew file mode 100644index 00000000000..128c840e775--- /dev/null+++ b/plugins/discourse-calendar/db/migrate/20260311161955_add_topic_custom_field_all_day_index.rb@@ -0,0 +1,11 @@+# frozen_string_literal: true++class AddTopicCustomFieldAllDayIndex < ActiveRecord::Migration[8.0]+ def change+ add_index :topic_custom_fields,+ %i[name topic_id],+ name: :idx_topic_custom_fields_topic_post_event_all_day,+ unique: true,+ where: "name = 'TopicEventAllDay'"+ end+enddiff --git a/plugins/discourse-calendar/lib/discourse_post_event/event_parser.rb b/plugins/discourse-calendar/lib/discourse_post_event/event_parser.rbindex f81c466136c..620a841d759 100644--- a/plugins/discourse-calendar/lib/discourse_post_event/event_parser.rb+++ b/plugins/discourse-calendar/lib/discourse_post_event/event_parser.rb@@ -19,6 +19,7 @@ module DiscoursePostEvent:closed,:"chat-enabled",:"max-attendees",+ :"all-day",]def self.extract_events(post)diff --git a/plugins/discourse-calendar/lib/discourse_post_event/web_hook_extension.rb b/plugins/discourse-calendar/lib/discourse_post_event/web_hook_extension.rbindex 349d26eb198..2d17a8744c2 100644--- a/plugins/discourse-calendar/lib/discourse_post_event/web_hook_extension.rb+++ b/plugins/discourse-calendar/lib/discourse_post_event/web_hook_extension.rb@@ -24,6 +24,23 @@ module DiscoursePostEventpost = calendar_event.posttopic = post&.topic+ parsed_starts_at =+ (+ if calendar_event.all_day+ calendar_event.starts_at&.utc&.strftime("%Y-%m-%d")+ else+ calendar_event.starts_at+ end+ )+ parsed_ends_at =+ (+ if calendar_event.all_day+ calendar_event.ends_at&.utc&.strftime("%Y-%m-%d")+ else+ calendar_event.ends_at+ end+ )+{event: {id: calendar_event.id,@@ -32,8 +49,9 @@ module DiscoursePostEventlocation: calendar_event.location,url: calendar_event.url,status: DiscoursePostEvent::Event.statuses[calendar_event.status]&.to_s,- starts_at: calendar_event.starts_at,- ends_at: calendar_event.ends_at,+ starts_at: parsed_starts_at,+ ends_at: parsed_ends_at,+ all_day: calendar_event.all_day,recurrence: calendar_event.recurrence,recurrence_until: calendar_event.recurrence_until,timezone: calendar_event.timezone,diff --git a/plugins/discourse-calendar/plugin.rb b/plugins/discourse-calendar/plugin.rbindex cf3921c3a1d..a8ad9fa2d5a 100644--- a/plugins/discourse-calendar/plugin.rb+++ b/plugins/discourse-calendar/plugin.rb@@ -73,6 +73,7 @@ module ::DiscoursePostEvent# Topic where op has a post event custom fieldTOPIC_POST_EVENT_STARTS_AT = "TopicEventStartsAt"TOPIC_POST_EVENT_ENDS_AT = "TopicEventEndsAt"+ TOPIC_POST_EVENT_ALL_DAY = "TopicEventAllDay"endrequire_relative "lib/discourse_calendar/engine"@@ -339,6 +340,35 @@ after_initialize doend,) { object.event_ends_at }+ add_preloaded_topic_list_custom_field DiscoursePostEvent::TOPIC_POST_EVENT_ALL_DAY++ add_to_serializer(+ :topic_view,+ :event_all_day,+ include_condition: -> do+ SiteSetting.discourse_post_event_enabled &&+ SiteSetting.display_post_event_date_on_topic_title && object.topic.event_all_day+ end,+ ) { object.topic.event_all_day }++ add_to_class(:topic, :event_all_day) do+ return @event_all_day if defined?(@event_all_day)+ @event_all_day =+ begin+ value = custom_fields[DiscoursePostEvent::TOPIC_POST_EVENT_ALL_DAY].to_s+ ActiveModel::Type::Boolean.new.cast(value)+ end+ end++ add_to_serializer(+ :topic_list_item,+ :event_all_day,+ include_condition: -> do+ SiteSetting.discourse_post_event_enabled &&+ SiteSetting.display_post_event_date_on_topic_title && object.event_all_day+ end,+ ) { object.event_all_day }+add_to_serializer(:topic_view,:event_timezone,diff --git a/plugins/discourse-calendar/spec/models/discourse_post_event/event_date_spec.rb b/plugins/discourse-calendar/spec/models/discourse_post_event/event_date_spec.rbindex f971d640ace..91c6ba3c408 100644--- a/plugins/discourse-calendar/spec/models/discourse_post_event/event_date_spec.rb+++ b/plugins/discourse-calendar/spec/models/discourse_post_event/event_date_spec.rb@@ -34,4 +34,38 @@ describe DiscoursePostEvent::EventDate doendendend++ describe "Topic custom fields" do+ it "writes TopicEventAllDay custom field for all-day events" do+ all_day_post = Fabricate(:post, topic: Fabricate(:topic, user: user))+ event =+ Fabricate(+ :event,+ post: all_day_post,+ original_starts_at: "2020-04-25 00:00:00 UTC",+ original_ends_at: "2020-04-27 00:00:00 UTC",+ all_day: true,+ )++ custom_field =+ TopicCustomField.find_by(+ topic_id: all_day_post.topic_id,+ name: DiscoursePostEvent::TOPIC_POST_EVENT_ALL_DAY,+ )++ expect(custom_field).to be_present+ expect(custom_field.value).to eq("t")+ end++ it "writes false for non-all-day events" do+ custom_field =+ TopicCustomField.find_by(+ topic_id: first_post.topic_id,+ name: DiscoursePostEvent::TOPIC_POST_EVENT_ALL_DAY,+ )++ expect(custom_field).to be_present+ expect(custom_field.value).to eq("f")+ end+ endenddiff --git a/plugins/discourse-calendar/spec/requests/api/schemas/json/events_index_detailed_response.json b/plugins/discourse-calendar/spec/requests/api/schemas/json/events_index_detailed_response.jsonindex fd1d334cfb9..c1498c639ee 100644--- a/plugins/discourse-calendar/spec/requests/api/schemas/json/events_index_detailed_response.json+++ b/plugins/discourse-calendar/spec/requests/api/schemas/json/events_index_detailed_response.json@@ -66,6 +66,9 @@"type": "string","pattern": "^\\d{2}:\\d{2}:\\d{2}$"},+ "all_day": {+ "type": "boolean"+ },"can_act_on_discourse_post_event": {"type": ["boolean",diff --git a/plugins/discourse-calendar/spec/requests/api/schemas/json/events_index_response.json b/plugins/discourse-calendar/spec/requests/api/schemas/json/events_index_response.jsonindex 5bdd22316a3..c52b4653b0e 100644--- a/plugins/discourse-calendar/spec/requests/api/schemas/json/events_index_response.json+++ b/plugins/discourse-calendar/spec/requests/api/schemas/json/events_index_response.json@@ -45,6 +45,9 @@"type": "string","pattern": "^\\d{2}:\\d{2}:\\d{2}$"},+ "all_day": {+ "type": "boolean"+ },"post": {"type": "object","additionalProperties": false,diff --git a/plugins/discourse-calendar/spec/requests/events_controller_spec.rb b/plugins/discourse-calendar/spec/requests/events_controller_spec.rbindex 566b9335a5a..83b297b38c2 100644--- a/plugins/discourse-calendar/spec/requests/events_controller_spec.rb+++ b/plugins/discourse-calendar/spec/requests/events_controller_spec.rb@@ -199,6 +199,25 @@ module DiscoursePostEventendend+ context "with an all-day event" do+ it "returns date-only strings for starts_at and ends_at" do+ Fabricate(+ :event,+ original_starts_at: Time.utc(2026, 3, 12),+ original_ends_at: Time.utc(2026, 3, 14),+ all_day: true,+ )++ get "/discourse-post-event/events.json"++ expect(response.status).to eq(200)+ event = response.parsed_body["events"].first+ expect(event["starts_at"]).to eq("2026-03-12")+ expect(event["ends_at"]).to eq("2026-03-14")+ expect(event["all_day"]).to eq(true)+ end+ end+context "with an existing post" dolet(:user) { Fabricate(:user, admin: true) }let(:topic) { Fabricate(:topic, user: user, category: Fabricate(:category)) }diff --git a/plugins/discourse-calendar/spec/serializers/discourse_post_event/event_serializer_spec.rb b/plugins/discourse-calendar/spec/serializers/discourse_post_event/event_serializer_spec.rbindex e113fa34ff9..98dfde7bcb9 100644--- a/plugins/discourse-calendar/spec/serializers/discourse_post_event/event_serializer_spec.rb+++ b/plugins/discourse-calendar/spec/serializers/discourse_post_event/event_serializer_spec.rb@@ -89,5 +89,33 @@ describe DiscoursePostEvent::EventSerializer doexpect(json[:event][:duration]).to eq("01:00:00")endend++ context "when event is all-day" do+ fab!(:post_all_day) { Fabricate(:post, topic: topic) }+ fab!(:all_day_event) do+ Fabricate(+ :event,+ post: post_all_day,+ original_starts_at: "2026-03-12 00:00:00 UTC",+ original_ends_at: "2026-03-14 00:00:00 UTC",+ all_day: true,+ )+ end++ it "serializes starts_at as date-only string" do+ json = DiscoursePostEvent::EventSerializer.new(all_day_event, scope: Guardian.new).as_json+ expect(json[:event][:starts_at]).to eq("2026-03-12")+ end++ it "serializes ends_at as date-only string" do+ json = DiscoursePostEvent::EventSerializer.new(all_day_event, scope: Guardian.new).as_json+ expect(json[:event][:ends_at]).to eq("2026-03-14")+ end++ it "serializes all_day as true" do+ json = DiscoursePostEvent::EventSerializer.new(all_day_event, scope: Guardian.new).as_json+ expect(json[:event][:all_day]).to eq(true)+ end+ endendenddiff --git a/plugins/discourse-calendar/spec/serializers/topic_list_item_serializer_spec.rb b/plugins/discourse-calendar/spec/serializers/topic_list_item_serializer_spec.rbindex 485335bac3d..402f628e5a3 100644--- a/plugins/discourse-calendar/spec/serializers/topic_list_item_serializer_spec.rb+++ b/plugins/discourse-calendar/spec/serializers/topic_list_item_serializer_spec.rb@@ -46,4 +46,28 @@ RSpec.describe TopicListItemSerializer doexpect(parsed_json["event_ends_at"]).to eq("2020-04-24T16:10:00.000Z")endend++ describe "#event_all_day" do+ it "returns true when the event is all-day" do+ SiteSetting.display_post_event_date_on_topic_title = true++ all_day_topic = Fabricate(:topic)+ all_day_post = Fabricate(:post, topic: all_day_topic)+ DiscoursePostEvent::Event.create!(+ id: all_day_post.id,+ original_starts_at: Time.utc(2020, 4, 25),+ original_ends_at: Time.utc(2020, 4, 27),+ all_day: true,+ )++ all_day_serializer = described_class.new(all_day_topic, scope: Guardian.new, root: false)+ all_day_json = JSON.parse(all_day_serializer.to_json)++ expect(all_day_json["event_all_day"]).to eq(true)+ end++ it "is not included when the event is not all-day" do+ expect(parsed_json).not_to have_key("event_all_day")+ end+ endenddiff --git a/plugins/discourse-calendar/spec/serializers/topic_view_serializer_spec.rb b/plugins/discourse-calendar/spec/serializers/topic_view_serializer_spec.rbindex 2e555046c10..715fcd77104 100644--- a/plugins/discourse-calendar/spec/serializers/topic_view_serializer_spec.rb+++ b/plugins/discourse-calendar/spec/serializers/topic_view_serializer_spec.rb@@ -97,4 +97,38 @@ RSpec.describe TopicViewSerializer doendendend++ context "with all-day event" do+ before do+ SiteSetting.display_post_event_date_on_topic_title = true+ DiscoursePostEvent::Event.create!(+ id: first_post.id,+ original_starts_at: Time.utc(2020, 4, 25),+ original_ends_at: Time.utc(2020, 4, 27),+ all_day: true,+ )+ end++ describe "#event_all_day" do+ it "returns true" do+ expect(parsed_json["event_all_day"]).to eq(true)+ end+ end+ end++ context "without all-day event" do+ before do+ DiscoursePostEvent::Event.create!(+ id: first_post.id,+ original_starts_at: 1.hour.from_now,+ original_ends_at: 2.hours.from_now,+ )+ end++ describe "#event_all_day" do+ it "is not included" do+ expect(parsed_json).not_to have_key("event_all_day")+ end+ end+ endenddiff --git a/plugins/discourse-calendar/test/javascripts/integration/components/event-date-test.gjs b/plugins/discourse-calendar/test/javascripts/integration/components/event-date-test.gjsindex 61f085d3857..783889c5ab6 100644--- a/plugins/discourse-calendar/test/javascripts/integration/components/event-date-test.gjs+++ b/plugins/discourse-calendar/test/javascripts/integration/components/event-date-test.gjs@@ -10,9 +10,11 @@ module("Integration | Component | EventDate", function (hooks) {hooks.beforeEach(function () {this.siteSettings.discourse_post_event_enabled = true;this.siteSettings.use_local_event_date = true;+ this.originalGuess = moment.tz.guess;});hooks.afterEach(function () {+ moment.tz.guess = this.originalGuess;this.clock?.restore();});@@ -85,4 +87,26 @@ module("Integration | Component | EventDate", function (hooks) {"displays date in browser timezone (Harare) when no event timezone");});++ test("all-day event does not shift date across timezones", async function (assert) {+ // Use a western timezone where UTC midnight would shift to the previous day+ moment.tz.guess = () => "America/Chicago";+ this.clock = fakeTime("2026-03-11T12:00:00Z", "America/Chicago", true);++ const topic = {+ event_starts_at: "2026-03-12",+ event_ends_at: "2026-03-14",+ event_all_day: true,+ };++ await render(<template><EventDate @topic={{topic}} /></template>);++ assert+ .dom(".event-date")+ .hasAttribute(+ "title",+ /March 12, 2026/,+ "displays March 12 (correct date) not March 11 (timezone-shifted)"+ );+ });});diff --git a/plugins/discourse-calendar/test/javascripts/integration/components/upcoming-events-list-test.gjs b/plugins/discourse-calendar/test/javascripts/integration/components/upcoming-events-list-test.gjsindex 7d3867cd450..bac4bc0d0d4 100644--- a/plugins/discourse-calendar/test/javascripts/integration/components/upcoming-events-list-test.gjs+++ b/plugins/discourse-calendar/test/javascripts/integration/components/upcoming-events-list-test.gjs@@ -542,6 +542,53 @@ module("Integration | Component | upcoming-events-list", function (hooks) {.dom(".upcoming-events-list__event-name").hasText("Awesome Event", "displays the event name");});++ test("with all-day multi-day event shows correct date range", async function (assert) {+ pretender.get("/discourse-post-event/events", () => {+ return response({+ events: [+ {+ id: 67510,+ starts_at: "2100-02-05",+ ends_at: "2100-02-08",+ timezone: "America/Chicago",+ post: {+ id: 67510,+ post_number: 1,+ url: "/t/all-day-event/18460/1",+ topic: { id: 18460, title: "All day conference" },+ },+ name: "All Day Conference",+ category_id: 1,+ all_day: true,+ },+ ],+ });+ });++ await render(<template><UpcomingEventsList /></template>);++ this.appEvents.trigger("page:changed", { url: "/" });++ await waitFor(".loading-container .spinner", { count: 0 });++ assert+ .dom(".upcoming-events-list__event")+ .exists({ count: 1 }, "all-day event is displayed");++ assert+ .dom(".upcoming-events-list__event-name")+ .hasText("All Day Conference", "displays the event name");++ const eventTime = document.querySelector(+ ".upcoming-events-list__event-time"+ ).innerText;++ assert.true(eventTime.includes("February"), "contains month name");+ assert.true(eventTime.includes("5"), "contains start day");+ assert.true(eventTime.includes("8"), "contains end day");+ assert.true(eventTime.includes("2100"), "contains year");+ });});function twoEventsResponseHandler({ queryParams }) {