Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 13 additions & 3 deletions api/dbv1/full_tracks.go
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ func (q *Queries) FullTracks(ctx context.Context, arg GetTracksParams) ([]FullTr
userMap[user.UserID] = user
}

fullTracks := make([]FullTrack, 0, len(rawTracks))
trackMap := map[int32]FullTrack{}
for _, track := range rawTracks {
track.ID, _ = trashid.EncodeHashId(int(track.TrackID))
user, ok := userMap[track.UserID]
Expand Down Expand Up @@ -75,14 +75,24 @@ func (q *Queries) FullTracks(ctx context.Context, arg GetTracksParams) ([]FullTr
}
}

fullTracks = append(fullTracks, FullTrack{
fullTrack := FullTrack{
GetTracksRow: track,
Artwork: squareImageStruct(track.CoverArtSizes, track.CoverArt),
User: user,
UserID: user.ID,
FolloweeFavorites: followeeFavorites,
FolloweeReposts: followeeReposts,
})
}
trackMap[track.TrackID] = fullTrack
}

// return in same order as input list of ids
// some ids may be not found...
fullTracks := []FullTrack{}
for _, id := range arg.Ids {
if t, found := trackMap[id]; found {
fullTracks = append(fullTracks, t)
}
}

return fullTracks, nil
Expand Down
19 changes: 4 additions & 15 deletions api/dbv1/get_tracks.sql.go

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

6 changes: 1 addition & 5 deletions api/dbv1/queries/get_tracks.sql
Original file line number Diff line number Diff line change
Expand Up @@ -158,10 +158,6 @@ LEFT JOIN aggregate_plays on play_item_id = t.track_id
LEFT JOIN track_routes on t.track_id = track_routes.track_id and track_routes.is_current = true
WHERE is_available = true
AND (is_unlisted = false OR t.owner_id = @my_id)
AND (
t.track_id = @track_id
OR t.owner_id = @owner_id
OR t.track_id = ANY(@ids::int[])
)
AND t.track_id = ANY(@ids::int[])
ORDER BY t.track_id
;
2 changes: 2 additions & 0 deletions api/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,8 @@ func NewApiServer(config Config) *ApiServer {
app.Get("/v1/full/users/:userId/mutuals", Full(app.v1UsersMutuals))
app.Get("/v1/full/users/:userId/supporting", Full(app.v1UsersSupporting))

app.Get("/v1/full/users/handle/:handle/tracks", Full(app.v1UserTracks))

app.Get("/v1/full/tracks", Full(app.v1Tracks))
app.Get("/v1/full/tracks/:trackId/reposts", Full(app.v1TrackReposts))
app.Get("/v1/full/tracks/:trackId/favorites", Full(app.v1TrackFavorites))
Expand Down
42 changes: 0 additions & 42 deletions api/v1_tracks_test.go

This file was deleted.

62 changes: 62 additions & 0 deletions api/v1_users.go
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,68 @@ func (app *ApiServer) v1UsersMutuals(c *fiber.Ctx, minResponse bool) error {
}, minResponse)
}

func (app *ApiServer) v1UserTracks(c *fiber.Ctx, minResponse bool) error {
myId, _ := trashid.DecodeHashId(c.Query("user_id"))

sortDir := "DESC"
if c.Query("sort_direction") == "asc" {
sortDir = "ASC"
}

sortField := "coalesce(t.release_date, t.created_at)"
switch c.Query("sort") {
case "reposts":
sortField = "repost_count"
case "saves":
sortField = "save_count"
}

sql := `
SELECT track_id
FROM tracks t
JOIN aggregate_track USING (track_id)
JOIN users u ON owner_id = u.user_id
JOIN aggregate_plays ON track_id = play_item_id
WHERE u.handle_lc = LOWER(@handle)
AND u.is_deactivated = false
AND t.is_delete = false
AND t.is_available = true
AND t.is_unlisted = false
AND t.stem_of is null
ORDER BY ` + sortField + ` ` + sortDir + `
LIMIT @limit
OFFSET @offset
`

args := pgx.NamedArgs{
"handle": c.Params("handle"),
}
args["limit"] = c.Query("limit", "20")
args["offset"] = c.Query("offset", "0")

rows, err := app.pool.Query(c.Context(), sql, args)
if err != nil {
return err
}

ids, err := pgx.CollectRows(rows, pgx.RowTo[int32])
if err != nil {
return err
}

tracks, err := app.queries.FullTracks(c.Context(), dbv1.GetTracksParams{
Ids: ids,
MyID: myId,
})
if err != nil {
return err
}

return c.JSON(fiber.Map{
"data": tracks,
})
}

func (app *ApiServer) v1UsersSupporting(c *fiber.Ctx, minResponse bool) error {
myId, _ := trashid.DecodeHashId(c.Query("user_id"))

Expand Down
3 changes: 3 additions & 0 deletions apidiff2.ts
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,9 @@ const testPaths = [
"/v1/playlists/P5abMZp/favorites?limit=15&offset=0&user_id=aNzoj",

"/v1/developer_apps/7d7b6b7a97d1deefe3a1ccc5a13c48e8f055e0b6",

"/v1/full/users/handle/sammiezonana/tracks?filter_tracks=all&limit=10&offset=0&sort=date&user_id=aNzoj",
"/v1/full/users/handle/stereosteve/tracks?filter_tracks=all&limit=10&offset=0&sort=date&user_id=7eP5n",
];

import { html } from "https://deno.land/x/html/mod.ts";
Expand Down
Loading