diff --git a/api/funkwhale_api/federation/views.py b/api/funkwhale_api/federation/views.py index ef581408c2e187bf32f3922c651b903f3583884e..37ad9ebfd1a481ae0d882d064ea285f6b7fd4424 100644 --- a/api/funkwhale_api/federation/views.py +++ b/api/funkwhale_api/federation/views.py @@ -88,7 +88,7 @@ class InstanceActorViewSet(FederationMixin, viewsets.GenericViewSet): class WellKnownViewSet(viewsets.GenericViewSet): authentication_classes = [] permission_classes = [] - renderer_classes = [renderers.WebfingerRenderer] + renderer_classes = [renderers.JSONRenderer, renderers.WebfingerRenderer] @list_route(methods=['get']) def nodeinfo(self, request, *args, **kwargs): diff --git a/api/tests/federation/test_views.py b/api/tests/federation/test_views.py index cc81f0657754960d1389bfe36bb6c02787f4c5a3..fd6ac2eb2ef07e581cd8b6bd473a0e65a0e30125 100644 --- a/api/tests/federation/test_views.py +++ b/api/tests/federation/test_views.py @@ -62,7 +62,10 @@ def test_wellknown_webfinger_system( actor = actors.SYSTEM_ACTORS[system_actor].get_actor_instance() url = reverse('federation:well-known-webfinger') response = api_client.get( - url, data={'resource': 'acct:{}'.format(actor.webfinger_subject)}) + url, + data={'resource': 'acct:{}'.format(actor.webfinger_subject)}, + HTTP_ACCEPT='application/jrd+json', + ) serializer = serializers.ActorWebfingerSerializer(actor) assert response.status_code == 200 @@ -83,7 +86,7 @@ def test_wellknown_nodeinfo(db, preferences, api_client, settings): ] } url = reverse('federation:well-known-nodeinfo') - response = api_client.get(url) + response = api_client.get(url, HTTP_ACCEPT='application/jrd+json') assert response.status_code == 200 assert response['Content-Type'] == 'application/jrd+json' assert response.data == expected diff --git a/changes/changelog.d/197.bugfix b/changes/changelog.d/197.bugfix new file mode 100644 index 0000000000000000000000000000000000000000..d40182f541340a87a6e855b51e625717fb9d6209 --- /dev/null +++ b/changes/changelog.d/197.bugfix @@ -0,0 +1 @@ +.well-known/nodeinfo endpoint can now answer to request with Accept: application/json (#197)