Clean up backend and web-player leftovers

Remove dead scaffold/config cruft and stale references left over from
recent refactors: dotnet's WebApi.http template file, the AppSettings
PascalCase/Dockerfile workaround (renamed to appsettings.json to match
convention), empty directories left behind by the auth-route and
folder-structure moves, a stale ESLint ignore, and the now-fully-applied
frontend refactor plan doc.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

.gitea/workflows/ci-cd.yml

@@ -1,115 +0,0 @@
-name: CI/CD
-
-on:
-  push:
-    branches: ['**']
-  pull_request:
-    branches: ['**']
-
-concurrency:
-  group: production-deploy
-  cancel-in-progress: false
-
-jobs:
-  backend-tests:
-    name: BackEnd
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-    defaults:
-      run:
-        working-directory: backend
-    steps:
-      - uses: actions/checkout@v4
-
-      - uses: actions/setup-dotnet@v4
-        with:
-          dotnet-version: '10.0.x'
-
-      - name: Restore
-        run: dotnet restore Musify.slnx
-
-      - name: Build
-        run: dotnet build Musify.slnx --no-restore -c Release
-
-      - name: Test
-        run: dotnet test Musify.slnx --no-build -c Release
-
-  web-player-checks:
-    name: WebPlayer
-    runs-on: ubuntu-latest
-    timeout-minutes: 15
-    defaults:
-      run:
-        working-directory: web-player
-    steps:
-      - uses: actions/checkout@v4
-
-      - uses: actions/setup-node@v4
-        with:
-          node-version: '22'
-          cache: npm
-          cache-dependency-path: web-player/package-lock.json
-
-      - run: npm ci
-
-      - name: Type-check
-        run: npm run check
-
-      - name: Lint
-        run: npm run lint
-
-  # Runs on the production host itself, through the existing self-hosted
-  # Gitea Actions runner (act_runner), which also carries a "production"
-  # label registered in native (non-docker) mode so its steps see the host's
-  # real Docker daemon directly (Docker socket + a bind-mounted deploy
-  # directory — see deploy/README.md for how that runner is set up).
-  #
-  # DEPLOY_PATH is the persistent clone already on that host (the one whose
-  # deploy/.env.prod is filled in and matches SharedServices/.env.prod) —
-  # deploy reuses it instead of a fresh checkout, since .env.prod is
-  # untracked and only lives there.
-  deploy:
-    name: Deploy
-    needs: [backend-tests, web-player-checks]
-    if: github.ref == 'refs/heads/master' && github.event_name == 'push'
-    runs-on: [production]
-    timeout-minutes: 20
-    env:
-      DEPLOY_PATH: /home/ubuntu/deploys/musify
-      COMPOSE: docker compose --env-file deploy/.env.prod -f deploy/compose.yml -f deploy/compose.prod.yml
-    steps:
-      - name: Pull latest master
-        run: |
-          set -euo pipefail
-          git config --global --add safe.directory "$DEPLOY_PATH"
-          cd "$DEPLOY_PATH"
-          git fetch origin master
-          git reset --hard origin/master
-
-      - name: Migrate database, generate keys
-        run: |
-          set -euo pipefail
-          cd "$DEPLOY_PATH"
-          $COMPOSE up -d wait-for-postgres keys-init migrate
-
-      # Both jobs verify themselves through the public auth./s3. URLs, served
-      # by the shared edge nginx (Infrastructure's edge/), and are idempotent.
-      - name: Create OIDC app and S3 bucket
-        run: |
-          set -euo pipefail
-          cd "$DEPLOY_PATH"
-          $COMPOSE up -d seaweedfs-init zitadel-init
-          for job in musify-seaweedfs-init musify-zitadel-init; do
-            code=$(docker wait "$job")
-            if [ "$code" != "0" ]; then
-              docker logs "$job"
-              echo "$job exited with $code"
-              exit 1
-            fi
-          done
-
-      - name: Build and start apps
-        run: |
-          set -euo pipefail
-          cd "$DEPLOY_PATH"
-          $COMPOSE --profile apps up -d --build api worker gateway web-player

.gitignore

@@ -28,4 +28,5 @@ Thumbs.db
 # Deploy secrets and runtime state
 deploy/keys/
 deploy/secrets/
+deploy/nginx/certs/
 deploy/zitadel/.output/

backend/Core/Musify.Application/Albums/GetAlbumTracks.cs

@@ -36,7 +36,7 @@ namespace Musify.Application.Albums
 
             var pagedEntities = await tracksQuery
                 .OrderBy(albumTrack => albumTrack.TrackNumber)
-                .Select(albumTrack => new { albumTrack.Track, ListensCount = albumTrack.Track.ListeningHistories.Count(l => l.IsCounted) })
+                .Select(albumTrack => new { albumTrack.Track, ListensCount = albumTrack.Track.ListeningHistories.Count })
                 .ToPagedListAsync(request.PageNumber, request.PageSize, totalCount, cancellationToken);
 
             var pagedTracks = new StaticPagedList<TrackApplicationResponse>(

backend/Core/Musify.Application/Albums/GetRecentlyListenedAlbums.cs

@@ -16,7 +16,7 @@ namespace Musify.Application.Albums
         {
             var listenedTrackIds = database.ListeningHistories
                 .AsNoTracking()
-                .Where(history => history.UserId == request.UserId && history.IsCounted);
+                .Where(history => history.UserId == request.UserId);
 
             var ranked = await database.AlbumHasTracks
                 .AsNoTracking()

backend/Core/Musify.Application/Genres/GetAvailableGenres.cs

@@ -1,26 +0,0 @@
-using Mediator;
-using Musify.Domain.ValueObjects;
-
-namespace Musify.Application.Genres
-{
-    public record GetAvailableGenresQuery : IQuery<IReadOnlyList<AvailableGenreResponse>>;
-
-    public record AvailableGenreResponse(Genre Genre, IReadOnlyList<Genre> IncompatibleWith);
-
-    public class GetAvailableGenresQueryHandler
-        : IQueryHandler<GetAvailableGenresQuery, IReadOnlyList<AvailableGenreResponse>>
-    {
-        public ValueTask<IReadOnlyList<AvailableGenreResponse>> Handle(GetAvailableGenresQuery request, CancellationToken cancellationToken)
-        {
-            var all = Enum.GetValues<Genre>();
-
-            IReadOnlyList<AvailableGenreResponse> result = all
-                .Select(genre => new AvailableGenreResponse(
-                    genre,
-                    all.Where(other => !GenreCompatibility.AreCompatible(genre, other)).ToList()))
-                .ToList();
-
-            return ValueTask.FromResult(result);
-        }
-    }
-}

backend/Core/Musify.Application/Genres/GetGenres.cs

@@ -1,31 +0,0 @@
-using Mediator;
-using Microsoft.EntityFrameworkCore;
-using Musify.Application.Contracts;
-using Musify.Domain.ValueObjects;
-
-namespace Musify.Application.Genres
-{
-    public record GetGenresQuery : IQuery<IReadOnlyList<GenreResponse>>;
-
-    public record GenreResponse(Genre Genre, int TrackCount);
-
-    public class GetGenresQueryHandler(IDatabase database)
-        : IQueryHandler<GetGenresQuery, IReadOnlyList<GenreResponse>>
-    {
-        public async ValueTask<IReadOnlyList<GenreResponse>> Handle(GetGenresQuery request, CancellationToken cancellationToken)
-        {
-            var rows = await database.TrackTags
-                .AsNoTracking()
-                .Where(tag => database.UserHasTracks.Any(userTrack => userTrack.TrackId == tag.TrackId))
-                .GroupBy(tag => tag.Tag)
-                .Select(group => new { Genre = group.Key, TrackCount = group.Select(tag => tag.TrackId).Distinct().Count() })
-                .ToListAsync(cancellationToken);
-
-            return rows
-                .OrderByDescending(row => row.TrackCount)
-                .ThenBy(row => row.Genre)
-                .Select(row => new GenreResponse(row.Genre, row.TrackCount))
-                .ToList();
-        }
-    }
-}

backend/Core/Musify.Application/Likes/GetLikedTracks.cs

@@ -30,7 +30,7 @@ namespace Musify.Application.Likes
 
             var pagedEntities = await likesQuery
                 .OrderByDescending(like => like.CreatedAt)
-                .Select(like => new { like.Track, ListensCount = like.Track.ListeningHistories.Count(l => l.IsCounted) })
+                .Select(like => new { like.Track, ListensCount = like.Track.ListeningHistories.Count })
                 .ToPagedListAsync(request.PageNumber, request.PageSize, totalCount, cancellationToken);
 
             var pagedTracks = new StaticPagedList<TrackApplicationResponse>(

backend/Core/Musify.Application/Mixes/GenerateMixesForUser.cs

@@ -38,7 +38,7 @@ namespace Musify.Application.Mixes
 
             var historyTrackIds = await database.ListeningHistories
                 .AsNoTracking()
-                .Where(history => history.UserId == userId && history.IsCounted)
+                .Where(history => history.UserId == userId)
                 .Select(history => history.TrackId)
                 .Distinct()
                 .ToListAsync(cancellationToken);

backend/Core/Musify.Application/Mixes/MixItemMapper.cs

@@ -19,7 +19,7 @@ namespace Musify.Application.Mixes
                 .AsNoTracking()
                 .Include(track => track.Owner)
                 .Where(track => trackIds.Contains(track.Id))
-                .Select(track => new { Track = track, ListensCount = track.ListeningHistories.Count(l => l.IsCounted) })
+                .Select(track => new { Track = track, ListensCount = track.ListeningHistories.Count })
                 .ToDictionaryAsync(x => x.Track.Id, cancellationToken);
 
             return orderedItems

backend/Core/Musify.Application/PlayLists/GetPlayListTracks.cs

@@ -36,7 +36,7 @@ namespace Musify.Application.PlayLists
 
             var pagedEntities = await tracksQuery
                 .OrderBy(plt => plt.Position)
-                .Select(plt => new { plt.Track, ListensCount = plt.Track.ListeningHistories.Count(l => l.IsCounted) })
+                .Select(plt => new { plt.Track, ListensCount = plt.Track.ListeningHistories.Count })
                 .ToPagedListAsync(request.PageNumber, request.PageSize, totalCount, cancellationToken);
 
             var pagedTracks = new StaticPagedList<TrackApplicationResponse>(

backend/Core/Musify.Application/Services/TrackStreamIssuer.cs

@@ -30,7 +30,6 @@ public sealed class TrackStreamIssuer(
             folderPath,
             streamGatewayConfiguration.AudioFileName);
 
-        Guid? listenId = null;
         if (userId != null)
         {
             var newListeningHistory = new ListeningHistory
@@ -40,10 +39,9 @@ public sealed class TrackStreamIssuer(
             };
             await database.ListeningHistories.AddAsync(newListeningHistory, cancellationToken);
             await database.SaveChangesAsync(cancellationToken);
-            listenId = newListeningHistory.Id;
         }
 
-        return new TrackStreamResponse(manifestUrl, ticket.Token, ticket.ExpiresInSeconds, listenId);
+        return new TrackStreamResponse(manifestUrl, ticket.Token, ticket.ExpiresInSeconds);
     }
 
     private long? AnonymousFragmentBytes(long? userId)

backend/Core/Musify.Application/Tracks/DeleteStaleUncountedListens.cs

@@ -1,33 +0,0 @@
-using Mediator;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Logging;
-using Musify.Application.Contracts;
-
-namespace Musify.Application.Tracks
-{
-    public record DeleteStaleUncountedListensCommand : ICommand<int>;
-
-    public class DeleteStaleUncountedListensCommandHandler(
-        IDatabase database,
-        ILogger<DeleteStaleUncountedListensCommandHandler> logger)
-        : ICommandHandler<DeleteStaleUncountedListensCommand, int>
-    {
-        public async ValueTask<int> Handle(DeleteStaleUncountedListensCommand request, CancellationToken cancellationToken)
-        {
-            var cutoff = DateTime.UtcNow.AddDays(-ListeningRules.UncountedRetentionDays);
-
-            var stale = await database.ListeningHistories
-                .Where(l => !l.IsCounted && l.ListenedAt < cutoff)
-                .ToListAsync(cancellationToken);
-
-            if (stale.Count == 0)
-                return 0;
-
-            database.ListeningHistories.RemoveRange(stale);
-            await database.SaveChangesAsync(cancellationToken);
-
-            logger.LogInformation("Deleted {Count} uncounted listens older than {Days} days", stale.Count, ListeningRules.UncountedRetentionDays);
-            return stale.Count;
-        }
-    }
-}

backend/Core/Musify.Application/Tracks/GetLastTrackListenedByUserId.cs

@@ -19,7 +19,7 @@ namespace Musify.Application.Tracks
                 .Include(t => t.Track.Tags)
                 .Where(t => t.UserId == query.UserId)
                 .OrderByDescending(t => t.ListenedAt)
-                .Select(t => TrackApplicationResponse.FromEntity(t.Track, t.Track.ListeningHistories.Count(l => l.IsCounted)))
+                .Select(t => TrackApplicationResponse.FromEntity(t.Track, t.Track.ListeningHistories.Count))
                 .FirstOrDefaultAsync(cancellationToken);
 
             return track == null

backend/Core/Musify.Application/Tracks/GetListeningHistory.cs

@@ -17,7 +17,7 @@ namespace Musify.Application.Tracks
         {
             var recentTrackIds = await database.ListeningHistories
                 .AsNoTracking()
-                .Where(l => l.UserId == query.UserId && l.IsCounted)
+                .Where(l => l.UserId == query.UserId)
                 .GroupBy(l => l.TrackId)
                 .OrderByDescending(g => g.Max(l => l.ListenedAt))
                 .Select(g => g.Key)
@@ -29,7 +29,7 @@ namespace Musify.Application.Tracks
                 .Include(t => t.Owner)
                 .Include(t => t.Tags)
                 .Where(t => recentTrackIds.Contains(t.Id))
-                .Select(t => new { t.Id, Track = t, ListensCount = t.ListeningHistories.Count(l => l.IsCounted) })
+                .Select(t => new { t.Id, Track = t, ListensCount = t.ListeningHistories.Count })
                 .ToDictionaryAsync(t => t.Id, cancellationToken);
 
             return recentTrackIds

backend/Core/Musify.Application/Tracks/GetTrackById.cs

@@ -18,7 +18,7 @@ namespace Musify.Application.Tracks
                 .Include(t => t.Owner)
                 .Include(t => t.Tags)
                 .Where(t => t.Id == request.TrackId)
-                .Select(t => new { Track = t, ListensCount = t.ListeningHistories.Count(l => l.IsCounted) })
+                .Select(t => new { Track = t, ListensCount = t.ListeningHistories.Count })
                 .SingleOrDefaultAsync(cancellationToken);
 
             if (entity == null)

backend/Core/Musify.Application/Tracks/GetTracks.cs

@@ -5,11 +5,10 @@ using Musify.Application.Tracks.Responses;
 using X.PagedList;
 using X.PagedList.EF;
 using Musify.Application.Contracts;
-using Musify.Domain.ValueObjects;
 
 namespace Musify.Application.Tracks
 {
-    public record GetTracksQuery(string? Name, int PageNumber, int PageSize, Genre? Genre = null)
+    public record GetTracksQuery(string? Name, int PageNumber, int PageSize)
         : IQuery<ErrorOr<TracksSearchResponse>>;
 
     public class GetTracksQueryHandler(IDatabase database)
@@ -29,15 +28,12 @@ namespace Musify.Application.Tracks
                 tracksQuery = tracksQuery.Where(t => t.Track.NormalizedTitle.Contains(normalizedName));
             }
 
-            if (request.Genre is { } genre)
-                tracksQuery = tracksQuery.Where(t => t.Track.Tags.Any(tag => tag.Tag == genre));
-
             var totalCount = await tracksQuery.CountAsync(cancellationToken);
 
             var pagedEntities = await tracksQuery
                 .OrderByDescending(t => t.Track.CreatedAt)
                 .ThenBy(t => t.Id)
-                .Select(t => new { t.Track, ListensCount = t.Track.ListeningHistories.Count(l => l.IsCounted) })
+                .Select(t => new { t.Track, ListensCount = t.Track.ListeningHistories.Count })
                 .ToPagedListAsync(request.PageNumber, request.PageSize, totalCount, cancellationToken);
 
             var items = pagedEntities

backend/Core/Musify.Application/Tracks/GetTracksByUserId.cs

@@ -40,7 +40,7 @@ namespace Musify.Application.Tracks
 
             var pagedEntities = await tracksQuery
                 .OrderBy(t => t.Track.CreatedAt)
-                .Select(t => new { t.Track, ListensCount = t.Track.ListeningHistories.Count(l => l.IsCounted) })
+                .Select(t => new { t.Track, ListensCount = t.Track.ListeningHistories.Count })
                 .ToPagedListAsync(pageNumber, pageSize, totalCount, cancellationToken);
 
             var pagedTracks = new StaticPagedList<TrackApplicationResponse>(

backend/Core/Musify.Application/Tracks/ListeningRules.cs

@@ -1,14 +0,0 @@
-namespace Musify.Application.Tracks
-{
-    public static class ListeningRules
-    {
-        public const double CountedThresholdSeconds = 30;
-        public const double CountedThresholdFraction = 0.5;
-        public const double DurationToleranceSeconds = 2;
-        public const double ClockToleranceSeconds = 5;
-        public const int UncountedRetentionDays = 8;
-
-        public static double CountedThreshold(double durationSeconds) =>
-            Math.Min(CountedThresholdSeconds, durationSeconds * CountedThresholdFraction);
-    }
-}

backend/Core/Musify.Application/Tracks/RecordListeningProgress.cs

@@ -1,44 +0,0 @@
-using ErrorOr;
-using Mediator;
-using Microsoft.EntityFrameworkCore;
-using Musify.Application.Contracts;
-
-namespace Musify.Application.Tracks
-{
-    public record RecordListeningProgressCommand(
-        long UserId,
-        Guid ListenId,
-        double PlayedSeconds)
-        : ICommand<ErrorOr<Success>>;
-
-    public class RecordListeningProgressCommandHandler(IDatabase database)
-        : ICommandHandler<RecordListeningProgressCommand, ErrorOr<Success>>
-    {
-        public async ValueTask<ErrorOr<Success>> Handle(RecordListeningProgressCommand request, CancellationToken cancellationToken)
-        {
-            if (!double.IsFinite(request.PlayedSeconds) || request.PlayedSeconds < 0)
-                return Error.Validation(description: "playedSeconds must be a non-negative number.");
-
-            var listen = await database.ListeningHistories
-                .Include(l => l.Track)
-                .SingleOrDefaultAsync(l => l.Id == request.ListenId && l.UserId == request.UserId, cancellationToken);
-
-            if (listen == null)
-                return Error.NotFound();
-
-            var now = DateTime.UtcNow;
-            var durationCap = listen.Track.DurationSeconds + ListeningRules.DurationToleranceSeconds;
-            var clockCap = (now - listen.ListenedAt).TotalSeconds + ListeningRules.ClockToleranceSeconds;
-            var accepted = Math.Min(request.PlayedSeconds, Math.Min(durationCap, clockCap));
-
-            listen.PlayedSeconds = Math.Max(listen.PlayedSeconds ?? 0, accepted);
-            listen.LastProgressAt = now;
-            listen.IsCounted = listen.IsCounted
-                || listen.PlayedSeconds >= ListeningRules.CountedThreshold(listen.Track.DurationSeconds);
-
-            await database.SaveChangesAsync(cancellationToken);
-
-            return Result.Success;
-        }
-    }
-}

backend/Core/Musify.Application/Tracks/Responses/TrackStreamResponse.cs

@@ -3,6 +3,5 @@ namespace Musify.Application.Tracks.Responses
     public record TrackStreamResponse(
         string ManifestUrl,
         string Ticket,
-        int ExpiresInSeconds,
+        int ExpiresInSeconds);
-        Guid? ListenId = null);
 }

backend/Core/Musify.Application/Users/GetListeningStats.cs

@@ -20,18 +20,17 @@ namespace Musify.Application.Users
                 .Where(l => l.UserId == request.UserId && l.ListenedAt >= weekAgo);
 
             var tracksThisWeek = await thisWeekHistory
-                .Where(l => l.IsCounted)
                 .Select(l => l.TrackId)
                 .Distinct()
                 .CountAsync(cancellationToken);
 
             var secondsThisWeek = await thisWeekHistory
-                .Join(database.Tracks.AsNoTracking(), l => l.TrackId, t => t.Id, (l, t) => l.PlayedSeconds ?? (l.IsCounted ? t.DurationSeconds : 0))
+                .Join(database.Tracks.AsNoTracking(), l => l.TrackId, t => t.Id, (l, t) => t.DurationSeconds)
                 .SumAsync(cancellationToken);
 
             var listenedDates = await database.ListeningHistories
                 .AsNoTracking()
-                .Where(l => l.UserId == request.UserId && l.IsCounted)
+                .Where(l => l.UserId == request.UserId)
                 .Select(l => l.ListenedAt.Date)
                 .Distinct()
                 .ToListAsync(cancellationToken);

backend/Core/Musify.Domain/Entities/ListeningHistory.cs

@@ -19,12 +19,6 @@ namespace Musify.Domain.Entities
         [Required]
         public DateTime ListenedAt { get; set; } = DateTime.UtcNow;
 
-        public double? PlayedSeconds { get; set; }
-
-        public DateTime? LastProgressAt { get; set; }
-
-        public bool IsCounted { get; set; }
-
         [ForeignKey(nameof(UserId) )]
         public User User { get; set; }
 

backend/Core/Musify.Infrastructure/Jobs/DailyMixGenerationJob.cs

@@ -15,7 +15,6 @@ namespace Musify.Infrastructure.Jobs
         {
             var userIds = await database.ListeningHistories
                 .AsNoTracking()
-                .Where(history => history.IsCounted)
                 .Select(history => history.UserId)
                 .Distinct()
                 .ToListAsync(cancellationToken);

backend/Core/Musify.Infrastructure/Jobs/ListeningHistoryCleanupJob.cs

@@ -1,13 +0,0 @@
-using Mediator;
-using Musify.Application.Tracks;
-
-namespace Musify.Infrastructure.Jobs
-{
-    public class ListeningHistoryCleanupJob(IMediator mediator)
-    {
-        public async Task RunAsync(CancellationToken cancellationToken)
-        {
-            await mediator.Send(new DeleteStaleUncountedListensCommand(), cancellationToken);
-        }
-    }
-}

backend/Core/Musify.Infrastructure/Persistence/AuditableEntityInterceptor.cs

@@ -37,7 +37,7 @@ namespace Musify.Infrastructure.Persistence
                 }
                 else if (entry.State == EntityState.Modified)
                 {
-                    entry.Property(nameof(IAuditable.UpdatedAt)).CurrentValue = now;
+                    entry.Entity.UpdatedAt = now;
                 }
             }
         }

backend/Core/Musify.Infrastructure/Persistence/Database.cs

@@ -13,13 +13,9 @@ namespace Musify.Infrastructure.Persistence
     public class Database(DatabaseConfiguration configuration)
         : DbContext, AppIDatabase
     {
-        private static readonly AuditableEntityInterceptor AuditInterceptor = new();
-
         protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
         {
-            optionsBuilder
+            optionsBuilder.UseNpgsql(configuration.ConnectionString, o => o.MapEnum<Genre>("genre"));
-                .UseNpgsql(configuration.ConnectionString, o => o.MapEnum<Genre>("genre"))
-                .AddInterceptors(AuditInterceptor);
         }
 
         protected override void OnModelCreating(ModelBuilder modelBuilder)

backend/Core/Musify.Infrastructure/Persistence/DatabaseDependencyInjection.cs

@@ -18,7 +18,10 @@ namespace Musify.Infrastructure.Persistence
             serviceDescriptors.AddSingleton(serviceProvider =>
                 serviceProvider.GetRequiredService<IOptions<DatabaseConfiguration>>().Value);
 
-            serviceDescriptors.AddDbContext<Database>();
+            serviceDescriptors.AddSingleton<AuditableEntityInterceptor>();
+
+            serviceDescriptors.AddDbContext<Database>((serviceProvider, options) =>
+                options.AddInterceptors(serviceProvider.GetRequiredService<AuditableEntityInterceptor>()));
 
             serviceDescriptors.AddScoped<IDatabase>(serviceProvider => serviceProvider.GetRequiredService<Database>());
 

backend/Core/Musify.Infrastructure/Persistence/Migrations/20260923172640_TrackPlayedSeconds.cs

@@ -1,52 +0,0 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace Musify.Infrastructure.Persistence.Migrations
-{
-    /// <inheritdoc />
-    public partial class TrackPlayedSeconds : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AddColumn<bool>(
-                name: "IsCounted",
-                table: "ListeningHistory",
-                type: "boolean",
-                nullable: false,
-                defaultValue: false);
-
-            migrationBuilder.AddColumn<DateTime>(
-                name: "LastProgressAt",
-                table: "ListeningHistory",
-                type: "timestamp with time zone",
-                nullable: true);
-
-            migrationBuilder.AddColumn<double>(
-                name: "PlayedSeconds",
-                table: "ListeningHistory",
-                type: "double precision",
-                nullable: true);
-
-            migrationBuilder.Sql("UPDATE \"ListeningHistory\" SET \"IsCounted\" = TRUE;");
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropColumn(
-                name: "IsCounted",
-                table: "ListeningHistory");
-
-            migrationBuilder.DropColumn(
-                name: "LastProgressAt",
-                table: "ListeningHistory");
-
-            migrationBuilder.DropColumn(
-                name: "PlayedSeconds",
-                table: "ListeningHistory");
-        }
-    }
-}

