From 6ff8c2c8da8b0467013b4bf841429b5f74a03f36 Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Mon, 7 May 2018 22:28:21 +0200
Subject: [PATCH] See #192: use nodeinfo/2.0 namespace to be future proof
---
api/funkwhale_api/instance/urls.py | 2 +-
api/tests/instance/test_views.py | 4 ++--
front/src/components/instance/Stats.vue | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/api/funkwhale_api/instance/urls.py b/api/funkwhale_api/instance/urls.py
index e66fdf88..f506488f 100644
--- a/api/funkwhale_api/instance/urls.py
+++ b/api/funkwhale_api/instance/urls.py
@@ -4,6 +4,6 @@ from . import views
urlpatterns = [
- url(r'^nodeinfo/$', views.NodeInfo.as_view(), name='nodeinfo'),
+ url(r'^nodeinfo/2.0/$', views.NodeInfo.as_view(), name='nodeinfo-2.0'),
url(r'^settings/$', views.InstanceSettings.as_view(), name='settings'),
]
diff --git a/api/tests/instance/test_views.py b/api/tests/instance/test_views.py
index c67688d5..4ac79086 100644
--- a/api/tests/instance/test_views.py
+++ b/api/tests/instance/test_views.py
@@ -7,7 +7,7 @@ def test_nodeinfo_endpoint(db, api_client, mocker):
}
mocked_nodeinfo = mocker.patch(
'funkwhale_api.instance.nodeinfo.get', return_value=payload)
- url = reverse('api:v1:instance:nodeinfo')
+ url = reverse('api:v1:instance:nodeinfo-2.0')
response = api_client.get(url)
assert response.status_code == 200
@@ -16,7 +16,7 @@ def test_nodeinfo_endpoint(db, api_client, mocker):
def test_nodeinfo_endpoint_disabled(db, api_client, preferences):
preferences['instance__nodeinfo_enabled'] = False
- url = reverse('api:v1:instance:nodeinfo')
+ url = reverse('api:v1:instance:nodeinfo-2.0')
response = api_client.get(url)
assert response.status_code == 404
diff --git a/front/src/components/instance/Stats.vue b/front/src/components/instance/Stats.vue
index 3b96afe9..ac144ceb 100644
--- a/front/src/components/instance/Stats.vue
+++ b/front/src/components/instance/Stats.vue
@@ -77,7 +77,7 @@ export default {
var self = this
this.isLoading = true
logger.default.debug('Fetching instance stats...')
- axios.get('instance/nodeinfo/').then((response) => {
+ axios.get('instance/nodeinfo/2.0/').then((response) => {
let d = response.data
self.stats = {}
self.stats.users = _.get(d, 'usage.users.total')
--
GitLab