Dedupe feed items. Add playlist artwork.

Feed endpoint ignores the client limit for now,
hardcoded to 40 per request.

Currently time span is hardcoded to last 30 days.
Client can either specify a time cursor,
or we could try to expand the time range based on offset param.

There are a few tricky details when expanding the time range
with the de-dupe logic...
Will have to think about that a bit.

Author: stereosteve

api/dbv1/full_playlists.go

@@ -19,6 +19,7 @@ type FullPlaylist struct {
 	FolloweeReposts   []*FolloweeRepost          `json:"followee_reposts"`
 	FolloweeFavorites []*FolloweeFavorite        `json:"followee_favorites"`
 	PlaylistContents  []FullPlaylistContentsItem `json:"playlist_contents"`
+	AddedTimestamps   []FullPlaylistContentsItem `json:"added_timestamps"`
 }
 
 type FullPlaylistContentsItem struct {
@@ -84,15 +85,16 @@ func (q *Queries) FullPlaylistsKeyed(ctx context.Context, arg GetPlaylistsParams
 		}
 
 		playlistMap[playlist.PlaylistID] = FullPlaylist{
-			GetPlaylistsRow: playlist,
-			ID:              id,
-			// Artwork:         squareImageStruct(track.CoverArtSizes, track.CoverArt),
+			GetPlaylistsRow:   playlist,
+			ID:                id,
+			Artwork:           squareImageStruct(playlist.Artwork),
 			User:              user,
 			UserID:            user.ID,
 			Tracks:            tracks,
 			FolloweeFavorites: fullFolloweeFavorites(playlist.FolloweeFavorites),
 			FolloweeReposts:   fullFolloweeReposts(playlist.FolloweeReposts),
 			PlaylistContents:  fullPlaylistContents,
+			AddedTimestamps:   fullPlaylistContents,
 		}
 	}
 

api/dbv1/get_playlists.sql.go

@@ -12,6 +12,8 @@ SELECT
   p.is_stream_gated,
   -- is_streamable,
 
+  coalesce(playlist_image_sizes_multihash, playlist_image_multihash) as artwork,
+
   p.playlist_name,
 
   p.playlist_id,

api/dbv1/queries/get_playlists.sql

@@ -24,11 +24,9 @@ func (app *ApiServer) v1UsersFeed(c *fiber.Ctx) error {
 
 		(
 			SELECT
-				user_id as actor_id,
-				'repost' as verb,
-				repost_type as obj_type,
-				repost_item_id as obj_id,
-				reposts.created_at
+				repost_type as entity_type,
+				repost_item_id as entity_id,
+				min(reposts.created_at) as created_at
 			FROM reposts
 			JOIN follow_set using (user_id)
 			LEFT JOIN tracks
@@ -47,16 +45,15 @@ func (app *ApiServer) v1UsersFeed(c *fiber.Ctx) error {
 				AND reposts.created_at >= @before - INTERVAL '30 DAYS'
 				AND reposts.is_delete = false
 				AND (tracks.track_id IS NOT NULL OR playlists.playlist_id IS NOT NULL)
+			GROUP BY entity_type, entity_id
 		)
 
 		UNION ALL
 
 		(
 			SELECT
-				user_id as actor_id,
-				'post' as verb,
-				'track' as obj_type,
-				track_id as obj_id,
+				'track' as entity_type,
+				track_id as entity_id,
 				created_at
 			from tracks
 			join follow_set on owner_id = user_id
@@ -71,42 +68,44 @@ func (app *ApiServer) v1UsersFeed(c *fiber.Ctx) error {
 
 		(
 			SELECT
-				user_id as actor_id,
-				'post' as verb,
-				'playlist' as obj_type,
-				playlist_id as obj_id,
+				'playlist' as entity_type,
+				playlist_id as entity_id,
 				created_at
 			from playlists
 			join follow_set on playlist_owner_id = user_id
 			where created_at < @before
-				and created_at >= @before::timestamp - INTERVAL '30 DAYS'
+				and created_at >= @before - INTERVAL '30 DAYS'
 				and is_delete = false
 				AND is_private = false
 		)
 
 	)
-	SELECT * FROM history
-	ORDER BY created_at asc
+	SELECT
+		entity_type,
+		entity_id,
+		max(created_at) as created_at
+	FROM history
+	GROUP BY entity_type, entity_id
+	ORDER BY created_at DESC
 	LIMIT @limit
 	OFFSET @offset
 	`
 
 	rows, err := app.pool.Query(c.Context(), sql, pgx.NamedArgs{
 		"userId": c.Locals("userId"),
 		"before": time.Now(),
-		"limit":  c.Query("limit", "50"),
+		// "limit":  c.Query("limit", "50"),
+		"limit":  40,
 		"offset": c.Query("offset", "0"),
 	})
 	if err != nil {
 		return err
 	}
 
 	type FeedItem struct {
-		ActorID   int
-		Verb      string
-		ObjType   string `json:"type"`
-		ObjID     int32
-		CreatedAt time.Time
+		EntityType string    `json:"type"`
+		EntityId   int32     `json:"-"`
+		CreatedAt  time.Time `json:"timestamp"`
 
 		Item any `db:"-" json:"item"`
 	}
@@ -116,17 +115,15 @@ func (app *ApiServer) v1UsersFeed(c *fiber.Ctx) error {
 		return err
 	}
 
-	// todo: remove duplicates
-	// something like:
-	// https://github.com/stereosteve/Elemental/blob/master/server/db/query-feed.ts#L77-L85
+	// todo: remove loose tracks that appear in playlist?
 
 	trackIds := []int32{}
 	playlistIds := []int32{}
 	for _, stub := range stubs {
-		if stub.ObjType == "track" {
-			trackIds = append(trackIds, stub.ObjID)
+		if stub.EntityType == "track" {
+			trackIds = append(trackIds, stub.EntityId)
 		} else {
-			playlistIds = append(playlistIds, stub.ObjID)
+			playlistIds = append(playlistIds, stub.EntityId)
 		}
 	}
 
@@ -140,10 +137,10 @@ func (app *ApiServer) v1UsersFeed(c *fiber.Ctx) error {
 	}
 
 	for idx, stub := range stubs {
-		if stub.ObjType == "track" {
-			stub.Item = loaded.TrackMap[stub.ObjID]
+		if stub.EntityType == "track" {
+			stub.Item = loaded.TrackMap[stub.EntityId]
 		} else {
-			stub.Item = loaded.PlaylistMap[stub.ObjID]
+			stub.Item = loaded.PlaylistMap[stub.EntityId]
 		}
 		stubs[idx] = stub
 	}