moon
/
pleroma-fe
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use a centralized fallback for missing values and use instance.federating instead of 

instance.federation.enabled
This commit is contained in:
Mark Felder 2019-12-12 15:29:50 -06:00
parent 8d14036a23
commit d899d06973
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/boot/after_store.js
View File

@ -228,6 +228,12 @@ const getNodeInfo = async ({ store }) => {
const federation = metadata.federation const federation = metadata.federation
store.dispatch('setInstanceOption', { name: 'federationPolicy', value: 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 const accounts = metadata.staffAccounts
await resolveStaffAccounts({ store, accounts }) await resolveStaffAccounts({ store, accounts })

2
src/components/nav_panel/nav_panel.js
View File

@ -11,7 +11,7 @@ const NavPanel = {
chat: state => state.chat.channel, chat: state => state.chat.channel,
followRequestCount: state => state.api.followRequests.length, followRequestCount: state => state.api.followRequests.length,
privateMode: state => state.instance.private, privateMode: state => state.instance.private,
federating: state => state.instance.federationPolicy.enabled || state.instance.federationPolicy.enabled !== false federating: state => state.instance.federating
}) })
} }

2
src/components/side_drawer/side_drawer.js
View File

@ -46,7 +46,7 @@ const SideDrawer = {
return this.$store.state.instance.private return this.$store.state.instance.private
}, },
federating () { federating () {
return this.$store.state.instance.federationPolicy.enabled || this.$store.state.instance.federationPolicy.enabled !== false return this.$store.state.instance.federating
} }
}, },
methods: { methods: {