maybe actually fixed now

internal/db/opts.go

@@ -134,6 +134,7 @@ type ListenActivityOpts struct {
 	Range    int
 	Month    int
 	Year     int
+	Timezone *time.Location
 	AlbumID  int32
 	ArtistID int32
 	TrackID  int32

internal/db/period.go

@@ -58,16 +58,17 @@ const (
 // If opts.Year (or opts.Year + opts.Month) is provided, start and end will simply by the start and end times of that year/month.
 func ListenActivityOptsToTimes(opts ListenActivityOpts) (start, end time.Time) {
 	now := time.Now()
+	loc := opts.Timezone
 
 	// If Year (and optionally Month) are specified, use calendar boundaries
 	if opts.Year != 0 {
 		if opts.Month != 0 {
 			// Specific month of a specific year
-			start = time.Date(opts.Year, time.Month(opts.Month), 1, 0, 0, 0, 0, now.Location())
+			start = time.Date(opts.Year, time.Month(opts.Month), 1, 0, 0, 0, 0, loc)
 			end = start.AddDate(0, 1, 0).Add(-time.Nanosecond)
 		} else {
 			// Whole year
-			start = time.Date(opts.Year, 1, 1, 0, 0, 0, 0, now.Location())
+			start = time.Date(opts.Year, 1, 1, 0, 0, 0, 0, loc)
 			end = start.AddDate(1, 0, 0).Add(-time.Nanosecond)
 		}
 		return start, end
@@ -79,30 +80,30 @@ func ListenActivityOptsToTimes(opts ListenActivityOpts) (start, end time.Time) {
 	// Determine step and align accordingly
 	switch opts.Step {
 	case StepDay:
-		today := time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, now.Location())
+		today := time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, loc)
 		start = today.AddDate(0, 0, -opts.Range)
 		end = today.AddDate(0, 0, 1).Add(-time.Nanosecond)
 
 	case StepWeek:
 		// Align to most recent Sunday
 		weekday := int(now.Weekday()) // Sunday = 0
-		startOfThisWeek := time.Date(now.Year(), now.Month(), now.Day()-weekday, 0, 0, 0, 0, now.Location())
+		startOfThisWeek := time.Date(now.Year(), now.Month(), now.Day()-weekday, 0, 0, 0, 0, loc)
 		start = startOfThisWeek.AddDate(0, 0, -7*opts.Range)
 		end = startOfThisWeek.AddDate(0, 0, 7).Add(-time.Nanosecond)
 
 	case StepMonth:
-		firstOfThisMonth := time.Date(now.Year(), now.Month(), 1, 0, 0, 0, 0, now.Location())
+		firstOfThisMonth := time.Date(now.Year(), now.Month(), 1, 0, 0, 0, 0, loc)
 		start = firstOfThisMonth.AddDate(0, -opts.Range, 0)
 		end = firstOfThisMonth.AddDate(0, 1, 0).Add(-time.Nanosecond)
 
 	case StepYear:
-		firstOfThisYear := time.Date(now.Year(), 1, 1, 0, 0, 0, 0, now.Location())
+		firstOfThisYear := time.Date(now.Year(), 1, 1, 0, 0, 0, 0, loc)
 		start = firstOfThisYear.AddDate(-opts.Range, 0, 0)
 		end = firstOfThisYear.AddDate(1, 0, 0).Add(-time.Nanosecond)
 
 	default:
 		// Default to daily
-		today := time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, now.Location())
+		today := time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, loc)
 		start = today.AddDate(0, 0, -opts.Range)
 		end = today.AddDate(0, 0, 1).Add(-time.Nanosecond)
 	}

internal/db/psql/listen_activity.go

@@ -8,7 +8,6 @@ import (
 	"github.com/gabehf/koito/internal/db"
 	"github.com/gabehf/koito/internal/logger"
 	"github.com/gabehf/koito/internal/repository"
-	"github.com/jackc/pgx/v5/pgtype"
 )
 
 func (d *Psql) GetListenActivity(ctx context.Context, opts db.ListenActivityOpts) ([]db.ListenActivityItem, error) {
@@ -26,10 +25,10 @@ func (d *Psql) GetListenActivity(ctx context.Context, opts db.ListenActivityOpts
 		l.Debug().Msgf("Fetching listen activity for %d %s(s) from %v to %v for release group %d",
 			opts.Range, opts.Step, t1.Format("Jan 02, 2006 15:04:05"), t2.Format("Jan 02, 2006 15:04:05"), opts.AlbumID)
 		rows, err := d.q.ListenActivityForRelease(ctx, repository.ListenActivityForReleaseParams{
-			Column1:   t1,
-			Column2:   t2,
-			Column3:   stepToInterval(opts.Step),
-			ReleaseID: opts.AlbumID,
+			Column1:      opts.Timezone.String(),
+			ListenedAt:   t1,
+			ListenedAt_2: t2,
+			ReleaseID:    opts.AlbumID,
 		})
 		if err != nil {
 			return nil, fmt.Errorf("GetListenActivity: ListenActivityForRelease: %w", err)
@@ -37,7 +36,7 @@ func (d *Psql) GetListenActivity(ctx context.Context, opts db.ListenActivityOpts
 		listenActivity = make([]db.ListenActivityItem, len(rows))
 		for i, row := range rows {
 			t := db.ListenActivityItem{
-				Start:   row.BucketStart,
+				Start:   row.Day.Time,
 				Listens: row.ListenCount,
 			}
 			listenActivity[i] = t
@@ -47,10 +46,10 @@ func (d *Psql) GetListenActivity(ctx context.Context, opts db.ListenActivityOpts
 		l.Debug().Msgf("Fetching listen activity for %d %s(s) from %v to %v for artist %d",
 			opts.Range, opts.Step, t1.Format("Jan 02, 2006 15:04:05"), t2.Format("Jan 02, 2006 15:04:05"), opts.ArtistID)
 		rows, err := d.q.ListenActivityForArtist(ctx, repository.ListenActivityForArtistParams{
-			Column1:  t1,
-			Column2:  t2,
-			Column3:  stepToInterval(opts.Step),
-			ArtistID: opts.ArtistID,
+			Column1:      opts.Timezone.String(),
+			ListenedAt:   t1,
+			ListenedAt_2: t2,
+			ArtistID:     opts.ArtistID,
 		})
 		if err != nil {
 			return nil, fmt.Errorf("GetListenActivity: ListenActivityForArtist: %w", err)
@@ -58,7 +57,7 @@ func (d *Psql) GetListenActivity(ctx context.Context, opts db.ListenActivityOpts
 		listenActivity = make([]db.ListenActivityItem, len(rows))
 		for i, row := range rows {
 			t := db.ListenActivityItem{
-				Start:   row.BucketStart,
+				Start:   row.Day.Time,
 				Listens: row.ListenCount,
 			}
 			listenActivity[i] = t
@@ -68,10 +67,10 @@ func (d *Psql) GetListenActivity(ctx context.Context, opts db.ListenActivityOpts
 		l.Debug().Msgf("Fetching listen activity for %d %s(s) from %v to %v for track %d",
 			opts.Range, opts.Step, t1.Format("Jan 02, 2006 15:04:05"), t2.Format("Jan 02, 2006 15:04:05"), opts.TrackID)
 		rows, err := d.q.ListenActivityForTrack(ctx, repository.ListenActivityForTrackParams{
-			Column1: t1,
-			Column2: t2,
-			Column3: stepToInterval(opts.Step),
-			ID:      opts.TrackID,
+			Column1:      opts.Timezone.String(),
+			ListenedAt:   t1,
+			ListenedAt_2: t2,
+			ID:           opts.TrackID,
 		})
 		if err != nil {
 			return nil, fmt.Errorf("GetListenActivity: ListenActivityForTrack: %w", err)
@@ -79,7 +78,7 @@ func (d *Psql) GetListenActivity(ctx context.Context, opts db.ListenActivityOpts
 		listenActivity = make([]db.ListenActivityItem, len(rows))
 		for i, row := range rows {
 			t := db.ListenActivityItem{
-				Start:   row.BucketStart,
+				Start:   row.Day.Time,
 				Listens: row.ListenCount,
 			}
 			listenActivity[i] = t
@@ -89,9 +88,9 @@ func (d *Psql) GetListenActivity(ctx context.Context, opts db.ListenActivityOpts
 		l.Debug().Msgf("Fetching listen activity for %d %s(s) from %v to %v",
 			opts.Range, opts.Step, t1.Format("Jan 02, 2006 15:04:05"), t2.Format("Jan 02, 2006 15:04:05"))
 		rows, err := d.q.ListenActivity(ctx, repository.ListenActivityParams{
-			Column1: pgtype.Date{Time: t1, Valid: true},
-			Column2: pgtype.Date{Time: t2, Valid: true},
-			Column3: stepToInterval(opts.Step),
+			Column1:      opts.Timezone.String(),
+			ListenedAt:   t1,
+			ListenedAt_2: t2,
 		})
 		if err != nil {
 			return nil, fmt.Errorf("GetListenActivity: ListenActivity: %w", err)
@@ -99,7 +98,7 @@ func (d *Psql) GetListenActivity(ctx context.Context, opts db.ListenActivityOpts
 		listenActivity = make([]db.ListenActivityItem, len(rows))
 		for i, row := range rows {
 			t := db.ListenActivityItem{
-				Start:   row.BucketedListensBucketStartDate,
+				Start:   row.Day.Time,
 				Listens: row.ListenCount,
 			}
 			listenActivity[i] = t

internal/db/timeframe.go

@@ -13,11 +13,12 @@ type Timeframe struct {
 	ToUnix   int64
 	From     time.Time
 	To       time.Time
+	Timezone *time.Location
 }
 
 func TimeframeToTimeRange(tf Timeframe) (t1, t2 time.Time) {
 	now := time.Now()
-	loc := now.Location()
+	loc := tf.Timezone
 
 	// ---------------------------------------------------------------------
 	// 1. Explicit From / To (time.Time) — highest precedence