From 6c06b48bff7daaa31d977cdc818021b5e3ee7d96 Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Wed, 11 Dec 2019 10:20:13 +0100
Subject: [PATCH 1/3] Make nodeinfo refresh task schedule configurable

---
 api/config/settings/common.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/api/config/settings/common.py b/api/config/settings/common.py
index e443007b5..2fb7b496c 100644
--- a/api/config/settings/common.py
+++ b/api/config/settings/common.py
@@ -589,7 +589,12 @@ CELERY_BEAT_SCHEDULE = {
     },
     "federation.refresh_nodeinfo_known_nodes": {
         "task": "federation.refresh_nodeinfo_known_nodes",
-        "schedule": crontab(minute="0", hour="*"),
+        "schedule": crontab(
+            **env.dict(
+                "SCHEDULE_FEDERATION_REFRESH_NODEINFO_KNOWN_NODES",
+                default={"minute": "0", "hour": "*"},
+            )
+        ),
         "options": {"expires": 60 * 60},
     },
 }

From 8cf003ab1c623579764cb168a51584c425927dc7 Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Wed, 11 Dec 2019 10:32:05 +0100
Subject: [PATCH 2/3] Added link to track in upload table

---
 front/src/views/content/libraries/FilesTable.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/front/src/views/content/libraries/FilesTable.vue b/front/src/views/content/libraries/FilesTable.vue
index fd0348a6e..47294fe57 100644
--- a/front/src/views/content/libraries/FilesTable.vue
+++ b/front/src/views/content/libraries/FilesTable.vue
@@ -120,7 +120,9 @@
         <template slot="row-cells" slot-scope="scope">
           <template v-if="scope.obj.track">
             <td>
-              <span :title="scope.obj.track.title">{{ scope.obj.track.title|truncate(25) }}</span>
+              <router-link :to="{name: 'library.tracks.detail', params: {id: scope.obj.track.id }}" :title="scope.obj.track.title">
+                {{ scope.obj.track.title|truncate(25) }}
+              </router-link>
             </td>
             <td>
               <span

From c8702ca72672cdf4e6d0698088073024f9845488 Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Wed, 11 Dec 2019 10:49:45 +0100
Subject: [PATCH 3/3] Fx #986: Fixed invalid displayed number of tracks in
 playlist

---
 api/funkwhale_api/playlists/views.py |  2 +-
 api/tests/playlists/test_views.py    | 12 ++++++++++++
 changes/changelog.d/986.bugfix       |  1 +
 3 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 changes/changelog.d/986.bugfix

diff --git a/api/funkwhale_api/playlists/views.py b/api/funkwhale_api/playlists/views.py
index 6f9ea23ce..f2ade8181 100644
--- a/api/funkwhale_api/playlists/views.py
+++ b/api/funkwhale_api/playlists/views.py
@@ -24,7 +24,7 @@ class PlaylistViewSet(
     queryset = (
         models.Playlist.objects.all()
         .select_related("user__actor")
-        .annotate(tracks_count=Count("playlist_tracks"))
+        .annotate(tracks_count=Count("playlist_tracks", distinct=True))
         .with_covers()
         .with_duration()
     )
diff --git a/api/tests/playlists/test_views.py b/api/tests/playlists/test_views.py
index 1c2b0f19e..2be64b2bb 100644
--- a/api/tests/playlists/test_views.py
+++ b/api/tests/playlists/test_views.py
@@ -25,6 +25,18 @@ def test_serializer_includes_tracks_count(factories, logged_in_api_client):
     assert response.data["tracks_count"] == 1
 
 
+def test_serializer_includes_tracks_count_986(factories, logged_in_api_client):
+    playlist = factories["playlists.Playlist"]()
+    plt = factories["playlists.PlaylistTrack"](playlist=playlist)
+    factories["music.Upload"].create_batch(
+        3, track=plt.track, library__privacy_level="everyone", import_status="finished"
+    )
+    url = reverse("api:v1:playlists-detail", kwargs={"pk": playlist.pk})
+    response = logged_in_api_client.get(url)
+
+    assert response.data["tracks_count"] == 1
+
+
 def test_serializer_includes_is_playable(factories, logged_in_api_client):
     playlist = factories["playlists.Playlist"]()
     factories["playlists.PlaylistTrack"](playlist=playlist)
diff --git a/changes/changelog.d/986.bugfix b/changes/changelog.d/986.bugfix
new file mode 100644
index 000000000..b18d8ec8d
--- /dev/null
+++ b/changes/changelog.d/986.bugfix
@@ -0,0 +1 @@
+Fixed invalid displayed number of tracks in playlist (#986)