From 6467e0342f52fff2e60ec76e5558c6be8c01587e Mon Sep 17 00:00:00 2001 From: Georg Krause Date: Tue, 5 Jul 2022 15:43:08 +0200 Subject: [PATCH 1/5] Fix linters --- api/funkwhale_api/federation/utils.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/api/funkwhale_api/federation/utils.py b/api/funkwhale_api/federation/utils.py index 9dce78246..d04d639aa 100644 --- a/api/funkwhale_api/federation/utils.py +++ b/api/funkwhale_api/federation/utils.py @@ -67,11 +67,7 @@ def slugify_username(username): def retrieve_ap_object( - fid, - actor, - serializer_class=None, - queryset=None, - apply_instance_policies=True, + fid, actor, serializer_class=None, queryset=None, apply_instance_policies=True, ): # we have a duplicate check here because it's less expensive to do those checks # twice than to trigger a HTTP request From b4c5827d89f6f9f4c947192395177b8ffa3c5436 Mon Sep 17 00:00:00 2001 From: Georg Krause Date: Tue, 5 Jul 2022 14:55:24 +0200 Subject: [PATCH 2/5] Fix test, we don't pass actors to update instance keys anymore --- api/tests/federation/test_tasks.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/tests/federation/test_tasks.py b/api/tests/federation/test_tasks.py index 6974cf11f..53d6c89d1 100644 --- a/api/tests/federation/test_tasks.py +++ b/api/tests/federation/test_tasks.py @@ -210,7 +210,7 @@ def test_update_domain_nodeinfo(factories, mocker, now, service_actor): retrieve_ap_object.assert_called_once_with( "https://actor.id", - actor=service_actor, + actor=None, queryset=models.Actor, serializer_class=serializers.ActorSerializer, ) From 0dd5d316bee7ad8aee870c1e43fe1edc6b5064e0 Mon Sep 17 00:00:00 2001 From: Georg Krause Date: Thu, 14 Jul 2022 10:42:28 +0200 Subject: [PATCH 3/5] Do run linter on tags, closes #1822 --- .gitlab-ci.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 367fa72ee..03f503baf 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -110,6 +110,8 @@ black: script: - black --check --diff api/ only: + refs: + - branches changes: - api/**/* @@ -128,6 +130,8 @@ flake8: paths: - "$PIP_CACHE_DIR" only: + refs: + - branches changes: - api/**/* @@ -146,6 +150,8 @@ eslint: paths: - front/node_modules only: + refs: + - branches changes: - front/**/* From 9582604fc10ad3831acf5aab2f5a7a2cfa78a885 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Pe=C3=B1a?= Date: Wed, 13 Jul 2022 16:23:47 +0200 Subject: [PATCH 4/5] Fix(plugins): libre.fm plugin scrobbles --- api/funkwhale_api/contrib/scrobbler/scrobbler.py | 2 +- changes/changelog.d/1817.bugfix | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 changes/changelog.d/1817.bugfix diff --git a/api/funkwhale_api/contrib/scrobbler/scrobbler.py b/api/funkwhale_api/contrib/scrobbler/scrobbler.py index 2d18ee778..c931752e6 100644 --- a/api/funkwhale_api/contrib/scrobbler/scrobbler.py +++ b/api/funkwhale_api/contrib/scrobbler/scrobbler.py @@ -17,7 +17,7 @@ def handshake_v1(session, url, username, password): params = { "hs": "true", "p": "1.2", - "c": PLUGIN["name"], + "c": "fw", "v": PLUGIN["version"], "u": username, "t": timestamp, diff --git a/changes/changelog.d/1817.bugfix b/changes/changelog.d/1817.bugfix new file mode 100644 index 000000000..b1d627713 --- /dev/null +++ b/changes/changelog.d/1817.bugfix @@ -0,0 +1 @@ +Fixed libre.fm plugin not submitting scrobbles (#1817) From ffe306ed5c1e269e211410248af3d77b6c7af627 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Pe=C3=B1a?= Date: Thu, 14 Jul 2022 12:53:53 +0200 Subject: [PATCH 5/5] Version bump and changelog for 1.2.7 --- CHANGELOG | 25 +++++++++++++++++++++++++ api/funkwhale_api/__init__.py | 2 +- changes/changelog.d/1817.bugfix | 1 - 3 files changed, 26 insertions(+), 2 deletions(-) delete mode 100644 changes/changelog.d/1817.bugfix diff --git a/CHANGELOG b/CHANGELOG index ede525489..84e79089c 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -10,6 +10,31 @@ This changelog is viewable on the web at https://docs.funkwhale.audio/changelog. .. towncrier +1.2.7 (2022-07-14) +------------------ + +Upgrade instructions are available at +https://docs.funkwhale.audio/admin/upgrading.html + +Bugfixes: + +- Fixed libre.fm plugin not submitting scrobbles (#1817) + +Committers: + +- Georg Krause +- Marcos Peña + +Contributors to our Issues: + +- Ciarán Ainsworth +- Marcos Peña + +Contributors to our Merge Requests: + +- Georg Krause +- Marcos Peña + 1.2.6 (2022-07-04) ------------------ diff --git a/api/funkwhale_api/__init__.py b/api/funkwhale_api/__init__.py index ca39fe0ce..10d6f210f 100644 --- a/api/funkwhale_api/__init__.py +++ b/api/funkwhale_api/__init__.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -__version__ = "1.2.6" +__version__ = "1.2.7" __version_info__ = tuple( [ int(num) if num.isdigit() else num diff --git a/changes/changelog.d/1817.bugfix b/changes/changelog.d/1817.bugfix deleted file mode 100644 index b1d627713..000000000 --- a/changes/changelog.d/1817.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fixed libre.fm plugin not submitting scrobbles (#1817)