diff options
| author | Shpuld Shpludson <shp@cock.li> | 2019-03-11 18:53:34 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2019-03-11 18:53:34 +0000 |
| commit | 7c26435e66fd7e142ea4b88fbe51eede32eeb5ce (patch) | |
| tree | d7b4ea789ceaaa8e5dacd7e74100962853853132 /src/boot/after_store.js | |
| parent | 7e9c8c3d219aa3b787c5606efbb54a73c1738b07 (diff) | |
| parent | f397537642a6b8a4079d8d45d835ddd50f2d2b4a (diff) | |
Merge branch 'develop' into 'master'
Update master with bugfixes (and other changes)
See merge request pleroma/pleroma-fe!673
Diffstat (limited to 'src/boot/after_store.js')
| -rw-r--r-- | src/boot/after_store.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/boot/after_store.js b/src/boot/after_store.js index 53ecc083..cd88c188 100644 --- a/src/boot/after_store.js +++ b/src/boot/after_store.js @@ -89,10 +89,8 @@ const afterStoreSetup = ({ store, i18n }) => { copyInstanceOption('noAttachmentLinks') copyInstanceOption('showFeaturesPanel') - if ((config.chatDisabled)) { + if (config.chatDisabled) { store.dispatch('disableChat') - } else { - store.dispatch('initializeSocket') } return store.dispatch('setTheme', config['theme']) @@ -169,6 +167,8 @@ const afterStoreSetup = ({ store, i18n }) => { store.dispatch('setInstanceOption', { name: 'chatAvailable', value: features.includes('chat') }) store.dispatch('setInstanceOption', { name: 'gopherAvailable', value: features.includes('gopher') }) + store.dispatch('setInstanceOption', { name: 'postFormats', value: metadata.postFormats }) + store.dispatch('setInstanceOption', { name: 'restrictedNicknames', value: metadata.restrictedNicknames }) const suggestions = metadata.suggestions |