Add coin-gated text posts

Author: dylanjeffers

api/dbv1/access.go

@@ -323,7 +323,7 @@ func (q *Queries) GetBulkTrackAccess(
 					var mint string
 					var balance int64
 					if err := rows.Scan(&mint, &balance); err == nil {
-						walletTokenBalances[mint] = balance
+						walletTokenBalances[mint] += balance
 					}
 				}
 				return rows.Err()

api/dbv1/full_comments.go

@@ -40,7 +40,6 @@ type FullComment struct {
 	Replies         []FullComment `json:"replies"`
 	ParentCommentId pgtype.Int4   `json:"parent_comment_id"`
 
-	// this should be omitted
 	ReplyIds []int32 `db:"reply_ids" json:"-"`
 }
 
@@ -51,12 +50,12 @@ func (q *Queries) FullCommentsKeyed(ctx context.Context, arg GetCommentsParams)
 
 	sql := `
 	SELECT
-		comment_id as id,
-		parent_comment_id,
-		entity_type,
-		entity_id,
-		user_id,
-		text as message,
+		comments.comment_id AS id,
+		comment_threads.parent_comment_id,
+		comments.entity_type,
+		comments.entity_id,
+		comments.user_id,
+		comments.text AS message,
 
 		(
 			SELECT json_agg(
@@ -72,7 +71,7 @@ func (q *Queries) FullCommentsKeyed(ctx context.Context, arg GetCommentsParams)
 			) m
 		)::jsonb as mentions,
 
-		track_timestamp_s,
+		comments.track_timestamp_s,
 
 		(
 			SELECT count(*)
@@ -90,7 +89,7 @@ func (q *Queries) FullCommentsKeyed(ctx context.Context, arg GetCommentsParams)
 			AND cc.is_delete = false
 		) as reply_ids,
 
-		is_edited,
+		comments.is_edited,
 
 		EXISTS (
 			SELECT 1
@@ -104,7 +103,7 @@ func (q *Queries) FullCommentsKeyed(ctx context.Context, arg GetCommentsParams)
 			SELECT 1
 			FROM comment_reactions
 			WHERE comment_id = comments.comment_id
-			AND user_id = tracks.owner_id
+			AND user_id = COALESCE(tracks.owner_id, comments.entity_id)
 			AND is_delete = false
 		) AS is_artist_reacted,
 
@@ -115,19 +114,22 @@ func (q *Queries) FullCommentsKeyed(ctx context.Context, arg GetCommentsParams)
 			FROM comment_notification_settings mutes
 			WHERE @my_id > 0
 			AND mutes.user_id = @my_id
-			AND mutes.entity_type = entity_type
-			AND mutes.entity_id = entity_id
+			AND mutes.entity_type = comments.entity_type
+			AND mutes.entity_id = comments.entity_id
 			LIMIT 1
 		), false) as is_muted,
 
 		comments.created_at,
 		comments.updated_at
 
 	FROM comments
-	JOIN tracks ON entity_id = track_id
+	LEFT JOIN tracks ON comments.entity_type = 'Track' AND comments.entity_id = tracks.track_id
 	LEFT JOIN comment_threads USING (comment_id)
-	WHERE comment_id = ANY(@ids::int[])
-	AND (@include_unlisted = true OR tracks.is_unlisted = false)
+	WHERE comments.comment_id = ANY(@ids::int[])
+	AND (
+		(comments.entity_type = 'Track' AND (@include_unlisted = true OR COALESCE(tracks.is_unlisted, false) = false))
+		OR comments.entity_type = 'Coin'
+	)
 	ORDER BY comments.created_at DESC
 	`
 
@@ -150,7 +152,6 @@ func (q *Queries) FullCommentsKeyed(ctx context.Context, arg GetCommentsParams)
 		commentMap[int32(comment.Id)] = comment
 	}
 
-	// fetch replies
 	replyIds := []int32{}
 	for _, comment := range comments {
 		replyIds = append(replyIds, comment.ReplyIds...)
@@ -170,7 +171,6 @@ func (q *Queries) FullCommentsKeyed(ctx context.Context, arg GetCommentsParams)
 				comment.Replies = append(comment.Replies, reply)
 			}
 		}
