Merge branch 'develop' into 'notifications'

# Conflicts:
#   src/main.js
This commit is contained in:
kaniini 2018-08-24 23:00:56 +00:00
commit fe906cc3f0
16 changed files with 224 additions and 101 deletions

View file

@ -49,6 +49,7 @@ const persistedStateOptions = {
'config.hideAttachments',
'config.hideAttachmentsInConv',
'config.hideNsfw',
'config.replyVisibility',
'config.autoLoad',
'config.hoverPreview',
'config.streaming',
@ -192,3 +193,12 @@ window.fetch('/instance/panel.html')
.then((html) => {
store.dispatch('setOption', { name: 'instanceSpecificPanelContent', value: html })
})
window.fetch('/nodeinfo/2.0.json')
.then((res) => res.json())
.then((data) => {
const suggestions = data.metadata.suggestions
store.dispatch('setOption', { name: 'suggestionsEnabled', value: suggestions.enabled })
store.dispatch('setOption', { name: 'suggestionsWeb', value: suggestions.web })
})