Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into issue-436-mastoapi-notifications

src/boot/after_store.js

@@ -4,10 +4,11 @@ import routes from './routes'
 
 import App from '../App.vue'
 
-const afterStoreSetup = ({ store, i18n }) => {
+const getStatusnetConfig = async ({ store }) => {
-  window.fetch('/api/statusnet/config.json')
+  try {
-    .then((res) => res.json())
+    const res = await window.fetch('/api/statusnet/config.json')
-    .then((data) => {
+    if (res.ok) {
+      const data = await res.json()
       const { name, closed: registrationClosed, textlimit, uploadlimit, server, vapidPublicKey } = data.site
 
       store.dispatch('setInstanceOption', { name: 'name', value: name })
@@ -28,138 +29,167 @@ const afterStoreSetup = ({ store, i18n }) => {
         store.dispatch('setInstanceOption', { name: 'vapidPublicKey', value: vapidPublicKey })
       }
 
-      var apiConfig = data.site.pleromafe
+      return data.site.pleromafe
-
+    } else {
-      window.fetch('/static/config.json')
+      throw (res)
-        .then((res) => res.json())
+    }
-        .catch((err) => {
+  } catch (error) {
-          console.warn('Failed to load static/config.json, continuing without it.')
+    console.error('Could not load statusnet config, potentially fatal')
-          console.warn(err)
+    console.error(error)
-          return {}
+  }
-        })
+}
-        .then((staticConfig) => {
+
-          const overrides = window.___pleromafe_dev_overrides || {}
+const getStaticConfig = async () => {
-          const env = window.___pleromafe_mode.NODE_ENV
+  try {
-
+    const res = await window.fetch('/static/config.json')
-          // This takes static config and overrides properties that are present in apiConfig
+    if (res.ok) {
-          let config = {}
+      return res.json()
-          if (overrides.staticConfigPreference && env === 'development') {
+    } else {
-            console.warn('OVERRIDING API CONFIG WITH STATIC CONFIG')
+      throw (res)
-            config = Object.assign({}, apiConfig, staticConfig)
+    }
-          } else {
+  } catch (error) {
-            config = Object.assign({}, staticConfig, apiConfig)
+    console.warn('Failed to load static/config.json, continuing without it.')
-          }
+    console.warn(error)
-
+    return {}
-          const copyInstanceOption = (name) => {
+  }
-            store.dispatch('setInstanceOption', {name, value: config[name]})
+}
-          }
+
-
+const setSettings = async ({ apiConfig, staticConfig, store }) => {
-          copyInstanceOption('nsfwCensorImage')
+  const overrides = window.___pleromafe_dev_overrides || {}
-          copyInstanceOption('background')
+  const env = window.___pleromafe_mode.NODE_ENV
-          copyInstanceOption('hidePostStats')
+
-          copyInstanceOption('hideUserStats')
+  // This takes static config and overrides properties that are present in apiConfig
-          copyInstanceOption('hideFilteredStatuses')
+  let config = {}
-          copyInstanceOption('logo')
+  if (overrides.staticConfigPreference && env === 'development') {
-
+    console.warn('OVERRIDING API CONFIG WITH STATIC CONFIG')
-          store.dispatch('setInstanceOption', {
+    config = Object.assign({}, apiConfig, staticConfig)
-            name: 'logoMask',
+  } else {
-            value: typeof config.logoMask === 'undefined'
+    config = Object.assign({}, staticConfig, apiConfig)
-              ? true
+  }
-              : config.logoMask
+
-          })
+  const copyInstanceOption = (name) => {
-
+    store.dispatch('setInstanceOption', { name, value: config[name] })
-          store.dispatch('setInstanceOption', {
+  }
-            name: 'logoMargin',
+
-            value: typeof config.logoMargin === 'undefined'
+  copyInstanceOption('nsfwCensorImage')
-              ? 0
+  copyInstanceOption('background')
-              : config.logoMargin
+  copyInstanceOption('hidePostStats')
-          })
+  copyInstanceOption('hideUserStats')
-
+  copyInstanceOption('hideFilteredStatuses')
-          copyInstanceOption('redirectRootNoLogin')
+  copyInstanceOption('logo')
-          copyInstanceOption('redirectRootLogin')
+
-          copyInstanceOption('showInstanceSpecificPanel')
+  store.dispatch('setInstanceOption', {
-          copyInstanceOption('scopeOptionsEnabled')
+    name: 'logoMask',
-          copyInstanceOption('formattingOptionsEnabled')
+    value: typeof config.logoMask === 'undefined'
-          copyInstanceOption('collapseMessageWithSubject')
+      ? true
-          copyInstanceOption('loginMethod')
+      : config.logoMask
-          copyInstanceOption('scopeCopy')
+  })
-          copyInstanceOption('subjectLineBehavior')
+
-          copyInstanceOption('postContentType')
+  store.dispatch('setInstanceOption', {
-          copyInstanceOption('alwaysShowSubjectInput')
+    name: 'logoMargin',
-          copyInstanceOption('noAttachmentLinks')
+    value: typeof config.logoMargin === 'undefined'
-          copyInstanceOption('showFeaturesPanel')
+      ? 0
-
+      : config.logoMargin
-          if (config.chatDisabled) {
+  })
-            store.dispatch('disableChat')
+
-          }
+  copyInstanceOption('redirectRootNoLogin')
-
+  copyInstanceOption('redirectRootLogin')
-          return store.dispatch('setTheme', config['theme'])
+  copyInstanceOption('showInstanceSpecificPanel')
-        })
+  copyInstanceOption('scopeOptionsEnabled')
-        .then(() => {
+  copyInstanceOption('formattingOptionsEnabled')
-          const router = new VueRouter({
+  copyInstanceOption('collapseMessageWithSubject')
-            mode: 'history',
+  copyInstanceOption('loginMethod')
-            routes: routes(store),
+  copyInstanceOption('scopeCopy')
-            scrollBehavior: (to, _from, savedPosition) => {
+  copyInstanceOption('subjectLineBehavior')
-              if (to.matched.some(m => m.meta.dontScroll)) {
+  copyInstanceOption('postContentType')
-                return false
+  copyInstanceOption('alwaysShowSubjectInput')
-              }
+  copyInstanceOption('noAttachmentLinks')
-              return savedPosition || { x: 0, y: 0 }
+  copyInstanceOption('showFeaturesPanel')
-            }
+
-          })
+  if ((config.chatDisabled)) {
-
+    store.dispatch('disableChat')
-          /* eslint-disable no-new */
+  } else {
-          new Vue({
+    store.dispatch('initializeSocket')
-            router,
+  }
-            store,
+
-            i18n,
+  return store.dispatch('setTheme', config['theme'])
-            el: '#app',
+}
-            render: h => h(App)
+
-          })
+const getTOS = async ({ store }) => {
-        })
+  try {
-    })
+    const res = await window.fetch('/static/terms-of-service.html')
-
+    if (res.ok) {
-  window.fetch('/static/terms-of-service.html')
+      const html = await res.text()
-    .then((res) => res.text())
-    .then((html) => {
       store.dispatch('setInstanceOption', { name: 'tos', value: html })
-    })
+    } else {
-
+      throw (res)
-  window.fetch('/api/pleroma/emoji.json')
+    }
-    .then(
+  } catch (e) {
-      (res) => res.json()
+    console.warn("Can't load TOS")
-        .then(
+    console.warn(e)
-          (values) => {
+  }
-            const emoji = Object.keys(values).map((key) => {
+}
-              return { shortcode: key, image_url: values[key] }
+
-            })
+const getInstancePanel = async ({ store }) => {
-            store.dispatch('setInstanceOption', { name: 'customEmoji', value: emoji })
+  try {
-            store.dispatch('setInstanceOption', { name: 'pleromaBackend', value: true })
+    const res = await window.fetch('/instance/panel.html')
-          },
+    if (res.ok) {
-          (failure) => {
+      const html = await res.text()
-            store.dispatch('setInstanceOption', { name: 'pleromaBackend', value: false })
+      store.dispatch('setInstanceOption', { name: 'instanceSpecificPanelContent', value: html })
-          }
+    } else {
-        ),
+      throw (res)
-      (error) => console.log(error)
+    }
-    )
+  } catch (e) {
-
+    console.warn("Can't load instance panel")
-  window.fetch('/static/emoji.json')
+    console.warn(e)
-    .then((res) => res.json())
+  }
-    .then((values) => {
+}
+
+const getStaticEmoji = async ({ store }) => {
+  try {
+    const res = await window.fetch('/static/emoji.json')
+    if (res.ok) {
+      const values = await res.json()
       const emoji = Object.keys(values).map((key) => {
         return { shortcode: key, image_url: false, 'utf': values[key] }
       })
       store.dispatch('setInstanceOption', { name: 'emoji', value: emoji })
-    })
+    } else {
+      throw (res)
+    }
+  } catch (e) {
+    console.warn("Can't load static emoji")
+    console.warn(e)
+  }
+}
 
-  window.fetch('/instance/panel.html')
+// This is also used to indicate if we have a 'pleroma backend' or not.
-    .then((res) => res.text())
+// Somewhat weird, should probably be somewhere else.
-    .then((html) => {
+const getCustomEmoji = async ({ store }) => {
-      store.dispatch('setInstanceOption', { name: 'instanceSpecificPanelContent', value: html })
+  try {
-    })
+    const res = await window.fetch('/api/pleroma/emoji.json')
+    if (res.ok) {
+      const values = await res.json()
+      const emoji = Object.keys(values).map((key) => {
+        return { shortcode: key, image_url: values[key] }
+      })
+      store.dispatch('setInstanceOption', { name: 'customEmoji', value: emoji })
+      store.dispatch('setInstanceOption', { name: 'pleromaBackend', value: true })
+    } else {
+      throw (res)
+    }
+  } catch (e) {
+    store.dispatch('setInstanceOption', { name: 'pleromaBackend', value: false })
+    console.warn("Can't load custom emojis, maybe not a Pleroma instance?")
+    console.warn(e)
+  }
+}
 
-  window.fetch('/nodeinfo/2.0.json')
+const getNodeInfo = async ({ store }) => {
-    .then((res) => res.json())
+  try {
-    .then((data) => {
+    const res = await window.fetch('/nodeinfo/2.0.json')
+    if (res.ok) {
+      const data = await res.json()
       const metadata = data.metadata
 
       const features = metadata.features
@@ -167,14 +197,54 @@ 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
       store.dispatch('setInstanceOption', { name: 'suggestionsEnabled', value: suggestions.enabled })
       store.dispatch('setInstanceOption', { name: 'suggestionsWeb', value: suggestions.web })
-    })
+    } else {
+      throw (res)
+    }
+  } catch (e) {
+    console.warn('Could not load nodeinfo')
+    console.warn(e)
+  }
+}
+
+const afterStoreSetup = async ({ store, i18n }) => {
+  const apiConfig = await getStatusnetConfig({ store })
+  const staticConfig = await getStaticConfig()
+  await setSettings({ store, apiConfig, staticConfig })
+  await getTOS({ store })
+  await getInstancePanel({ store })
+  await getStaticEmoji({ store })
+  await getCustomEmoji({ store })
+  await getNodeInfo({ store })
+
+  // Now we have the server settings and can try logging in
+  if (store.state.oauth.token) {
+    store.dispatch('loginUser', store.state.oauth.token)
+  }
+
+  const router = new VueRouter({
+    mode: 'history',
+    routes: routes(store),
+    scrollBehavior: (to, _from, savedPosition) => {
+      if (to.matched.some(m => m.meta.dontScroll)) {
+        return false
+      }
+      return savedPosition || { x: 0, y: 0 }
+    }
+  })
+
+  /* eslint-disable no-new */
+  return new Vue({
+    router,
+    store,
+    i18n,
+    el: '#app',
+    render: h => h(App)
+  })
 }
 
 export default afterStoreSetup

src/main.js

@@ -53,9 +53,10 @@ const persistedStateOptions = {
     'users.lastLoginName',
     'oauth'
   ]
-}
+};
 
-createPersistedState(persistedStateOptions).then((persistedState) => {
+(async () => {
+  const persistedState = await createPersistedState(persistedStateOptions)
   const store = new Vuex.Store({
     modules: {
       interface: interfaceModule,
@@ -75,7 +76,7 @@ createPersistedState(persistedStateOptions).then((persistedState) => {
   })
 
   afterStoreSetup({ store, i18n })
-})
+})()
 
 // These are inlined by webpack's DefinePlugin
 /* eslint-disable */