From e85ae5d9a1ff5fddcf6e821631bfd0d72e481b5c Mon Sep 17 00:00:00 2001 From: Petitminion Date: Wed, 7 May 2025 18:02:02 +0200 Subject: [PATCH 01/15] fix(front):only request playlist.libfollow if not my playlist --- front/src/components/audio/PlayButton.vue | 12 ++++++------ front/src/utils/utils.ts | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/front/src/components/audio/PlayButton.vue b/front/src/components/audio/PlayButton.vue index dfc8e4600..523cbce71 100644 --- a/front/src/components/audio/PlayButton.vue +++ b/front/src/components/audio/PlayButton.vue @@ -108,7 +108,7 @@ const labels = computed(() => ({ const isOpen = ref(false) -const playlistFollowInfo = computed(() => { +const playlistLibraryFollowInfo = computed(() => { const playlist = props.playlist; if (!playlist) return null; @@ -268,13 +268,13 @@ const playlistFollowInfo = computed(() => { {{ obj.label }} - {{ playlistFollowInfo.label }} + {{ playlistLibraryFollowInfo.label }} diff --git a/front/src/utils/utils.ts b/front/src/utils/utils.ts index 848103ce4..99a63e97d 100644 --- a/front/src/utils/utils.ts +++ b/front/src/utils/utils.ts @@ -2,8 +2,8 @@ import type { Track, Album, ArtistCredit, QueueItemSource } from '~/types' import type { components } from '~/generated/types' import { useStore } from '~/store' import type { QueueTrack } from '~/composables/audio/queue' +import store from '~/store' -const store = useStore() export function generateTrackCreditString (track: Track | Album | null): string | null { if (!track || !track.artist_credit || track.artist_credit.length === 0) { From 5b6cdb35157a8a1c572c67a1d05603512d79be33 Mon Sep 17 00:00:00 2001 From: Petitminion Date: Fri, 9 May 2025 01:12:03 +0200 Subject: [PATCH 02/15] fix archivedl --- api/funkwhale_api/contrib/archivedl/tasks.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/funkwhale_api/contrib/archivedl/tasks.py b/api/funkwhale_api/contrib/archivedl/tasks.py index 7b4096796..51e0d9da4 100644 --- a/api/funkwhale_api/contrib/archivedl/tasks.py +++ b/api/funkwhale_api/contrib/archivedl/tasks.py @@ -189,4 +189,4 @@ def filter_files(files, allowed_extensions): def get_search_url(query, page_size, page): q = urllib.parse.urlencode({"q": query}) return f"https://archive.org/advancedsearch.php?{q}&sort[]=addeddate+desc&rows={page_size}\ - &page={page}&output=json&mediatype=audio" + &page={page}&output=json" From 1feffad091e84c1aef0e6517934ffbcb110707f0 Mon Sep 17 00:00:00 2001 From: Petitminion Date: Thu, 15 May 2025 15:10:40 +0200 Subject: [PATCH 03/15] display user list insteal of user libraries --- .../components/federation/LibraryWidget.vue | 31 +++++++++++-------- front/src/locales/en_US.json | 3 +- front/src/views/auth/ProfileOverview.vue | 9 ------ 3 files changed, 20 insertions(+), 23 deletions(-) diff --git a/front/src/components/federation/LibraryWidget.vue b/front/src/components/federation/LibraryWidget.vue index 4b075e231..558bd4da1 100644 --- a/front/src/components/federation/LibraryWidget.vue +++ b/front/src/components/federation/LibraryWidget.vue @@ -1,20 +1,20 @@