MirrorMirror
/
funkwhale
mirror of https://dev.funkwhale.audio/funkwhale/funkwhale.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

See #192: use nodeinfo/2.0 namespace to be future proof

This commit is contained in:
Eliot Berriot 2018-05-07 22:28:21 +02:00
parent b536e5a1f9
commit 6ff8c2c8da
No known key found for this signature in database
GPG Key ID: DD6965E2476E5C27
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/funkwhale_api/instance/urls.py
View File

@ -4,6 +4,6 @@ from . import views
urlpatterns = [ 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'), url(r'^settings/$', views.InstanceSettings.as_view(), name='settings'),
] ]

4
api/tests/instance/test_views.py
View File

@ -7,7 +7,7 @@ def test_nodeinfo_endpoint(db, api_client, mocker):
} }
mocked_nodeinfo = mocker.patch( mocked_nodeinfo = mocker.patch(
'funkwhale_api.instance.nodeinfo.get', return_value=payload) '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) response = api_client.get(url)
assert response.status_code == 200 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): def test_nodeinfo_endpoint_disabled(db, api_client, preferences):
preferences['instance__nodeinfo_enabled'] = False preferences['instance__nodeinfo_enabled'] = False
url = reverse('api:v1:instance:nodeinfo') url = reverse('api:v1:instance:nodeinfo-2.0')
response = api_client.get(url) response = api_client.get(url)
assert response.status_code == 404 assert response.status_code == 404

2
front/src/components/instance/Stats.vue
View File

@ -77,7 +77,7 @@ export default {
var self = this var self = this
this.isLoading = true this.isLoading = true
logger.default.debug('Fetching instance stats...') logger.default.debug('Fetching instance stats...')
axios.get('instance/nodeinfo/').then((response) => { axios.get('instance/nodeinfo/2.0/').then((response) => {
let d = response.data let d = response.data
self.stats = {} self.stats = {}
self.stats.users = _.get(d, 'usage.users.total') self.stats.users = _.get(d, 'usage.users.total')