diff options
| author | shpuld <shp@cock.li> | 2019-03-28 22:25:40 +0200 |
|---|---|---|
| committer | shpuld <shp@cock.li> | 2019-03-28 22:25:40 +0200 |
| commit | 31010779f6cc1abdd18fa117c0832e20623e1624 (patch) | |
| tree | 2eaf8861e1baee86a1f4d33e0e10543e62cdd98c /src/boot/after_store.js | |
| parent | fd12263cacd2a869ad61dd8580f918b45d9b2a51 (diff) | |
| parent | c829b1a5f4a013882ba298b0f95ec0f8b3ed3758 (diff) | |
Merge branch 'develop' into feature/mobile-improvements-3
Diffstat (limited to 'src/boot/after_store.js')
| -rw-r--r-- | src/boot/after_store.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/boot/after_store.js b/src/boot/after_store.js index 549de497..f86a65e3 100644 --- a/src/boot/after_store.js +++ b/src/boot/after_store.js @@ -97,6 +97,7 @@ const setSettings = async ({ apiConfig, staticConfig, store }) => { copyInstanceOption('showInstanceSpecificPanel') copyInstanceOption('scopeOptionsEnabled') copyInstanceOption('formattingOptionsEnabled') + copyInstanceOption('hideMutedPosts') copyInstanceOption('collapseMessageWithSubject') copyInstanceOption('loginMethod') copyInstanceOption('scopeCopy') @@ -243,7 +244,7 @@ const afterStoreSetup = async ({ store, i18n }) => { // Now we have the server settings and can try logging in if (store.state.oauth.token) { - store.dispatch('loginUser', store.state.oauth.token) + await store.dispatch('loginUser', store.state.oauth.token) } const router = new VueRouter({ |