feat: timezone awarenwss

2026-03-18 01:35:09 +00:00
parent a85ac23a6b
commit db5d23c2ac
12 changed files with 406 additions and 64 deletions
@@ -134,19 +134,6 @@ func handleCreate(s *discordgo.Session, i *discordgo.InteractionCreate) {
 		return
 	}

-	whenStr = strings.TrimSpace(whenStr)
-	if whenStr == "" {
-		shared.RespondEphemeral(s, i, "Datetime cannot be empty.")
-		return
-	}
-
-	// Expect layout "2006-01-02 15:04" in UTC.
-	when, err := time.ParseInLocation("2006-01-02 15:04", whenStr, time.UTC)
-	if err != nil {
-		shared.RespondEphemeral(s, i, "Invalid datetime format. Use `2006-01-02 15:04` in UTC.")
-		return
-	}
-
 	requesterID, err := strconv.ParseInt(i.Member.User.ID, 10, 64)
 	if err != nil {
 		shared.RespondEphemeral(s, i, "Invalid user ID.")
@@ -158,6 +145,26 @@ func handleCreate(s *discordgo.Session, i *discordgo.InteractionCreate) {
 		return
 	}

+	whenStr = strings.TrimSpace(whenStr)
+	if whenStr == "" {
+		shared.RespondEphemeral(s, i, "Datetime cannot be empty.")
+		return
+	}
+
+	// Resolve requester's timezone and parse input using explicit layout in that zone.
+	loc, zone, _, err := services.Global.UserSettings.GetTimezone(context.Background(), requesterID)
+	if err != nil {
+		loc = time.UTC
+		zone = "UTC"
+	}
+	// Expect layout "2006-01-02 15:04" in the user's timezone.
+	when, err := time.ParseInLocation("2006-01-02 15:04", whenStr, loc)
+	if err != nil {
+		shared.RespondEphemeral(s, i, "Invalid datetime. Use `2006-01-02 15:04` in your timezone ("+zone+").")
+		return
+	}
+	when = when.In(time.UTC)
+
 	ctx := context.Background()
 	scheduleID, err := services.Global.Schedule.CreateSchedule(ctx, guildID, requesterID, inviteeID, when, desc)
 	if err != nil {
@@ -176,11 +183,23 @@ func handleCreate(s *discordgo.Session, i *discordgo.InteractionCreate) {
 		Title:       "New session request",
 		Description: fmt.Sprintf("You have been invited to a session by <@%s>.", i.Member.User.ID),
 		Color:       0x4caf50,
-		Fields: []*discordgo.MessageEmbedField{
-			{
-				Name:  "When (UTC)",
-				Value: when.Format("2006-01-02 15:04"),
-			},
+	}
+	// Show both UTC and invitee-local time if available.
+	utcStr := when.Format("2006-01-02 15:04")
+	locInv, zoneInv, _, err := services.Global.UserSettings.GetTimezone(context.Background(), inviteeID)
+	if err != nil {
+		locInv = time.UTC
+		zoneInv = "UTC"
+	}
+	localInvStr := when.In(locInv).Format("2006-01-02 15:04")
+	embed.Fields = []*discordgo.MessageEmbedField{
+		{
+			Name:  "When (UTC)",
+			Value: utcStr,
+		},
+		{
+			Name:  "When (" + zoneInv + ")",
+			Value: localInvStr,
 		},
 	}
 	if desc != "" {
@@ -298,12 +317,6 @@ func handleReschedule(s *discordgo.Session, i *discordgo.InteractionCreate) {
 		return
 	}

-	when, err := time.ParseInLocation("2006-01-02 15:04", whenStr, time.UTC)
-	if err != nil {
-		shared.RespondEphemeral(s, i, "Invalid datetime format. Use `2006-01-02 15:04` in UTC.")
-		return
-	}
-
 	userID, err := strconv.ParseInt(i.Member.User.ID, 10, 64)
 	if err != nil {
 		shared.RespondEphemeral(s, i, "Invalid user ID.")
@@ -325,6 +338,20 @@ func handleReschedule(s *discordgo.Session, i *discordgo.InteractionCreate) {
 		return
 	}

+	// Use rescheduler's timezone for parsing.
+	loc, zone, _, err := services.Global.UserSettings.GetTimezone(ctx, userID)
+	if err != nil {
+		loc = time.UTC
+		zone = "UTC"
+	}
+	// Expect explicit layout "2006-01-02 15:04" in user's timezone.
+	when, err := time.ParseInLocation("2006-01-02 15:04", whenStr, loc)
+	if err != nil {
+		shared.RespondEphemeral(s, i, "Invalid datetime. Use `2006-01-02 15:04` in your timezone ("+zone+").")
+		return
+	}
+	when = when.In(time.UTC)
+
 	if err := services.Global.Schedule.Reschedule(ctx, sch.ID, when); err != nil {
 		shared.RespondEphemeral(s, i, "Failed to reschedule session.")
 		return
@@ -338,12 +365,18 @@ func handleReschedule(s *discordgo.Session, i *discordgo.InteractionCreate) {
 		otherID = sch.RequesterID
 	}

-	// DM both about the change
-	msg := fmt.Sprintf("Session `%d` has been rescheduled to %s UTC with <@%d>.", sch.ID, whenFmt, otherID)
-	if sch.Description != "" {
-		msg += "\nTopic: " + sch.Description
-	}
+	// DM both about the change, including their local times if available.
 	for _, uid := range []int64{sch.RequesterID, sch.InviteeID} {
+		locU, zoneU, _, err := services.Global.UserSettings.GetTimezone(ctx, uid)
+		if err != nil {
+			locU = time.UTC
+			zoneU = "UTC"
+		}
+		localU := when.In(locU).Format("2006-01-02 15:04")
+		msg := fmt.Sprintf("Session `%d` has been rescheduled to %s UTC (%s %s) with <@%d>.", sch.ID, whenFmt, localU, zoneU, otherID)
+		if sch.Description != "" {
+			msg += "\nTopic: " + sch.Description
+		}
 		ch, err := s.UserChannelCreate(strconv.FormatInt(uid, 10))
 		if err != nil {
 			continue
@@ -361,11 +394,22 @@ func handleReschedule(s *discordgo.Session, i *discordgo.InteractionCreate) {
 				Title:       "Rescheduled session",
 				Description: fmt.Sprintf("Session `%d` has been rescheduled by <@%s>.", sch.ID, i.Member.User.ID),
 				Color:       0xffc107,
-				Fields: []*discordgo.MessageEmbedField{
-					{
-						Name:  "When (UTC)",
-						Value: whenFmt,
-					},
+			}
+			// Show both UTC and invitee-local time if available.
+			locInv, zoneInv, _, errTZ := services.Global.UserSettings.GetTimezone(ctx, sch.InviteeID)
+			if errTZ != nil {
+				locInv = time.UTC
+				zoneInv = "UTC"
+			}
+			localInvStr := when.In(locInv).Format("2006-01-02 15:04")
+			embed.Fields = []*discordgo.MessageEmbedField{
+				{
+					Name:  "When (UTC)",
+					Value: whenFmt,
+				},
+				{
+					Name:  "When (" + zoneInv + ")",
+					Value: localInvStr,
 				},
 			}
 			if sch.Description != "" {