Skip to content

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

FIX: use user timezone for upcoming-events redirect date (#40341)

David Taylorec1b357850c5
diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/routes/discourse-post-event-upcoming-events/default-index.js b/plugins/discourse-calendar/assets/javascripts/discourse/routes/discourse-post-event-upcoming-events/default-index.js
index 1d0ddbb9956..d226028a2f5 100644
--- a/plugins/discourse-calendar/assets/javascripts/discourse/routes/discourse-post-event-upcoming-events/default-index.js
+++ b/plugins/discourse-calendar/assets/javascripts/discourse/routes/discourse-post-event-upcoming-events/default-index.js
@@ -3,11 +3,14 @@ import moment from "moment";
import DiscourseRoute from "discourse/routes/discourse";
export default class PostEventUpcomingEventsDefaultIndexRoute extends DiscourseRoute {
+ @service currentUser;
@service router;
@service siteSettings;
beforeModel() {
- const today = moment();
+ // Use the user's TZ so the redirect date matches what the calendar will render.
+ const tz = this.currentUser?.user_option?.timezone;
+ const today = tz ? moment.tz(tz) : moment();
const year = today.year();
const month = today.month() + 1; // moment months are 0-indexed, but URLs use 1-indexed
const day = today.date();
diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/routes/discourse-post-event-upcoming-events/default-mine.js b/plugins/discourse-calendar/assets/javascripts/discourse/routes/discourse-post-event-upcoming-events/default-mine.js
index 1dd075ca72a..8fb0bbb4ff1 100644
--- a/plugins/discourse-calendar/assets/javascripts/discourse/routes/discourse-post-event-upcoming-events/default-mine.js
+++ b/plugins/discourse-calendar/assets/javascripts/discourse/routes/discourse-post-event-upcoming-events/default-mine.js
@@ -3,10 +3,13 @@ import moment from "moment";
import DiscourseRoute from "discourse/routes/discourse";
export default class PostEventUpcomingEventsDefaultMineRoute extends DiscourseRoute {
+ @service currentUser;
@service router;
beforeModel() {
- const today = moment();
+ // Use the user's TZ so the redirect date matches what the calendar will render.
+ const tz = this.currentUser?.user_option?.timezone;
+ const today = tz ? moment.tz(tz) : moment();
const year = today.year();
const month = today.month() + 1; // moment months are 0-indexed, but URLs use 1-indexed
const day = today.date();