From db3b8a13415d55bdde8d1f1fb9c078fa26a43714 Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Mon, 13 Aug 2018 18:21:51 +0200 Subject: [PATCH] Change pleroma config endpoint from static to api-based --- app/javascript/mastodon/actions/pleroma.js | 2 +- app/javascript/mastodon/reducers/pleroma.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/javascript/mastodon/actions/pleroma.js b/app/javascript/mastodon/actions/pleroma.js index 7b879acb4..a4ab8cd80 100644 --- a/app/javascript/mastodon/actions/pleroma.js +++ b/app/javascript/mastodon/actions/pleroma.js @@ -38,7 +38,7 @@ export function fetchPleromaConfig() { return (dispatch, getState) => { dispatch(fetchPleromaConfigRequest()); - api(getState).get('/static/config.json').then(response => { + api(getState).get('/api/statusnet/config.json').then(response => { dispatch(fetchPleromaConfigSuccess(response.data)); }).catch(error => { dispatch(fetchPleromaConfigFail(error)); diff --git a/app/javascript/mastodon/reducers/pleroma.js b/app/javascript/mastodon/reducers/pleroma.js index e7ec92474..2901d0246 100644 --- a/app/javascript/mastodon/reducers/pleroma.js +++ b/app/javascript/mastodon/reducers/pleroma.js @@ -11,7 +11,7 @@ export function custom_panel(state = initialPanel, action) { case PANEL_FETCH_SUCCESS: return state.set('panel', action.panel); break; case PLEROMA_CONFIG_FETCH_SUCCESS: - return state.set('enabled', (action.config || {}).showInstanceSpecificPanel || false); + return state.set('enabled', (action.config || {}).site.pleromafe.showInstanceSpecificPanel || false); } return state;