diff --git a/api/funkwhale_api/federation/api_views.py b/api/funkwhale_api/federation/api_views.py index 2c7e26582..549bac917 100644 --- a/api/funkwhale_api/federation/api_views.py +++ b/api/funkwhale_api/federation/api_views.py @@ -25,7 +25,8 @@ from . import utils def update_follow(follow, approved): follow.approved = approved follow.save(update_fields=["approved"]) - routes.outbox.dispatch({"type": "Accept"}, context={"follow": follow}) + if approved: + routes.outbox.dispatch({"type": "Accept"}, context={"follow": follow}) class LibraryFollowViewSet( diff --git a/api/tests/federation/test_api_views.py b/api/tests/federation/test_api_views.py index feb2ea246..75579d39a 100644 --- a/api/tests/federation/test_api_views.py +++ b/api/tests/federation/test_api_views.py @@ -123,9 +123,12 @@ def test_user_can_accept_or_reject_own_follows( assert follow.approved is expected - mocked_dispatch.assert_called_once_with( - {"type": "Accept"}, context={"follow": follow} - ) + if action == "accept": + mocked_dispatch.assert_called_once_with( + {"type": "Accept"}, context={"follow": follow} + ) + if action == "reject": + mocked_dispatch.assert_not_called() def test_user_can_list_inbox_items(factories, logged_in_api_client): diff --git a/changes/changelog.d/713.doc b/changes/changelog.d/713.doc new file mode 100644 index 000000000..ad3db61a2 --- /dev/null +++ b/changes/changelog.d/713.doc @@ -0,0 +1 @@ +Added documentation on mono-container docker upgrade (#713) diff --git a/changes/changelog.d/716.bugfix b/changes/changelog.d/716.bugfix new file mode 100644 index 000000000..1b9b182c9 --- /dev/null +++ b/changes/changelog.d/716.bugfix @@ -0,0 +1 @@ +Fixed constant and unpredictable reordering during file upload (#716) diff --git a/changes/changelog.d/729.bugfix b/changes/changelog.d/729.bugfix new file mode 100644 index 000000000..a0209cb95 --- /dev/null +++ b/changes/changelog.d/729.bugfix @@ -0,0 +1 @@ +Display new notifications immediatly on notifications page (#729) diff --git a/changes/changelog.d/743.bugfig b/changes/changelog.d/743.bugfig new file mode 100644 index 000000000..5a3ebea0c --- /dev/null +++ b/changes/changelog.d/743.bugfig @@ -0,0 +1 @@ +Do not send notification when rejecting a follow on a local library (#743) diff --git a/docs/upgrading/index.rst b/docs/upgrading/index.rst index 945319ad3..c0a3653f3 100644 --- a/docs/upgrading/index.rst +++ b/docs/upgrading/index.rst @@ -36,6 +36,39 @@ Docker setup If you've followed the setup instructions in :doc:`Docker`, upgrade path is easy: +Mono-container installation +^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +Basically, you need to pull the new container image, stop and delete your existing container, +and relaunch a new one: + +.. parsed-literal:: + export FUNKWHALE_VERSION="|version|" + +.. code-block:: shell + + docker pull funkwhale/all-in-one:$FUNKWHALE_VERSION + docker stop funkwhale + docker rm funkwhale + docker run \ + --name=funkwhale \ + --restart=unless-stopped \ + --env-file=/srv/funkwhale/.env \ + -v /srv/funkwhale/data:/data \ + -v /path/to/your/music/dir:/music:ro \ + -e PUID=$UID \ + -e PGID=$GID \ + -p 5000:80 \ + -d \ + funkwhale/all-in-one:$FUNKWHALE_VERSION + +If you are not managing the container directly by hand, but use a third party tool such as Portainer, +instructions will vary, but, as a rule of thumb, pulling the new version of the image, and relaunch +a new container with the same arguments as the previous one (except for the image version) is enough. + +Multi-container installation +^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + .. parsed-literal:: cd /srv/funkwhale diff --git a/docs/users/apps.rst b/docs/users/apps.rst index 000ce6ac8..36f47f09a 100644 --- a/docs/users/apps.rst +++ b/docs/users/apps.rst @@ -171,4 +171,13 @@ Then in your .config/ncmpcpp/config, change the startup_screen value so that it This will show your artists, albums, and playlists when you start ncmpcpp. -[Optional]: enable and start mopidy as a service to start the server at boot. \ No newline at end of file +[Optional]: enable and start mopidy as a service to start the server at boot. + +Mobydick (Desktop) +^^^^^^^^^^^^^^^^^^ + +- Price: free +- Website: https://github.com/BaptisteGelez/mobydick + +Mobydick is a free and open-source desktop application for linux (based on GTK+) to easily download +tracks, albums and discography from a Funkwhale instance. diff --git a/front/src/components/library/FileUpload.vue b/front/src/components/library/FileUpload.vue index 09297caec..8a867dadf 100644 --- a/front/src/components/library/FileUpload.vue +++ b/front/src/components/library/FileUpload.vue @@ -282,15 +282,18 @@ export default { }, sortedFiles() { // return errored files on top - return this.files.sort(f => { + + return _.sortBy(this.files.map(f => { + let statusIndex = 0 if (f.errored) { - return -5; + statusIndex = -1 } if (f.success) { - return 5; + statusIndex = 1 } - return 0; - }); + f.statusIndex = statusIndex + return f + }), ['statusIndex', 'name']) } }, watch: { diff --git a/front/src/views/Notifications.vue b/front/src/views/Notifications.vue index bee7e5e35..3f262740c 100644 --- a/front/src/views/Notifications.vue +++ b/front/src/views/Notifications.vue @@ -1,10 +1,7 @@