-		// todo: sort replies?
 		comment.ReplyCount = len(comment.Replies)
 
 		if comment.IsDelete {

api/dbv1/parallel.go

@@ -7,11 +7,11 @@ import (
 )
 
 type ParallelParams struct {
-	UserIds       []int32
-	TrackIds      []int32
-	PlaylistIds   []int32
-	MyID          int32
-	AuthedWallet  string
+	UserIds      []int32
+	TrackIds     []int32
+	PlaylistIds  []int32
+	MyID         int32
+	AuthedWallet string
 }
 
 type ParallelResult struct {

api/relay.go

@@ -11,6 +11,7 @@ import (
 	"api.audius.co/trashid"
 	"connectrpc.com/connect"
 	v1 "github.com/OpenAudio/go-openaudio/pkg/api/core/v1"
+	"github.com/OpenAudio/go-openaudio/pkg/sdk"
 	cconfig "github.com/OpenAudio/go-openaudio/pkg/core/config"
 	"github.com/OpenAudio/go-openaudio/pkg/core/server"
 	eth_gen "github.com/OpenAudio/go-openaudio/pkg/eth/contracts/gen"
@@ -259,37 +260,43 @@ func (app *ApiServer) relay(c *fiber.Ctx) error {
 	})
 }
 
+const sosEndpoint = "https://sos.audius.co"
+
 func (app *ApiServer) handleRelay(ctx context.Context, logger *zap.Logger, decodedTx *v1.ManageEntityLegacy) (*v1.Transaction, error) {
-	allClients := app.openAudioPool.GetAll()
-	if len(allClients) == 0 {
-		logger.Error("no OpenAudio clients configured")
-		return nil, fmt.Errorf("no OpenAudio clients configured")
-	}
-
-	var lastErr error
-	for i, clientInfo := range allClients {
-		endpointLogger := logger.With(zap.String("openaudio_endpoint", clientInfo.Endpoint), zap.Int("attempt", i+1))
-		res, err := clientInfo.Client.Core.SendTransaction(ctx, connect.NewRequest(&v1.SendTransactionRequest{
-			Transaction: &v1.SignedTransaction{
-				Transaction: &v1.SignedTransaction_ManageEntity{
-					ManageEntity: decodedTx,
-				},
+	req := &v1.SendTransactionRequest{
+		Transaction: &v1.SignedTransaction{
+			Transaction: &v1.SignedTransaction_ManageEntity{
+				ManageEntity: decodedTx,
 			},
-		}))
-
-		if err != nil {
-			lastErr = err
-			endpointLogger.Warn("transaction failed, trying next", zap.Error(err))
-			continue
+		},
+	}
+
+	// mainnet
+	go func() {
+		allClients := app.openAudioPool.GetAll()
+		for i, clientInfo := range allClients {
+			endpointLogger := logger.With(zap.String("openaudio_endpoint", clientInfo.Endpoint), zap.Int("attempt", i+1))
+			res, err := clientInfo.Client.Core.SendTransaction(context.Background(), connect.NewRequest(req))
+			if err != nil {
+				endpointLogger.Warn("transaction failed, trying next", zap.Error(err))
+				continue
+			}
+			endpointLogger.Info("transaction confirmed", zap.String("hash", res.Msg.Transaction.GetHash()))
+			return
 		}
+		logger.Error("all mainnet endpoints failed")
+	}()
 
-		msg := res.Msg.Transaction
-		endpointLogger.Info("transaction confirmed", zap.String("hash", msg.GetHash()))
-		return msg, nil
+	// sos
+	sosClient := sdk.NewOpenAudioSDK(sosEndpoint)
+	sosLogger := logger.With(zap.String("openaudio_endpoint", sosEndpoint))
+	res, err := sosClient.Core.SendTransaction(ctx, connect.NewRequest(req))
+	if err != nil {
+		sosLogger.Warn("sos dual-write failed", zap.Error(err))
+		return nil, err
 	}
-
-	logger.Error("all OpenAudio endpoints failed", zap.Error(lastErr))
-	return nil, fmt.Errorf("all endpoints failed, last error: %w", lastErr)
+	sosLogger.Info("sos dual-write confirmed", zap.String("hash", res.Msg.Transaction.GetHash()))
+	return res.Msg.Transaction, nil
 }
 
 func transactionToReceipt(tx *v1.Transaction, wallet string) map[string]interface{} {

api/server.go

@@ -507,6 +507,8 @@ func NewApiServer(config config.Config) *ApiServer {
 		g.Post("/tracks/:trackId/downloads", app.requireAuthMiddleware, app.requireWriteScope, app.postV1TrackDownload)
 		g.Put("/tracks/:trackId", app.requireAuthMiddleware, app.requireWriteScope, app.putV1Track)
 		g.Delete("/tracks/:trackId", app.requireAuthMiddleware, app.requireWriteScope, app.deleteV1Track)
+		g.Get("/fan_club/feed", app.v1FanClubFeed)
+
 		g.Get("/tracks/:trackId/comments", app.v1TrackComments)
 		g.Get("/tracks/:trackId/comment_count", app.v1TrackCommentCount)
 		g.Get("/tracks/:trackId/comment-count", app.v1TrackCommentCount)

api/solana_wallet_middleware.go

@@ -52,3 +52,14 @@ func (app *ApiServer) solanaWalletMiddleware(c *fiber.Ctx) error {
 	c.Locals(SolanaWalletCtxKey, wallet)
 	return c.Next()
 }
+
+// tryGetSolanaWallet returns the verified wallet from the request context, or "".
+func (app *ApiServer) tryGetSolanaWallet(c *fiber.Ctx) string {
+	if c == nil {
+		return ""
+	}
+	if w, ok := c.UserContext().Value(SolanaWalletCtxKey).(string); ok {
+		return w
+	}
+	return ""
+}