Merge branch 'stable' into develop

2023-06-28 13:05:47 +02:00 · 2023-06-28 13:05:47 +02:00 · 232ca0f050
commit 232ca0f050
parent a1a24270e3 cc7fde67b6
30 changed files with 623 additions and 513 deletions
--- a/api/funkwhale_api/music/management/commands/prune_skipped_uploads.py
+++ b/api/funkwhale_api/music/management/commands/prune_skipped_uploads.py
@ -22,7 +22,7 @@ class Command(BaseCommand):
    @transaction.atomic
    def handle(self, *args, **options):
        skipped = models.Upload.objects.filter(import_status="skipped")
-        count = len(skipped)
+        count = skipped.count()
        if options["force"]:
            skipped.delete()
            print(f"Deleted {count} entries from the database.")