+
{{ end }} diff --git a/internal/sessions/session.go b/internal/sessions/session.go index 07b4b77..11abcc1 100644 --- a/internal/sessions/session.go +++ b/internal/sessions/session.go @@ -4,6 +4,7 @@ import ( "encoding/json" "fmt" "log/slog" + "math" "time" "github.com/gin-contrib/sessions" @@ -77,9 +78,9 @@ func (s *Session) Current() *SessionMode { return s.History[s.Mode] } -func (s *Session) DateUser(tz int) time.Time { +func (s *Session) DateUser() time.Time { m := s.Current() - return convertUTCToUser(m.Start, tz) + return m.Start } func (s *Session) Save() error { @@ -126,19 +127,43 @@ func (m *SessionMode) CommonGuessPrefix() string { return before[0:minWord] } -func (m *SessionMode) DateUser(tz int) time.Time { - return convertUTCToUser(m.Start, tz) +func (m *SessionMode) DateUser() time.Time { + return m.Start } -func (m *SessionMode) Stale() bool { +var remainingSeedTime time.Time + +func (m *SessionMode) RemainingTime() string { now := time.Now() - return m.Start.Month() != now.Month() || m.Start.Day() != now.Day() + if !remainingSeedTime.IsZero() { + now = remainingSeedTime + } + + tomorrow := time.Date(now.Year(), now.Month(), now.Day()+1, 0, 0, 0, 0, time.UTC) + + // The time between tomorrow (midnight) and right now + interval := tomorrow.Sub(now) + + // Number of hours, floating point precision + hours := math.Floor(interval.Hours()) + + // Subtract the truncated hours=>minutes from the total minutes + minutes := math.Floor(interval.Minutes() - (hours * 60)) + + // Truncate the hours & minutes, and print + hoursStr := "hours" + if hours >= 1 && hours < 2 { + hoursStr = "hour" + } + + minutesStr := "minutes" + if minutes >= 1 && minutes < 2 { + minutesStr = "minute" + } + return fmt.Sprintf("%0.f %s, %0.f %s", hours, hoursStr, minutes, minutesStr) } -// convertUTCToLocal will take a given time in UTC and convert it to a given user's timezone -// TZ for PDT (-7:00) is a positive 420, so SUBTRACT that from the unix timestamp -func convertUTCToUser(t time.Time, tz int) time.Time { - ret := t.In(time.FixedZone("User", tz*-1)) - ret = ret.Add(time.Minute * -1 * time.Duration(tz)) - return ret +func (m *SessionMode) Stale() bool { + now := time.Now() + return m.Start.Month() != now.Month() || m.Start.Day() != now.Day() } diff --git a/internal/sessions/session_test.go b/internal/sessions/session_test.go index 9cb24ce..d9eb430 100644 --- a/internal/sessions/session_test.go +++ b/internal/sessions/session_test.go @@ -95,3 +95,52 @@ func TestSessionMode_Stale(t *testing.T) { }) } } + +func TestSessionMode_RemainingTime(t *testing.T) { + tests := []struct { + name string + remainingSeedTime time.Time + want string + }{ + { + name: "24 hours", + remainingSeedTime: time.Date(2020, time.January, 1, 0, 0, 0, 0, time.UTC), + want: "24 hours, 0 minutes", + }, + { + name: "6 hours, 30 minutes", + remainingSeedTime: time.Date(2020, time.January, 1, 17, 30, 0, 0, time.UTC), + want: "6 hours, 30 minutes", + }, + { + name: "7 hours, 59 minutes", + remainingSeedTime: time.Date(2020, time.January, 1, 16, 1, 0, 0, time.UTC), + want: "7 hours, 59 minutes", + }, + { + name: "1 hour, 1 minute", + remainingSeedTime: time.Date(2020, time.January, 1, 22, 59, 0, 0, time.UTC), + want: "1 hour, 1 minute", + }, + { + name: "0 hours, 1 minute", + remainingSeedTime: time.Date(2020, time.January, 1, 23, 59, 0, 0, time.UTC), + want: "0 hours, 1 minute", + }, + { + name: "Next month", + remainingSeedTime: time.Date(2020, time.January, 31, 0, 0, 0, 0, time.UTC), + want: "24 hours, 0 minutes", + }, + } + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + m := &SessionMode{} + remainingSeedTime = tt.remainingSeedTime + + if got := m.RemainingTime(); got != tt.want { + t.Errorf("SessionMode.RemainingTime() = %v, want %v", got, tt.want) + } + }) + } +} diff --git a/web/tests/guess.spec.ts b/web/tests/guess.spec.ts index 06afeb8..55816e7 100644 --- a/web/tests/guess.spec.ts +++ b/web/tests/guess.spec.ts @@ -7,7 +7,6 @@ const hardYesterday = "gabbroid" test.use({ locale: 'en-US', - timezoneId: 'America/Los_Angeles', }) test('guesses the default word', async ({ page }) => { @@ -53,7 +52,7 @@ test('guesses the default word', async ({ page }) => { // Correct guess await lWordEntry.type(defaultToday) await lWordEntry.press('Enter') - await expect(page.locator('#app')).toContainText('You guessed "' + defaultToday + '" correctly') + await expect(page.locator('#guesser').first()).toContainText('You guessed "' + defaultToday + '" correctly') await expect(lGuessBefore).toHaveText('apple ham') await expect(lGuessAfter).toHaveText('yam zoo') }) @@ -101,7 +100,7 @@ test('guesses the hard word', async ({ page }) => { // Correct guess await lWordEntry.type(hardToday) await lWordEntry.press('Enter') - await expect(page.locator('#app')).toContainText('You guessed "' + hardToday + '" correctly') + await expect(page.locator('#guesser').first()).toContainText('You guessed "' + hardToday + '" correctly') await expect(lGuessBefore).toHaveText('apple cherry') await expect(lGuessAfter).toHaveText('tree trunk') })