feat(api): embed pending collaborator invites on the owner's own tracks#947

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
raymondjacobson merged 1 commit into from
Jun 10, 2026
Merged

feat(api): embed pending collaborator invites on the owner's own tracks #947

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions api/dbv1/queries/track_collaborators.sql
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
-- Accepted collaborators for a set of tracks, used to embed a `collaborators`
-- array on track responses. Returns one row per (track, collaborator); the Go
-- layer bulk-resolves the user objects. Backed by the track_collaborators
-- primary key (track_id leads), so the ANY(...) lookup is index-served.
-- Accepted and pending collaborators for a set of tracks, used to embed a
-- `collaborators` array (accepted) on every track response and a
-- `pending_collaborators` array on the owner's own tracks. Returns one row per
-- (track, collaborator) with status; the Go layer splits by status and
-- bulk-resolves the user objects. Backed by the track_collaborators primary key
-- (track_id leads), so the ANY(...) lookup is index-served.
-- name: GetTrackCollaborators :many
SELECT track_id, collaborator_user_id
SELECT track_id, collaborator_user_id, status
FROM track_collaborators
WHERE track_id = ANY(@track_ids::int[])
AND status = 'accepted'
AND status IN ('accepted', 'pending')
ORDER BY track_id, created_at;

-- A user's collaborator invites/credits, optionally filtered by status
Expand Down
21 changes: 12 additions & 9 deletions api/dbv1/track_collaborators.sql.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

