Merge remote-tracking branch 'origin/main' into mjp-rewards

Author: rickyrombo

Makefile

@@ -7,11 +7,19 @@ test::
 	go test -count=1 -cover ./...
 
 staging::
-	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o build/bridge-amd64
-	rsync -ravz build/ stage-discovery-4:bridgerton
+	mkdir -p build/staging
+	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o build/staging/bridge-amd64
+	rsync -ravz build/staging/ stage-discovery-4:bridgerton
 	ssh stage-discovery-4 -t 'cd bridgerton && docker compose up -d --build && docker compose restart bridge'
 	curl 'https://bridgerton.staging.audius.co'
 
+production::
+	mkdir -p build/production
+	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o build/production/bridge-amd64
+	rsync -ravz build/production/ prod-discovery-4:bridgerton
+	ssh prod-discovery-4 -t 'cd bridgerton && docker compose up -d --build && docker compose restart bridge'
+	curl 'https://bridgerton.audius.co'
+
 psql::
 	docker compose exec db psql -U postgres
 

README.md

@@ -24,13 +24,16 @@ http://localhost:1323/v2/users/stereosteve
 
 > This will watch sql files + re-run `sqlc generate` + restart server when go files change.
 
+other env vars:
+```
+delegatePrivateKey: key to sign stream/download requests with
+axiomToken: axiom api token to pipe logs to axiom
+axiomDataset: axiom dataset name
+```
 
 ## API diff
 
-test diffs from v1/ endpoints
-```
-make apidiff
-```
+http://localhost:1323/apidiff.html
 
 ## adminer
 

api/dbv1/full_tracks.go

