diff options
| author | Mark Felder <feld@FreeBSD.org> | 2019-12-12 15:29:50 -0600 |
|---|---|---|
| committer | Mark Felder <feld@FreeBSD.org> | 2019-12-12 15:29:50 -0600 |
| commit | d899d06973c7c46e77f9e47f480d6967e83b4adf (patch) | |
| tree | 67d9c208a13ecfc6c13416dc5d007cf4723c45d1 | |
| parent | 8d14036a23adbd13b098abeeef9622471f4a64d3 (diff) | |
Use a centralized fallback for missing values and use instance.federating instead of
instance.federation.enabled
| -rw-r--r-- | src/boot/after_store.js | 6 | ||||
| -rw-r--r-- | src/components/nav_panel/nav_panel.js | 2 | ||||
| -rw-r--r-- | src/components/side_drawer/side_drawer.js | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/src/boot/after_store.js b/src/boot/after_store.js index f169d7ba..228a0497 100644 --- a/src/boot/after_store.js +++ b/src/boot/after_store.js @@ -228,6 +228,12 @@ const getNodeInfo = async ({ store }) => { const federation = metadata.federation store.dispatch('setInstanceOption', { name: 'federationPolicy', value: federation }) + store.dispatch('setInstanceOption', { + name: 'federating', + value: typeof federation.enabled === 'undefined' + ? true + : federation.enabled + }) const accounts = metadata.staffAccounts await resolveStaffAccounts({ store, accounts }) diff --git a/src/components/nav_panel/nav_panel.js b/src/components/nav_panel/nav_panel.js index 515e47e6..d9268585 100644 --- a/src/components/nav_panel/nav_panel.js +++ b/src/components/nav_panel/nav_panel.js @@ -11,7 +11,7 @@ const NavPanel = { chat: state => state.chat.channel, followRequestCount: state => state.api.followRequests.length, privateMode: state => state.instance.private, - federating: state => state.instance.federationPolicy.enabled || state.instance.federationPolicy.enabled !== false + federating: state => state.instance.federating }) } diff --git a/src/components/side_drawer/side_drawer.js b/src/components/side_drawer/side_drawer.js index 670d28b4..2534eb8f 100644 --- a/src/components/side_drawer/side_drawer.js +++ b/src/components/side_drawer/side_drawer.js @@ -46,7 +46,7 @@ const SideDrawer = { return this.$store.state.instance.private }, federating () { - return this.$store.state.instance.federationPolicy.enabled || this.$store.state.instance.federationPolicy.enabled !== false + return this.$store.state.instance.federating } }, methods: { |