feed filters + fix followee_reposts

Author: stereosteve

api/dbv1/get_tracks.sql.go

@@ -70,7 +70,7 @@ SELECT
     FROM (
       SELECT user_id, repost_item_id, reposts.created_at
       FROM reposts
-      JOIN follows ON followee_user_id = reposts.user_id AND follower_user_id = @my_id
+      JOIN follows ON followee_user_id = reposts.user_id AND follower_user_id = @my_id AND follows.is_delete = false
       JOIN aggregate_user USING (user_id)
       WHERE repost_item_id = t.track_id
         AND repost_type = 'track'
@@ -92,7 +92,7 @@ SELECT
     FROM (
       SELECT user_id, save_item_id, saves.created_at
       FROM saves
-      JOIN follows ON followee_user_id = saves.user_id AND follower_user_id = @my_id
+      JOIN follows ON followee_user_id = saves.user_id AND follower_user_id = @my_id AND follows.is_delete = false
       JOIN aggregate_user USING (user_id)
       WHERE save_item_id = t.track_id
         AND save_type = 'track'

api/dbv1/queries/get_tracks.sql

@@ -8,9 +8,12 @@ import (
 	"github.com/jackc/pgx/v5"
 )
 
-// todo: some dedupe stuff
+// todo: time range beyond 30 days
+// - how + when to expand time range,
+// - how to de-dupe items from appearing twice when expanding time range... is tricky
 func (app *ApiServer) v1UsersFeed(c *fiber.Ctx) error {
 	myId := app.getMyId(c)
+
 	sql := `
 	WITH
 	follow_set AS (
@@ -41,7 +44,8 @@ func (app *ApiServer) v1UsersFeed(c *fiber.Ctx) error {
 				AND playlists.is_delete = false
 				AND playlists.is_private = false
 			WHERE
-				reposts.created_at < @before
+				@filter in ('all', 'repost')
+				AND reposts.created_at < @before
 				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)
@@ -57,11 +61,12 @@ func (app *ApiServer) v1UsersFeed(c *fiber.Ctx) error {
 				created_at
 			from tracks
 			join follow_set on owner_id = user_id
-			where created_at < @before
-				and created_at >= @before::timestamp - INTERVAL '30 DAYS'
-				and is_unlisted = false
-				and is_delete = false
-				and stem_of is null
+			where @filter in ('all', 'original')
+				AND created_at < @before
+				AND created_at >= @before::timestamp - INTERVAL '30 DAYS'
+				AND is_unlisted = false
+				AND is_delete = false
+				AND stem_of is null
 		)
 
 		UNION ALL
@@ -73,9 +78,10 @@ func (app *ApiServer) v1UsersFeed(c *fiber.Ctx) error {
 				created_at
 			from playlists
 			join follow_set on playlist_owner_id = user_id
-			where created_at < @before
-				and created_at >= @before - INTERVAL '30 DAYS'
-				and is_delete = false
+			where @filter in ('all', 'original')
+				AND created_at < @before
+				AND created_at >= @before - INTERVAL '30 DAYS'
+				AND is_delete = false
 				AND is_private = false
 		)
 
@@ -97,6 +103,7 @@ func (app *ApiServer) v1UsersFeed(c *fiber.Ctx) error {
 		// "limit":  c.Query("limit", "50"),
 		"limit":  40,
 		"offset": c.Query("offset", "0"),
+		"filter": c.Query("filter", "all"), // original, repost
 	})
 	if err != nil {
 		return err