@@ -2,6 +2,7 @@ package dbv1
 
 import (
 	"context"
+	"encoding/json"
 	"fmt"
 
 	"bridgerton.audius.co/trashid"
@@ -13,12 +14,18 @@ type FullTracksParams GetTracksParams
 type FullTrack struct {
 	GetTracksRow
 
-	Artwork *SquareImage `json:"artwork"`
-	UserID  string       `json:"user_id"`
-	User    FullUser     `json:"user"`
+	Permalink    string       `json:"permalink"`
+	IsStreamable bool         `json:"is_streamable"`
+	Artwork      *SquareImage `json:"artwork"`
+	Stream       *MediaLink   `json:"stream"`
+	Download     *MediaLink   `json:"download"`
+	Preview      *MediaLink   `json:"preview"`
+	UserID       string       `json:"user_id"`
+	User         FullUser     `json:"user"`
 
 	FolloweeReposts   []*FolloweeRepost   `json:"followee_reposts"`
 	FolloweeFavorites []*FolloweeFavorite `json:"followee_favorites"`
+	RemixOf           FullRemixOf         `json:"remix_of"`
 }
 
 func (q *Queries) FullTracksKeyed(ctx context.Context, arg GetTracksParams) (map[int32]FullTrack, error) {
@@ -30,6 +37,12 @@ func (q *Queries) FullTracksKeyed(ctx context.Context, arg GetTracksParams) (map
 	userIds := []int32{}
 	for _, track := range rawTracks {
 		userIds = append(userIds, track.UserID)
+
+		var remixOf RemixOf
+		json.Unmarshal(track.RemixOf, &remixOf)
+		for _, r := range remixOf.Tracks {
+			userIds = append(userIds, r.ParentUserId)
+		}
 	}
 
 	userMap, err := q.FullUsersKeyed(ctx, GetUsersParams{
@@ -52,13 +65,55 @@ func (q *Queries) FullTracksKeyed(ctx context.Context, arg GetTracksParams) (map
 			continue
 		}
 
+		// Collect media links
+		// TODO(API-49): support self-access via grants
+		// see https://github.com/AudiusProject/audius-protocol/blob/4bd9fe80d8cca519844596061505ad8737579019/packages/discovery-provider/src/queries/query_helpers.py#L905
+		stream := mediaLink(track.TrackCid.String, track.TrackID, arg.MyID.(int32))
+		var download *MediaLink
+		if track.IsDownloadable {
+			download = mediaLink(track.OrigFileCid.String, track.TrackID, arg.MyID.(int32))
+		}
+		var preview *MediaLink
+		if track.PreviewCid.String != "" {
+			preview = mediaLink(track.PreviewCid.String, track.TrackID, arg.MyID.(int32))
+		}
+
+		// client dies if this field is nil
+		// todo: what are default field visibility values?
+		if track.FieldVisibility == nil {
+			track.FieldVisibility = []byte(`{}`)
+		}
+
+		// remix_of
+		var remixOf RemixOf
+		var fullRemixOf FullRemixOf
+		json.Unmarshal(track.RemixOf, &remixOf)
+		fullRemixOf = FullRemixOf{
+			Tracks: make([]FullRemixOfTrack, len(remixOf.Tracks)),
+		}
+		for idx, r := range remixOf.Tracks {
+			trackId, _ := trashid.EncodeHashId(int(r.ParentTrackId))
+			fullRemixOf.Tracks[idx] = FullRemixOfTrack{
+				HasRemixAuthorReposted: r.HasRemixAuthorReposted,
+				HasRemixAuthorSaved:    r.HasRemixAuthorSaved,
+				ParentTrackId:          trackId,
+				User:                   userMap[r.ParentUserId],
+			}
+		}
+
 		fullTrack := FullTrack{
 			GetTracksRow:      track,
+			IsStreamable:      !track.IsDelete && !user.IsDeactivated,
+			Permalink:         fmt.Sprintf("/%s/%s", user.Handle.String, track.Slug.String),
 			Artwork:           squareImageStruct(track.CoverArtSizes, track.CoverArt),
+			Stream:            stream,
+			Download:          download,
+			Preview:           preview,
 			User:              user,
 			UserID:            user.ID,
 			FolloweeFavorites: fullFolloweeFavorites(track.FolloweeFavorites),
 			FolloweeReposts:   fullFolloweeReposts(track.FolloweeReposts),
+			RemixOf:           fullRemixOf,
 		}
 		trackMap[track.TrackID] = fullTrack
 	}

api/dbv1/full_users.go

@@ -46,9 +46,7 @@ func (q *Queries) FullUsersKeyed(ctx context.Context, arg GetUsersParams) (map[i
 
 			if cid != "" {
 				// rendezvous for cid
-				rankedHosts := rendezvous.GlobalHasher.Rank(cid)
-				first := rankedHosts[0]
-				rest := rankedHosts[1:3]
+				first, rest := rendezvous.GlobalHasher.ReplicaSet3(cid)
 
 				coverPhoto = &RectangleImage{
 					X640:    fmt.Sprintf("%s/content/%s/640x.jpg", first, cid),
@@ -110,9 +108,7 @@ func squareImageStruct(maybeCids ...pgtype.Text) *SquareImage {
 	}
 
 	// rendezvous for cid
-	rankedHosts := rendezvous.GlobalHasher.Rank(cid)
-	first := rankedHosts[0]
-	rest := rankedHosts[1:3]
+	first, rest := rendezvous.GlobalHasher.ReplicaSet3(cid)
 
 	return &SquareImage{
 		X150x150:   fmt.Sprintf("%s/content/%s/150x150.jpg", first, cid),

api/dbv1/get_tracks.sql.go

@@ -46,3 +46,23 @@ type FolloweeFavorite struct {
 	UserId         string `json:"user_id"`
 	CreatedAt      string `json:"created_at"`
 }
+
+type RemixOf struct {
+	Tracks []struct {
+		HasRemixAuthorReposted bool  `json:"has_remix_author_reposted"`
+		HasRemixAuthorSaved    bool  `json:"has_remix_author_saved"`
+		ParentTrackId          int32 `json:"parent_track_id"`
+		ParentUserId           int32 `json:"parent_user_id"`
+	}
+}
+
+type FullRemixOfTrack struct {
+	HasRemixAuthorReposted bool     `json:"has_remix_author_reposted"`
+	HasRemixAuthorSaved    bool     `json:"has_remix_author_saved"`
+	ParentTrackId          string   `json:"parent_track_id"`
+	User                   FullUser `json:"user"`
+}
+
+type FullRemixOf struct {
+	Tracks []FullRemixOfTrack `json:"tracks"`
+}