From 293bf94632125b34a695dd9e44feba1cfc79e834 Mon Sep 17 00:00:00 2001 From: Randy Schott <1815175+schottra@users.noreply.github.com> Date: Wed, 13 Aug 2025 17:03:40 -0400 Subject: [PATCH] include unlisted in listening history to prevent null items in output --- api/v1_users_history.go | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/api/v1_users_history.go b/api/v1_users_history.go index d33ec345..dc836000 100644 --- a/api/v1_users_history.go +++ b/api/v1_users_history.go @@ -63,15 +63,15 @@ func (app *ApiServer) v1UsersHistory(c *fiber.Ctx) error { sql := ` WITH history AS ( - SELECT - (jsonb_array_elements(listening_history)->>'track_id')::int AS track_id, - (jsonb_array_elements(listening_history)->>'play_count')::int AS play_count, - (jsonb_array_elements(listening_history)->>'timestamp')::timestamp AS timestamp + SELECT + (jsonb_array_elements(listening_history)->>'track_id')::int AS track_id, + (jsonb_array_elements(listening_history)->>'play_count')::int AS play_count, + (jsonb_array_elements(listening_history)->>'timestamp')::timestamp AS timestamp FROM user_listening_history WHERE user_id = @userId ) SELECT history.track_id AS item_id, - history.timestamp AS item_created_at, + history.timestamp AS item_created_at, 'track' AS item_type, @class AS class FROM history @@ -119,8 +119,9 @@ func (app *ApiServer) v1UsersHistory(c *fiber.Ctx) error { // get tracks tracks, err := app.queries.FullTracksKeyed(c.Context(), dbv1.FullTracksParams{ GetTracksParams: dbv1.GetTracksParams{ - Ids: trackIds, - MyID: myId, + Ids: trackIds, + MyID: myId, + IncludeUnlisted: true, }, }) if err != nil {