Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into remove-twitterapi-config

1 files changed, 7 insertions, 1 deletions

diff --git a/src/boot/after_store.js b/src/boot/after_store.js
index b943ed95..5213fbbd 100644
--- a/src/boot/after_store.js
+++ b/src/boot/after_store.js
@@ -108,9 +108,9 @@ const setSettings = async ({ apiConfig, staticConfig, store }) => {
   copyInstanceOption('subjectLineBehavior')
   copyInstanceOption('postContentType')
   copyInstanceOption('alwaysShowSubjectInput')
-  copyInstanceOption('noAttachmentLinks')
   copyInstanceOption('showFeaturesPanel')
   copyInstanceOption('hideSitename')
+  copyInstanceOption('sidebarRight')
 
   return store.dispatch('setTheme', config['theme'])
 }
@@ -250,6 +250,9 @@ const getNodeInfo = async ({ store }) => {
           : federation.enabled
       })
 
+      const accountActivationRequired = metadata.accountActivationRequired
+      store.dispatch('setInstanceOption', { name: 'accountActivationRequired', value: accountActivationRequired })
+
       const accounts = metadata.staffAccounts
       resolveStaffAccounts({ store, accounts })
     } else {
@@ -319,6 +322,9 @@ const afterStoreSetup = async ({ store, i18n }) => {
     getStatusnetConfig({ store })
   ])
 
+  // Start fetching things that don't need to block the UI
+  store.dispatch('fetchMutes')
+
   const router = new VueRouter({
     mode: 'history',
     routes: routes(store),