backend/Core/Musify.Infrastructure/Persistence/Migrations/DatabaseModelSnapshot.cs

@@ -1,4 +1,4 @@
-// <auto-generated />
+
 using System;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
@@ -68,7 +68,7 @@ namespace Musify.Infrastructure.Persistence.Migrations
 
                     b.HasIndex("Delivered");
 
-                    b.ToTable("InboxState");
+                    b.ToTable("InboxState", (string)null);
                 });
 
             modelBuilder.Entity("MassTransit.EntityFrameworkCoreIntegration.OutboxMessage", b =>
@@ -159,7 +159,7 @@ namespace Musify.Infrastructure.Persistence.Migrations
                     b.HasIndex("InboxMessageId", "InboxConsumerId", "SequenceNumber")
                         .IsUnique();
 
-                    b.ToTable("OutboxMessage");
+                    b.ToTable("OutboxMessage", (string)null);
                 });
 
             modelBuilder.Entity("MassTransit.EntityFrameworkCoreIntegration.OutboxState", b =>
@@ -189,7 +189,7 @@ namespace Musify.Infrastructure.Persistence.Migrations
 
                     b.HasIndex("Created");
 
-                    b.ToTable("OutboxState");
+                    b.ToTable("OutboxState", (string)null);
                 });
 
             modelBuilder.Entity("Musify.Domain.Entities.Album", b =>
@@ -231,7 +231,7 @@ namespace Musify.Infrastructure.Persistence.Migrations
 
                     b.HasIndex("OwnerUserId");
 
-                    b.ToTable("Albums");
+                    b.ToTable("Albums", (string)null);
                 });
 
             modelBuilder.Entity("Musify.Domain.Entities.AlbumHasTrack", b =>
@@ -259,7 +259,7 @@ namespace Musify.Infrastructure.Persistence.Migrations
                     b.HasIndex("AlbumId", "TrackId")
                         .IsUnique();
 
-                    b.ToTable("AlbumHasTrack");
+                    b.ToTable("AlbumHasTrack", (string)null);
                 });
 
             modelBuilder.Entity("Musify.Domain.Entities.ListeningHistory", b =>
@@ -268,18 +268,9 @@ namespace Musify.Infrastructure.Persistence.Migrations
                         .ValueGeneratedOnAdd()
                         .HasColumnType("uuid");
 
-                    b.Property<bool>("IsCounted")
-                        .HasColumnType("boolean");
-
-                    b.Property<DateTime?>("LastProgressAt")
-                        .HasColumnType("timestamp with time zone");
-
                     b.Property<DateTime>("ListenedAt")
                         .HasColumnType("timestamp with time zone");
 
-                    b.Property<double?>("PlayedSeconds")
-                        .HasColumnType("double precision");
-
                     b.Property<Guid>("TrackId")
                         .HasColumnType("uuid");
 
@@ -292,7 +283,7 @@ namespace Musify.Infrastructure.Persistence.Migrations
 
                     b.HasIndex("UserId");
 
-                    b.ToTable("ListeningHistory");
+                    b.ToTable("ListeningHistory", (string)null);
                 });
 
             modelBuilder.Entity("Musify.Domain.Entities.Mix", b =>
@@ -326,7 +317,7 @@ namespace Musify.Infrastructure.Persistence.Migrations
 
                     b.HasIndex("UserId", "Position");
 
-                    b.ToTable("Mixes");
+                    b.ToTable("Mixes", (string)null);
                 });
 
             modelBuilder.Entity("Musify.Domain.Entities.MixItem", b =>
@@ -350,7 +341,7 @@ namespace Musify.Infrastructure.Persistence.Migrations
 
                     b.HasIndex("MixId", "Position");
 
-                    b.ToTable("MixItems");
+                    b.ToTable("MixItems", (string)null);
                 });
 
             modelBuilder.Entity("Musify.Domain.Entities.PlayList", b =>
@@ -394,7 +385,7 @@ namespace Musify.Infrastructure.Persistence.Migrations
 
                     b.HasIndex("UserId");
 
-                    b.ToTable("PlayLists");
+                    b.ToTable("PlayLists", (string)null);
                 });
 
             modelBuilder.Entity("Musify.Domain.Entities.PlayListHasTrack", b =>
@@ -421,7 +412,7 @@ namespace Musify.Infrastructure.Persistence.Migrations
 
                     b.HasIndex("TrackId");
 
-                    b.ToTable("PlayListHasTrack");
+                    b.ToTable("PlayListHasTrack", (string)null);
                 });
 
             modelBuilder.Entity("Musify.Domain.Entities.Track", b =>
@@ -459,7 +450,7 @@ namespace Musify.Infrastructure.Persistence.Migrations
 
                     b.HasIndex("OwnerUserId");
 
-                    b.ToTable("Tracks");
+                    b.ToTable("Tracks", (string)null);
                 });
 
             modelBuilder.Entity("Musify.Domain.Entities.TrackLike", b =>
@@ -484,7 +475,7 @@ namespace Musify.Infrastructure.Persistence.Migrations
                     b.HasIndex("UserId", "TrackId")
                         .IsUnique();
 
-                    b.ToTable("TrackLikes");
+                    b.ToTable("TrackLikes", (string)null);
                 });
 
             modelBuilder.Entity("Musify.Domain.Entities.TrackTag", b =>
@@ -504,7 +495,7 @@ namespace Musify.Infrastructure.Persistence.Migrations
                     b.HasIndex("TrackId", "Tag")
                         .IsUnique();
 
-                    b.ToTable("TrackTags");
+                    b.ToTable("TrackTags", (string)null);
                 });
 
             modelBuilder.Entity("Musify.Domain.Entities.Upload", b =>
@@ -533,7 +524,7 @@ namespace Musify.Infrastructure.Persistence.Migrations
 
                     b.HasKey("Id");
 
-                    b.ToTable("Upload");
+                    b.ToTable("Upload", (string)null);
                 });
 
             modelBuilder.Entity("Musify.Domain.Entities.UploadIntent", b =>
@@ -584,7 +575,7 @@ namespace Musify.Infrastructure.Persistence.Migrations
 
                     b.HasIndex("UserId");
 
-                    b.ToTable("UploadIntents");
+                    b.ToTable("UploadIntents", (string)null);
                 });
 
             modelBuilder.Entity("Musify.Domain.Entities.User", b =>
@@ -622,7 +613,7 @@ namespace Musify.Infrastructure.Persistence.Migrations
 
                     b.HasKey("Id");
 
-                    b.ToTable("User");
+                    b.ToTable("User", (string)null);
                 });
 
             modelBuilder.Entity("Musify.Domain.Entities.UserFollow", b =>
@@ -647,7 +638,7 @@ namespace Musify.Infrastructure.Persistence.Migrations
                     b.HasIndex("FollowerId", "FollowedId")
                         .IsUnique();
 
-                    b.ToTable("UserFollows");
+                    b.ToTable("UserFollows", (string)null);
                 });
 
             modelBuilder.Entity("Musify.Domain.Entities.UserHasTrack", b =>
@@ -668,7 +659,7 @@ namespace Musify.Infrastructure.Persistence.Migrations
 
                     b.HasIndex("UserId");
 
-                    b.ToTable("UserHasTrack");
+                    b.ToTable("UserHasTrack", (string)null);
                 });
 
             modelBuilder.Entity("Musify.Infrastructure.MassTransit.Sagas.AlbumProcessingState", b =>
@@ -695,7 +686,7 @@ namespace Musify.Infrastructure.Persistence.Migrations
 
                     b.HasKey("CorrelationId");
 
-                    b.ToTable("AlbumProcessingState");
+                    b.ToTable("AlbumProcessingState", (string)null);
                 });
 
             modelBuilder.Entity("Musify.Infrastructure.MassTransit.Sagas.PlayListProcessingState", b =>
@@ -722,7 +713,7 @@ namespace Musify.Infrastructure.Persistence.Migrations
 
                     b.HasKey("CorrelationId");
 
-                    b.ToTable("PlayListProcessingState");
+                    b.ToTable("PlayListProcessingState", (string)null);
                 });
 
             modelBuilder.Entity("Musify.Infrastructure.MassTransit.Sagas.TrackProcessingState", b =>
@@ -758,7 +749,7 @@ namespace Musify.Infrastructure.Persistence.Migrations
 
                     b.HasKey("CorrelationId");
 
-                    b.ToTable("TrackProcessingState");
+                    b.ToTable("TrackProcessingState", (string)null);
                 });
 
             modelBuilder.Entity("MassTransit.EntityFrameworkCoreIntegration.OutboxMessage", b =>
@@ -812,7 +803,7 @@ namespace Musify.Infrastructure.Persistence.Migrations
 
                             b1.HasKey("AlbumId");
 
-                            b1.ToTable("Albums");
+                            b1.ToTable("Albums", (string)null);
 
                             b1.WithOwner()
                                 .HasForeignKey("AlbumId");
@@ -905,28 +896,32 @@ namespace Musify.Infrastructure.Persistence.Migrations
                                 .HasColumnType("uuid");
 
                             b1.Property<string>("LargeName")
+                                .IsRequired()
                                 .HasMaxLength(64)
                                 .HasColumnType("character varying(64)")
                                 .HasColumnName("LargePictureName");
 
                             b1.Property<string>("MediumName")
+                                .IsRequired()
                                 .HasMaxLength(64)
                                 .HasColumnType("character varying(64)")
                                 .HasColumnName("MediumPictureName");
 
                             b1.Property<string>("OriginalName")
+                                .IsRequired()
                                 .HasMaxLength(64)
                                 .HasColumnType("character varying(64)")
                                 .HasColumnName("OriginalPictureName");
 
                             b1.Property<string>("SmallName")
+                                .IsRequired()
                                 .HasMaxLength(64)
                                 .HasColumnType("character varying(64)")
                                 .HasColumnName("SmallPictureName");
 
                             b1.HasKey("PlayListId");
 
-                            b1.ToTable("PlayLists");
+                            b1.ToTable("PlayLists", (string)null);
 
                             b1.WithOwner()
                                 .HasForeignKey("PlayListId");
@@ -997,7 +992,7 @@ namespace Musify.Infrastructure.Persistence.Migrations
 
                             b1.HasKey("TrackId");
 
-                            b1.ToTable("Tracks");
+                            b1.ToTable("Tracks", (string)null);
 
                             b1.WithOwner()
                                 .HasForeignKey("TrackId");
@@ -1034,7 +1029,7 @@ namespace Musify.Infrastructure.Persistence.Migrations
 
                             b1.HasKey("TrackId");
 
-                            b1.ToTable("Tracks");
+                            b1.ToTable("Tracks", (string)null);
 
                             b1.WithOwner()
                                 .HasForeignKey("TrackId");

backend/Core/Musify.Infrastructure/Services/ServicesDependencyInjection.cs

@@ -74,7 +74,6 @@ namespace Musify.Infrastructure.Services
 
             serviceDescriptors.AddHangfireServer();
             serviceDescriptors.AddScoped<DailyMixGenerationJob>();
-            serviceDescriptors.AddScoped<ListeningHistoryCleanupJob>();
 
             return serviceDescriptors;
         }