73 changes: 52 additions & 21 deletions api/dbv1/tracks.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,10 @@ type Track struct {
UserID trashid.HashId `json:"user_id"`
User User `json:"user"`
Collaborators []User `json:"collaborators"`
Access Access `json:"access"`
// PendingCollaborators is populated only on the requester's own tracks (so
// the owner's edit form can preserve still-pending invites); empty otherwise.
PendingCollaborators []User `json:"pending_collaborators"`
Access Access `json:"access"`

FolloweeReposts []*FolloweeRepost `json:"followee_reposts"`
FolloweeFavorites []*FolloweeFavorite `json:"followee_favorites"`
Expand DownExpand Up@@ -70,16 +73,35 @@ func (q *Queries) TracksKeyed(ctx context.Context, arg TracksParams) (map[int32]
collectSplitUserIds(rawTrack.DownloadConditions)
}

// Fetch accepted collaborators for these tracks in one query, and fold
// their user IDs into the bulk user fetch below so each is fully resolved.
// Fetch accepted + pending collaborators for these tracks in one query, and
// fold their user IDs into the bulk user fetch below so each is fully
// resolved. Accepted are embedded on every response; pending are embedded
// only on the requester's own tracks (for the owner's edit form), so their
// user IDs are only resolved for owned tracks.
myID := arg.MyID.(int32)
ownedTracks := map[int32]bool{}
for _, rawTrack := range rawTracks {
if rawTrack.UserID == myID {
ownedTracks[rawTrack.TrackID] = true
}
}
collaboratorRows, err := q.GetTrackCollaborators(ctx, trackIds)
if err != nil {
return nil, err
}
collaboratorsByTrack := map[int32][]int32{}
pendingByTrack := map[int32][]int32{}
for _, cr := range collaboratorRows {
collaboratorsByTrack[cr.TrackID] = append(collaboratorsByTrack[cr.TrackID], cr.CollaboratorUserID)
userIds = append(userIds, cr.CollaboratorUserID)
switch cr.Status {
case "accepted":
collaboratorsByTrack[cr.TrackID] = append(collaboratorsByTrack[cr.TrackID], cr.CollaboratorUserID)
userIds = append(userIds, cr.CollaboratorUserID)
case "pending":
if ownedTracks[cr.TrackID] {
pendingByTrack[cr.TrackID] = append(pendingByTrack[cr.TrackID], cr.CollaboratorUserID)
userIds = append(userIds, cr.CollaboratorUserID)
}
}
}

userMap, err := q.UsersKeyed(ctx, GetUsersParams{
Expand DownExpand Up@@ -153,6 +175,14 @@ func (q *Queries) TracksKeyed(ctx context.Context, arg TracksParams) (map[int32]
}
}

// Resolve pending collaborators (only present for the owner's own tracks).
pendingCollaborators := []User{}
for _, cid := range pendingByTrack[rawTrack.TrackID] {
if cu, ok := userMap[cid]; ok {
pendingCollaborators = append(pendingCollaborators, cu)
}
}

// Get access from the bulk access map
access := accessMap[rawTrack.TrackID]

Expand DownExpand Up@@ -193,22 +223,23 @@ func (q *Queries) TracksKeyed(ctx context.Context, arg TracksParams) (map[int32]
}

track := Track{
GetTracksRow: rawTrack,
IsStreamable: !rawTrack.IsDelete && !user.IsDeactivated,
Permalink: fmt.Sprintf("/%s/%s", user.Handle.String, rawTrack.Slug.String),
Artwork: squareImageStruct(rawTrack.CoverArtSizes, rawTrack.CoverArt),
Stream: stream,
Download: download,
Preview: preview,
User: user,
UserID: user.ID,
Collaborators: collaborators,
FolloweeFavorites: fullFolloweeFavorites(rawTrack.FolloweeFavorites),
FolloweeReposts: fullFolloweeReposts(rawTrack.FolloweeReposts),
RemixOf: fullRemixOf,
StreamConditions: rawTrack.StreamConditions,
DownloadConditions: rawTrack.DownloadConditions,
Access: access,
GetTracksRow: rawTrack,
IsStreamable: !rawTrack.IsDelete && !user.IsDeactivated,
Permalink: fmt.Sprintf("/%s/%s", user.Handle.String, rawTrack.Slug.String),
Artwork: squareImageStruct(rawTrack.CoverArtSizes, rawTrack.CoverArt),
Stream: stream,
Download: download,
Preview: preview,
User: user,
UserID: user.ID,
Collaborators: collaborators,
PendingCollaborators: pendingCollaborators,
FolloweeFavorites: fullFolloweeFavorites(rawTrack.FolloweeFavorites),
FolloweeReposts: fullFolloweeReposts(rawTrack.FolloweeReposts),
RemixOf: fullRemixOf,
StreamConditions: rawTrack.StreamConditions,
DownloadConditions: rawTrack.DownloadConditions,
Access: access,
}
trackMap[rawTrack.TrackID] = track
}
Expand Down
10 changes: 10 additions & 0 deletions api/swagger/swagger-v1.yaml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -14958,6 +14958,11 @@ components:
description: Accepted collaborator artists on the track.
items:
$ref: "#/components/schemas/user"
pending_collaborators:
type: array
description: Pending collaborator invites; only present on the owner's own tracks.
items:
$ref: "#/components/schemas/user"
duration:
type: integer
is_downloadable:
Expand DownExpand Up@@ -16439,6 +16444,11 @@ components:
description: Accepted collaborator artists on the track.
items:
$ref: "#/components/schemas/user"
pending_collaborators:
type: array
description: Pending collaborator invites; only present on the owner's own tracks.
items:
$ref: "#/components/schemas/user"
duration:
type: integer
is_downloadable:
Expand Down
30 changes: 30 additions & 0 deletions api/v1_track_collaborators_test.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -174,3 +174,33 @@ func TestCollaboratorSeesPrivateTrack(t *testing.T) {
assert.NoError(t, err)
assert.Len(t, rows, 0, "a rejected collaborator must not see the private track")
}

// Pending collaborator invites are embedded only on the owner's own tracks (so
// their edit form can preserve them); accepted collaborators stay public.
func TestPendingCollaboratorsVisibleToOwnerOnly(t *testing.T) {
app := testAppWithFixtures(t)
ctx := context.Background()

// Track 700 is owned by user 500: user 1 accepted, user 2 still pending.
now := time.Now()
database.SeedTable(app.pool.Replicas[0], "track_collaborators", []map[string]any{
{"track_id": 700, "collaborator_user_id": 1, "invited_by": 500, "status": "accepted", "created_at": now, "updated_at": now},
{"track_id": 700, "collaborator_user_id": 2, "invited_by": 500, "status": "pending", "created_at": now, "updated_at": now},
})

// As the owner (my_id = 500): accepted embedded + pending visible.
owned, err := app.queries.TracksKeyed(ctx, dbv1.TracksParams{
GetTracksParams: dbv1.GetTracksParams{Ids: []int32{700}, MyID: int32(500)},
})
assert.NoError(t, err)
assert.Len(t, owned[700].Collaborators, 1, "accepted collaborator is embedded")
assert.Len(t, owned[700].PendingCollaborators, 1, "owner sees the pending invite")

// As a non-owner (my_id = 1): accepted still embedded, pending hidden.
other, err := app.queries.TracksKeyed(ctx, dbv1.TracksParams{
GetTracksParams: dbv1.GetTracksParams{Ids: []int32{700}, MyID: int32(1)},
})
assert.NoError(t, err)
assert.Len(t, other[700].Collaborators, 1, "accepted collaborator stays public")
assert.Len(t, other[700].PendingCollaborators, 0, "pending invite is hidden from non-owners")
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
feat(api): embed pending collaborator invites on the owner's own tracks#947

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

raymondjacobson
merged 1 commit into

from

Jun 10, 2026
 Merged


feat(api): embed pending collaborator invites on the owner's own tracks
#947
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


14 changes: 8 additions & 6 deletions
api/dbv1/queries/track_collaborators.sql

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
-- Accepted collaborators for a set of tracks, used to embed a `collaborators`
-- array on track responses. Returns one row per (track, collaborator); the Go
-- layer bulk-resolves the user objects. Backed by the track_collaborators
-- primary key (track_id leads), so the ANY(...) lookup is index-served.
-- Accepted and pending collaborators for a set of tracks, used to embed a
-- `collaborators` array (accepted) on every track response and a
-- `pending_collaborators` array on the owner's own tracks. Returns one row per
-- (track, collaborator) with status; the Go layer splits by status and
-- bulk-resolves the user objects. Backed by the track_collaborators primary key
-- (track_id leads), so the ANY(...) lookup is index-served.
-- name: GetTrackCollaborators :many
SELECT track_id, collaborator_user_id
SELECT track_id, collaborator_user_id, status
FROM track_collaborators
WHERE track_id = ANY(@track_ids::int[])
 AND status = 'accepted'
 AND status IN ('accepted', 'pending')
ORDER BY track_id, created_at;

-- A user's collaborator invites/credits, optionally filtered by status
Expand Down

21 changes: 12 additions & 9 deletions
api/dbv1/track_collaborators.sql.go

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


73 changes: 52 additions & 21 deletions
api/dbv1/tracks.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,10 @@ type Track struct {
	UserID trashid.HashId `json:"user_id"`
	User User `json:"user"`
	Collaborators []User `json:"collaborators"`
	Access Access `json:"access"`
	// PendingCollaborators is populated only on the requester's own tracks (so
	// the owner's edit form can preserve still-pending invites); empty otherwise.
	PendingCollaborators []User `json:"pending_collaborators"`
	Access Access `json:"access"`

	FolloweeReposts []*FolloweeRepost `json:"followee_reposts"`
	FolloweeFavorites []*FolloweeFavorite `json:"followee_favorites"`
Expand DownExpand Up@@ -70,16 +73,35 @@ func (q *Queries) TracksKeyed(ctx context.Context, arg TracksParams) (map[int32]
 collectSplitUserIds(rawTrack.DownloadConditions)
	}

	// Fetch accepted collaborators for these tracks in one query, and fold
	// their user IDs into the bulk user fetch below so each is fully resolved.
	// Fetch accepted + pending collaborators for these tracks in one query, and
	// fold their user IDs into the bulk user fetch below so each is fully
	// resolved. Accepted are embedded on every response; pending are embedded
	// only on the requester's own tracks (for the owner's edit form), so their
	// user IDs are only resolved for owned tracks.
	myID := arg.MyID.(int32)
	ownedTracks := map[int32]bool{}
	for _, rawTrack := range rawTracks {
 if rawTrack.UserID == myID {
 ownedTracks[rawTrack.TrackID] = true
 }
	}
	collaboratorRows, err := q.GetTrackCollaborators(ctx, trackIds)
	if err != nil {
 return nil, err
	}
	collaboratorsByTrack := map[int32][]int32{}
	pendingByTrack := map[int32][]int32{}
	for _, cr := range collaboratorRows {
 collaboratorsByTrack[cr.TrackID] = append(collaboratorsByTrack[cr.TrackID], cr.CollaboratorUserID)
 userIds = append(userIds, cr.CollaboratorUserID)
 switch cr.Status {
 case "accepted":
 collaboratorsByTrack[cr.TrackID] = append(collaboratorsByTrack[cr.TrackID], cr.CollaboratorUserID)
 userIds = append(userIds, cr.CollaboratorUserID)
 case "pending":
 if ownedTracks[cr.TrackID] {
 pendingByTrack[cr.TrackID] = append(pendingByTrack[cr.TrackID], cr.CollaboratorUserID)
 userIds = append(userIds, cr.CollaboratorUserID)
 }
 }
	}

	userMap, err := q.UsersKeyed(ctx, GetUsersParams{
Expand DownExpand Up@@ -153,6 +175,14 @@ func (q *Queries) TracksKeyed(ctx context.Context, arg TracksParams) (map[int32]
 }
 }

 // Resolve pending collaborators (only present for the owner's own tracks).
 pendingCollaborators := []User{}
 for _, cid := range pendingByTrack[rawTrack.TrackID] {
 if cu, ok := userMap[cid]; ok {
 pendingCollaborators = append(pendingCollaborators, cu)
 }
 }

 // Get access from the bulk access map
 access := accessMap[rawTrack.TrackID]

Expand DownExpand Up@@ -193,22 +223,23 @@ func (q *Queries) TracksKeyed(ctx context.Context, arg TracksParams) (map[int32]
 }

 track := Track{
 GetTracksRow: rawTrack,
 IsStreamable: !rawTrack.IsDelete && !user.IsDeactivated,
 Permalink: fmt.Sprintf("/%s/%s", user.Handle.String, rawTrack.Slug.String),
 Artwork: squareImageStruct(rawTrack.CoverArtSizes, rawTrack.CoverArt),
 Stream: stream,
 Download: download,
 Preview: preview,
 User: user,
 UserID: user.ID,
 Collaborators: collaborators,
 FolloweeFavorites: fullFolloweeFavorites(rawTrack.FolloweeFavorites),
 FolloweeReposts: fullFolloweeReposts(rawTrack.FolloweeReposts),
 RemixOf: fullRemixOf,
 StreamConditions: rawTrack.StreamConditions,
 DownloadConditions: rawTrack.DownloadConditions,
 Access: access,
 GetTracksRow: rawTrack,
 IsStreamable: !rawTrack.IsDelete && !user.IsDeactivated,
 Permalink: fmt.Sprintf("/%s/%s", user.Handle.String, rawTrack.Slug.String),
 Artwork: squareImageStruct(rawTrack.CoverArtSizes, rawTrack.CoverArt),
 Stream: stream,
 Download: download,
 Preview: preview,
 User: user,
 UserID: user.ID,
 Collaborators: collaborators,
 PendingCollaborators: pendingCollaborators,
 FolloweeFavorites: fullFolloweeFavorites(rawTrack.FolloweeFavorites),
 FolloweeReposts: fullFolloweeReposts(rawTrack.FolloweeReposts),
 RemixOf: fullRemixOf,
 StreamConditions: rawTrack.StreamConditions,
 DownloadConditions: rawTrack.DownloadConditions,
 Access: access,
 }
 trackMap[rawTrack.TrackID] = track
	}
Expand Down

10 changes: 10 additions & 0 deletions
api/swagger/swagger-v1.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14958,6 +14958,11 @@ components:
 description: Accepted collaborator artists on the track.
 items:
 $ref: "#/components/schemas/user"
 pending_collaborators:
 type: array
 description: Pending collaborator invites; only present on the owner's own tracks.
 items:
 $ref: "#/components/schemas/user"
 duration:
 type: integer
 is_downloadable:
Expand DownExpand Up@@ -16439,6 +16444,11 @@ components:
 description: Accepted collaborator artists on the track.
 items:
 $ref: "#/components/schemas/user"
 pending_collaborators:
 type: array
 description: Pending collaborator invites; only present on the owner's own tracks.
 items:
 $ref: "#/components/schemas/user"
 duration:
 type: integer
 is_downloadable:
Expand Down

30 changes: 30 additions & 0 deletions
api/v1_track_collaborators_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -174,3 +174,33 @@ func TestCollaboratorSeesPrivateTrack(t *testing.T) {
	assert.NoError(t, err)
	assert.Len(t, rows, 0, "a rejected collaborator must not see the private track")
}

// Pending collaborator invites are embedded only on the owner's own tracks (so
// their edit form can preserve them); accepted collaborators stay public.
func TestPendingCollaboratorsVisibleToOwnerOnly(t *testing.T) {
	app := testAppWithFixtures(t)
	ctx := context.Background()

	// Track 700 is owned by user 500: user 1 accepted, user 2 still pending.
	now := time.Now()
	database.SeedTable(app.pool.Replicas[0], "track_collaborators", []map[string]any{
 {"track_id": 700, "collaborator_user_id": 1, "invited_by": 500, "status": "accepted", "created_at": now, "updated_at": now},
 {"track_id": 700, "collaborator_user_id": 2, "invited_by": 500, "status": "pending", "created_at": now, "updated_at": now},
	})

	// As the owner (my_id = 500): accepted embedded + pending visible.
	owned, err := app.queries.TracksKeyed(ctx, dbv1.TracksParams{
 GetTracksParams: dbv1.GetTracksParams{Ids: []int32{700}, MyID: int32(500)},
	})
	assert.NoError(t, err)
	assert.Len(t, owned[700].Collaborators, 1, "accepted collaborator is embedded")
	assert.Len(t, owned[700].PendingCollaborators, 1, "owner sees the pending invite")

	// As a non-owner (my_id = 1): accepted still embedded, pending hidden.
	other, err := app.queries.TracksKeyed(ctx, dbv1.TracksParams{
 GetTracksParams: dbv1.GetTracksParams{Ids: []int32{700}, MyID: int32(1)},
	})
	assert.NoError(t, err)
	assert.Len(t, other[700].Collaborators, 1, "accepted collaborator stays public")
	assert.Len(t, other[700].PendingCollaborators, 0, "pending invite is hidden from non-owners")
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
feat(api): embed pending collaborator invites on the owner's own tracks#947

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

raymondjacobson
merged 1 commit into

from

Jun 10, 2026
 Merged


feat(api): embed pending collaborator invites on the owner's own tracks
#947
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


14 changes: 8 additions & 6 deletions
api/dbv1/queries/track_collaborators.sql

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
-- Accepted collaborators for a set of tracks, used to embed a `collaborators`
-- array on track responses. Returns one row per (track, collaborator); the Go
-- layer bulk-resolves the user objects. Backed by the track_collaborators
-- primary key (track_id leads), so the ANY(...) lookup is index-served.
-- Accepted and pending collaborators for a set of tracks, used to embed a
-- `collaborators` array (accepted) on every track response and a
-- `pending_collaborators` array on the owner's own tracks. Returns one row per
-- (track, collaborator) with status; the Go layer splits by status and
-- bulk-resolves the user objects. Backed by the track_collaborators primary key
-- (track_id leads), so the ANY(...) lookup is index-served.
-- name: GetTrackCollaborators :many
SELECT track_id, collaborator_user_id
SELECT track_id, collaborator_user_id, status
FROM track_collaborators
WHERE track_id = ANY(@track_ids::int[])
 AND status = 'accepted'
 AND status IN ('accepted', 'pending')
ORDER BY track_id, created_at;

-- A user's collaborator invites/credits, optionally filtered by status
Expand Down

21 changes: 12 additions & 9 deletions
api/dbv1/track_collaborators.sql.go

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


73 changes: 52 additions & 21 deletions
api/dbv1/tracks.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,10 @@ type Track struct {
	UserID trashid.HashId `json:"user_id"`
	User User `json:"user"`
	Collaborators []User `json:"collaborators"`
	Access Access `json:"access"`
	// PendingCollaborators is populated only on the requester's own tracks (so
	// the owner's edit form can preserve still-pending invites); empty otherwise.
	PendingCollaborators []User `json:"pending_collaborators"`
	Access Access `json:"access"`

	FolloweeReposts []*FolloweeRepost `json:"followee_reposts"`
	FolloweeFavorites []*FolloweeFavorite `json:"followee_favorites"`
Expand DownExpand Up@@ -70,16 +73,35 @@ func (q *Queries) TracksKeyed(ctx context.Context, arg TracksParams) (map[int32]
 collectSplitUserIds(rawTrack.DownloadConditions)
	}

	// Fetch accepted collaborators for these tracks in one query, and fold
	// their user IDs into the bulk user fetch below so each is fully resolved.
	// Fetch accepted + pending collaborators for these tracks in one query, and
	// fold their user IDs into the bulk user fetch below so each is fully
	// resolved. Accepted are embedded on every response; pending are embedded
	// only on the requester's own tracks (for the owner's edit form), so their
	// user IDs are only resolved for owned tracks.
	myID := arg.MyID.(int32)
	ownedTracks := map[int32]bool{}
	for _, rawTrack := range rawTracks {
 if rawTrack.UserID == myID {
 ownedTracks[rawTrack.TrackID] = true
 }
	}
	collaboratorRows, err := q.GetTrackCollaborators(ctx, trackIds)
	if err != nil {
 return nil, err
	}
	collaboratorsByTrack := map[int32][]int32{}
	pendingByTrack := map[int32][]int32{}
	for _, cr := range collaboratorRows {
 collaboratorsByTrack[cr.TrackID] = append(collaboratorsByTrack[cr.TrackID], cr.CollaboratorUserID)
 userIds = append(userIds, cr.CollaboratorUserID)
 switch cr.Status {
 case "accepted":
 collaboratorsByTrack[cr.TrackID] = append(collaboratorsByTrack[cr.TrackID], cr.CollaboratorUserID)
 userIds = append(userIds, cr.CollaboratorUserID)
 case "pending":
 if ownedTracks[cr.TrackID] {
 pendingByTrack[cr.TrackID] = append(pendingByTrack[cr.TrackID], cr.CollaboratorUserID)
 userIds = append(userIds, cr.CollaboratorUserID)
 }
 }
	}

	userMap, err := q.UsersKeyed(ctx, GetUsersParams{
Expand DownExpand Up@@ -153,6 +175,14 @@ func (q *Queries) TracksKeyed(ctx context.Context, arg TracksParams) (map[int32]
 }
 }

 // Resolve pending collaborators (only present for the owner's own tracks).
 pendingCollaborators := []User{}
 for _, cid := range pendingByTrack[rawTrack.TrackID] {
 if cu, ok := userMap[cid]; ok {
 pendingCollaborators = append(pendingCollaborators, cu)
 }
 }

 // Get access from the bulk access map
 access := accessMap[rawTrack.TrackID]

Expand DownExpand Up@@ -193,22 +223,23 @@ func (q *Queries) TracksKeyed(ctx context.Context, arg TracksParams) (map[int32]
 }

 track := Track{
 GetTracksRow: rawTrack,
 IsStreamable: !rawTrack.IsDelete && !user.IsDeactivated,
 Permalink: fmt.Sprintf("/%s/%s", user.Handle.String, rawTrack.Slug.String),
 Artwork: squareImageStruct(rawTrack.CoverArtSizes, rawTrack.CoverArt),
 Stream: stream,
 Download: download,
 Preview: preview,
 User: user,
 UserID: user.ID,
 Collaborators: collaborators,
 FolloweeFavorites: fullFolloweeFavorites(rawTrack.FolloweeFavorites),
 FolloweeReposts: fullFolloweeReposts(rawTrack.FolloweeReposts),
 RemixOf: fullRemixOf,
 StreamConditions: rawTrack.StreamConditions,
 DownloadConditions: rawTrack.DownloadConditions,
 Access: access,
 GetTracksRow: rawTrack,
 IsStreamable: !rawTrack.IsDelete && !user.IsDeactivated,
 Permalink: fmt.Sprintf("/%s/%s", user.Handle.String, rawTrack.Slug.String),
 Artwork: squareImageStruct(rawTrack.CoverArtSizes, rawTrack.CoverArt),
 Stream: stream,
 Download: download,
 Preview: preview,
 User: user,
 UserID: user.ID,
 Collaborators: collaborators,
 PendingCollaborators: pendingCollaborators,
 FolloweeFavorites: fullFolloweeFavorites(rawTrack.FolloweeFavorites),
 FolloweeReposts: fullFolloweeReposts(rawTrack.FolloweeReposts),
 RemixOf: fullRemixOf,
 StreamConditions: rawTrack.StreamConditions,
 DownloadConditions: rawTrack.DownloadConditions,
 Access: access,
 }
 trackMap[rawTrack.TrackID] = track
	}
Expand Down

10 changes: 10 additions & 0 deletions
api/swagger/swagger-v1.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14958,6 +14958,11 @@ components:
 description: Accepted collaborator artists on the track.
 items:
 $ref: "#/components/schemas/user"
 pending_collaborators:
 type: array
 description: Pending collaborator invites; only present on the owner's own tracks.
 items:
 $ref: "#/components/schemas/user"
 duration:
 type: integer
 is_downloadable:
Expand DownExpand Up@@ -16439,6 +16444,11 @@ components:
 description: Accepted collaborator artists on the track.
 items:
 $ref: "#/components/schemas/user"
 pending_collaborators:
 type: array
 description: Pending collaborator invites; only present on the owner's own tracks.
 items:
 $ref: "#/components/schemas/user"
 duration:
 type: integer
 is_downloadable:
Expand Down

30 changes: 30 additions & 0 deletions
api/v1_track_collaborators_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -174,3 +174,33 @@ func TestCollaboratorSeesPrivateTrack(t *testing.T) {
	assert.NoError(t, err)
	assert.Len(t, rows, 0, "a rejected collaborator must not see the private track")
}

// Pending collaborator invites are embedded only on the owner's own tracks (so
// their edit form can preserve them); accepted collaborators stay public.
func TestPendingCollaboratorsVisibleToOwnerOnly(t *testing.T) {
	app := testAppWithFixtures(t)
	ctx := context.Background()

	// Track 700 is owned by user 500: user 1 accepted, user 2 still pending.
	now := time.Now()
	database.SeedTable(app.pool.Replicas[0], "track_collaborators", []map[string]any{
 {"track_id": 700, "collaborator_user_id": 1, "invited_by": 500, "status": "accepted", "created_at": now, "updated_at": now},
 {"track_id": 700, "collaborator_user_id": 2, "invited_by": 500, "status": "pending", "created_at": now, "updated_at": now},
	})

	// As the owner (my_id = 500): accepted embedded + pending visible.
	owned, err := app.queries.TracksKeyed(ctx, dbv1.TracksParams{
 GetTracksParams: dbv1.GetTracksParams{Ids: []int32{700}, MyID: int32(500)},
	})
	assert.NoError(t, err)
	assert.Len(t, owned[700].Collaborators, 1, "accepted collaborator is embedded")
	assert.Len(t, owned[700].PendingCollaborators, 1, "owner sees the pending invite")

	// As a non-owner (my_id = 1): accepted still embedded, pending hidden.
	other, err := app.queries.TracksKeyed(ctx, dbv1.TracksParams{
 GetTracksParams: dbv1.GetTracksParams{Ids: []int32{700}, MyID: int32(1)},
	})
	assert.NoError(t, err)
	assert.Len(t, other[700].Collaborators, 1, "accepted collaborator stays public")
	assert.Len(t, other[700].PendingCollaborators, 0, "pending invite is hidden from non-owners")
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
feat(api): embed pending collaborator invites on the owner's own tracks#947

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

raymondjacobson
merged 1 commit into

from

Jun 10, 2026
 Merged


feat(api): embed pending collaborator invites on the owner's own tracks
#947
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


14 changes: 8 additions & 6 deletions
api/dbv1/queries/track_collaborators.sql

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
-- Accepted collaborators for a set of tracks, used to embed a `collaborators`
-- array on track responses. Returns one row per (track, collaborator); the Go
-- layer bulk-resolves the user objects. Backed by the track_collaborators
-- primary key (track_id leads), so the ANY(...) lookup is index-served.
-- Accepted and pending collaborators for a set of tracks, used to embed a
-- `collaborators` array (accepted) on every track response and a
-- `pending_collaborators` array on the owner's own tracks. Returns one row per
-- (track, collaborator) with status; the Go layer splits by status and
-- bulk-resolves the user objects. Backed by the track_collaborators primary key
-- (track_id leads), so the ANY(...) lookup is index-served.
-- name: GetTrackCollaborators :many
SELECT track_id, collaborator_user_id
SELECT track_id, collaborator_user_id, status
FROM track_collaborators
WHERE track_id = ANY(@track_ids::int[])
 AND status = 'accepted'
 AND status IN ('accepted', 'pending')
ORDER BY track_id, created_at;

-- A user's collaborator invites/credits, optionally filtered by status
Expand Down

21 changes: 12 additions & 9 deletions
api/dbv1/track_collaborators.sql.go

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


73 changes: 52 additions & 21 deletions
api/dbv1/tracks.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,10 @@ type Track struct {
	UserID trashid.HashId `json:"user_id"`
	User User `json:"user"`
	Collaborators []User `json:"collaborators"`
	Access Access `json:"access"`
	// PendingCollaborators is populated only on the requester's own tracks (so
	// the owner's edit form can preserve still-pending invites); empty otherwise.
	PendingCollaborators []User `json:"pending_collaborators"`
	Access Access `json:"access"`

	FolloweeReposts []*FolloweeRepost `json:"followee_reposts"`
	FolloweeFavorites []*FolloweeFavorite `json:"followee_favorites"`
Expand DownExpand Up@@ -70,16 +73,35 @@ func (q *Queries) TracksKeyed(ctx context.Context, arg TracksParams) (map[int32]
 collectSplitUserIds(rawTrack.DownloadConditions)
	}

	// Fetch accepted collaborators for these tracks in one query, and fold
	// their user IDs into the bulk user fetch below so each is fully resolved.
	// Fetch accepted + pending collaborators for these tracks in one query, and
	// fold their user IDs into the bulk user fetch below so each is fully
	// resolved. Accepted are embedded on every response; pending are embedded
	// only on the requester's own tracks (for the owner's edit form), so their
	// user IDs are only resolved for owned tracks.
	myID := arg.MyID.(int32)
	ownedTracks := map[int32]bool{}
	for _, rawTrack := range rawTracks {
 if rawTrack.UserID == myID {
 ownedTracks[rawTrack.TrackID] = true
 }
	}
	collaboratorRows, err := q.GetTrackCollaborators(ctx, trackIds)
	if err != nil {
 return nil, err
	}
	collaboratorsByTrack := map[int32][]int32{}
	pendingByTrack := map[int32][]int32{}
	for _, cr := range collaboratorRows {
 collaboratorsByTrack[cr.TrackID] = append(collaboratorsByTrack[cr.TrackID], cr.CollaboratorUserID)
 userIds = append(userIds, cr.CollaboratorUserID)
 switch cr.Status {
 case "accepted":
 collaboratorsByTrack[cr.TrackID] = append(collaboratorsByTrack[cr.TrackID], cr.CollaboratorUserID)
 userIds = append(userIds, cr.CollaboratorUserID)
 case "pending":
 if ownedTracks[cr.TrackID] {
 pendingByTrack[cr.TrackID] = append(pendingByTrack[cr.TrackID], cr.CollaboratorUserID)
 userIds = append(userIds, cr.CollaboratorUserID)
 }
 }
	}

	userMap, err := q.UsersKeyed(ctx, GetUsersParams{
Expand DownExpand Up@@ -153,6 +175,14 @@ func (q *Queries) TracksKeyed(ctx context.Context, arg TracksParams) (map[int32]
 }
 }

 // Resolve pending collaborators (only present for the owner's own tracks).
 pendingCollaborators := []User{}
 for _, cid := range pendingByTrack[rawTrack.TrackID] {
 if cu, ok := userMap[cid]; ok {
 pendingCollaborators = append(pendingCollaborators, cu)
 }
 }

 // Get access from the bulk access map
 access := accessMap[rawTrack.TrackID]

Expand DownExpand Up@@ -193,22 +223,23 @@ func (q *Queries) TracksKeyed(ctx context.Context, arg TracksParams) (map[int32]
 }

 track := Track{
 GetTracksRow: rawTrack,
 IsStreamable: !rawTrack.IsDelete && !user.IsDeactivated,
 Permalink: fmt.Sprintf("/%s/%s", user.Handle.String, rawTrack.Slug.String),
 Artwork: squareImageStruct(rawTrack.CoverArtSizes, rawTrack.CoverArt),
 Stream: stream,
 Download: download,
 Preview: preview,
 User: user,
 UserID: user.ID,
 Collaborators: collaborators,
 FolloweeFavorites: fullFolloweeFavorites(rawTrack.FolloweeFavorites),
 FolloweeReposts: fullFolloweeReposts(rawTrack.FolloweeReposts),
 RemixOf: fullRemixOf,
 StreamConditions: rawTrack.StreamConditions,
 DownloadConditions: rawTrack.DownloadConditions,
 Access: access,
 GetTracksRow: rawTrack,
 IsStreamable: !rawTrack.IsDelete && !user.IsDeactivated,
 Permalink: fmt.Sprintf("/%s/%s", user.Handle.String, rawTrack.Slug.String),
 Artwork: squareImageStruct(rawTrack.CoverArtSizes, rawTrack.CoverArt),
 Stream: stream,
 Download: download,
 Preview: preview,
 User: user,
 UserID: user.ID,
 Collaborators: collaborators,
 PendingCollaborators: pendingCollaborators,
 FolloweeFavorites: fullFolloweeFavorites(rawTrack.FolloweeFavorites),
 FolloweeReposts: fullFolloweeReposts(rawTrack.FolloweeReposts),
 RemixOf: fullRemixOf,
 StreamConditions: rawTrack.StreamConditions,
 DownloadConditions: rawTrack.DownloadConditions,
 Access: access,
 }
 trackMap[rawTrack.TrackID] = track
	}
Expand Down

10 changes: 10 additions & 0 deletions
api/swagger/swagger-v1.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14958,6 +14958,11 @@ components:
 description: Accepted collaborator artists on the track.
 items:
 $ref: "#/components/schemas/user"
 pending_collaborators:
 type: array
 description: Pending collaborator invites; only present on the owner's own tracks.
 items:
 $ref: "#/components/schemas/user"
 duration:
 type: integer
 is_downloadable:
Expand DownExpand Up@@ -16439,6 +16444,11 @@ components:
 description: Accepted collaborator artists on the track.
 items:
 $ref: "#/components/schemas/user"
 pending_collaborators:
 type: array
 description: Pending collaborator invites; only present on the owner's own tracks.
 items:
 $ref: "#/components/schemas/user"
 duration:
 type: integer
 is_downloadable:
Expand Down

30 changes: 30 additions & 0 deletions
api/v1_track_collaborators_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -174,3 +174,33 @@ func TestCollaboratorSeesPrivateTrack(t *testing.T) {
	assert.NoError(t, err)
	assert.Len(t, rows, 0, "a rejected collaborator must not see the private track")
}

// Pending collaborator invites are embedded only on the owner's own tracks (so
// their edit form can preserve them); accepted collaborators stay public.
func TestPendingCollaboratorsVisibleToOwnerOnly(t *testing.T) {
	app := testAppWithFixtures(t)
	ctx := context.Background()

	// Track 700 is owned by user 500: user 1 accepted, user 2 still pending.
	now := time.Now()
	database.SeedTable(app.pool.Replicas[0], "track_collaborators", []map[string]any{
 {"track_id": 700, "collaborator_user_id": 1, "invited_by": 500, "status": "accepted", "created_at": now, "updated_at": now},
 {"track_id": 700, "collaborator_user_id": 2, "invited_by": 500, "status": "pending", "created_at": now, "updated_at": now},
	})

	// As the owner (my_id = 500): accepted embedded + pending visible.
	owned, err := app.queries.TracksKeyed(ctx, dbv1.TracksParams{
 GetTracksParams: dbv1.GetTracksParams{Ids: []int32{700}, MyID: int32(500)},
	})
	assert.NoError(t, err)
	assert.Len(t, owned[700].Collaborators, 1, "accepted collaborator is embedded")
	assert.Len(t, owned[700].PendingCollaborators, 1, "owner sees the pending invite")

	// As a non-owner (my_id = 1): accepted still embedded, pending hidden.
	other, err := app.queries.TracksKeyed(ctx, dbv1.TracksParams{
 GetTracksParams: dbv1.GetTracksParams{Ids: []int32{700}, MyID: int32(1)},
	})
	assert.NoError(t, err)
	assert.Len(t, other[700].Collaborators, 1, "accepted collaborator stays public")
	assert.Len(t, other[700].PendingCollaborators, 0, "pending invite is hidden from non-owners")
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
feat(api): embed pending collaborator invites on the owner's own tracks#947

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

raymondjacobson
merged 1 commit into

from

Jun 10, 2026
 Merged


feat(api): embed pending collaborator invites on the owner's own tracks
#947
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


14 changes: 8 additions & 6 deletions
api/dbv1/queries/track_collaborators.sql

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
-- Accepted collaborators for a set of tracks, used to embed a `collaborators`
-- array on track responses. Returns one row per (track, collaborator); the Go
-- layer bulk-resolves the user objects. Backed by the track_collaborators
-- primary key (track_id leads), so the ANY(...) lookup is index-served.
-- Accepted and pending collaborators for a set of tracks, used to embed a
-- `collaborators` array (accepted) on every track response and a
-- `pending_collaborators` array on the owner's own tracks. Returns one row per
-- (track, collaborator) with status; the Go layer splits by status and
-- bulk-resolves the user objects. Backed by the track_collaborators primary key
-- (track_id leads), so the ANY(...) lookup is index-served.
-- name: GetTrackCollaborators :many
SELECT track_id, collaborator_user_id
SELECT track_id, collaborator_user_id, status
FROM track_collaborators
WHERE track_id = ANY(@track_ids::int[])
 AND status = 'accepted'
 AND status IN ('accepted', 'pending')
ORDER BY track_id, created_at;

-- A user's collaborator invites/credits, optionally filtered by status
Expand Down

21 changes: 12 additions & 9 deletions
api/dbv1/track_collaborators.sql.go

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


73 changes: 52 additions & 21 deletions
api/dbv1/tracks.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,10 @@ type Track struct {
	UserID trashid.HashId `json:"user_id"`
	User User `json:"user"`
	Collaborators []User `json:"collaborators"`
	Access Access `json:"access"`
	// PendingCollaborators is populated only on the requester's own tracks (so
	// the owner's edit form can preserve still-pending invites); empty otherwise.
	PendingCollaborators []User `json:"pending_collaborators"`
	Access Access `json:"access"`

	FolloweeReposts []*FolloweeRepost `json:"followee_reposts"`
	FolloweeFavorites []*FolloweeFavorite `json:"followee_favorites"`
Expand DownExpand Up@@ -70,16 +73,35 @@ func (q *Queries) TracksKeyed(ctx context.Context, arg TracksParams) (map[int32]
 collectSplitUserIds(rawTrack.DownloadConditions)
	}

	// Fetch accepted collaborators for these tracks in one query, and fold
	// their user IDs into the bulk user fetch below so each is fully resolved.
	// Fetch accepted + pending collaborators for these tracks in one query, and
	// fold their user IDs into the bulk user fetch below so each is fully
	// resolved. Accepted are embedded on every response; pending are embedded
	// only on the requester's own tracks (for the owner's edit form), so their
	// user IDs are only resolved for owned tracks.
	myID := arg.MyID.(int32)
	ownedTracks := map[int32]bool{}
	for _, rawTrack := range rawTracks {
 if rawTrack.UserID == myID {
 ownedTracks[rawTrack.TrackID] = true
 }
	}
	collaboratorRows, err := q.GetTrackCollaborators(ctx, trackIds)
	if err != nil {
 return nil, err
	}
	collaboratorsByTrack := map[int32][]int32{}
	pendingByTrack := map[int32][]int32{}
	for _, cr := range collaboratorRows {
 collaboratorsByTrack[cr.TrackID] = append(collaboratorsByTrack[cr.TrackID], cr.CollaboratorUserID)
 userIds = append(userIds, cr.CollaboratorUserID)
 switch cr.Status {
 case "accepted":
 collaboratorsByTrack[cr.TrackID] = append(collaboratorsByTrack[cr.TrackID], cr.CollaboratorUserID)
 userIds = append(userIds, cr.CollaboratorUserID)
 case "pending":
 if ownedTracks[cr.TrackID] {
 pendingByTrack[cr.TrackID] = append(pendingByTrack[cr.TrackID], cr.CollaboratorUserID)
 userIds = append(userIds, cr.CollaboratorUserID)
 }
 }
	}

	userMap, err := q.UsersKeyed(ctx, GetUsersParams{
Expand DownExpand Up@@ -153,6 +175,14 @@ func (q *Queries) TracksKeyed(ctx context.Context, arg TracksParams) (map[int32]
 }
 }

 // Resolve pending collaborators (only present for the owner's own tracks).
 pendingCollaborators := []User{}
 for _, cid := range pendingByTrack[rawTrack.TrackID] {
 if cu, ok := userMap[cid]; ok {
 pendingCollaborators = append(pendingCollaborators, cu)
 }
 }

 // Get access from the bulk access map
 access := accessMap[rawTrack.TrackID]

Expand DownExpand Up@@ -193,22 +223,23 @@ func (q *Queries) TracksKeyed(ctx context.Context, arg TracksParams) (map[int32]
 }

 track := Track{
 GetTracksRow: rawTrack,
 IsStreamable: !rawTrack.IsDelete && !user.IsDeactivated,
 Permalink: fmt.Sprintf("/%s/%s", user.Handle.String, rawTrack.Slug.String),
 Artwork: squareImageStruct(rawTrack.CoverArtSizes, rawTrack.CoverArt),
 Stream: stream,
 Download: download,
 Preview: preview,
 User: user,
 UserID: user.ID,
 Collaborators: collaborators,
 FolloweeFavorites: fullFolloweeFavorites(rawTrack.FolloweeFavorites),
 FolloweeReposts: fullFolloweeReposts(rawTrack.FolloweeReposts),
 RemixOf: fullRemixOf,
 StreamConditions: rawTrack.StreamConditions,
 DownloadConditions: rawTrack.DownloadConditions,
 Access: access,
 GetTracksRow: rawTrack,
 IsStreamable: !rawTrack.IsDelete && !user.IsDeactivated,
 Permalink: fmt.Sprintf("/%s/%s", user.Handle.String, rawTrack.Slug.String),
 Artwork: squareImageStruct(rawTrack.CoverArtSizes, rawTrack.CoverArt),
 Stream: stream,
 Download: download,
 Preview: preview,
 User: user,
 UserID: user.ID,
 Collaborators: collaborators,
 PendingCollaborators: pendingCollaborators,
 FolloweeFavorites: fullFolloweeFavorites(rawTrack.FolloweeFavorites),
 FolloweeReposts: fullFolloweeReposts(rawTrack.FolloweeReposts),
 RemixOf: fullRemixOf,
 StreamConditions: rawTrack.StreamConditions,
 DownloadConditions: rawTrack.DownloadConditions,
 Access: access,
 }
 trackMap[rawTrack.TrackID] = track
	}
Expand Down

10 changes: 10 additions & 0 deletions
api/swagger/swagger-v1.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14958,6 +14958,11 @@ components:
 description: Accepted collaborator artists on the track.
 items:
 $ref: "#/components/schemas/user"
 pending_collaborators:
 type: array
 description: Pending collaborator invites; only present on the owner's own tracks.
 items:
 $ref: "#/components/schemas/user"
 duration:
 type: integer
 is_downloadable:
Expand DownExpand Up@@ -16439,6 +16444,11 @@ components:
 description: Accepted collaborator artists on the track.
 items:
 $ref: "#/components/schemas/user"
 pending_collaborators:
 type: array
 description: Pending collaborator invites; only present on the owner's own tracks.
 items:
 $ref: "#/components/schemas/user"
 duration:
 type: integer
 is_downloadable:
Expand Down

30 changes: 30 additions & 0 deletions
api/v1_track_collaborators_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -174,3 +174,33 @@ func TestCollaboratorSeesPrivateTrack(t *testing.T) {
	assert.NoError(t, err)
	assert.Len(t, rows, 0, "a rejected collaborator must not see the private track")
}

// Pending collaborator invites are embedded only on the owner's own tracks (so
// their edit form can preserve them); accepted collaborators stay public.
func TestPendingCollaboratorsVisibleToOwnerOnly(t *testing.T) {
	app := testAppWithFixtures(t)
	ctx := context.Background()

	// Track 700 is owned by user 500: user 1 accepted, user 2 still pending.
	now := time.Now()
	database.SeedTable(app.pool.Replicas[0], "track_collaborators", []map[string]any{
 {"track_id": 700, "collaborator_user_id": 1, "invited_by": 500, "status": "accepted", "created_at": now, "updated_at": now},
 {"track_id": 700, "collaborator_user_id": 2, "invited_by": 500, "status": "pending", "created_at": now, "updated_at": now},
	})

	// As the owner (my_id = 500): accepted embedded + pending visible.
	owned, err := app.queries.TracksKeyed(ctx, dbv1.TracksParams{
 GetTracksParams: dbv1.GetTracksParams{Ids: []int32{700}, MyID: int32(500)},
	})
	assert.NoError(t, err)
	assert.Len(t, owned[700].Collaborators, 1, "accepted collaborator is embedded")
	assert.Len(t, owned[700].PendingCollaborators, 1, "owner sees the pending invite")

	// As a non-owner (my_id = 1): accepted still embedded, pending hidden.
	other, err := app.queries.TracksKeyed(ctx, dbv1.TracksParams{
 GetTracksParams: dbv1.GetTracksParams{Ids: []int32{700}, MyID: int32(1)},
	})
	assert.NoError(t, err)
	assert.Len(t, other[700].Collaborators, 1, "accepted collaborator stays public")
	assert.Len(t, other[700].PendingCollaborators, 0, "pending invite is hidden from non-owners")
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
feat(api): embed pending collaborator invites on the owner's own tracks#947

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

raymondjacobson
merged 1 commit into

from

Jun 10, 2026
 Merged


feat(api): embed pending collaborator invites on the owner's own tracks
#947
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


14 changes: 8 additions & 6 deletions
api/dbv1/queries/track_collaborators.sql

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
-- Accepted collaborators for a set of tracks, used to embed a `collaborators`
-- array on track responses. Returns one row per (track, collaborator); the Go
-- layer bulk-resolves the user objects. Backed by the track_collaborators
-- primary key (track_id leads), so the ANY(...) lookup is index-served.
-- Accepted and pending collaborators for a set of tracks, used to embed a
-- `collaborators` array (accepted) on every track response and a
-- `pending_collaborators` array on the owner's own tracks. Returns one row per
-- (track, collaborator) with status; the Go layer splits by status and
-- bulk-resolves the user objects. Backed by the track_collaborators primary key
-- (track_id leads), so the ANY(...) lookup is index-served.
-- name: GetTrackCollaborators :many
SELECT track_id, collaborator_user_id
SELECT track_id, collaborator_user_id, status
FROM track_collaborators
WHERE track_id = ANY(@track_ids::int[])
 AND status = 'accepted'
 AND status IN ('accepted', 'pending')
ORDER BY track_id, created_at;

-- A user's collaborator invites/credits, optionally filtered by status
Expand Down

21 changes: 12 additions & 9 deletions
api/dbv1/track_collaborators.sql.go

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


73 changes: 52 additions & 21 deletions
api/dbv1/tracks.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,10 @@ type Track struct {
	UserID trashid.HashId `json:"user_id"`
	User User `json:"user"`
	Collaborators []User `json:"collaborators"`
	Access Access `json:"access"`
	// PendingCollaborators is populated only on the requester's own tracks (so
	// the owner's edit form can preserve still-pending invites); empty otherwise.
	PendingCollaborators []User `json:"pending_collaborators"`
	Access Access `json:"access"`

	FolloweeReposts []*FolloweeRepost `json:"followee_reposts"`
	FolloweeFavorites []*FolloweeFavorite `json:"followee_favorites"`
Expand DownExpand Up@@ -70,16 +73,35 @@ func (q *Queries) TracksKeyed(ctx context.Context, arg TracksParams) (map[int32]
 collectSplitUserIds(rawTrack.DownloadConditions)
	}

	// Fetch accepted collaborators for these tracks in one query, and fold
	// their user IDs into the bulk user fetch below so each is fully resolved.
	// Fetch accepted + pending collaborators for these tracks in one query, and
	// fold their user IDs into the bulk user fetch below so each is fully
	// resolved. Accepted are embedded on every response; pending are embedded
	// only on the requester's own tracks (for the owner's edit form), so their
	// user IDs are only resolved for owned tracks.
	myID := arg.MyID.(int32)
	ownedTracks := map[int32]bool{}
	for _, rawTrack := range rawTracks {
 if rawTrack.UserID == myID {
 ownedTracks[rawTrack.TrackID] = true
 }
	}
	collaboratorRows, err := q.GetTrackCollaborators(ctx, trackIds)
	if err != nil {
 return nil, err
	}
	collaboratorsByTrack := map[int32][]int32{}
	pendingByTrack := map[int32][]int32{}
	for _, cr := range collaboratorRows {
 collaboratorsByTrack[cr.TrackID] = append(collaboratorsByTrack[cr.TrackID], cr.CollaboratorUserID)
 userIds = append(userIds, cr.CollaboratorUserID)
 switch cr.Status {
 case "accepted":
 collaboratorsByTrack[cr.TrackID] = append(collaboratorsByTrack[cr.TrackID], cr.CollaboratorUserID)
 userIds = append(userIds, cr.CollaboratorUserID)
 case "pending":
 if ownedTracks[cr.TrackID] {
 pendingByTrack[cr.TrackID] = append(pendingByTrack[cr.TrackID], cr.CollaboratorUserID)
 userIds = append(userIds, cr.CollaboratorUserID)
 }
 }
	}

	userMap, err := q.UsersKeyed(ctx, GetUsersParams{
Expand DownExpand Up@@ -153,6 +175,14 @@ func (q *Queries) TracksKeyed(ctx context.Context, arg TracksParams) (map[int32]
 }
 }

 // Resolve pending collaborators (only present for the owner's own tracks).
 pendingCollaborators := []User{}
 for _, cid := range pendingByTrack[rawTrack.TrackID] {
 if cu, ok := userMap[cid]; ok {
 pendingCollaborators = append(pendingCollaborators, cu)
 }
 }

 // Get access from the bulk access map
 access := accessMap[rawTrack.TrackID]

Expand DownExpand Up@@ -193,22 +223,23 @@ func (q *Queries) TracksKeyed(ctx context.Context, arg TracksParams) (map[int32]
 }

 track := Track{
 GetTracksRow: rawTrack,
 IsStreamable: !rawTrack.IsDelete && !user.IsDeactivated,
 Permalink: fmt.Sprintf("/%s/%s", user.Handle.String, rawTrack.Slug.String),
 Artwork: squareImageStruct(rawTrack.CoverArtSizes, rawTrack.CoverArt),
 Stream: stream,
 Download: download,
 Preview: preview,
 User: user,
 UserID: user.ID,
 Collaborators: collaborators,
 FolloweeFavorites: fullFolloweeFavorites(rawTrack.FolloweeFavorites),
 FolloweeReposts: fullFolloweeReposts(rawTrack.FolloweeReposts),
 RemixOf: fullRemixOf,
 StreamConditions: rawTrack.StreamConditions,
 DownloadConditions: rawTrack.DownloadConditions,
 Access: access,
 GetTracksRow: rawTrack,
 IsStreamable: !rawTrack.IsDelete && !user.IsDeactivated,
 Permalink: fmt.Sprintf("/%s/%s", user.Handle.String, rawTrack.Slug.String),
 Artwork: squareImageStruct(rawTrack.CoverArtSizes, rawTrack.CoverArt),
 Stream: stream,
 Download: download,
 Preview: preview,
 User: user,
 UserID: user.ID,
 Collaborators: collaborators,
 PendingCollaborators: pendingCollaborators,
 FolloweeFavorites: fullFolloweeFavorites(rawTrack.FolloweeFavorites),
 FolloweeReposts: fullFolloweeReposts(rawTrack.FolloweeReposts),
 RemixOf: fullRemixOf,
 StreamConditions: rawTrack.StreamConditions,
 DownloadConditions: rawTrack.DownloadConditions,
 Access: access,
 }
 trackMap[rawTrack.TrackID] = track
	}
Expand Down

10 changes: 10 additions & 0 deletions
api/swagger/swagger-v1.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14958,6 +14958,11 @@ components:
 description: Accepted collaborator artists on the track.
 items:
 $ref: "#/components/schemas/user"
 pending_collaborators:
 type: array
 description: Pending collaborator invites; only present on the owner's own tracks.
 items:
 $ref: "#/components/schemas/user"
 duration:
 type: integer
 is_downloadable:
Expand DownExpand Up@@ -16439,6 +16444,11 @@ components:
 description: Accepted collaborator artists on the track.
 items:
 $ref: "#/components/schemas/user"
 pending_collaborators:
 type: array
 description: Pending collaborator invites; only present on the owner's own tracks.
 items:
 $ref: "#/components/schemas/user"
 duration:
 type: integer
 is_downloadable:
Expand Down

30 changes: 30 additions & 0 deletions
api/v1_track_collaborators_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -174,3 +174,33 @@ func TestCollaboratorSeesPrivateTrack(t *testing.T) {
	assert.NoError(t, err)
	assert.Len(t, rows, 0, "a rejected collaborator must not see the private track")
}

// Pending collaborator invites are embedded only on the owner's own tracks (so
// their edit form can preserve them); accepted collaborators stay public.
func TestPendingCollaboratorsVisibleToOwnerOnly(t *testing.T) {
	app := testAppWithFixtures(t)
	ctx := context.Background()

	// Track 700 is owned by user 500: user 1 accepted, user 2 still pending.
	now := time.Now()
	database.SeedTable(app.pool.Replicas[0], "track_collaborators", []map[string]any{
 {"track_id": 700, "collaborator_user_id": 1, "invited_by": 500, "status": "accepted", "created_at": now, "updated_at": now},
 {"track_id": 700, "collaborator_user_id": 2, "invited_by": 500, "status": "pending", "created_at": now, "updated_at": now},
	})

	// As the owner (my_id = 500): accepted embedded + pending visible.
	owned, err := app.queries.TracksKeyed(ctx, dbv1.TracksParams{
 GetTracksParams: dbv1.GetTracksParams{Ids: []int32{700}, MyID: int32(500)},
	})
	assert.NoError(t, err)
	assert.Len(t, owned[700].Collaborators, 1, "accepted collaborator is embedded")
	assert.Len(t, owned[700].PendingCollaborators, 1, "owner sees the pending invite")

	// As a non-owner (my_id = 1): accepted still embedded, pending hidden.
	other, err := app.queries.TracksKeyed(ctx, dbv1.TracksParams{
 GetTracksParams: dbv1.GetTracksParams{Ids: []int32{700}, MyID: int32(1)},
	})
	assert.NoError(t, err)
	assert.Len(t, other[700].Collaborators, 1, "accepted collaborator stays public")
	assert.Len(t, other[700].PendingCollaborators, 0, "pending invite is hidden from non-owners")
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
feat(api): embed pending collaborator invites on the owner's own tracks#947

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

raymondjacobson
merged 1 commit into

from

Jun 10, 2026
 Merged


feat(api): embed pending collaborator invites on the owner's own tracks
#947
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


14 changes: 8 additions & 6 deletions
api/dbv1/queries/track_collaborators.sql

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
-- Accepted collaborators for a set of tracks, used to embed a `collaborators`
-- array on track responses. Returns one row per (track, collaborator); the Go
-- layer bulk-resolves the user objects. Backed by the track_collaborators
-- primary key (track_id leads), so the ANY(...) lookup is index-served.
-- Accepted and pending collaborators for a set of tracks, used to embed a
-- `collaborators` array (accepted) on every track response and a
-- `pending_collaborators` array on the owner's own tracks. Returns one row per
-- (track, collaborator) with status; the Go layer splits by status and
-- bulk-resolves the user objects. Backed by the track_collaborators primary key
-- (track_id leads), so the ANY(...) lookup is index-served.
-- name: GetTrackCollaborators :many
SELECT track_id, collaborator_user_id
SELECT track_id, collaborator_user_id, status
FROM track_collaborators
WHERE track_id = ANY(@track_ids::int[])
 AND status = 'accepted'
 AND status IN ('accepted', 'pending')
ORDER BY track_id, created_at;

-- A user's collaborator invites/credits, optionally filtered by status
Expand Down

21 changes: 12 additions & 9 deletions
api/dbv1/track_collaborators.sql.go

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


73 changes: 52 additions & 21 deletions
api/dbv1/tracks.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,10 @@ type Track struct {
	UserID trashid.HashId `json:"user_id"`
	User User `json:"user"`
	Collaborators []User `json:"collaborators"`
	Access Access `json:"access"`
	// PendingCollaborators is populated only on the requester's own tracks (so
	// the owner's edit form can preserve still-pending invites); empty otherwise.
	PendingCollaborators []User `json:"pending_collaborators"`
	Access Access `json:"access"`

	FolloweeReposts []*FolloweeRepost `json:"followee_reposts"`
	FolloweeFavorites []*FolloweeFavorite `json:"followee_favorites"`
Expand DownExpand Up@@ -70,16 +73,35 @@ func (q *Queries) TracksKeyed(ctx context.Context, arg TracksParams) (map[int32]
 collectSplitUserIds(rawTrack.DownloadConditions)
	}

	// Fetch accepted collaborators for these tracks in one query, and fold
	// their user IDs into the bulk user fetch below so each is fully resolved.
	// Fetch accepted + pending collaborators for these tracks in one query, and
	// fold their user IDs into the bulk user fetch below so each is fully
	// resolved. Accepted are embedded on every response; pending are embedded
	// only on the requester's own tracks (for the owner's edit form), so their
	// user IDs are only resolved for owned tracks.
	myID := arg.MyID.(int32)
	ownedTracks := map[int32]bool{}
	for _, rawTrack := range rawTracks {
 if rawTrack.UserID == myID {
 ownedTracks[rawTrack.TrackID] = true
 }
	}
	collaboratorRows, err := q.GetTrackCollaborators(ctx, trackIds)
	if err != nil {
 return nil, err
	}
	collaboratorsByTrack := map[int32][]int32{}
	pendingByTrack := map[int32][]int32{}
	for _, cr := range collaboratorRows {
 collaboratorsByTrack[cr.TrackID] = append(collaboratorsByTrack[cr.TrackID], cr.CollaboratorUserID)
 userIds = append(userIds, cr.CollaboratorUserID)
 switch cr.Status {
 case "accepted":
 collaboratorsByTrack[cr.TrackID] = append(collaboratorsByTrack[cr.TrackID], cr.CollaboratorUserID)
 userIds = append(userIds, cr.CollaboratorUserID)
 case "pending":
 if ownedTracks[cr.TrackID] {
 pendingByTrack[cr.TrackID] = append(pendingByTrack[cr.TrackID], cr.CollaboratorUserID)
 userIds = append(userIds, cr.CollaboratorUserID)
 }
 }
	}

	userMap, err := q.UsersKeyed(ctx, GetUsersParams{
Expand DownExpand Up@@ -153,6 +175,14 @@ func (q *Queries) TracksKeyed(ctx context.Context, arg TracksParams) (map[int32]
 }
 }

 // Resolve pending collaborators (only present for the owner's own tracks).
 pendingCollaborators := []User{}
 for _, cid := range pendingByTrack[rawTrack.TrackID] {
 if cu, ok := userMap[cid]; ok {
 pendingCollaborators = append(pendingCollaborators, cu)
 }
 }

 // Get access from the bulk access map
 access := accessMap[rawTrack.TrackID]

Expand DownExpand Up@@ -193,22 +223,23 @@ func (q *Queries) TracksKeyed(ctx context.Context, arg TracksParams) (map[int32]
 }

 track := Track{
 GetTracksRow: rawTrack,
 IsStreamable: !rawTrack.IsDelete && !user.IsDeactivated,
 Permalink: fmt.Sprintf("/%s/%s", user.Handle.String, rawTrack.Slug.String),
 Artwork: squareImageStruct(rawTrack.CoverArtSizes, rawTrack.CoverArt),
 Stream: stream,
 Download: download,
 Preview: preview,
 User: user,
 UserID: user.ID,
 Collaborators: collaborators,
 FolloweeFavorites: fullFolloweeFavorites(rawTrack.FolloweeFavorites),
 FolloweeReposts: fullFolloweeReposts(rawTrack.FolloweeReposts),
 RemixOf: fullRemixOf,
 StreamConditions: rawTrack.StreamConditions,
 DownloadConditions: rawTrack.DownloadConditions,
 Access: access,
 GetTracksRow: rawTrack,
 IsStreamable: !rawTrack.IsDelete && !user.IsDeactivated,
 Permalink: fmt.Sprintf("/%s/%s", user.Handle.String, rawTrack.Slug.String),
 Artwork: squareImageStruct(rawTrack.CoverArtSizes, rawTrack.CoverArt),
 Stream: stream,
 Download: download,
 Preview: preview,
 User: user,
 UserID: user.ID,
 Collaborators: collaborators,
 PendingCollaborators: pendingCollaborators,
 FolloweeFavorites: fullFolloweeFavorites(rawTrack.FolloweeFavorites),
 FolloweeReposts: fullFolloweeReposts(rawTrack.FolloweeReposts),
 RemixOf: fullRemixOf,
 StreamConditions: rawTrack.StreamConditions,
 DownloadConditions: rawTrack.DownloadConditions,
 Access: access,
 }
 trackMap[rawTrack.TrackID] = track
	}
Expand Down

10 changes: 10 additions & 0 deletions
api/swagger/swagger-v1.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14958,6 +14958,11 @@ components:
 description: Accepted collaborator artists on the track.
 items:
 $ref: "#/components/schemas/user"
 pending_collaborators:
 type: array
 description: Pending collaborator invites; only present on the owner's own tracks.
 items:
 $ref: "#/components/schemas/user"
 duration:
 type: integer
 is_downloadable:
Expand DownExpand Up@@ -16439,6 +16444,11 @@ components:
 description: Accepted collaborator artists on the track.
 items:
 $ref: "#/components/schemas/user"
 pending_collaborators:
 type: array
 description: Pending collaborator invites; only present on the owner's own tracks.
 items:
 $ref: "#/components/schemas/user"
 duration:
 type: integer
 is_downloadable:
Expand Down

30 changes: 30 additions & 0 deletions
api/v1_track_collaborators_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -174,3 +174,33 @@ func TestCollaboratorSeesPrivateTrack(t *testing.T) {
	assert.NoError(t, err)
	assert.Len(t, rows, 0, "a rejected collaborator must not see the private track")
}

// Pending collaborator invites are embedded only on the owner's own tracks (so
// their edit form can preserve them); accepted collaborators stay public.
func TestPendingCollaboratorsVisibleToOwnerOnly(t *testing.T) {
	app := testAppWithFixtures(t)
	ctx := context.Background()

	// Track 700 is owned by user 500: user 1 accepted, user 2 still pending.
	now := time.Now()
	database.SeedTable(app.pool.Replicas[0], "track_collaborators", []map[string]any{
 {"track_id": 700, "collaborator_user_id": 1, "invited_by": 500, "status": "accepted", "created_at": now, "updated_at": now},
 {"track_id": 700, "collaborator_user_id": 2, "invited_by": 500, "status": "pending", "created_at": now, "updated_at": now},
	})

	// As the owner (my_id = 500): accepted embedded + pending visible.
	owned, err := app.queries.TracksKeyed(ctx, dbv1.TracksParams{
 GetTracksParams: dbv1.GetTracksParams{Ids: []int32{700}, MyID: int32(500)},
	})
	assert.NoError(t, err)
	assert.Len(t, owned[700].Collaborators, 1, "accepted collaborator is embedded")
	assert.Len(t, owned[700].PendingCollaborators, 1, "owner sees the pending invite")

	// As a non-owner (my_id = 1): accepted still embedded, pending hidden.
	other, err := app.queries.TracksKeyed(ctx, dbv1.TracksParams{
 GetTracksParams: dbv1.GetTracksParams{Ids: []int32{700}, MyID: int32(1)},
	})
	assert.NoError(t, err)
	assert.Len(t, other[700].Collaborators, 1, "accepted collaborator stays public")
	assert.Len(t, other[700].PendingCollaborators, 0, "pending invite is hidden from non-owners")
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
feat(api): embed pending collaborator invites on the owner's own tracks#947

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

raymondjacobson
merged 1 commit into

from

Jun 10, 2026
 Merged


feat(api): embed pending collaborator invites on the owner's own tracks
#947
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


14 changes: 8 additions & 6 deletions
api/dbv1/queries/track_collaborators.sql

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
-- Accepted collaborators for a set of tracks, used to embed a `collaborators`
-- array on track responses. Returns one row per (track, collaborator); the Go
-- layer bulk-resolves the user objects. Backed by the track_collaborators
-- primary key (track_id leads), so the ANY(...) lookup is index-served.
-- Accepted and pending collaborators for a set of tracks, used to embed a
-- `collaborators` array (accepted) on every track response and a
-- `pending_collaborators` array on the owner's own tracks. Returns one row per
-- (track, collaborator) with status; the Go layer splits by status and
-- bulk-resolves the user objects. Backed by the track_collaborators primary key
-- (track_id leads), so the ANY(...) lookup is index-served.
-- name: GetTrackCollaborators :many
SELECT track_id, collaborator_user_id
SELECT track_id, collaborator_user_id, status
FROM track_collaborators
WHERE track_id = ANY(@track_ids::int[])
 AND status = 'accepted'
 AND status IN ('accepted', 'pending')
ORDER BY track_id, created_at;

-- A user's collaborator invites/credits, optionally filtered by status
Expand Down

21 changes: 12 additions & 9 deletions
api/dbv1/track_collaborators.sql.go

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


73 changes: 52 additions & 21 deletions
api/dbv1/tracks.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,10 @@ type Track struct {
	UserID trashid.HashId `json:"user_id"`
	User User `json:"user"`
	Collaborators []User `json:"collaborators"`
	Access Access `json:"access"`
	// PendingCollaborators is populated only on the requester's own tracks (so
	// the owner's edit form can preserve still-pending invites); empty otherwise.
	PendingCollaborators []User `json:"pending_collaborators"`
	Access Access `json:"access"`

	FolloweeReposts []*FolloweeRepost `json:"followee_reposts"`
	FolloweeFavorites []*FolloweeFavorite `json:"followee_favorites"`
Expand DownExpand Up@@ -70,16 +73,35 @@ func (q *Queries) TracksKeyed(ctx context.Context, arg TracksParams) (map[int32]
 collectSplitUserIds(rawTrack.DownloadConditions)
	}

	// Fetch accepted collaborators for these tracks in one query, and fold
	// their user IDs into the bulk user fetch below so each is fully resolved.
	// Fetch accepted + pending collaborators for these tracks in one query, and
	// fold their user IDs into the bulk user fetch below so each is fully
	// resolved. Accepted are embedded on every response; pending are embedded
	// only on the requester's own tracks (for the owner's edit form), so their
	// user IDs are only resolved for owned tracks.
	myID := arg.MyID.(int32)
	ownedTracks := map[int32]bool{}
	for _, rawTrack := range rawTracks {
 if rawTrack.UserID == myID {
 ownedTracks[rawTrack.TrackID] = true
 }
	}
	collaboratorRows, err := q.GetTrackCollaborators(ctx, trackIds)
	if err != nil {
 return nil, err
	}
	collaboratorsByTrack := map[int32][]int32{}
	pendingByTrack := map[int32][]int32{}
	for _, cr := range collaboratorRows {
 collaboratorsByTrack[cr.TrackID] = append(collaboratorsByTrack[cr.TrackID], cr.CollaboratorUserID)
 userIds = append(userIds, cr.CollaboratorUserID)
 switch cr.Status {
 case "accepted":
 collaboratorsByTrack[cr.TrackID] = append(collaboratorsByTrack[cr.TrackID], cr.CollaboratorUserID)
 userIds = append(userIds, cr.CollaboratorUserID)
 case "pending":
 if ownedTracks[cr.TrackID] {
 pendingByTrack[cr.TrackID] = append(pendingByTrack[cr.TrackID], cr.CollaboratorUserID)
 userIds = append(userIds, cr.CollaboratorUserID)
 }
 }
	}

	userMap, err := q.UsersKeyed(ctx, GetUsersParams{
Expand DownExpand Up@@ -153,6 +175,14 @@ func (q *Queries) TracksKeyed(ctx context.Context, arg TracksParams) (map[int32]
 }
 }

 // Resolve pending collaborators (only present for the owner's own tracks).
 pendingCollaborators := []User{}
 for _, cid := range pendingByTrack[rawTrack.TrackID] {
 if cu, ok := userMap[cid]; ok {
 pendingCollaborators = append(pendingCollaborators, cu)
 }
 }

 // Get access from the bulk access map
 access := accessMap[rawTrack.TrackID]

Expand DownExpand Up@@ -193,22 +223,23 @@ func (q *Queries) TracksKeyed(ctx context.Context, arg TracksParams) (map[int32]
 }

 track := Track{
 GetTracksRow: rawTrack,
 IsStreamable: !rawTrack.IsDelete && !user.IsDeactivated,
 Permalink: fmt.Sprintf("/%s/%s", user.Handle.String, rawTrack.Slug.String),
 Artwork: squareImageStruct(rawTrack.CoverArtSizes, rawTrack.CoverArt),
 Stream: stream,
 Download: download,
 Preview: preview,
 User: user,
 UserID: user.ID,
 Collaborators: collaborators,
 FolloweeFavorites: fullFolloweeFavorites(rawTrack.FolloweeFavorites),
 FolloweeReposts: fullFolloweeReposts(rawTrack.FolloweeReposts),
 RemixOf: fullRemixOf,
 StreamConditions: rawTrack.StreamConditions,
 DownloadConditions: rawTrack.DownloadConditions,
 Access: access,
 GetTracksRow: rawTrack,
 IsStreamable: !rawTrack.IsDelete && !user.IsDeactivated,
 Permalink: fmt.Sprintf("/%s/%s", user.Handle.String, rawTrack.Slug.String),
 Artwork: squareImageStruct(rawTrack.CoverArtSizes, rawTrack.CoverArt),
 Stream: stream,
 Download: download,
 Preview: preview,
 User: user,
 UserID: user.ID,
 Collaborators: collaborators,
 PendingCollaborators: pendingCollaborators,
 FolloweeFavorites: fullFolloweeFavorites(rawTrack.FolloweeFavorites),
 FolloweeReposts: fullFolloweeReposts(rawTrack.FolloweeReposts),
 RemixOf: fullRemixOf,
 StreamConditions: rawTrack.StreamConditions,
 DownloadConditions: rawTrack.DownloadConditions,
 Access: access,
 }
 trackMap[rawTrack.TrackID] = track
	}
Expand Down

10 changes: 10 additions & 0 deletions
api/swagger/swagger-v1.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14958,6 +14958,11 @@ components:
 description: Accepted collaborator artists on the track.
 items:
 $ref: "#/components/schemas/user"
 pending_collaborators:
 type: array
 description: Pending collaborator invites; only present on the owner's own tracks.
 items:
 $ref: "#/components/schemas/user"
 duration:
 type: integer
 is_downloadable:
Expand DownExpand Up@@ -16439,6 +16444,11 @@ components:
 description: Accepted collaborator artists on the track.
 items:
 $ref: "#/components/schemas/user"
 pending_collaborators:
 type: array
 description: Pending collaborator invites; only present on the owner's own tracks.
 items:
 $ref: "#/components/schemas/user"
 duration:
 type: integer
 is_downloadable:
Expand Down

30 changes: 30 additions & 0 deletions
api/v1_track_collaborators_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -174,3 +174,33 @@ func TestCollaboratorSeesPrivateTrack(t *testing.T) {
	assert.NoError(t, err)
	assert.Len(t, rows, 0, "a rejected collaborator must not see the private track")
}

// Pending collaborator invites are embedded only on the owner's own tracks (so
// their edit form can preserve them); accepted collaborators stay public.
func TestPendingCollaboratorsVisibleToOwnerOnly(t *testing.T) {
	app := testAppWithFixtures(t)
	ctx := context.Background()

	// Track 700 is owned by user 500: user 1 accepted, user 2 still pending.
	now := time.Now()
	database.SeedTable(app.pool.Replicas[0], "track_collaborators", []map[string]any{
 {"track_id": 700, "collaborator_user_id": 1, "invited_by": 500, "status": "accepted", "created_at": now, "updated_at": now},
 {"track_id": 700, "collaborator_user_id": 2, "invited_by": 500, "status": "pending", "created_at": now, "updated_at": now},
	})

	// As the owner (my_id = 500): accepted embedded + pending visible.
	owned, err := app.queries.TracksKeyed(ctx, dbv1.TracksParams{
 GetTracksParams: dbv1.GetTracksParams{Ids: []int32{700}, MyID: int32(500)},
	})
	assert.NoError(t, err)
	assert.Len(t, owned[700].Collaborators, 1, "accepted collaborator is embedded")
	assert.Len(t, owned[700].PendingCollaborators, 1, "owner sees the pending invite")

	// As a non-owner (my_id = 1): accepted still embedded, pending hidden.
	other, err := app.queries.TracksKeyed(ctx, dbv1.TracksParams{
 GetTracksParams: dbv1.GetTracksParams{Ids: []int32{700}, MyID: int32(1)},
	})
	assert.NoError(t, err)
	assert.Len(t, other[700].Collaborators, 1, "accepted collaborator stays public")
	assert.Len(t, other[700].PendingCollaborators, 0, "pending invite is hidden from non-owners")
}
Loading