Merge feature/self-exclusion-fixes: no self in discover/search/follow

Author: mayur-tolexo

internal/creators/handlers.go

@@ -34,6 +34,15 @@ func discoverCreators(svc *Service, sm *auth.SessionManager) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		limit := queryInt(r, "limit")
 		offset := queryInt(r, "offset")
+		// Optional viewer session → excludes the viewer from results (self never
+		// appears in their own discover/search) and fills isFollowing per row.
+		// Anonymous viewer → 0, which the query treats as "exclude nobody".
+		var viewerID int64
+		if sm != nil {
+			if id, err := sm.GetUser(r); err == nil {
+				viewerID = id
+			}
+		}
 		// q present (after trim) → search; absent/empty → popularity-ranked discover.
 		// Both return DiscoverCreatorsRow, so the marshal path below is shared.
 		q := strings.TrimSpace(r.URL.Query().Get("q"))
@@ -42,21 +51,14 @@ func discoverCreators(svc *Service, sm *auth.SessionManager) http.HandlerFunc {
 			err  error
 		)
 		if q != "" {
-			rows, err = svc.SearchCreators(r.Context(), q, limit, offset)
+			rows, err = svc.SearchCreators(r.Context(), viewerID, q, limit, offset)
 		} else {
-			rows, err = svc.DiscoverCreators(r.Context(), limit, offset)
+			rows, err = svc.DiscoverCreators(r.Context(), viewerID, limit, offset)
 		}
 		if err != nil {
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 			return
 		}