backend/Hosts/Musify.Api/DataTransferObjects/Tracks/RecordListeningProgressRequest.cs

@@ -1,3 +0,0 @@
-namespace Musify.Api.DataTransferObjects.Tracks;
-
-public record RecordListeningProgressRequest(double PlayedSeconds);

backend/Hosts/Musify.Api/Endpoints/GenreEndpoints.cs

@@ -1,39 +0,0 @@
-using Mediator;
-using Musify.Application.Genres;
-
-namespace Musify.Api.Endpoints;
-
-public static class GenreEndpoints
-{
-    public static IEndpointRouteBuilder MapGenreEndpoints(this IEndpointRouteBuilder app)
-    {
-        var group = app.MapGroup("/genres")
-            .WithTags("Genres");
-
-        group.MapGet("/", GetGenres)
-            .WithName("GetGenres")
-            .WithSummary("Get The Genres That Have At Least One Track, Most Populated First. Works Anonymously.")
-            .Produces<IReadOnlyList<GenreResponse>>();
-
-        group.MapGet("/available", GetAvailableGenres)
-            .WithName("GetAvailableGenres")
-            .WithSummary("Get Every Genre A Track Can Be Tagged With, Including The Genres It Cannot Be Combined With. Works Anonymously.")
-            .Produces<IReadOnlyList<AvailableGenreResponse>>();
-
-        return app;
-    }
-
-    private static async Task<IReadOnlyList<AvailableGenreResponse>> GetAvailableGenres(
-        IMediator mediator,
-        CancellationToken cancellationToken)
-    {
-        return await mediator.Send(new GetAvailableGenresQuery(), cancellationToken);
-    }
-
-    private static async Task<IReadOnlyList<GenreResponse>> GetGenres(
-        IMediator mediator,
-        CancellationToken cancellationToken)
-    {
-        return await mediator.Send(new GetGenresQuery(), cancellationToken);
-    }
-}

backend/Hosts/Musify.Api/Endpoints/TrackEndpoints.cs

@@ -1,5 +1,4 @@
 using Mediator;
-using Musify.Domain.ValueObjects;
 using Musify.Application.Tracks;
 using Musify.Application.Tracks.Responses;
 using Musify.Application.Shared;
@@ -20,9 +19,8 @@ public static class TrackEndpoints
 
         group.MapGet("/", GetTracks)
             .WithName("GetTracks")
-            .WithSummary("Get Paginated Tracks, Optionally Filtered By Name And Genre.")
+            .WithSummary("Get Paginated Tracks, Optionally Filtered By Name.")
-            .Produces<TracksSearchResponse>()
+            .Produces<TracksSearchResponse>();
-            .ProducesValidationProblem();
 
         group.MapGet("/{id}", GetTrackById)
             .WithName("GetTrackById")
@@ -43,14 +41,6 @@ public static class TrackEndpoints
             .Produces(StatusCodes.Status401Unauthorized)
             .Produces(StatusCodes.Status404NotFound);
 
-        group.MapPut("/listens/{listenId}/progress", RecordListeningProgress)
-            .WithName("RecordListeningProgress")
-            .WithSummary("Report The Total Seconds Actually Played For A Listen Started By The Stream Endpoint.")
-            .RequireAuthorization()
-            .Produces(StatusCodes.Status204NoContent)
-            .Produces(StatusCodes.Status401Unauthorized)
-            .Produces(StatusCodes.Status404NotFound);
-
         group.MapGet("/users/{userId}", GetTracksByUserId)
             .WithName("GetTracksByUserId")
             .WithSummary("Get Paginated Tracks For A User.")
@@ -94,25 +84,10 @@ public static class TrackEndpoints
         IMediator mediator,
         CancellationToken cancellationToken,
         string? name,
-        string? genre,
         int pageNumber = 1,
         int pageSize = 10)
     {
-        Genre? parsedGenre = null;
+        var result = await mediator.Send(new GetTracksQuery(name, pageNumber, pageSize), cancellationToken);
-        if (!string.IsNullOrWhiteSpace(genre))
-        {
-            if (!Enum.TryParse<Genre>(genre, ignoreCase: true, out var value) || !Enum.IsDefined(value))
-            {
-                return Results.ValidationProblem(new Dictionary<string, string[]>
-                {
-                    [nameof(genre)] = [$"'{genre}' is not a valid genre."]
-                });
-            }
-
-            parsedGenre = value;
-        }
-
-        var result = await mediator.Send(new GetTracksQuery(name, pageNumber, pageSize, parsedGenre), cancellationToken);
         return result.ToHttpResult();
     }
 
@@ -153,19 +128,6 @@ public static class TrackEndpoints
         return result.ToHttpResult();
     }
 
-    private static async Task<IResult> RecordListeningProgress(
-        IMediator mediator,
-        CurrentUser currentUser,
-        Guid listenId,
-        RecordListeningProgressRequest request,
-        CancellationToken cancellationToken)
-    {
-        var result = await mediator.Send(
-            new RecordListeningProgressCommand(currentUser.RequiredId, listenId, request.PlayedSeconds),
-            cancellationToken);
-        return result.ToHttpResult();
-    }
-
     private static async Task<IResult> GetTracksByUserId(
         IMediator mediator,
         long userId,

backend/Hosts/Musify.Api/Program.cs

@@ -40,7 +40,6 @@ app.UseAuthorization();
 app
     .MapAlbumEndpoints()
     .MapConfigEndpoints()
-    .MapGenreEndpoints()
     .MapLikeEndpoints()
     .MapMixEndpoints()
     .MapPlayListEndpoints()

backend/Hosts/Musify.Worker/Program.cs

@@ -41,11 +41,6 @@ using (var scope = host.Services.CreateScope())
         job => job.RunAsync(CancellationToken.None),
         Cron.Daily(),
         new RecurringJobOptions { TimeZone = TimeZoneInfo.Utc });
-    recurringJobManager.AddOrUpdate<ListeningHistoryCleanupJob>(
-        "listening-history-cleanup",
-        job => job.RunAsync(CancellationToken.None),
-        Cron.Daily(3),
-        new RecurringJobOptions { TimeZone = TimeZoneInfo.Utc });
 }
 
 host.Run();

backend/Tests/Musify.Api.Tests/Endpoints/GenreEndpointsTests.cs

@@ -1,106 +0,0 @@
-using System.Net;
-using System.Net.Http.Json;
-using System.Text.Json;
-using System.Text.Json.Serialization;
-using Microsoft.Extensions.DependencyInjection;
-using Musify.Api.Tests.TestSupport;
-using Musify.Application.Genres;
-using Musify.Application.Tracks.Responses;
-using Musify.Domain.Entities;
-using Musify.Domain.ValueObjects;
-using Musify.Infrastructure.Persistence;
-using Xunit;
-
-namespace Musify.Api.Tests.Endpoints
-{
-    [Collection(ApiCollection.Name)]
-    public sealed class GenreEndpointsTests(ApiTestFixture fixture)
-    {
-        private static readonly JsonSerializerOptions JsonOptions = new(JsonSerializerDefaults.Web)
-        {
-            Converters = { new JsonStringEnumConverter() }
-        };
-
-        private async Task<string> SeedTrackAsync(Genre genre)
-        {
-            using var scope = fixture.Services.CreateScope();
-            var database = scope.ServiceProvider.GetRequiredService<Database>();
-            var owner = new User { Id = Random.Shared.NextInt64(1, long.MaxValue), Name = "genre-owner", NormalizedName = "GENRE-OWNER" };
-            var title = $"Genre track {Guid.NewGuid():N}";
-            var track = new Track
-            {
-                Title = title,
-                NormalizedTitle = title.ToUpperInvariant(),
-                OwnerUserId = owner.Id,
-                Owner = owner,
-                Tags = [new TrackTag { TrackId = Guid.Empty, Tag = genre }]
-            };
-            foreach (var tag in track.Tags)
-                tag.TrackId = track.Id;
-            database.Users.Add(owner);
-            database.Tracks.Add(track);
-            database.UserHasTracks.Add(new UserHasTrack { UserId = owner.Id, TrackId = track.Id });
-            await database.SaveChangesAsync(TestContext.Current.CancellationToken);
-            return title;
-        }
-
-        [Fact]
-        public async Task GetGenres_Anonymous_ListsGenresInUse()
-        {
-            await SeedTrackAsync(Genre.Funk);
-
-            var response = await fixture.CreateAnonymousClient().GetAsync("/genres", TestContext.Current.CancellationToken);
-
-            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
-            var body = await response.Content.ReadFromJsonAsync<List<GenreResponse>>(JsonOptions, TestContext.Current.CancellationToken);
-            Assert.Contains(body!, g => g.Genre == Genre.Funk && g.TrackCount >= 1);
-        }
-
-        [Fact]
-        public async Task GetAvailableGenres_Anonymous_ListsEveryGenreWithIncompatibilities()
-        {
-            var response = await fixture.CreateAnonymousClient().GetAsync("/genres/available", TestContext.Current.CancellationToken);
-
-            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
-            var body = await response.Content.ReadFromJsonAsync<List<AvailableGenreResponse>>(JsonOptions, TestContext.Current.CancellationToken);
-            Assert.Equal(Enum.GetValues<Genre>().Length, body!.Count);
-            Assert.Contains(Genre.Lofi, body.Single(g => g.Genre == Genre.Metal).IncompatibleWith);
-        }
-
-        [Theory]
-        [InlineData("Nope")]
-        [InlineData("999")]
-        public async Task GetTracks_UnknownGenre_ReturnsBadRequest(string genre)
-        {
-            var response = await fixture.CreateAnonymousClient().GetAsync($"/tracks?genre={genre}", TestContext.Current.CancellationToken);
-
-            Assert.Equal(HttpStatusCode.BadRequest, response.StatusCode);
-        }
-
-        [Fact]
-        public async Task GetTracks_GenreQuery_IsCaseInsensitive()
-        {
-            var title = await SeedTrackAsync(Genre.Blues);
-
-            var response = await fixture.CreateAnonymousClient().GetAsync("/tracks?genre=blues&pageSize=100", TestContext.Current.CancellationToken);
-
-            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
-            var body = await response.Content.ReadFromJsonAsync<TracksSearchResponse>(JsonOptions, TestContext.Current.CancellationToken);
-            Assert.Contains(body!.Items, item => item.Track.Title == title);
-        }
-
-        [Fact]
-        public async Task GetTracks_GenreQuery_FiltersByTag()
-        {
-            var title = await SeedTrackAsync(Genre.Ambient);
-            await SeedTrackAsync(Genre.Techno);
-
-            var response = await fixture.CreateAnonymousClient().GetAsync("/tracks?genre=Ambient&pageSize=100", TestContext.Current.CancellationToken);
-
-            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
-            var body = await response.Content.ReadFromJsonAsync<TracksSearchResponse>(JsonOptions, TestContext.Current.CancellationToken);
-            Assert.Contains(body!.Items, item => item.Track.Title == title);
-            Assert.All(body.Items, item => Assert.Contains(Genre.Ambient, item.Track.Tags));
-        }
-    }
-}

backend/Tests/Musify.Api.Tests/Endpoints/ListeningProgressEndpointsTests.cs

@@ -1,109 +0,0 @@
-using System.Net;
-using System.Net.Http.Json;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.DependencyInjection;
-using Musify.Api.DataTransferObjects.Tracks;
-using Musify.Api.DataTransferObjects.Users;
-using Musify.Domain.Entities;
-using Musify.Infrastructure.Persistence;
-using Xunit;
-using Musify.Api.Tests.TestSupport;
-
-namespace Musify.Api.Tests.Endpoints
-{
-    [Collection(ApiCollection.Name)]
-    public sealed class ListeningProgressEndpointsTests(ApiTestFixture fixture)
-    {
-        private async Task<long> CreateUserAsync()
-        {
-            var userId = Random.Shared.NextInt64(1, long.MaxValue);
-            var response = await fixture.CreateAnonymousClient().PostAsJsonAsync(
-                "/users", new CreateUserRequest(userId, $"user-{userId}", null, null), TestContext.Current.CancellationToken);
-            response.EnsureSuccessStatusCode();
-            return userId;
-        }
-
-        private async Task<Guid> SeedListenAsync(long userId, double durationSeconds)
-        {
-            using var scope = fixture.Services.CreateScope();
-            var database = scope.ServiceProvider.GetRequiredService<Database>();
-            var owner = await database.Users.SingleAsync(u => u.Id == userId, TestContext.Current.CancellationToken);
-            var track = new Track
-            {
-                Title = "Progress track",
-                NormalizedTitle = "PROGRESS TRACK",
-                OwnerUserId = owner.Id,
-                Owner = owner,
-                DurationSeconds = durationSeconds
-            };
-            var listen = new ListeningHistory
-            {
-                UserId = userId,
-                TrackId = track.Id,
-                ListenedAt = DateTime.UtcNow.AddMinutes(-10)
-            };
-            database.Tracks.Add(track);
-            database.ListeningHistories.Add(listen);
-            await database.SaveChangesAsync(TestContext.Current.CancellationToken);
-            return listen.Id;
-        }
-
-        private async Task<ListeningHistory> LoadListenAsync(Guid listenId)
-        {
-            using var scope = fixture.Services.CreateScope();
-            var database = scope.ServiceProvider.GetRequiredService<Database>();
-            return await database.ListeningHistories.AsNoTracking()
-                .SingleAsync(l => l.Id == listenId, TestContext.Current.CancellationToken);
-        }
-
-        [Fact]
-        public async Task PutProgress_Anonymous_ReturnsUnauthorized()
-        {
-            var response = await fixture.CreateAnonymousClient().PutAsJsonAsync(
-                $"/tracks/listens/{Guid.NewGuid()}/progress", new RecordListeningProgressRequest(10), TestContext.Current.CancellationToken);
-
-            Assert.Equal(HttpStatusCode.Unauthorized, response.StatusCode);
-        }
-
-        [Fact]
-        public async Task PutProgress_OwnListen_StoresSecondsAndMarksCounted()
-        {
-            var userId = await CreateUserAsync();
-            var listenId = await SeedListenAsync(userId, durationSeconds: 200);
-
-            var response = await fixture.CreateAuthenticatedClient(userId).PutAsJsonAsync(
-                $"/tracks/listens/{listenId}/progress", new RecordListeningProgressRequest(45), TestContext.Current.CancellationToken);
-
-            Assert.Equal(HttpStatusCode.NoContent, response.StatusCode);
-            var stored = await LoadListenAsync(listenId);
-            Assert.Equal(45, stored.PlayedSeconds);
-            Assert.True(stored.IsCounted);
-        }
-
-        [Fact]
-        public async Task PutProgress_OtherUsersListen_ReturnsNotFound()
-        {
-            var ownerId = await CreateUserAsync();
-            var otherId = await CreateUserAsync();
-            var listenId = await SeedListenAsync(ownerId, durationSeconds: 200);
-
-            var response = await fixture.CreateAuthenticatedClient(otherId).PutAsJsonAsync(
-                $"/tracks/listens/{listenId}/progress", new RecordListeningProgressRequest(45), TestContext.Current.CancellationToken);
-
-            Assert.Equal(HttpStatusCode.NotFound, response.StatusCode);
-            Assert.Null((await LoadListenAsync(listenId)).PlayedSeconds);
-        }
-
-        [Fact]
-        public async Task PutProgress_NegativeSeconds_ReturnsBadRequest()
-        {
-            var userId = await CreateUserAsync();
-            var listenId = await SeedListenAsync(userId, durationSeconds: 200);
-
-            var response = await fixture.CreateAuthenticatedClient(userId).PutAsJsonAsync(
-                $"/tracks/listens/{listenId}/progress", new RecordListeningProgressRequest(-5), TestContext.Current.CancellationToken);
-
-            Assert.Equal(HttpStatusCode.BadRequest, response.StatusCode);
-        }
-    }
-}

backend/Tests/Musify.Application.Tests/Albums/GetRecentlyListenedAlbumsQueryHandlerTests.cs

@@ -57,25 +57,5 @@ namespace Musify.Application.Tests.Albums
             Assert.False(result.IsError);
             Assert.Equal(2, result.Value.Count);
         }
-
-        [Fact]
-        public async Task Handle_UncountedListens_AreIgnored()
-        {
-            var owner = TestEntities.User();
-            var countedAlbum = TestEntities.Album(owner.Id, "Counted album");
-            var skippedAlbum = TestEntities.Album(owner.Id, "Skipped album");
-            var countedTrack = TestEntities.Track(owner, "In counted");
-            var skippedTrack = TestEntities.Track(owner, "In skipped");
-            await SeedAsync(
-                owner, countedAlbum, skippedAlbum, countedTrack, skippedTrack,
-                new AlbumHasTrack { AlbumId = countedAlbum.Id, TrackId = countedTrack.Id, TrackNumber = 1 },
-                new AlbumHasTrack { AlbumId = skippedAlbum.Id, TrackId = skippedTrack.Id, TrackNumber = 1 },
-                TestEntities.ListeningHistory(owner.Id, countedTrack.Id, DateTime.UtcNow.AddDays(-1), playedSeconds: 120),
-                TestEntities.ListeningHistory(owner.Id, skippedTrack.Id, DateTime.UtcNow, playedSeconds: 1, isCounted: false));
-
-            var result = await CreateHandler().Handle(new GetRecentlyListenedAlbumsQuery(owner.Id, Limit: 10), TestContext.Current.CancellationToken);
-
-            Assert.Equal(["Counted album"], result.Value.Select(album => album.Title));
-        }
     }
 }

backend/Tests/Musify.Application.Tests/Genres/GetAvailableGenresQueryHandlerTests.cs

@@ -1,32 +0,0 @@
-using Musify.Application.Genres;
-using Musify.Domain.ValueObjects;
-using Xunit;
-
-namespace Musify.Application.Tests.Genres
-{
-    public sealed class GetAvailableGenresQueryHandlerTests
-    {
-        private static async Task<IReadOnlyList<AvailableGenreResponse>> RunAsync() =>
-            await new GetAvailableGenresQueryHandler().Handle(new GetAvailableGenresQuery(), TestContext.Current.CancellationToken);
-
-        [Fact]
-        public async Task Handle_ReturnsEveryGenre()
-        {
-            var result = await RunAsync();
-
-            Assert.Equal(Enum.GetValues<Genre>(), result.Select(r => r.Genre));
-        }
-
-        [Fact]
-        public async Task Handle_ListsIncompatibleGenresSymmetrically()
-        {
-            var result = await RunAsync();
-
-            var metal = result.Single(r => r.Genre == Genre.Metal);
-            var lofi = result.Single(r => r.Genre == Genre.Lofi);
-            Assert.Contains(Genre.Lofi, metal.IncompatibleWith);
-            Assert.Contains(Genre.Metal, lofi.IncompatibleWith);
-            Assert.Empty(result.Single(r => r.Genre == Genre.Pop).IncompatibleWith);
-        }
-    }
-}

