Resolves 404 on skipped upload

api/funkwhale_api/music/models.py

@@ -680,8 +680,12 @@ class UploadQuerySet(common_models.NullsLastQuerySet):
         libraries = Library.objects.viewable_by(actor)
 
         if include:
-            return self.filter(library__in=libraries, import_status="finished")
-        return self.exclude(library__in=libraries, import_status="finished")
+            return self.filter(
+                library__in=libraries, import_status__in=["finished", "skipped"]
+            )
+        return self.exclude(
+            library__in=libraries, import_status__in=["finished", "skipped"]
+        )
 
     def local(self, include=True):
         query = models.Q(library__actor__domain_id=settings.FEDERATION_HOSTNAME)

api/tests/music/test_models.py

@@ -212,7 +212,8 @@ def test_library(factories):
 
 
 @pytest.mark.parametrize(
-    "status,expected", [("pending", False), ("errored", False), ("finished", True)]
+    "status,expected",
+    [("pending", False), ("errored", False), ("finished", True), ("skipped", True)],
 )
 def test_playable_by_correct_status(status, expected, factories):
     upload = factories["music.Upload"](

changes/changelog.d/1349.bugfix

@@ -0,0 +1 @@
+Fixed unplayable skipped upload (#1349)