-		// Optional viewer session → fill isFollowing per row.
-		var viewerID int64
-		if sm != nil {
-			if id, err := sm.GetUser(r); err == nil {
-				viewerID = id
-			}
-		}
 		out := make([]CreatorJSON, 0, len(rows))
 		for _, row := range rows {
 			out = append(out, MarshalCreator(row, svc.IsFollowing(r.Context(), viewerID, row.ID)))

internal/creators/marshal.go

@@ -14,10 +14,16 @@ type CreatorJSON struct {
 	CartCount     int    `json:"cartCount"`
 	FollowerCount int    `json:"followerCount"`
 	IsFollowing   bool   `json:"isFollowing"`
+	// IsSelf is true only on the profile endpoint when the logged-in viewer is
+	// the creator. It is always false for discover/search rows (the viewer is
+	// excluded from those at the query level).
+	IsSelf bool `json:"isSelf"`
 }
 
 // MarshalCreator converts a DiscoverCreators row into the frontend CreatorJSON
 // shape. isFollowing is supplied by the handler (it depends on the viewer).
+// isSelf is always false here: the viewer is excluded from discover/search at
+// the query level, so a row can never be the viewer themselves.
 func MarshalCreator(row sqlcgen.DiscoverCreatorsRow, isFollowing bool) CreatorJSON {
 	return CreatorJSON{
 		Handle:        pgTextStr(row.Handle),
@@ -26,20 +32,23 @@ func MarshalCreator(row sqlcgen.DiscoverCreatorsRow, isFollowing bool) CreatorJS
 		CartCount:     int(row.CartCount),
 		FollowerCount: int(row.FollowerCount),
 		IsFollowing:   isFollowing,
+		IsSelf:        false,
 	}
 }
 
 // MarshalCreatorProfile converts a user row plus its counts into CreatorJSON.
 // Used by the profile endpoint, where cartCount/followerCount are computed
-// alongside the carts rather than coming from the discover aggregate.
-func MarshalCreatorProfile(u sqlcgen.User, cartCount, followerCount int, isFollowing bool) CreatorJSON {
+// alongside the carts rather than coming from the discover aggregate. isSelf is
+// set when the viewer is the creator (the frontend then hides the Follow button).
+func MarshalCreatorProfile(u sqlcgen.User, cartCount, followerCount int, isFollowing, isSelf bool) CreatorJSON {
 	return CreatorJSON{
 		Handle:        pgTextStr(u.Handle),
 		DisplayName:   u.DisplayName,
 		AvatarURL:     pgTextStr(u.AvatarUrl),
 		CartCount:     cartCount,
 		FollowerCount: followerCount,
 		IsFollowing:   isFollowing,
+		IsSelf:        isSelf,
 	}
 }
 

internal/creators/service.go

@@ -54,25 +54,29 @@ func clampPage(limit, offset int32) (int32, int32) {
 }
 
 // DiscoverCreators returns creators (users with >=1 public cart) ranked by
-// 7-day cart views. isFollowing is left false here; the handler fills it in
-// per viewer (or leaves it false for anonymous viewers).
-func (s *Service) DiscoverCreators(ctx context.Context, limit, offset int32) ([]sqlcgen.DiscoverCreatorsRow, error) {
+// 7-day cart views, excluding viewerID (the logged-in viewer never appears in
+// their own discover list; an anonymous viewer passes 0, which matches no real
+// user). isFollowing is left false here; the handler fills it in per viewer (or
+// leaves it false for anonymous viewers).
+func (s *Service) DiscoverCreators(ctx context.Context, viewerID int64, limit, offset int32) ([]sqlcgen.DiscoverCreatorsRow, error) {
 	limit, offset = clampPage(limit, offset)
-	return s.q.DiscoverCreators(ctx, sqlcgen.DiscoverCreatorsParams{Limit: limit, Offset: offset})
+	return s.q.DiscoverCreators(ctx, sqlcgen.DiscoverCreatorsParams{ViewerID: viewerID, Lim: limit, Off: offset})
 }
 
 // SearchCreators returns creators (users with >=1 public cart) whose handle or
-// display name matches q, ranked prefix-first then by 7-day cart views. It
-// mirrors DiscoverCreators' pagination and returns the same row type so the
+// display name matches q, ranked prefix-first then by 7-day cart views,
+// excluding viewerID (same self-exclusion as DiscoverCreators; 0 = anonymous).
+// It mirrors DiscoverCreators' pagination and returns the same row type so the
 // handler reuses one marshal path; isFollowing is filled per viewer there.
-func (s *Service) SearchCreators(ctx context.Context, q string, limit, offset int32) ([]sqlcgen.DiscoverCreatorsRow, error) {
+func (s *Service) SearchCreators(ctx context.Context, viewerID int64, q string, limit, offset int32) ([]sqlcgen.DiscoverCreatorsRow, error) {
 	limit, offset = clampPage(limit, offset)
 	esc := escapeLike(strings.TrimSpace(q))
 	rows, err := s.q.SearchCreators(ctx, sqlcgen.SearchCreatorsParams{
-		Pattern: pgText("%" + esc + "%"),
-		Prefix:  pgText(esc + "%"),
-		Lim:     limit,
-		Off:     offset,
+		ViewerID: viewerID,
+		Pattern:  pgText("%" + esc + "%"),
+		Prefix:   pgText(esc + "%"),
+		Lim:      limit,
+		Off:      offset,
 	})
 	if err != nil {
 		return nil, err
@@ -133,8 +137,11 @@ func (s *Service) GetCreatorProfile(ctx context.Context, handle string, viewerID
 		return CreatorJSON{}, nil, err
 	}
 	isFollowing := s.IsFollowing(ctx, viewerID, user.ID)
+	// isSelf is true only when a logged-in viewer (non-zero) is viewing their own
+	// profile — the frontend hides the Follow button in that case.
+	isSelf := viewerID != 0 && viewerID == user.ID
 
-	creator = MarshalCreatorProfile(user, len(cartRows), int(followerCount), isFollowing)
+	creator = MarshalCreatorProfile(user, len(cartRows), int(followerCount), isFollowing, isSelf)
 	return creator, cartsJSON, nil
 }
 

internal/creators/service_test.go

@@ -137,13 +137,38 @@ func TestService_DiscoverOnlyCreatorsWithPublicCarts(t *testing.T) {
 	pc := publicCart(t, env.cartsSvc, privateOnly, "Bob Secret")
 	makePrivate(t, env.cartsSvc, privateOnly, pc.ID)
 
-	rows, err := env.svc.DiscoverCreators(ctx, 50, 0)
+	// viewerID 0 → anonymous → excludes nobody.
+	rows, err := env.svc.DiscoverCreators(ctx, 0, 50, 0)
 	require.NoError(t, err)
 	require.Len(t, rows, 1)
 	assert.Equal(t, withPublic, rows[0].ID)
 	assert.Equal(t, int64(1), rows[0].CartCount)
 }
 
+func TestService_DiscoverExcludesViewer(t *testing.T) {
+	env := setupSvc(t)
+	ctx := context.Background()
+
+	viewer := newUser(t, env.q, "g-dv1", "viewer@example.com", "Viewer")
+	other := newUser(t, env.q, "g-dv2", "other@example.com", "Other")
+	publicCart(t, env.cartsSvc, viewer, "Viewer Cart")
+	publicCart(t, env.cartsSvc, other, "Other Cart")
+
+	// Logged-out (viewerID 0) sees both creators.
+	anon, err := env.svc.DiscoverCreators(ctx, 0, 50, 0)
+	require.NoError(t, err)
+	require.Len(t, anon, 2)
+	assert.True(t, containsID(anon, viewer))
+	assert.True(t, containsID(anon, other))
+
+	// Logged-in viewer is excluded from their own discover list.
+	rows, err := env.svc.DiscoverCreators(ctx, viewer, 50, 0)
+	require.NoError(t, err)
+	require.Len(t, rows, 1)
+	assert.Equal(t, other, rows[0].ID)
+	assert.False(t, containsID(rows, viewer), "viewer must not appear in their own discover list")
+}
+
 func TestService_DiscoverOrderedBy7dViews(t *testing.T) {
 	env := setupSvc(t)
 	ctx := context.Background()
@@ -156,7 +181,7 @@ func TestService_DiscoverOrderedBy7dViews(t *testing.T) {
 	seedViews(t, env.pool, lowCart.ID, 3)
 	seedViews(t, env.pool, highCart.ID, 99)
 
-	rows, err := env.svc.DiscoverCreators(ctx, 50, 0)
+	rows, err := env.svc.DiscoverCreators(ctx, 0, 50, 0)
 	require.NoError(t, err)
 	require.Len(t, rows, 2)
 	assert.Equal(t, high, rows[0].ID, "highest 7-day views should rank first")
@@ -185,12 +210,35 @@ func TestService_SearchByHandleSubstring(t *testing.T) {
 	publicCart(t, env.cartsSvc, other, "F Cart")
 
 	// "eld" is a substring of the handle "zelda" but not of "frank".
-	rows, err := env.svc.SearchCreators(ctx, "eld", 50, 0)
+	rows, err := env.svc.SearchCreators(ctx, 0, "eld", 50, 0)
 	require.NoError(t, err)
 	require.Len(t, rows, 1)
 	assert.Equal(t, match, rows[0].ID)
 }
 
+func TestService_SearchExcludesViewer(t *testing.T) {
+	env := setupSvc(t)
+	ctx := context.Background()
+
+	// Both handles contain the "nova" token; the viewer must be excluded.
+	viewer := newUser(t, env.q, "g-sv1", "nova-me@example.com", "Nova Me")
+	other := newUser(t, env.q, "g-sv2", "nova-you@example.com", "Nova You")
+	publicCart(t, env.cartsSvc, viewer, "Viewer Cart")
+	publicCart(t, env.cartsSvc, other, "Other Cart")
+
+	// Logged-out (viewerID 0) matches both.
+	anon, err := env.svc.SearchCreators(ctx, 0, "nova", 50, 0)
+	require.NoError(t, err)
+	require.Len(t, anon, 2)
+
+	// Logged-in viewer is excluded from their own search results.
+	rows, err := env.svc.SearchCreators(ctx, viewer, "nova", 50, 0)
+	require.NoError(t, err)
+	require.Len(t, rows, 1)
+	assert.Equal(t, other, rows[0].ID)
+	assert.False(t, containsID(rows, viewer), "viewer must not appear in their own search results")
+}
+
 func TestService_SearchByDisplayNameCaseInsensitive(t *testing.T) {
 	env := setupSvc(t)
 	ctx := context.Background()
@@ -202,7 +250,7 @@ func TestService_SearchByDisplayNameCaseInsensitive(t *testing.T) {
 
 	// Lowercase query matches the display name "Aurora Borealis" case-insensitively
 	// (and does not match the handle "user1").
-	rows, err := env.svc.SearchCreators(ctx, "aurora", 50, 0)
+	rows, err := env.svc.SearchCreators(ctx, 0, "aurora", 50, 0)
 	require.NoError(t, err)
 	require.Len(t, rows, 1)
 	assert.Equal(t, match, rows[0].ID)
@@ -223,7 +271,7 @@ func TestService_SearchPrefixRanksAboveSubstring(t *testing.T) {
 	seedViews(t, env.pool, prefixCart.ID, 1)
 	seedViews(t, env.pool, substrCart.ID, 99)
 
-	rows, err := env.svc.SearchCreators(ctx, "sun", 50, 0)
+	rows, err := env.svc.SearchCreators(ctx, 0, "sun", 50, 0)
 	require.NoError(t, err)
 	require.Len(t, rows, 2)
 	assert.Equal(t, prefix, rows[0].ID, "prefix match ranks above substring despite fewer views")
@@ -245,7 +293,7 @@ func TestService_SearchExcludesPrivateOnlyAndBanned(t *testing.T) {
 	publicCart(t, env.cartsSvc, banned, "Nova Banned Cart")
 	banUser(t, env.pool, banned)
 
-	rows, err := env.svc.SearchCreators(ctx, "nova", 50, 0)
+	rows, err := env.svc.SearchCreators(ctx, 0, "nova", 50, 0)
 	require.NoError(t, err)
 	require.Len(t, rows, 1, "only the creator with a public cart, not banned")
 	assert.Equal(t, withPublic, rows[0].ID)
@@ -263,14 +311,14 @@ func TestService_SearchEscapesWildcards(t *testing.T) {
 	publicCart(t, env.cartsSvc, b, "Bravo Cart")
 
 	// A bare "%" must be treated as a literal (escaped), not a match-all wildcard.
-	rows, err := env.svc.SearchCreators(ctx, "%", 50, 0)
+	rows, err := env.svc.SearchCreators(ctx, 0, "%", 50, 0)
 	require.NoError(t, err)
 	assert.Empty(t, rows, "literal %% should not match every creator")
 	assert.False(t, containsID(rows, a))
 	assert.False(t, containsID(rows, b))
 
 	// "_" is likewise literal: it must not single-character-wildcard-match.
-	rows, err = env.svc.SearchCreators(ctx, "_", 50, 0)
+	rows, err = env.svc.SearchCreators(ctx, 0, "_", 50, 0)
 	require.NoError(t, err)
 	assert.Empty(t, rows, "literal _ should not match")
 }
@@ -299,10 +347,21 @@ func TestService_GetCreatorProfile(t *testing.T) {
 	assert.Equal(t, 1, profile.CartCount, "only the public, non-archived cart counts")
 	assert.Equal(t, 1, profile.FollowerCount)
 	assert.True(t, profile.IsFollowing)
+	assert.False(t, profile.IsSelf, "a different viewer is not the profile owner")
 	require.Len(t, cartsJSON, 1)
 	assert.Equal(t, "Visible", cartsJSON[0].Title)
 	// Public context must not leak analytics.
 	assert.Equal(t, 0, cartsJSON[0].ViewsLast7d)
+
+	// Anonymous viewer (0) is never self.
+	anon, _, err := env.svc.GetCreatorProfile(ctx, "priya", 0)
+	require.NoError(t, err)
+	assert.False(t, anon.IsSelf, "anonymous viewer is never the profile owner")
+
+	// The creator viewing their own profile → isSelf true.
+	own, _, err := env.svc.GetCreatorProfile(ctx, "priya", creator)
+	require.NoError(t, err)
+	assert.True(t, own.IsSelf, "the owner viewing their own profile is self")
 }
 
 func TestService_GetCreatorProfile_UnknownHandle(t *testing.T) {

internal/db/queries.sql

@@ -212,7 +212,8 @@ ORDER BY created_at DESC;
 -- name: DiscoverCreators :many
 -- Creators (users with >=1 public, non-archived cart) ranked by 7-day cart
 -- views. cart_count counts public carts; follower_count via correlated
--- subquery to avoid join fan-out.
+-- subquery to avoid join fan-out. viewer_id excludes the logged-in viewer from
+-- their own results (a logged-out viewer passes 0, which matches no real user).
 SELECT
   u.id,
   u.handle,
@@ -227,9 +228,10 @@ JOIN carts c
 LEFT JOIN cart_views_daily cv
   ON cv.cart_id = c.id AND cv.day >= current_date - 6
 WHERE u.banned_at IS NULL AND u.handle IS NOT NULL
+  AND u.id <> sqlc.arg(viewer_id)
 GROUP BY u.id, u.handle, u.display_name, u.avatar_url
 ORDER BY views_7d DESC, MAX(c.updated_at) DESC, u.id
-LIMIT $1 OFFSET $2;
+LIMIT sqlc.arg(lim) OFFSET sqlc.arg(off);
 
 -- name: SearchCreators :many
 -- Creators (>=1 public, non-archived cart) whose handle or display name matches
@@ -250,6 +252,7 @@ JOIN carts c
 LEFT JOIN cart_views_daily cv
   ON cv.cart_id = c.id AND cv.day >= current_date - 6
 WHERE u.banned_at IS NULL AND u.handle IS NOT NULL
+  AND u.id <> sqlc.arg(viewer_id)
   AND (u.handle ILIKE sqlc.arg(pattern) OR u.display_name ILIKE sqlc.arg(pattern))
 GROUP BY u.id, u.handle, u.display_name, u.avatar_url
 ORDER BY