backend/Tests/Musify.Application.Tests/Genres/GetGenresQueryHandlerTests.cs

@@ -1,69 +0,0 @@
-using Musify.Application.Genres;
-using Musify.Application.Tests.TestSupport;
-using Musify.Domain.Entities;
-using Musify.Domain.ValueObjects;
-using Xunit;
-
-namespace Musify.Application.Tests.Genres
-{
-    public sealed class GetGenresQueryHandlerTests : HandlerTestBase
-    {
-        private GetGenresQueryHandler CreateHandler() => new(Database);
-
-        [Fact]
-        public async Task Handle_NoTracks_ReturnsEmpty()
-        {
-            var result = await CreateHandler().Handle(new GetGenresQuery(), TestContext.Current.CancellationToken);
-
-            Assert.Empty(result);
-        }
-
-        [Fact]
-        public async Task Handle_ReturnsOnlyGenresInUse_MostPopulatedFirst()
-        {
-            var owner = TestEntities.User();
-            var rockA = TestEntities.Track(owner, "Rock A", tags: [Genre.Rock]);
-            var rockB = TestEntities.Track(owner, "Rock B", tags: [Genre.Rock, Genre.Indie]);
-            var jazz = TestEntities.Track(owner, "Jazz", tags: [Genre.Jazz]);
-            await SeedAsync(
-                owner, rockA, rockB, jazz,
-                new UserHasTrack { UserId = owner.Id, TrackId = rockA.Id },
-                new UserHasTrack { UserId = owner.Id, TrackId = rockB.Id },
-                new UserHasTrack { UserId = owner.Id, TrackId = jazz.Id });
-
-            var result = await CreateHandler().Handle(new GetGenresQuery(), TestContext.Current.CancellationToken);
-
-            Assert.Equal(
-                [(Genre.Rock, 2), (Genre.Jazz, 1), (Genre.Indie, 1)],
-                result.Select(r => (r.Genre, r.TrackCount)));
-        }
-
-        [Fact]
-        public async Task Handle_TrackInSeveralLibraries_IsCountedOnce()
-        {
-            var owner = TestEntities.User();
-            var other = TestEntities.User(id: 2, name: "other-user");
-            var track = TestEntities.Track(owner, tags: [Genre.Pop]);
-            await SeedAsync(
-                owner, other, track,
-                new UserHasTrack { UserId = owner.Id, TrackId = track.Id },
-                new UserHasTrack { UserId = other.Id, TrackId = track.Id });
-
-            var result = await CreateHandler().Handle(new GetGenresQuery(), TestContext.Current.CancellationToken);
-
-            Assert.Equal(1, Assert.Single(result).TrackCount);
-        }
-
-        [Fact]
-        public async Task Handle_TrackNotInAnyLibrary_IsIgnored()
-        {
-            var owner = TestEntities.User();
-            var track = TestEntities.Track(owner, tags: [Genre.Metal]);
-            await SeedAsync(owner, track);
-
-            var result = await CreateHandler().Handle(new GetGenresQuery(), TestContext.Current.CancellationToken);
-
-            Assert.Empty(result);
-        }
-    }
-}

backend/Tests/Musify.Application.Tests/Mixes/GenerateMixesForUserCommandHandlerTests.cs

@@ -72,21 +72,5 @@ namespace Musify.Application.Tests.Mixes
                 .ToListAsync(TestContext.Current.CancellationToken);
             Assert.All(discoveryItems, item => Assert.Equal(unheardTrack.Id, item.TrackId));
         }
-
-        [Fact]
-        public async Task Handle_TrackWithOnlyUncountedListens_IsTreatedAsUnheard()
-        {
-            var user = TestEntities.User();
-            var skipped = TestEntities.Track(user, "Only skipped");
-            await SeedAsync(
-                user, skipped,
-                new UserHasTrack { UserId = user.Id, TrackId = skipped.Id },
-                TestEntities.ListeningHistory(user.Id, skipped.Id, playedSeconds: 3, isCounted: false));
-
-            await CreateHandler().Handle(new GenerateMixesForUserCommand(user.Id), TestContext.Current.CancellationToken);
-
-            var mixes = await Database.Mixes.ToListAsync(TestContext.Current.CancellationToken);
-            Assert.Contains(mixes, mix => mix.Title == "Descubrimiento");
-        }
     }
 }

backend/Tests/Musify.Application.Tests/TestSupport/TestEntities.cs

@@ -177,16 +177,12 @@ namespace Musify.Application.Tests.TestSupport
         public static ListeningHistory ListeningHistory(
             long userId,
             Guid trackId,
-            DateTime? listenedAt = null,
+            DateTime? listenedAt = null) =>
-            double? playedSeconds = null,
-            bool isCounted = true) =>
             new()
             {
                 UserId = userId,
                 TrackId = trackId,
-                ListenedAt = listenedAt ?? DateTime.UtcNow,
+                ListenedAt = listenedAt ?? DateTime.UtcNow
-                PlayedSeconds = playedSeconds,
-                IsCounted = isCounted
             };
     }
 }

backend/Tests/Musify.Application.Tests/Tracks/DeleteStaleUncountedListensCommandHandlerTests.cs

@@ -1,32 +0,0 @@
-using Microsoft.EntityFrameworkCore;
-using Musify.Application.Tests.TestSupport;
-using Musify.Application.Tracks;
-using Xunit;
-
-namespace Musify.Application.Tests.Tracks
-{
-    public sealed class DeleteStaleUncountedListensCommandHandlerTests : HandlerTestBase
-    {
-        private DeleteStaleUncountedListensCommandHandler CreateHandler() =>
-            new(Database, NoOpLogger<DeleteStaleUncountedListensCommandHandler>());
-
-        [Fact]
-        public async Task Handle_DeletesOnlyOldUncountedListens()
-        {
-            var owner = TestEntities.User();
-            var track = TestEntities.Track(owner);
-            var oldUncounted = TestEntities.ListeningHistory(owner.Id, track.Id, DateTime.UtcNow.AddDays(-9), playedSeconds: 2, isCounted: false);
-            var oldCounted = TestEntities.ListeningHistory(owner.Id, track.Id, DateTime.UtcNow.AddDays(-9), playedSeconds: 100);
-            var recentUncounted = TestEntities.ListeningHistory(owner.Id, track.Id, DateTime.UtcNow.AddDays(-2), playedSeconds: 2, isCounted: false);
-            await SeedAsync(owner, track, oldUncounted, oldCounted, recentUncounted);
-
-            var deleted = await CreateHandler().Handle(new DeleteStaleUncountedListensCommand(), TestContext.Current.CancellationToken);
-
-            Assert.Equal(1, deleted);
-            var remaining = await Database.ListeningHistories.Select(l => l.Id).ToListAsync(TestContext.Current.CancellationToken);
-            Assert.DoesNotContain(oldUncounted.Id, remaining);
-            Assert.Contains(oldCounted.Id, remaining);
-            Assert.Contains(recentUncounted.Id, remaining);
-        }
-    }
-}

backend/Tests/Musify.Application.Tests/Tracks/GetListeningHistoryQueryHandlerTests.cs

@@ -35,21 +35,5 @@ namespace Musify.Application.Tests.Tracks
 
             Assert.Empty(result);
         }
-
-        [Fact]
-        public async Task Handle_UncountedListens_AreIgnored()
-        {
-            var owner = TestEntities.User();
-            var counted = TestEntities.Track(owner, "Counted");
-            var skipped = TestEntities.Track(owner, "Skipped");
-            await SeedAsync(
-                owner, counted, skipped,
-                TestEntities.ListeningHistory(owner.Id, counted.Id, DateTime.UtcNow.AddMinutes(-5), playedSeconds: 90),
-                TestEntities.ListeningHistory(owner.Id, skipped.Id, DateTime.UtcNow, playedSeconds: 2, isCounted: false));
-
-            var result = await CreateHandler().Handle(new GetListeningHistoryQuery(owner.Id), TestContext.Current.CancellationToken);
-
-            Assert.Equal(["Counted"], result.Select(track => track.Title));
-        }
     }
 }

backend/Tests/Musify.Application.Tests/Tracks/GetTrackByIdQueryHandlerTests.cs

@@ -33,21 +33,5 @@ namespace Musify.Application.Tests.Tracks
 
             Assert.Equal(ErrorType.NotFound, result.FirstError.Type);
         }
-
-        [Fact]
-        public async Task Handle_ListensCount_OnlyCountsCountedListens()
-        {
-            var owner = TestEntities.User();
-            var track = TestEntities.Track(owner);
-            await SeedAsync(
-                owner, track,
-                TestEntities.ListeningHistory(owner.Id, track.Id, playedSeconds: 100),
-                TestEntities.ListeningHistory(owner.Id, track.Id, playedSeconds: 100),
-                TestEntities.ListeningHistory(owner.Id, track.Id, playedSeconds: 1, isCounted: false));
-
-            var result = await CreateHandler().Handle(new GetTrackByIdQuery(track.Id), TestContext.Current.CancellationToken);
-
-            Assert.Equal(2, result.Value.ListensCount);
-        }
     }
 }

backend/Tests/Musify.Application.Tests/Tracks/GetTrackStreamQueryHandlerTests.cs

@@ -45,9 +45,6 @@ namespace Musify.Application.Tests.Tracks
             var history = Assert.Single(await Database.ListeningHistories.ToListAsync(TestContext.Current.CancellationToken));
             Assert.Equal(owner.Id, history.UserId);
             Assert.Equal(track.Id, history.TrackId);
-            Assert.Equal(history.Id, result.Value.ListenId);
-            Assert.False(history.IsCounted);
-            Assert.Null(history.PlayedSeconds);
         }
 
         [Fact]

backend/Tests/Musify.Application.Tests/Tracks/GetTracksQueryHandlerTests.cs

@@ -1,6 +1,5 @@
 using Musify.Application.Tests.TestSupport;
 using Musify.Application.Tracks;
-using Musify.Domain.ValueObjects;
 using Xunit;
 
 namespace Musify.Application.Tests.Tracks
@@ -44,23 +43,5 @@ namespace Musify.Application.Tests.Tracks
             var item = Assert.Single(result.Value.Items);
             Assert.Equal("Bohemian Rhapsody", item.Track.Title);
         }
-
-        [Fact]
-        public async Task Handle_GenreFilter_ReturnsOnlyTracksWithThatTag()
-        {
-            var owner = TestEntities.User();
-            var rock = TestEntities.Track(owner, "Loud", tags: [Genre.Rock, Genre.Indie]);
-            var jazz = TestEntities.Track(owner, "Smooth", tags: [Genre.Jazz]);
-            await SeedAsync(
-                owner, rock, jazz,
-                new Musify.Domain.Entities.UserHasTrack { UserId = owner.Id, TrackId = rock.Id },
-                new Musify.Domain.Entities.UserHasTrack { UserId = owner.Id, TrackId = jazz.Id });
-
-            var result = await CreateHandler().Handle(new GetTracksQuery(null, 1, 10, Genre.Indie), TestContext.Current.CancellationToken);
-
-            Assert.False(result.IsError);
-            var item = Assert.Single(result.Value.Items);
-            Assert.Equal("Loud", item.Track.Title);
-        }
     }
 }

backend/Tests/Musify.Application.Tests/Tracks/RecordListeningProgressCommandHandlerTests.cs

@@ -1,127 +0,0 @@
-using ErrorOr;
-using Microsoft.EntityFrameworkCore;
-using Musify.Application.Tests.TestSupport;
-using Musify.Application.Tracks;
-using Musify.Domain.Entities;
-using Xunit;
-
-namespace Musify.Application.Tests.Tracks
-{
-    public sealed class RecordListeningProgressCommandHandlerTests : HandlerTestBase
-    {
-        private RecordListeningProgressCommandHandler CreateHandler() => new(Database);
-
-        private async Task<ListeningHistory> ReloadAsync(Guid id) =>
-            await Database.ListeningHistories.AsNoTracking()
-                .SingleAsync(l => l.Id == id, TestContext.Current.CancellationToken);
-
-        private async Task<(User User, ListeningHistory Listen)> SeedListenAsync(
-            double durationSeconds, DateTime listenedAt)
-        {
-            var user = TestEntities.User();
-            var track = TestEntities.Track(user, durationSeconds: durationSeconds);
-            var listen = TestEntities.ListeningHistory(user.Id, track.Id, listenedAt, isCounted: false);
-            await SeedAsync(user, track, listen);
-            return (user, listen);
-        }
-
-        [Fact]
-        public async Task Handle_BelowThreshold_StoresSecondsWithoutCounting()
-        {
-            var (user, listen) = await SeedListenAsync(200, DateTime.UtcNow.AddSeconds(-60));
-
-            var result = await CreateHandler().Handle(
-                new RecordListeningProgressCommand(user.Id, listen.Id, 10), TestContext.Current.CancellationToken);
-
-            Assert.False(result.IsError);
-            var stored = await ReloadAsync(listen.Id);
-            Assert.Equal(10, stored.PlayedSeconds);
-            Assert.False(stored.IsCounted);
-        }
-
-        [Fact]
-        public async Task Handle_ReachesThirtySeconds_MarksAsCounted()
-        {
-            var (user, listen) = await SeedListenAsync(200, DateTime.UtcNow.AddSeconds(-60));
-
-            await CreateHandler().Handle(
-                new RecordListeningProgressCommand(user.Id, listen.Id, 30), TestContext.Current.CancellationToken);
-
-            Assert.True((await ReloadAsync(listen.Id)).IsCounted);
-        }
-
-        [Fact]
-        public async Task Handle_ShortTrack_CountsAtHalfDuration()
-        {
-            var (user, listen) = await SeedListenAsync(20, DateTime.UtcNow.AddSeconds(-60));
-
-            await CreateHandler().Handle(
-                new RecordListeningProgressCommand(user.Id, listen.Id, 10), TestContext.Current.CancellationToken);
-
-            Assert.True((await ReloadAsync(listen.Id)).IsCounted);
-        }
-
-        [Fact]
-        public async Task Handle_LowerValueThanStored_KeepsHighest()
-        {
-            var (user, listen) = await SeedListenAsync(200, DateTime.UtcNow.AddSeconds(-60));
-            var handler = CreateHandler();
-
-            await handler.Handle(new RecordListeningProgressCommand(user.Id, listen.Id, 40), TestContext.Current.CancellationToken);
-            await handler.Handle(new RecordListeningProgressCommand(user.Id, listen.Id, 15), TestContext.Current.CancellationToken);
-
-            var stored = await ReloadAsync(listen.Id);
-            Assert.Equal(40, stored.PlayedSeconds);
-            Assert.True(stored.IsCounted);
-        }
-
-        [Fact]
-        public async Task Handle_MoreThanElapsedClock_IsCappedToElapsedTime()
-        {
-            var (user, listen) = await SeedListenAsync(200, DateTime.UtcNow.AddSeconds(-20));
-
-            await CreateHandler().Handle(
-                new RecordListeningProgressCommand(user.Id, listen.Id, 150), TestContext.Current.CancellationToken);
-
-            var stored = await ReloadAsync(listen.Id);
-            Assert.InRange(stored.PlayedSeconds!.Value, 24, 27);
-        }
-
-        [Fact]
-        public async Task Handle_MoreThanTrackDuration_IsCappedToDuration()
-        {
-            var (user, listen) = await SeedListenAsync(50, DateTime.UtcNow.AddMinutes(-30));
-
-            await CreateHandler().Handle(
-                new RecordListeningProgressCommand(user.Id, listen.Id, 900), TestContext.Current.CancellationToken);
-
-            Assert.Equal(52, (await ReloadAsync(listen.Id)).PlayedSeconds);
-        }
-
-        [Fact]
-        public async Task Handle_OtherUsersListen_ReturnsNotFound()
-        {
-            var (_, listen) = await SeedListenAsync(200, DateTime.UtcNow.AddSeconds(-60));
-
-            var result = await CreateHandler().Handle(
-                new RecordListeningProgressCommand(long.MaxValue, listen.Id, 10), TestContext.Current.CancellationToken);
-
-            Assert.True(result.IsError);
-            Assert.Equal(ErrorType.NotFound, result.FirstError.Type);
-        }
-
-        [Theory]
-        [InlineData(-1)]
-        [InlineData(double.NaN)]
-        [InlineData(double.PositiveInfinity)]
-        public async Task Handle_InvalidSeconds_ReturnsValidationError(double seconds)
-        {
-            var (user, listen) = await SeedListenAsync(200, DateTime.UtcNow.AddSeconds(-60));
-
-            var result = await CreateHandler().Handle(
-                new RecordListeningProgressCommand(user.Id, listen.Id, seconds), TestContext.Current.CancellationToken);
-
-            Assert.Equal(ErrorType.Validation, result.FirstError.Type);
-        }
-    }
-}

backend/Tests/Musify.Application.Tests/Users/GetListeningStatsQueryHandlerTests.cs

@@ -40,37 +40,6 @@ namespace Musify.Application.Tests.Users
             Assert.Equal(500, result.SecondsThisWeek);
         }
 
-        [Fact]
-        public async Task Handle_PlayedSeconds_SumsPlayedTimeInsteadOfDuration()
-        {
-            var user = TestEntities.User();
-            var track = TestEntities.Track(user, durationSeconds: 200);
-            await SeedAsync(
-                user, track,
-                TestEntities.ListeningHistory(user.Id, track.Id, playedSeconds: 200),
-                TestEntities.ListeningHistory(user.Id, track.Id, playedSeconds: 12, isCounted: false));
-
-            var result = await CreateHandler().Handle(new GetListeningStatsQuery(user.Id), TestContext.Current.CancellationToken);
-
-            Assert.Equal(212, result.SecondsThisWeek);
-        }
-
-        [Fact]
-        public async Task Handle_UncountedListens_AreExcludedFromTracksAndStreak()
-        {
-            var user = TestEntities.User();
-            var track = TestEntities.Track(user);
-            await SeedAsync(
-                user, track,
-                TestEntities.ListeningHistory(user.Id, track.Id, playedSeconds: 3, isCounted: false));
-
-            var result = await CreateHandler().Handle(new GetListeningStatsQuery(user.Id), TestContext.Current.CancellationToken);
-
-            Assert.Equal(0, result.TracksThisWeek);
-            Assert.Equal(0, result.StreakDays);
-            Assert.Equal(3, result.SecondsThisWeek);
-        }
-
         [Fact]
         public async Task Handle_ListenedTodayAndYesterday_StreakIsTwo()
         {

backend/Tests/Musify.Infrastructure.Tests/Persistence/AuditableEntityInterceptorTests.cs

@@ -1,4 +1,3 @@
-using Microsoft.EntityFrameworkCore;
 using Musify.Domain.Entities;
 using Musify.Infrastructure.Tests.TestSupport;
 using Xunit;
@@ -44,11 +43,6 @@ namespace Musify.Infrastructure.Tests.Persistence
             Assert.Equal(originalCreatedAt, user.CreatedAt);
             Assert.True(user.UpdatedAt > originalCreatedAt,
                 $"original-created-at={originalCreatedAt:O}, final-updated-at={user.UpdatedAt:O}");
-
-            await using var reader = fixture.CreateDatabase();
-            var stored = await reader.Users.SingleAsync(u => u.Id == user.Id, TestContext.Current.CancellationToken);
-            Assert.True(stored.UpdatedAt > stored.CreatedAt,
-                $"stored-created-at={stored.CreatedAt:O}, stored-updated-at={stored.UpdatedAt:O}");
         }
     }
 }

deploy/.env.prod.example

@@ -1,14 +1,11 @@
 # Production configuration for deploy/compose.yml + compose.prod.yml.
 # Copy to deploy/.env.prod, then:
 #
-#   1. replace every `*.example.com` with your actual domains (each service
+#   1. replace every `example.com` with your domain,
-#      below has its own, independent domain — they don't need to share a
-#      root, e.g. for DNS providers that don't allow multi-level
-#      subdomains),
 #   2. replace every CHANGE_ME with a strong random value
 #      (`openssl rand -hex 24`),
-#   3. point each domain below at the server and add its vhost to the shared
+#   3. point these DNS records at the server, all proxied/TLS-terminated the
-#      edge (Infrastructure's edge/conf.d).
+#      same way: example.com, www, api, auth, stream, s3.
 #
 # Requires ../../../Infrastructure running first, on the same Docker host,
 # with its own `infra-net` network already created. See
@@ -17,13 +14,12 @@
 
 DOTNET_ENVIRONMENT=Production
 
-# --- Domains -------------------------------------------------------------
+# --- Domain ------------------------------------------------------------------
-# Public URLs. They must match the vhosts of the shared edge nginx
+# ROOT_DOMAIN drives the nginx vhosts; the URLs below must agree with it.
-# (Infrastructure's edge/conf.d), which is what serves them; the domains are
+ROOT_DOMAIN=example.com
-# independent, they don't need to share a root.
+PUBLIC_WEB_URL=https://example.com
-PUBLIC_WEB_URL=https://musify.example.com
+PUBLIC_API_URL=https://api.example.com
-PUBLIC_API_URL=https://musifyapi.example.com
+PUBLIC_STREAM_URL=https://stream.example.com
-PUBLIC_STREAM_URL=https://musifystream.example.com
 PUBLIC_AUTH_URL=https://auth.example.com
 S3_PUBLIC_URL=https://s3.example.com
 
@@ -66,4 +62,6 @@ SESSION_SECRET=CHANGE_ME
 AUTH_ALLOW_INSECURE_HTTP=false
 
 # --- Misc --------------------------------------------------------------------
-AUTH_REQUIRE_HTTPS=true
+AUTH_REQUIRE_HTTPS=true
+# Largest request body nginx accepts (audio uploads go through the web player).
+MAX_UPLOAD_SIZE=1024m

deploy/README.md

@@ -13,7 +13,7 @@ wherever you actually cloned it.
 |---|---|
 | `compose.yml` | Musify's own services, including the one-shot bootstrap jobs. No published ports, no domains, no environment-specific values. |
 | `compose.dev.yml` | Development overlay: publishes Musify's ports to the host. |
-| `compose.prod.yml` | Production overlay: joins Infrastructure's `infra-net` network. |
+| `compose.prod.yml` | Production overlay: adds the nginx edge and joins Infrastructure's `infra-net` network. |
 | `.env` / `.env.prod` | The values compose interpolates. Not versioned; templates in `.env.example` / `.env.prod.example`. |
 
 The four applications (`api`, `worker`, `gateway`, `web-player`) sit behind
@@ -113,26 +113,26 @@ SeaweedFS is done from the `Infrastructure` repo instead.
 
 ## Production
 
-Musify doesn't run its own nginx: the shared edge in Infrastructure
+On a server with a domain:
-(`edge/`) owns host ports 80/443, terminates TLS for every project's domains
-and proxies to Musify's containers over `infra-net`. On a server with
-domains:
 
 1. Bring up the `Infrastructure` repo first, with its own `.env.prod` filled
    in. It creates the `infra-net` network this stack joins.
-2. Bring up its `edge/` (see Infrastructure's README) and add Musify's
+2. From this repository's root:
-   vhosts and certificate there (`edge/conf.d/musify.conf`). The five
-   public hostnames (web, api, stream, auth, s3) are independent: they
-   don't need to share a root domain.
-3. From this repository's root:
 
 ```sh
 cp deploy/.env.prod.example deploy/.env.prod
 ```
 
-   Replace every `*.example.com` with your domains (they must match the
+Fill it in:
-   edge's vhosts) and every `CHANGE_ME` with a random value
+
-   (`openssl rand -hex 24`). `chmod 600 deploy/.env.prod`.
+1. Replace every `example.com` with your domain and every `CHANGE_ME` with a
+   random value (`openssl rand -hex 24`). `chmod 600 deploy/.env.prod`.
+2. Drop **`deploy/nginx/certs/origin.pem` and `origin.key`**, the origin
+   certificate nginx serves. The stack assumes Cloudflare in *Full (strict)*
+   mode in front of it, so a Cloudflare Origin Certificate is enough; any
+   certificate valid for the five hostnames works.
+3. Point `example.com`, `www`, `api`, `auth`, `stream` and `s3` at the server,
+   proxied and TLS-terminated the same way.
 
 Then:
 
@@ -141,45 +141,14 @@ docker compose --env-file deploy/.env.prod -f deploy/compose.yml -f deploy/compo
 docker compose --env-file deploy/.env.prod -f deploy/compose.yml -f deploy/compose.prod.yml --profile apps up -d --build
 ```
 
-The first command starts Musify's bootstrap jobs (`zitadel-init` and
+The first command starts Musify's bootstrap jobs and the nginx edge; the
-`seaweedfs-init` reach Zitadel/SeaweedFS through the public `auth.`/`s3.`
+second builds and starts the applications, already wired to the OIDC client
-URLs, so the edge has to be serving them by then); the second builds and
+ids the first one produced. Both are idempotent, so running them again
-starts the applications, already wired to the OIDC client ids the first one
+deploys a new version (`... --profile apps up -d --build` alone is enough for
-produced. Both are idempotent, so running them again deploys a new version
+an update once the stack already exists).
-(`... --profile apps up -d --build` alone is enough for an update once the
-stack already exists).
 
-Nothing in this stack publishes a port; everything is reachable only on the
+Only nginx publishes ports (80/443). Every other Musify service, and all of
-internal `infra-net` network, through the edge.
+Infrastructure's, is reachable only on the internal `infra-net` network.
-
-### Continuous deployment
-
-`.gitea/workflows/ci-cd.yml` runs the backend and web-player checks on every
-push/PR, and on a successful push to `master` deploys automatically. The
-deploy job runs on `gitea-runner`, the self-hosted Gitea Actions runner on
-the production host (`~/gitea/docker-compose.yml`), configured by
-`~/gitea/runner-data/config.yaml` (`CONFIG_FILE`): job containers are pinned
-to the `gitea_gitea` network so `actions/checkout` can resolve `gitea`,
-`ubuntu-latest` is `node:22` (JS actions need Node inside the job
-container), and a `production:host` label runs steps natively.
-
-Native mode means the label's steps execute inside the runner container
-itself rather than a fresh one. That container has `/var/run/docker.sock`
-mounted, so `docker`/`docker compose` there still control the host's real
-Docker daemon (sibling containers, "Docker outside of Docker"). Its compose
-service also bind-mounts `/home/ubuntu/deploys` into itself at the *same*
-path, which matters because compose's own relative bind mounts (`./keys`)
-are resolved by the host daemon against that literal path; mounting it
-anywhere else would silently bind the wrong (empty) directory.
-
-`DEPLOY_PATH` (hardcoded in the workflow as `/home/ubuntu/deploys/musify`)
-is a persistent clone on that host, reused instead of a fresh checkout each
-run since `deploy/.env.prod` is untracked and only lives there.
-`/home/ubuntu/deploys/SharedServices` is the sibling clone of the
-`Infrastructure` repo (shared services + `edge/`), already running; its
-`.env.prod` shares the Postgres/RabbitMQ/S3 credentials with Musify's own
-`deploy/.env.prod` by design (see that repo's README). The edge is deployed
-from that repo, not from this pipeline.
 
 ---
 
@@ -190,9 +159,13 @@ deploy/
 ├─ compose.yml                     # Musify's own services: wait-for-postgres, keys-init,
 │                                   #   migrate, seaweedfs-init, zitadel-init, api/worker/gateway/web-player
 ├─ compose.dev.yml                 # dev overlay: host ports
-├─ compose.prod.yml                # prod overlay: joins infra-net
+├─ compose.prod.yml                # prod overlay: nginx edge, joins infra-net
 ├─ .env.example / .env.prod.example
-└─ keys/                           # RS256 stream-ticket key pair (generated)
+├─ keys/                           # RS256 stream-ticket key pair (generated)
+└─ nginx/
+   ├─ templates/default.conf.template # vhosts, rendered with the domain by envsubst
+   ├─ snippets/proxy.conf             # proxy headers shared by every vhost
+   └─ certs/                          # origin.pem + origin.key (not versioned)
 ```
 
 The application images are built from `backend/Musify.*.Dockerfile` (build

deploy/compose.prod.yml

@@ -1,10 +1,11 @@
 name: musify-prod
 
-# Production overlay: joins Infrastructure's shared `infra-net` network so
+# Production overlay: adds the nginx edge and joins Infrastructure's shared
-# this project's containers can reach Postgres, Zitadel, SeaweedFS, RabbitMQ
+# `infra-net` network so this project's containers can reach Postgres,
-# and Jaeger by container name, and so the shared edge nginx (Infrastructure's
+# Zitadel, SeaweedFS, RabbitMQ and Jaeger by container name. None of them
-# `edge/`, which owns host ports 80/443 and terminates TLS for every domain)
+# run as part of this compose project anymore (see
-# can reach api, gateway and web-player. Nothing here publishes a port.
+# ../../../Infrastructure/README.md, which must already be up). Nothing but
+# nginx publishes a port; every other service is reachable only on infra-net.
 #
 #   docker compose --env-file deploy/.env.prod -f deploy/compose.yml -f deploy/compose.prod.yml up -d
 #   docker compose --env-file deploy/.env.prod -f deploy/compose.yml -f deploy/compose.prod.yml --profile apps up -d --build
@@ -19,3 +20,31 @@ services:
   zitadel-init:
     volumes:
       - ./.env.prod:/workspace/.env
+
+  # Every vhost proxies through `set $upstream ...; proxy_pass $upstream;`
+  # with the embedded Docker DNS resolver (see nginx/templates), so nginx
+  # does not need api/gateway/web-player to exist at its own startup, only
+  # at request time. That is what lets it start in the FIRST command
+  # (profile-gated services aren't part of that invocation yet) and still be
+  # reachable at the auth domain for zitadel-init to provision through.
+  nginx:
+    image: nginx:1.27-alpine
+    container_name: musify-nginx
+    environment:
+      # The entrypoint renders /etc/nginx/templates/*.template with envsubst.
+      # The filter keeps it from eating nginx's own $host / $remote_addr.
+      MUSIFY_ROOT_DOMAIN: ${ROOT_DOMAIN}
+      MUSIFY_MAX_UPLOAD_SIZE: ${MAX_UPLOAD_SIZE:-1024m}
+      NGINX_ENVSUBST_FILTER: ^MUSIFY_
+    ports:
+      - "80:80"
+      - "443:443"
+    volumes:
+      - ./nginx/templates:/etc/nginx/templates:ro
+      - ./nginx/snippets:/etc/nginx/snippets:ro
+      - ./nginx/certs:/etc/nginx/certs:ro
+      - nginx_cache:/var/cache/nginx
+    restart: unless-stopped
+
+volumes:
+  nginx_cache:

deploy/compose.yml

@@ -381,10 +381,6 @@ services:
     environment:
       NODE_ENV: production
       PORT: 3000
-      # adapter-node rejects request bodies over 512K by default; audio
-      # uploads are posted to /upload. Keep in line with the edge's
-      # client_max_body_size.
-      BODY_SIZE_LIMIT: 1G
       ORIGIN: ${PUBLIC_WEB_URL}
       ZITADEL_ISSUER: ${PUBLIC_AUTH_URL}
       ZITADEL_CLIENT_ID: ${WEB_CLIENT_ID}

deploy/nginx/snippets/proxy.conf

@@ -0,0 +1,9 @@
+# Shared proxy settings for every Musify vhost.
+proxy_http_version 1.1;
+proxy_set_header Host              $host;
+proxy_set_header X-Real-IP         $remote_addr;
+proxy_set_header X-Forwarded-For   $proxy_add_x_forwarded_for;
+proxy_set_header X-Forwarded-Proto https;
+proxy_set_header X-Forwarded-Host  $host;
+proxy_set_header Upgrade           $http_upgrade;
+proxy_set_header Connection        $connection_upgrade;

deploy/nginx/templates/default.conf.template

@@ -0,0 +1,119 @@
+# Musify edge. The nginx entrypoint renders this with envsubst into
+# /etc/nginx/conf.d/default.conf (replacing the image's stock file) using the
+# MUSIFY_* variables set in compose.prod.yml.
+#
+# Cloudflare (Full strict) terminates the public edge; this box only needs to
+# serve the Cloudflare Origin Certificate in nginx/certs/. Each vhost proxies to
+# a compose service by name through the embedded Docker DNS resolver, so nginx
+# re-resolves it instead of caching the IP of a container that may be recreated.
+
+resolver 127.0.0.11 valid=10s;
+
+map $http_upgrade $connection_upgrade {
+    default upgrade;
+    ''      close;
+}
+
+server {
+    listen 80;
+    listen [::]:80;
+    server_name ${MUSIFY_ROOT_DOMAIN} www.${MUSIFY_ROOT_DOMAIN}
+                api.${MUSIFY_ROOT_DOMAIN} auth.${MUSIFY_ROOT_DOMAIN}
+                stream.${MUSIFY_ROOT_DOMAIN} s3.${MUSIFY_ROOT_DOMAIN};
+    return 301 https://$host$request_uri;
+}
+
+# Web player (SvelteKit, adapter-node). Uploads are posted to its own form
+# actions, so it needs the large body size too.
+server {
+    listen 443 ssl;
+    http2 on;
+    server_name ${MUSIFY_ROOT_DOMAIN};
+    client_max_body_size ${MUSIFY_MAX_UPLOAD_SIZE};
+
+    ssl_certificate     /etc/nginx/certs/origin.pem;
+    ssl_certificate_key /etc/nginx/certs/origin.key;
+
+    location / {
+        set $upstream http://web-player:3000;
+        proxy_pass $upstream;
+        include /etc/nginx/snippets/proxy.conf;
+    }
+}
+
+server {
+    listen 443 ssl;
+    http2 on;
+    server_name www.${MUSIFY_ROOT_DOMAIN};
+
+    ssl_certificate     /etc/nginx/certs/origin.pem;
+    ssl_certificate_key /etc/nginx/certs/origin.key;
+
+    return 301 https://${MUSIFY_ROOT_DOMAIN}$request_uri;
+}
+
+server {
+    listen 443 ssl;
+    http2 on;
+    server_name api.${MUSIFY_ROOT_DOMAIN};
+
+    ssl_certificate     /etc/nginx/certs/origin.pem;
+    ssl_certificate_key /etc/nginx/certs/origin.key;
+
+    location / {
+        set $upstream http://api:5111;
+        proxy_pass $upstream;
+        include /etc/nginx/snippets/proxy.conf;
+    }
+}
+
+# Audio bytes. Buffering off keeps range requests (seeking) responsive.
+server {
+    listen 443 ssl;
+    http2 on;
+    server_name stream.${MUSIFY_ROOT_DOMAIN};
+
+    ssl_certificate     /etc/nginx/certs/origin.pem;
+    ssl_certificate_key /etc/nginx/certs/origin.key;
+
+    location / {
+        set $upstream http://gateway:8081;
+        proxy_pass $upstream;
+        include /etc/nginx/snippets/proxy.conf;
+        proxy_buffering off;
+    }
+}
+
+server {
+    listen 443 ssl;
+    http2 on;
+    server_name auth.${MUSIFY_ROOT_DOMAIN};
+
+    ssl_certificate     /etc/nginx/certs/origin.pem;
+    ssl_certificate_key /etc/nginx/certs/origin.key;
+
+    location / {
+        set $upstream http://zitadel:8080;
+        proxy_pass $upstream;
+        include /etc/nginx/snippets/proxy.conf;
+        grpc_set_header Host $host;
+    }
+}
+
+# Presigned S3 PUT/GET straight from the browser.
+server {
+    listen 443 ssl;
+    http2 on;
+    server_name s3.${MUSIFY_ROOT_DOMAIN};
+    client_max_body_size ${MUSIFY_MAX_UPLOAD_SIZE};
+
+    ssl_certificate     /etc/nginx/certs/origin.pem;
+    ssl_certificate_key /etc/nginx/certs/origin.key;
+
+    location / {
+        set $upstream http://seaweedfs:8333;
+        proxy_pass $upstream;
+        include /etc/nginx/snippets/proxy.conf;
+        proxy_request_buffering off;
+    }
+}

web-player/.prettierignore

@@ -9,5 +9,3 @@ package
 package-lock.json
 src/lib/api/schema.d.ts
 static
-.agents
-skills-lock.json

web-player/.prettierrc

@@ -3,7 +3,6 @@
 	"singleQuote": true,
 	"trailingComma": "none",
 	"printWidth": 100,
-	"endOfLine": "auto",
 	"plugins": ["prettier-plugin-svelte", "prettier-plugin-tailwindcss"],
 	"tailwindStylesheet": "./src/routes/layout.css",
 	"overrides": [

web-player/CLAUDE.md

@@ -57,14 +57,6 @@ The design system lives in `src/routes/layout.css` (`@theme` tokens plus `@utili
 - Reach for these base components before creating a new one: `Artwork`, `Avatar`, `ListRow`, `MediaIdentity`, `TrackList`, `MediaCard`, `PageHeader`, `ContextMenu`, `ConfirmDialog`, `PlayButton`, `Slider`, `Logo`, `Chip`, `SegmentedControl`, `CoverForm`.
 - Known and accepted gap (documented in `scripts/check-tokens.mjs`): icon `strokeWidth={n}` isn't unified yet. There are 13 different values spread across almost every component, and migrating them to `stroke-thin/regular/bold` recipes safely would require visually confirming that `lucide-svelte` actually respects `stroke-width` through CSS, so that was left out of the last pass.
 
-## Motion
-
-Every animation follows one scale of three durations and one easing curve, all defined in `theme.css`. Fast (`--mf-motion-fast`, 150ms) is for hover, focus and press feedback: color, opacity and small scale changes. Plain `transition` or `transition-colors` already uses it because it is the Tailwind default, so never write `duration-150`. Base (`--mf-motion-base`, 200ms) is for things that appear on top of the page or move inside a control: modals, menus, the queue panel, `animate-pop`, `animate-fade` and the segmented control thumb. Slow (`--mf-motion-slow`, 300ms) is for content entering the page and larger movement: `animate-enter`, cover zoom on hover and the player dock padding.
-
-Entrances and movement always use `--mf-ease` (`ease-snappy` in Tailwind, `expoOut` in Svelte transitions), which feels immediate because most of the motion happens at the start. Color transitions keep the Tailwind default curve. Overlays must feel instant: the modal backdrop uses `transition:fade={{ duration: 200 }}` and the panel uses a local `pop` transition (opacity + scale + translateY, `expoOut`, 200ms) mirroring `animate-pop`'s keyframes — both directives so the modal fades and pops on close too, not just on open, and the whole thing settles in 200ms. Staggered lists use `--i` with 40ms steps capped at ten items.
-
-The only exceptions are looping indicators (equalizer bars, pulse, spin, sheen) and the accent hue crossfade in `+layout.svelte` (600ms), which is ambient and meant to be slow. Do not add new durations or curves; if something needs a different feel, pick the closest step of the scale. `prefers-reduced-motion` disables everything globally in `layout.css`.
-
 ## Auth
 
 `hooks.server.ts` validates the encrypted session cookie (`mf_session`), refreshes the `access_token`, and fills `locals.user` and `locals.accessToken`. To protect a route, check `locals.user` in its `load` and redirect to `/auth?returnTo=…`. When talking to the backend, send `locals.accessToken` as a Bearer token to `API_BASE_URL`.

web-player/docs/paginas.md

@@ -9,12 +9,12 @@ Status legend: ✅ done · 🟡 partial / mockup · ⬜ pending.
 ## Home (app) `/` 🟡
 
 - **Hero**: a greeting plus "Your music. No limits." with a color wash taken from the current track's hue.
-- **Quick access, meaning recently played** (`GET /users/{id}/listening-history` merged with `player.recentlyPlayed` via `mergeRecentlyPlayed`). Empty state with an icon and an "Explore" CTA.
+- **Quick access, meaning recently played** (`player.recentlyPlayed`, client side for now). Empty state with an icon and an "Explore" CTA.
 - **Your playlists**: mosaic cards for the user's playlists (sample data for now). Has an empty state.
-- **Resume on load**: the root layout fetches `GET /users/{id}/last-listened-track` and hydrates the player (`player.hydrate`) with it, paused, so the player bar isn't empty on a fresh session. Only applies when nothing is already loaded (won't override an in-progress session).
 
 ### Pending backend work (ASP.NET) for Home
 
+- **Recently played**: track plays per user (a history table with `userId`, `trackId`, `playedAt`) and expose `GET /me/recently-played?limit=` (or `/users/{id}/recently-played`), returning tracks ordered by `playedAt` descending, with no duplicates. The frontend would load this in a `load` function and pass it to the store instead of using `recentlyPlayed`.
 - **Playlists by last listen**: add `lastPlayedAt` to the playlist (the schema currently only has `createdAt`/`updatedAt`) and allow sorting `GET /playlists/users/{userId}` by that field (for example `?sort=lastPlayed`), to show "your most recently played" playlists.
 - Tracks will need an **artist** and a **color/hue** (or a real cover to extract one from) for the artwork and the dynamic accent. Right now `TrackApplicationResponse` carries neither artist nor color.
 
@@ -119,10 +119,10 @@ A fixed bottom bar, visible while something is playing. Shows track info, transp
 
 ## Available backend (summary)
 
-| Resource  | Endpoints                                                         |
+| Resource  | Endpoints                                                            |
-| --------- | ----------------------------------------------------------------- |
+| --------- | --------------------------------------------------------------------- |
-| Tracks    | list/search, detail, by user, stream, create, delete, upload-urls |
+| Tracks    | list/search, detail, by user, stream, create, delete, upload-urls     |
-| Playlists | CRUD, playlist tracks, add/remove track, upload-picture           |
+| Playlists | CRUD, playlist tracks, add/remove track, upload-picture               |
-| Users     | list/search, detail, create                                       |
+| Users     | list/search, detail, create                                            |
 
 Typed client in `$lib/server/api.ts` (`openapi-fetch`, ErrorOr style). Use it inside `load`/server actions, never from the client. Types live in `src/lib/api/schema.d.ts`.

web-player/package-lock.json

@@ -39,40 +39,6 @@
 				"vite": "^8.0.16"
 			}
 		},
-		"node_modules/@emnapi/core": {
-			"version": "1.11.3",
-			"resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.11.3.tgz",
-			"integrity": "sha512-zLpS5asjEb7lq8jYLq37N6XKaE41DIexlY1rF/z4/tIl3wo13Sqm28fRyfIsKZD+NZ8mM5RoKkpW/rBcuoSZSg==",
-			"license": "MIT",
-			"optional": true,
-			"peer": true,
-			"dependencies": {
-				"@emnapi/wasi-threads": "1.2.3",
-				"tslib": "^2.4.0"
-			}
-		},
-		"node_modules/@emnapi/core/node_modules/@emnapi/wasi-threads": {
-			"version": "1.2.3",
-			"resolved": "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-1.2.3.tgz",
-			"integrity": "sha512-ELEBe8PsLvvJ6QMr0zLt8ffvOHW/dc1m3CEzNMg7aJUv3bMaoDtw2TXyDAwkYBuroxxuHEwhRTLJSe5sya547g==",
-			"license": "MIT",
-			"optional": true,
-			"peer": true,
-			"dependencies": {
-				"tslib": "^2.4.0"
-			}
-		},
-		"node_modules/@emnapi/runtime": {
-			"version": "1.11.3",
-			"resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.11.3.tgz",
-			"integrity": "sha512-Xz4Tpyki7XyrpbUK1jR1AhdAdaXyhhY4lZ3neLodmhpuWfy2PAQN5B46sAiU4liOXGLkHypn/qU+jvfWSCYYLA==",
-			"license": "MIT",
-			"optional": true,
-			"peer": true,
-			"dependencies": {
-				"tslib": "^2.4.0"
-			}
-		},
 		"node_modules/@emnapi/wasi-threads": {
 			"version": "1.2.2",
 			"resolved": "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-1.2.2.tgz",
@@ -1152,6 +1118,7 @@
 			"resolved": "https://registry.npmjs.org/@sveltejs/kit/-/kit-2.69.1.tgz",
 			"integrity": "sha512-+nz8Fx/cElzb2ZPHC+6Ll3y3NEVIe4Na75PeplLlyTmd1dBXAjz2KR14y1ZgNjb2ThfAYzulu+PFy1UE3RCUzA==",
 			"license": "MIT",
+			"peer": true,
 			"dependencies": {
 				"@standard-schema/spec": "^1.0.0",
 				"@sveltejs/acorn-typescript": "^1.0.9",
@@ -1203,6 +1170,7 @@
 			"resolved": "https://registry.npmjs.org/@sveltejs/vite-plugin-svelte/-/vite-plugin-svelte-7.1.2.tgz",
 			"integrity": "sha512-DrUBA2UXRfDmUX/ZTiEopd3X40yavsJF1FX2RygcuIScHL7o5YX1fMvoYnDhjeJQC4weCOklirpNWlcb2NiSeA==",
 			"license": "MIT",
+			"peer": true,
 			"dependencies": {
 				"deepmerge": "^4.3.1",
 				"magic-string": "^0.30.21",
@@ -1440,27 +1408,6 @@
 				"node": ">=14.0.0"
 			}
 		},
-		"node_modules/@tailwindcss/oxide-wasm32-wasi/node_modules/@emnapi/core": {
-			"version": "1.11.1",
-			"dev": true,
-			"inBundle": true,
-			"license": "MIT",
-			"optional": true,
-			"dependencies": {
-				"@emnapi/wasi-threads": "1.2.2",
-				"tslib": "^2.4.0"
-			}
-		},
-		"node_modules/@tailwindcss/oxide-wasm32-wasi/node_modules/@emnapi/runtime": {
-			"version": "1.11.1",
-			"dev": true,
-			"inBundle": true,
-			"license": "MIT",
-			"optional": true,
-			"dependencies": {
-				"tslib": "^2.4.0"
-			}
-		},
 		"node_modules/@tailwindcss/oxide-wasm32-wasi/node_modules/@emnapi/wasi-threads": {
 			"version": "1.2.2",
 			"dev": true,
@@ -1597,6 +1544,7 @@
 			"integrity": "sha512-EANqOCF9QFyra+4pfxUcX9STKJpCLjMbObVzljIJomAWSnuSIEAvyzEU53GaajbXJEgdh0iEcPL+DGvpUd4k1Q==",
 			"devOptional": true,
 			"license": "MIT",
+			"peer": true,
 			"dependencies": {
 				"undici-types": "~6.21.0"
 			}
@@ -1658,6 +1606,7 @@
 			"integrity": "sha512-KA0OshtlcCCXmbfqyZkM5pV3/WNraJf7DkJRLpyrmwPtud57H5BDX7C3k0LPSPxpprfRL+cJDGabF10mvNCoCw==",
 			"dev": true,
 			"license": "MIT",
+			"peer": true,
 			"dependencies": {
 				"@typescript-eslint/scope-manager": "8.64.0",
 				"@typescript-eslint/types": "8.64.0",
@@ -1765,6 +1714,7 @@
 			"integrity": "sha512-qjhfuTfLXjA4IOzXvz0rTjT01BqEiIgPoUeMwiEjnaHKJMTNo8rH5pYW1a2L/0Dnux2fPC85AeyJoWaGa8WxTA==",
 			"devOptional": true,
 			"license": "MIT",
+			"peer": true,
 			"engines": {
 				"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
 			},
@@ -1848,6 +1798,7 @@
 			"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.17.0.tgz",
 			"integrity": "sha512-xRQbDb9BnwDafYNn6Vwl839DYVjqXYb1XVGtWAZ1kcDc6iwAL4hg3B1dZlRiuENFeO2H53gFG3in621AdERVAg==",
 			"license": "MIT",
+			"peer": true,
 			"bin": {
 				"acorn": "bin/acorn"
 			},
@@ -2082,6 +2033,7 @@
 			"integrity": "sha512-GVTD7s1vdIl6UYvAfriOPeY1Df8LIZjfofLvHwde+erDHGGuHyuM6xoxRxmHiebhYuD2p1vN4wWh0XzPARSGDQ==",
 			"dev": true,
 			"license": "MIT",
+			"peer": true,
 			"workspaces": [
 				"packages/*"
 			],
@@ -3160,6 +3112,7 @@
 				}
 			],
 			"license": "MIT",
+			"peer": true,
 			"dependencies": {
 				"nanoid": "^3.3.12",
 				"picocolors": "^1.1.1",
@@ -3293,6 +3246,7 @@
 			"integrity": "sha512-/FVl766LpUfB5vXgCYOYa0MeV/441Ia99AeICQIQFTY/Nw0roZwULcXpku5i1/m5kt/baz+s4Zogspd839HSMg==",
 			"dev": true,
 			"license": "MIT",
+			"peer": true,
 			"bin": {
 				"prettier": "bin/prettier.cjs"
 			},
@@ -3309,6 +3263,7 @@
 			"integrity": "sha512-wXvbXMjSvb4C9ENWTHXyd+ihakKCsJ6rJhLP6/8HFNj4GkZr48jqL9PoKsl2sk7SyCZRTnJ7O2TTowUpOxP/KA==",
 			"dev": true,
 			"license": "MIT",
+			"peer": true,
 			"engines": {
 				"node": ">=20"
 			},
@@ -3479,6 +3434,7 @@
 			"resolved": "https://registry.npmjs.org/rollup/-/rollup-4.62.2.tgz",
 			"integrity": "sha512-RFnrW4lhXA3s3eqHDZvN654g8OTjzRfqpIRJYczCGB6HzphckVAi/Qh4tbPUbRuDi7s1Llv8g/NspLkttY3gTA==",
 			"license": "MIT",
+			"peer": true,
 			"dependencies": {
 				"@types/estree": "1.0.9"
 			},
@@ -3613,6 +3569,7 @@
 			"resolved": "https://registry.npmjs.org/svelte/-/svelte-5.56.4.tgz",
 			"integrity": "sha512-/d0QHehmRuJW8gVz395MTkPcPozxzdjBMBE8oEYGz8O3b9KTMzzQ9ZHJQLuFKOHOPQbU6kx/X4iid/EBBzH7iw==",
 			"license": "MIT",
+			"peer": true,
 			"dependencies": {
 				"@jridgewell/remapping": "^2.3.4",
 				"@jridgewell/sourcemap-codec": "^1.5.0",
@@ -3824,6 +3781,7 @@
 			"integrity": "sha512-y2TvuxSZPDyQakkFRPZHKFm+KKVqIisdg9/CZwm9ftvKXLP8NRWj38/ODjNbr43SsoXqNuAisEf1GdCxqWcdBw==",
 			"devOptional": true,
 			"license": "Apache-2.0",
+			"peer": true,
 			"bin": {
 				"tsc": "bin/tsc",
 				"tsserver": "bin/tsserver"
@@ -3885,6 +3843,7 @@
 			"resolved": "https://registry.npmjs.org/vite/-/vite-8.1.3.tgz",
 			"integrity": "sha512-Ds+gBRbj0lwRO2Y5hwnUBdxSwlAve9LeRyU4sNnAr0ewW0gWF0n5bgXgUzbgZ49MV9BVUAQUFYVcDUcilUExMA==",
 			"license": "MIT",
+			"peer": true,
 			"dependencies": {
 				"lightningcss": "^1.32.0",
 				"picomatch": "^4.0.4",

web-player/src/hooks.server.ts

@@ -1,16 +1,15 @@
 import type { Handle } from '@sveltejs/kit';
 import {
-	clearSessionCookie,
 	decodeSession,
 	encodeSession,
-	readSessionCookie,
 	refreshSession,
-	writeSessionCookie
+	sessionCookieOptions,
+	SESSION_COOKIE
 } from '$lib/server/auth';
 import { authConfig } from '$lib/server/config';
 
 export const handle: Handle = async ({ event, resolve }) => {
-	let session = await decodeSession(readSessionCookie(event.cookies));
+	let session = await decodeSession(event.cookies.get(SESSION_COOKIE));
 
 	if (
 		session &&
@@ -18,9 +17,13 @@ export const handle: Handle = async ({ event, resolve }) => {
 	) {
 		session = await refreshSession(session);
 		if (session) {
-			writeSessionCookie(event.cookies, await encodeSession(session), event.url);
+			event.cookies.set(
+				SESSION_COOKIE,
+				await encodeSession(session),
+				sessionCookieOptions(event.url)
+			);
 		} else {
-			clearSessionCookie(event.cookies);
+			event.cookies.delete(SESSION_COOKIE, { path: '/' });
 		}
 	}
 

web-player/src/lib/components/layout/MobileHeader.svelte

@@ -18,7 +18,7 @@
 </script>
 
 <header
-	class="sticky top-0 z-(--z-sticky) flex h-14 items-center justify-between bg-transparent page-x backdrop-blur-md sm:hidden"
+	class="sticky top-0 z-(--z-sticky) flex h-14 items-center justify-between border-b border-hairline bg-bg/85 page-x backdrop-blur-md sm:hidden"
 >
 	<a href="/">
 		<Logo size="sm" />

web-player/src/lib/components/layout/Sidebar.svelte

@@ -6,8 +6,8 @@
 	import type { SessionUser } from '$lib/types';
 	import ListRow from '../ui/media/ListRow.svelte';
 	import IconButton from '../ui/primitives/IconButton.svelte';
-	import Plus from '@lucide/svelte/icons/plus';
 	import Logo from '../ui/primitives/Logo.svelte';
+	import Plus from '@lucide/svelte/icons/plus';
 
 	interface SidebarPlaylist {
 		id: string;
@@ -31,10 +31,10 @@
 </script>
 
 <aside
-	class="hidden shrink-0 flex-col border-r border-hairline p-5 lg:flex"
+	class="hidden shrink-0 flex-col border-r border-hairline bg-bg p-5 theme-transition lg:flex"
 	style="width:var(--mf-sidebar-w)"
 >
-	<a href="/" class="mb-4">
+	<a href="/" class="px-3 pb-3">
 		<Logo size="sm" />
 	</a>
 
@@ -44,14 +44,14 @@
 			<a
 				href={link.href}
 				aria-current={active ? 'page' : undefined}
-				class="flex items-center gap-3 rounded-control px-3 py-2 text-sm transition-colors {active
+				class="flex items-center gap-3 rounded-control px-3 py-2 text-sm transition-colors duration-150 {active
 					? 'bg-surface-2 text-fg'
 					: 'text-fg-2 hover:bg-hover hover:text-fg'}"
 			>
-				<link.icon class="size-icon-md shrink-0" strokeWidth={1.5} />
+				<link.icon class="size-4.5 shrink-0" strokeWidth={1.5} />
 				<span class="flex-1 truncate">{link.label}</span>
 				{#if link.count}
-					<span class="text-xs text-fg-2 tabular-nums">{link.count}</span>
+					<span class="text-xs text-muted tabular-nums">{link.count}</span>
 				{/if}
 			</a>
 		{/each}
@@ -60,7 +60,7 @@
 	{#if user}
 		<div class="mx-3 mt-6 mb-3.5 h-px bg-line"></div>
 		<div class="flex items-center justify-between px-3 pb-1.5">
-			<span class="text-eyebrow text-fg-2">Tus playlists</span>
+			<span class="text-eyebrow text-muted">Tus playlists</span>
 			{#if playlists.length > 0}
 				<IconButton
 					label="Crear playlist"
@@ -68,12 +68,12 @@
 					size="xs"
 					onclick={() => createPlaylistModal.show()}
 				>
-					<Plus class="size-icon-sm text-fg-2" strokeWidth={1.25} />
+					<Plus class="size-icon-sm" strokeWidth={1.25} />
 				</IconButton>
 			{/if}
 		</div>
 
-		<div class="flex flex-1 flex-col gap-px overflow-y-auto pb-icon-md">
+		<div class="flex flex-1 flex-col gap-px overflow-y-auto pb-4.5">
 			{#each playlists as playlist (playlist.id)}
 				{@const active = page.url.pathname === `/playlists/${playlist.id}`}
 				<ListRow
@@ -91,7 +91,7 @@
 				<button
 					type="button"
 					onclick={() => createPlaylistModal.show()}
-					class="flex items-center gap-2 rounded-control px-3 py-2 text-xs text-fg-2 transition-colors hover:bg-hover hover:text-fg-2"
+					class="flex items-center gap-2 rounded-control px-3 py-2 text-xs text-muted transition-colors hover:bg-hover hover:text-fg-2"
 				>
 					<Plus class="size-3.5" strokeWidth={1.8} />
 					Crear tu primera lista

web-player/src/lib/components/layout/TopBar.svelte

@@ -69,21 +69,21 @@
 		<label
 			class="flex h-9.5 w-full items-center gap-2.5 rounded-control bg-surface-2 px-3.5 transition focus-within:bg-surface-hover"
 		>
-			<Search class="size-4 shrink-0 text-fg-2" strokeWidth={1.8} />
+			<Search class="size-4 shrink-0 text-fg-3" strokeWidth={1.8} />
 			<input
 				type="text"
 				bind:this={searchInput}
 				bind:value={query}
 				oninput={onInput}
 				placeholder="Canciones, artistas, álbumes o playlists"
-				class="w-full min-w-0 bg-transparent text-sm text-fg placeholder:text-fg-2 focus:outline-none"
+				class="w-full min-w-0 bg-transparent text-sm text-fg placeholder:text-muted focus:outline-none"
 			/>
 			{#if query}
 				<button
 					type="button"
 					onclick={clearQuery}
 					aria-label="Borrar búsqueda"
-					class="grid size-5 shrink-0 place-items-center rounded-full text-fg-2 transition hover:text-fg"
+					class="grid size-5 shrink-0 place-items-center rounded-full text-muted transition hover:text-fg"
 				>
 					<X class="size-3.5" />
 				</button>

web-player/src/lib/components/player/PlayerBar.svelte

@@ -32,7 +32,7 @@
 	<div class="flex min-w-0 flex-1 flex-col items-center gap-2">
 		<TransportControls />
 		<div class="flex w-full max-w-hero items-center gap-3">
-			<span class="min-w-8 text-right text-xs text-fg-2 tabular-nums">
+			<span class="min-w-8 text-right text-xs text-fg-3 tabular-nums">
 				{fmtTime(player.progress)}
 			</span>
 			<Slider
@@ -42,13 +42,13 @@
 				oninput={seek}
 				variant="seek"
 			/>
-			<span class="min-w-8 text-xs text-fg-2 tabular-nums">
+			<span class="min-w-8 text-xs text-fg-3 tabular-nums">
 				{fmtTime(player.current.duration)}
 			</span>
 		</div>
 	</div>
 	<div class="hidden w-(--mf-player-side-w) shrink-0 items-center justify-end gap-3.5 sm:flex">
-		<Volume2 class="size-icon-sm shrink-0 text-fg-2" strokeWidth={1.8} />
+		<Volume2 class="size-icon-sm shrink-0 text-fg-3" strokeWidth={1.8} />
 		<Slider
 			value={player.volume}
 			max={100}

web-player/src/lib/components/player/PlayerDock.svelte

@@ -1,6 +1,7 @@
 <script lang="ts">
 	import PlayerBar from './PlayerBar.svelte';
 	import TabsBar from '../layout/TabsBar.svelte';
+	import Alert from '$lib/components/ui/primitives/Alert.svelte';
 	import { player } from '$lib/player/player.svelte';
 	import type { SessionUser } from '$lib/types';
 
@@ -16,6 +17,11 @@
 <div
 	class="pointer-events-none fixed inset-x-0 bottom-0 z-(--z-sticky) flex flex-col lg:left-(--mf-sidebar-w)"
 >
+	{#if player.error}
+		<div class="pointer-events-auto px-4 pb-2.5">
+			<Alert tone="danger">{player.error}</Alert>
+		</div>
+	{/if}
 	{#if hasTrack}
 		<PlayerBar />
 	{/if}

web-player/src/lib/components/player/Queue.svelte

@@ -7,7 +7,7 @@
 	import { fmtTime } from '$lib/utils/format';
 	import X from '@lucide/svelte/icons/x';
 	import { fly } from 'svelte/transition';
-	import { expoOut } from 'svelte/easing';
+	import { cubicOut } from 'svelte/easing';
 
 	const upcoming = $derived.by(() => {
 		const idx = player.tracks.findIndex((t) => t.id === player.currentId);
@@ -17,8 +17,8 @@
 
 {#if queuePanel.open}
 	<aside
-		transition:fly={{ x: 24, duration: 200, easing: expoOut }}
+		transition:fly={{ x: 24, duration: 220, easing: cubicOut }}
-		class="hidden shrink-0 flex-col border-l border-hairline px-4 pt-5 sm:flex"
+		class="hidden shrink-0 flex-col border-l border-hairline bg-bg px-4 pt-5 theme-transition sm:flex"
 		style="width:var(--mf-queue-w); padding-bottom:calc(var(--mf-player-h) + 2rem)"
 	>
 		<div class="mb-5 flex items-center justify-between">
@@ -29,8 +29,8 @@
 		</div>
 
 		{#if player.current.id}
-			<p class="mb-3 text-eyebrow text-fg-2">Reproduciendo</p>
+			<p class="mb-3 text-eyebrow text-fg-3">Reproduciendo</p>
-			<div class="mb-6 rounded-control surface-active p-2.5">
+			<div class="mb-6 rounded-control bg-accent-tint p-2.5">
 				<MediaIdentity
 					trackId={player.current.id}
 					title={player.current.title}
@@ -42,12 +42,12 @@
 		{/if}
 
 		<div class="mb-3 flex items-center justify-between gap-3">
-			<span class="min-w-0 flex-1 truncate text-eyebrow text-fg-2"> A continuación </span>
+			<span class="min-w-0 flex-1 truncate text-eyebrow text-fg-3"> A continuación </span>
 			{#if upcoming.length > 0}
 				<button
 					type="button"
 					onclick={() => player.clearUpcoming()}
-					class="shrink-0 text-xs text-fg-2 transition-colors hover:text-fg"
+					class="shrink-0 text-xs text-fg-3 transition-colors hover:text-fg"
 				>
 					Vaciar
 				</button>
@@ -68,12 +68,13 @@
 				>
 					{#snippet trailing()}
 						{#if track.duration}
-							<span class="shrink-0 text-xs text-fg-2 tabular-nums">{fmtTime(track.duration)}</span>
+							<span class="shrink-0 text-xs text-muted tabular-nums">{fmtTime(track.duration)}</span
+							>
 						{/if}
 					{/snippet}
 				</ListRow>
 			{:else}
-				<p class="px-2 py-6 text-center text-xs text-fg-2">No hay más canciones en la cola.</p>
+				<p class="px-2 py-6 text-center text-xs text-fg-3">No hay más canciones en la cola.</p>
 			{/each}
 		</div>
 	</aside>

web-player/src/lib/components/player/TrackInfo.svelte

@@ -49,7 +49,7 @@
 		<ArtistLink
 			name={player.current.artist || '—'}
 			ownerUserId={player.current.ownerUserId}
-			class="mt-0.5 text-xs text-fg-2"
+			class="mt-0.5 text-xs text-fg-3"
 		/>
 	</div>
 	{#if !compact}

web-player/src/lib/components/player/TransportControls.svelte

@@ -13,7 +13,7 @@
 	const sideClass = $derived(
 		compact
 			? 'grid size-10 place-items-center text-fg opacity-70 transition active:scale-90'
-			: 'flex text-fg-2 transition hover:text-fg active:scale-90'
+			: 'flex text-fg-2 transition-colors hover:text-fg active:scale-90'
 	);
 </script>
 
@@ -24,7 +24,7 @@
 			onclick={() => player.toggleShuffle()}
 			aria-pressed={player.shuffle}
 			aria-label="Aleatorio"
-			class="transition-colors hover:text-fg {player.shuffle ? 'text-accent' : 'text-fg-2'}"
+			class="transition-colors hover:text-fg {player.shuffle ? 'text-accent' : 'text-fg-3'}"
 		>
 			<Shuffle class="size-4" strokeWidth={1.8} />
 		</button>
@@ -56,7 +56,7 @@
 			onclick={() => player.toggleRepeat()}
 			aria-pressed={player.repeat}
 			aria-label="Repetir"
-			class="transition-colors hover:text-fg {player.repeat ? 'text-accent' : 'text-fg-2'}"
+			class="transition-colors hover:text-fg {player.repeat ? 'text-accent' : 'text-fg-3'}"
 		>
 			<Repeat class="size-4" strokeWidth={1.8} />
 		</button>

web-player/src/lib/components/ui/forms/CoverForm.svelte

@@ -80,7 +80,7 @@
 
 	<div class="flex items-center justify-between gap-4">
 		{#if helperText}
-			<p class="text-sm text-fg-2">{helperText}</p>
+			<p class="text-sm text-muted">{helperText}</p>
 		{:else}
 			<span></span>
 		{/if}

web-player/src/lib/components/ui/forms/ImageDropzone.svelte

@@ -68,6 +68,6 @@
 			class="h-full w-full object-cover"
 		/>
 	{:else}
-		<Icon class="size-icon-xl {gradient ? 'text-on-art/70' : 'text-fg-2'}" strokeWidth={1.3} />
+		<Icon class="size-icon-xl {gradient ? 'text-on-art/70' : 'text-muted'}" strokeWidth={1.3} />
 	{/if}
 </label>

web-player/src/lib/components/ui/forms/PlaylistForm.svelte

@@ -88,7 +88,7 @@
 		<div class="flex items-center justify-between gap-4 rounded-art bg-surface px-4 py-3.5">
 			<div class="min-w-0">
 				<div class="text-sm font-medium text-fg-2">Visibilidad</div>
-				<div class="mt-0.5 text-xs text-fg-2">
+				<div class="mt-0.5 text-xs text-muted">
 					{visibility === 'private'
 						? 'Solo tú la ves en tu biblioteca'
 						: 'Cualquiera con el enlace puede verla'}

web-player/src/lib/components/ui/layout/SectionHeading.svelte

@@ -30,21 +30,21 @@
 		{title}
 	</h2>
 	{#if subtitle}
-		<p class="mt-1 text-xs text-fg-2">{subtitle}</p>
+		<p class="mt-1 text-xs text-fg-3">{subtitle}</p>
 	{/if}
 {/snippet}
 
 {#snippet autoActions()}
 	{#if count !== undefined}
 		<div class="h-px flex-1 self-center bg-line"></div>
-		<span class="shrink-0 text-xs text-fg-2 tabular-nums">
+		<span class="shrink-0 text-xs text-muted tabular-nums">
 			{plural(count, 'resultado', 'resultados')}
 		</span>
 	{/if}
 	{#if href}
 		<a
 			{href}
-			class="shrink-0 text-xs font-medium tracking-wider text-fg-2 uppercase transition-colors hover:text-fg"
+			class="shrink-0 text-xs font-medium tracking-wider text-fg-3 uppercase transition-colors hover:text-fg"
 		>
 			{linkLabel}
 		</a>

web-player/src/lib/components/ui/media/Artwork.svelte

@@ -118,7 +118,7 @@
 		/>
 	{:else if fallback === 'music'}
 		<div class="grid h-full w-full place-items-center bg-surface">
-			<svg viewBox="0 0 24 24" fill="currentColor" class="h-2/5 w-2/5 text-fg-2">
+			<svg viewBox="0 0 24 24" fill="currentColor" class="h-2/5 w-2/5 text-fg-3">
 				<path
 					d="M19.952 1.651a.75.75 0 0 1 .298.599V16.303a3 3 0 0 1-2.176 2.884l-1.32.377a2.553 2.553 0 1 1-1.401-4.909l2.311-.66a1.5 1.5 0 0 0 1.088-1.442V6.994l-9 2.572v9.737a3 3 0 0 1-2.176 2.884l-1.32.377a2.553 2.553 0 1 1-1.402-4.909l2.312-.66a1.5 1.5 0 0 0 1.088-1.442V5.25a.75.75 0 0 1 .544-.721l10.5-3a.75.75 0 0 1 .754.122Z"
 				/>

web-player/src/lib/components/ui/media/ExplicitBadge.svelte

@@ -7,7 +7,7 @@
 </script>
 
 <span
-	class="grid size-4 shrink-0 place-items-center rounded-tag bg-fg-2 text-xs leading-4 font-bold text-bg {klass}"
+	class="grid size-4 shrink-0 place-items-center rounded-tag bg-fg-3 text-xs leading-4 font-bold text-bg {klass}"
 	title="Contenido explícito"
 	aria-label="Contenido explícito">E</span
 >

web-player/src/lib/components/ui/media/ListRow.svelte

@@ -50,7 +50,7 @@
 	const classes = $derived(
 		`flex items-center gap-3 text-left transition-colors ${
 			variant === 'card' ? 'rounded-art p-2 pr-3.5' : 'rounded-control p-2'
-		} ${active ? 'surface-active' : 'hover:bg-hover'} ${klass}`
+		} ${active ? 'bg-accent-tint' : 'hover:bg-hover'} ${klass}`
 	);
 </script>
 

web-player/src/lib/components/ui/media/MediaCard.svelte

@@ -38,7 +38,7 @@
 				{trackIds}
 				size="fill"
 				alt={title}
-				class="rounded-art transition duration-300 ease-snappy group-hover:scale-105"
+				class="rounded-art transition duration-300 group-hover:scale-105"
 			/>
 		{/if}
 		{#if onPlay}
@@ -50,12 +50,12 @@
 				size="sm"
 				onclick={onPlay}
 				label="Reproducir {title}"
-				class="absolute right-2.5 bottom-2.5 opacity-0 transition-opacity group-hover:opacity-100"
+				class="absolute right-2.5 bottom-2.5 opacity-0 transition-opacity duration-150 group-hover:opacity-100"
 			/>
 		{/if}
 	</div>
 	<div class="mt-2.5 truncate text-sm text-fg">{title}</div>
 	{#if subtitle}
-		<div class="mt-0.5 truncate text-xs text-fg-2">{subtitle}</div>
+		<div class="mt-0.5 truncate text-xs text-fg-3">{subtitle}</div>
 	{/if}
 </a>

web-player/src/lib/components/ui/media/MediaIdentity.svelte

@@ -63,6 +63,6 @@
 			>
 			{@render badge?.()}
 		</div>
-		<ArtistLink name={artist} {ownerUserId} class="mt-0.5 text-xs text-fg-2" />
+		<ArtistLink name={artist} {ownerUserId} class="mt-0.5 text-xs text-fg-3" />
 	</div>
 </div>

web-player/src/lib/components/ui/media/PlayButton.svelte

@@ -26,12 +26,12 @@
 	};
 
 	const VARIANT: Record<'strong' | 'glass', string> = {
-		strong: 'bg-cta-strong text-ink hover:bg-cta-strong-hover',
+		strong: 'bg-cta-strong text-ink hover:brightness-95',
 		glass: 'border border-on-art/12 bg-ink/76 text-fg backdrop-blur'
 	};
 
 	const classes = $derived(
-		`grid shrink-0 place-items-center rounded-full transition ${SIZE[size]} ${VARIANT[variant]} ${klass}`
+		`grid shrink-0 place-items-center rounded-full transition duration-150 ${SIZE[size]} ${VARIANT[variant]} ${klass}`
 	);
 </script>
 

web-player/src/lib/components/ui/media/TrackList.svelte

@@ -91,7 +91,7 @@
 
 <div class="overflow-x-auto {klass}">
 	<div
-		class="grid track-grid items-center gap-3 border-b border-line pr-4 pb-3 pl-2 text-sm text-fg-2 sm:gap-8 sm:pr-6 sm:pl-3"
+		class="grid track-grid items-center gap-3 border-b border-line pr-4 pb-3 pl-2 text-sm text-fg-3 sm:gap-8 sm:pr-6 sm:pl-3"
 		style="--mf-track-cols:{gridColumns}; --mf-track-cols-mobile:{gridColumnsMobile}"
 	>
 		{#if index}
@@ -106,14 +106,13 @@
 			<span></span>
 		{/if}
 	</div>
-	<div class="mt-1 flex flex-col gap-0.5" role="list">
+	<div class="mt-1 flex flex-col gap-0.5">
 		{#each tracks as track, i (track.id)}
 			{@const active = player.current.id === track.id}
 
 			<div
-				role="listitem"
 				class="group grid track-grid items-center gap-3 rounded-control py-3 pr-4 pl-2 transition-colors sm:gap-8 sm:pr-6 sm:pl-3 {active
-					? 'surface-active'
+					? 'bg-accent-tint'
 					: 'hover:bg-hover'}"
 				style="--mf-track-cols:{gridColumns}; --mf-track-cols-mobile:{gridColumnsMobile}"
 				oncontextmenu={oncontextmenu ? (event) => oncontextmenu(event, track, i) : undefined}
@@ -123,7 +122,7 @@
 						type="button"
 						onclick={() => onPlay(i)}
 						aria-label={active && player.playing ? 'Pausar' : 'Reproducir'}
-						class="relative grid size-8 place-items-center rounded-tag text-xs text-fg-2 tabular-nums"
+						class="relative grid size-8 place-items-center rounded-tag text-xs text-muted tabular-nums"
 					>
 						{#if active}
 							<EqBars paused={!player.playing} />
@@ -139,7 +138,6 @@
 					tabindex="0"
 					use:pressable={() => onPlay(i)}
 					onclick={(event) => event.stopPropagation()}
-					onkeydown={(event) => event.stopPropagation()}
 					class="flex min-w-0 flex-1 text-left"
 				>
 					<MediaIdentity
@@ -158,7 +156,7 @@
 					</MediaIdentity>
 				</div>
 				{#each columns as column (column)}
-					<span class="hidden truncate text-center text-xs text-fg-2 tabular-nums sm:block">
+					<span class="hidden truncate text-center text-xs text-muted tabular-nums sm:block">
 						{#if column === 'plays'}
 							{Number(track.listensCount ?? 0)}
 						{:else if column === 'added' && track.addedAt}
@@ -168,7 +166,7 @@
 						{/if}
 					</span>
 				{/each}
-				<span class="truncate text-center text-xs text-fg-2 tabular-nums">
+				<span class="truncate text-center text-xs text-muted tabular-nums">
 					{fmtTime(Number(track.duration))}
 				</span>
 				{#if rowAction}

web-player/src/lib/components/ui/overlay/AccountMenu.svelte

@@ -44,10 +44,7 @@
 	{@render trigger({ toggle, open })}
 
 	{#if open}
-		<GlassMenu
+		<GlassMenu class="absolute top-full right-0 z-(--z-menu) mt-2 overflow-hidden {WIDTH[width]}">
-			border={false}
-			class="absolute top-full right-0 z-(--z-menu) mt-2 overflow-hidden {WIDTH[width]}"
-		>
 			<MenuItem icon={User} label="Ver perfil" href="/user/{user.sub}" onclick={close} />
 			{@render extraItems?.({ close })}
 			{#if accountUrl}

web-player/src/lib/components/ui/overlay/ConfirmDialog.svelte

@@ -1,5 +1,5 @@
 <script lang="ts">
-	import Dialog from './Dialog.svelte';
+	import Modal from './Modal.svelte';
 	import Button from '../primitives/Button.svelte';
 
 	interface Props {
@@ -14,11 +14,13 @@
 	let { open, onClose, title, description, confirmLabel, action }: Props = $props();
 </script>
 
-<Dialog {open} {onClose} {title} {description}>
+<Modal {open} {onClose} maxWidth="max-w-sm">
-	{#snippet actions()}
+	<h2 class="text-display-3 text-fg">{title}</h2>
+	<p class="mt-2.5 text-body text-fg-2">{description}</p>
+	<div class="mt-6 flex items-center justify-end gap-3">
 		<Button variant="secondary" onclick={onClose}>Cancelar</Button>
 		<form method="POST" {action}>
 			<Button type="submit" variant="danger">{confirmLabel}</Button>
 		</form>
-	{/snippet}
+	</div>
-</Dialog>
+</Modal>

web-player/src/lib/components/ui/overlay/ContextMenu.svelte

@@ -63,7 +63,7 @@
 				class="flex items-center gap-3 rounded-control px-2 py-2.5 text-sm font-medium text-fg-2 transition group-hover/addmenu:bg-hover"
 			>
 				<span class="flex-1 cursor-default">{playlistAction.label}</span>
-				<ChevronRight class="size-icon-sm shrink-0 text-fg-2" />
+				<ChevronRight class="size-icon-sm shrink-0 text-fg-3" />
 			</div>
 			<div
 				class="invisible absolute top-0 z-(--z-submenu) opacity-0 transition group-hover/addmenu:visible group-hover/addmenu:opacity-100 max-sm:top-full max-sm:right-0 max-sm:left-0 max-sm:px-0 max-sm:pt-1.5 {openLeft
@@ -75,7 +75,7 @@
 				>
 					<div class="max-h-80 overflow-y-auto">
 						{#if playlists.length === 0}
-							<p class="px-2 py-2.5 text-sm text-fg-2">Todavía no tienes playlists.</p>
+							<p class="px-2 py-2.5 text-sm text-fg-3">Todavía no tienes playlists.</p>
 						{/if}
 						{#each playlists as playlist (playlist.id)}
 							<form

web-player/src/lib/components/ui/overlay/Dialog.svelte

@@ -1,40 +0,0 @@
-<script lang="ts">
-	import type { Snippet } from 'svelte';
-	import CircleAlert from '@lucide/svelte/icons/circle-alert';
-	import Modal from './Modal.svelte';
-
-	interface Props {
-		open: boolean;
-		onClose: () => void;
-		title: string;
-		description?: string;
-		tone?: 'neutral' | 'danger';
-		children?: Snippet;
-		actions?: Snippet;
-	}
-
-	let { open, onClose, title, description, tone = 'neutral', children, actions }: Props = $props();
-</script>
-
-<Modal
-	{open}
-	{onClose}
-	maxWidth="max-w-sm"
-	panelClass={tone === 'danger' ? 'glass-panel-danger' : ''}
->
-	{#if tone === 'danger'}
-		<span class="mb-4 grid size-10 place-items-center rounded-full bg-danger/12 text-danger-fg">
-			<CircleAlert class="size-icon-md" strokeWidth={2} />
-		</span>
-	{/if}
-	<h2 class="text-display-3 text-fg">{title}</h2>
-	{#if description}
-		<p class="mt-2.5 text-body text-fg-2">{description}</p>
-	{/if}
-	{@render children?.()}
-	{#if actions}
-		<div class="mt-6 flex flex-wrap items-center justify-end gap-3">
-			{@render actions()}
-		</div>
-	{/if}
-</Modal>

web-player/src/lib/components/ui/overlay/DialogHost.svelte

@@ -1,34 +0,0 @@
-<script lang="ts">
-	import Dialog from './Dialog.svelte';
-	import Button from '../primitives/Button.svelte';
-	import { dialog, type DialogAction, type DialogOptions } from '$lib/state/dialog.svelte';
-
-	// Keep the last dialog's content so the exit transition doesn't render an empty panel.
-	let last = $state<DialogOptions | null>(null);
-	$effect.pre(() => {
-		if (dialog.current) last = dialog.current;
-	});
-	const current = $derived(dialog.current ?? last);
-	const buttons: DialogAction[] = $derived(
-		current?.actions?.length ? current.actions : [{ label: 'Entendido' }]
-	);
-</script>
-
-<Dialog
-	open={dialog.current !== null}
-	onClose={() => dialog.close()}
-	title={current?.title ?? ''}
-	description={current?.description}
-	tone={current?.tone}
->
-	{#snippet actions()}
-		{#each buttons as action, i (action.label)}
-			<Button
-				variant={action.variant ?? (i === buttons.length - 1 ? 'primary' : 'secondary')}
-				onclick={() => dialog.run(action)}
-			>
-				{action.label}
-			</Button>
-		{/each}
-	{/snippet}
-</Dialog>

web-player/src/lib/components/ui/overlay/GlassMenu.svelte

@@ -4,18 +4,12 @@
 	interface Props {
 		class?: string;
 		style?: string;
-		border?: boolean;
 		children: Snippet;
 	}
 
-	let { class: klass = '', style = '', border = true, children }: Props = $props();
+	let { class: klass = '', style = '', children }: Props = $props();
 </script>
 
-<div
+<div class="glass-panel animate-pop rounded-panel border border-hairline p-1.5 {klass}" {style}>
-	class="glass-panel animate-pop rounded-panel p-1.5 {border
-		? 'border border-hairline'
-		: ''} {klass}"
-	{style}
->
 	{@render children()}
 </div>

web-player/src/lib/components/ui/overlay/MenuItem.svelte

@@ -24,7 +24,7 @@
 	}: Props = $props();
 
 	const classes = $derived(
-		`flex w-full items-center gap-3 rounded-control px-2 py-2.5 text-left text-xs font-medium text-fg-2 transition hover:bg-hover ${klass}`
+		`flex w-full items-center gap-3 rounded-control px-2 py-2.5 text-left text-sm font-medium text-fg-2 transition hover:bg-hover ${klass}`
 	);
 </script>
 

web-player/src/lib/components/ui/overlay/Modal.svelte

@@ -2,9 +2,6 @@
 	import type { Snippet } from 'svelte';
 	import X from '@lucide/svelte/icons/x';
 	import IconButton from '../primitives/IconButton.svelte';
-	import { fade } from 'svelte/transition';
-	import { expoOut } from 'svelte/easing';
-	import type { TransitionConfig } from 'svelte/transition';
 
 	interface Props {
 		open: boolean;
@@ -48,15 +45,6 @@
 		);
 	}
 
-	function pop(node: Element, { duration = 200 }: { duration?: number } = {}): TransitionConfig {
-		return {
-			duration,
-			easing: expoOut,
-			css: (t) =>
-				`opacity: ${t}; transform: scale(${0.98 + 0.02 * t}) translateY(${0.25 * (1 - t)}rem);`
-		};
-	}
-
 	function onWindowKeydown(event: KeyboardEvent) {
 		if (!open) return;
 		if (event.key === 'Escape') {
@@ -82,15 +70,13 @@
 
 {#if open}
 	<div
-		transition:fade={{ duration: 200 }}
+		class="animate-fade fixed inset-0 z-(--z-modal) grid place-items-center bg-scrim/70 p-4 backdrop-blur-sm"
-		class="fixed inset-0 z-(--z-modal) grid place-items-center bg-scrim/70 p-4 backdrop-blur-sm"
 		role="presentation"
 		onclick={onBackdropClick}
 	>
 		<div
 			bind:this={panel}
-			transition:pop={{ duration: 200 }}
+			class="glass-panel animate-pop max-h-[85dvh] w-full overflow-y-auto {maxWidth} rounded-panel p-5 outline-none sm:p-6 {panelClass}"
-			class="glass-panel max-h-[85dvh] w-full overflow-y-auto {maxWidth} rounded-panel p-5 outline-none sm:p-6 {panelClass}"
 			role="dialog"
 			aria-modal="true"
 			aria-label={title}
@@ -100,7 +86,7 @@
 				<div class="flex items-center justify-between gap-4">
 					<div class="min-w-0">
 						{#if eyebrow}
-							<p class="mb-2.5 text-eyebrow text-fg-2">
+							<p class="mb-2.5 text-eyebrow text-muted">
 								{eyebrow}
 							</p>
 						{/if}

web-player/src/lib/components/ui/primitives/BackLink.svelte

@@ -24,7 +24,7 @@
 <a
 	href={target.url}
 	{onclick}
-	class="inline-flex items-center text-fg-2 transition-colors hover:text-accent-soft"
+	class="inline-flex items-center text-fg-3 transition-colors hover:text-accent-soft"
 >
 	<span class="grid size-8 place-items-center">
 		<ArrowLeft class="size-icon-sm" />

web-player/src/lib/components/ui/primitives/Button.svelte

@@ -3,7 +3,7 @@
 	import LoaderCircle from '@lucide/svelte/icons/loader-circle';
 
 	interface Props {
-		variant?: 'primary' | 'secondary' | 'accent' | 'danger';
+		variant?: 'primary' | 'secondary' | 'glass' | 'accent' | 'strong' | 'danger';
 		size?: 'sm' | 'md' | 'lg';
 		type?: 'button' | 'submit';
 		href?: string;
@@ -29,20 +29,25 @@
 	}: Props = $props();
 
 	const sizes = {
-		sm: 'rounded-control px-4 py-2 text-xs',
+		sm: 'px-4 py-2.5 text-xs',
-		md: 'rounded-btn-sm px-4.5 py-2.5 text-control-sm',
+		md: 'px-5 py-3 text-sm',
-		lg: 'rounded-btn px-6 py-3.5 text-sm'
+		lg: 'px-6 py-3.5 text-sm'
 	};
 
+	const subtle = 'bg-btn text-fg-2 hover:bg-btn-hover hover:text-fg';
+	const glass = 'font-normal bg-btn-glass text-fg-2 hover:bg-btn-glass-hover hover:text-fg';
+
 	const variants = {
-		primary: 'bg-cta-strong text-ink hover:bg-cta-strong-hover',
+		primary: subtle,
-		secondary: 'bg-btn text-fg hover:bg-btn-hover',
+		secondary: subtle,
-		accent: 'surface-active text-accent-soft hover:surface-active-hover',
+		glass,
+		accent: 'bg-accent-btn text-accent-soft hover:bg-accent-btn-hover',
+		strong: 'bg-cta-strong text-ink hover:brightness-95',
 		danger: 'bg-danger text-on-art hover:brightness-110'
 	};
 
 	const classes = $derived(
-		`inline-flex items-center justify-center gap-2 font-medium btn-transition focus-visible:ring-2 focus-visible:ring-accent focus-visible:ring-offset-2 focus-visible:ring-offset-bg focus-visible:outline-none disabled:opacity-40 ${sizes[size]} ${variants[variant]} ${klass}`
+		`inline-flex items-center justify-center gap-2 rounded-control transition focus-visible:ring-2 focus-visible:ring-accent focus-visible:ring-offset-2 focus-visible:ring-offset-bg focus-visible:outline-none disabled:opacity-40 ${sizes[size]} ${variants[variant]} ${klass}`
 	);
 </script>
 

web-player/src/lib/components/ui/primitives/Chip.svelte

@@ -3,33 +3,34 @@
 
 	interface Props {
 		selected?: boolean;
-		disabled?: boolean;
 		count?: number;
 		href?: string;
 		onclick?: () => void;
 		children: Snippet;
 	}
 
-	let { selected = false, disabled = false, count, href, onclick, children }: Props = $props();
+	let { selected = false, count, href, onclick, children }: Props = $props();
 
 	const classes = $derived(
 		href
 			? 'rounded-full border border-line-strong px-3.5 py-2 text-xs text-fg-2 transition-colors hover:bg-hover hover:text-fg'
 			: `flex items-center gap-2 rounded-full px-3.5 py-2 text-xs font-medium transition ${
-					selected ? 'bg-cta-strong text-ink' : 'bg-btn text-fg-2 hover:bg-btn-hover hover:text-fg'
+					selected
-				} ${disabled ? 'cursor-not-allowed opacity-40' : ''}`
+						? 'bg-cta-strong text-ink'
+						: 'bg-surface-2 text-fg-2 hover:bg-surface-hover hover:text-fg'
+				}`
 	);
 </script>
 
 {#snippet content()}
 	{@render children()}
 	{#if count !== undefined}
-		<span class="tabular-nums {selected ? 'opacity-55' : 'text-fg-2'}">{count}</span>
+		<span class="tabular-nums {selected ? 'opacity-55' : 'text-muted'}">{count}</span>
 	{/if}
 {/snippet}
 
 {#if href}
 	<a {href} class={classes}>{@render content()}</a>
 {:else}
-	<button type="button" {onclick} {disabled} class={classes}>{@render content()}</button>
+	<button type="button" {onclick} class={classes}>{@render content()}</button>
 {/if}

web-player/src/lib/components/ui/primitives/Field.svelte

@@ -20,7 +20,7 @@
 	{/if}
 	{@render children()}
 	{#if hint}
-		<div class="mt-2 flex items-center justify-between gap-3 text-xs text-fg-2">
+		<div class="mt-2 flex items-center justify-between gap-3 text-xs text-muted">
 			{@render hint()}
 		</div>
 	{/if}

web-player/src/lib/components/ui/primitives/IconButton.svelte

@@ -41,7 +41,7 @@
 	};
 
 	const TEXT: Record<'muted' | 'subtle' | 'plain', string> = {
-		muted: 'text-fg-2 hover:text-fg',
+		muted: 'text-muted hover:text-fg',
 		subtle: 'text-fg-2 hover:text-fg',
 		plain: 'text-fg-2 hover:text-fg'
 	};

web-player/src/lib/components/ui/primitives/InfiniteScroll.svelte

@@ -34,6 +34,6 @@
 
 <div bind:this={sentinel} class="flex min-h-12 items-center justify-center py-8">
 	{#if loading}
-		<LoaderCircle class="size-5 animate-spin text-fg-2" />
+		<LoaderCircle class="size-5 animate-spin text-muted" />
 	{/if}
 </div>

web-player/src/lib/components/ui/primitives/Input.svelte

@@ -36,7 +36,7 @@
 
 <div class="relative w-full">
 	{#if Icon}
-		<span class="pointer-events-none absolute inset-y-0 left-4 grid place-items-center text-fg-2">
+		<span class="pointer-events-none absolute inset-y-0 left-4 grid place-items-center text-muted">
 			<Icon class="size-icon-lg" />
 		</span>
 	{/if}

web-player/src/lib/components/ui/primitives/Logo.svelte

@@ -5,10 +5,18 @@
 
 	let { size = 'sm' }: Props = $props();
 
+	const MARK: Record<'sm' | 'lg', string> = {
+		sm: 'size-5.5 rounded-thumb',
+		lg: 'size-8 rounded-control'
+	};
+
 	const TEXT: Record<'sm' | 'lg', string> = {
 		sm: 'font-display text-lg font-semibold tracking-tight text-fg',
 		lg: 'font-display text-[clamp(1.5rem,3vw,2.5rem)] font-semibold tracking-tight'
 	};
 </script>
 
-<span class={TEXT[size]}>Musify</span>
+<span class="flex items-center gap-3">
+	<span class="{MARK[size]} bg-[image:var(--mf-logo-grad)]"></span>
+	<span class={TEXT[size]}>Musify</span>
+</span>

web-player/src/lib/components/ui/primitives/SegmentedControl.svelte

@@ -16,7 +16,7 @@
 
 <div class="relative flex shrink-0 rounded-full bg-surface-2 p-1">
 	<div
-		class="absolute inset-y-1 left-1 rounded-full bg-fg transition-transform duration-200 ease-snappy"
+		class="absolute inset-y-1 left-1 rounded-full bg-fg transition-transform duration-300 ease-out"
 		style="width:calc((100% - 0.5rem) / {options.length}); transform:translateX(calc({index} * 100%))"
 	></div>
 	{#each options as option (option.value)}
@@ -26,7 +26,7 @@
 			class="relative z-(--z-raised) flex-1 px-4 py-1.5 text-center text-xs font-medium transition-colors {value ===
 			option.value
 				? 'text-ink'
-				: 'text-fg-2 hover:text-fg-2'}"
+				: 'text-muted hover:text-fg-2'}"
 		>
 			{option.label}
 		</button>