Merge branch 'betterStorage' into shigusegubu

* betterStorage: Fixed "user.id is undefined" or something error more sane by properly handling HTTP errors undo rename because it makes less sense now. proxying nodeinfo made FE work even without either api or static config Removed warning. Added support for working without static/config.json more missing stuff fix some missing stuff translations Added more stuff that's actually being added to instanceConfig, simplified the whitelist. more refactoring some recategorization of options... Initial version
2018-09-17 19:08:41 +03:00 · 2018-09-17 19:08:41 +03:00 · b0af6b572c
commit b0af6b572c
parent 3fe199ac0e 03f28d3fa6
5 changed files with 96 additions and 74 deletions
--- a/config/index.js
+++ b/config/index.js
@ -27,6 +27,11 @@ module.exports = {
        changeOrigin: true,
        cookieDomainRewrite: 'localhost'
      },
+      '/nodeinfo': {
+        target: 'http://localhost:4000/',
+        changeOrigin: true,
+        cookieDomainRewrite: 'localhost'
+      },
      '/socket': {
        target: 'http://localhost:4000/',
        changeOrigin: true,
--- a/src/lib/persisted_state.js
+++ b/src/lib/persisted_state.js
@ -92,8 +92,6 @@ export default function createPersistedState ({
                store.dispatch('settingsSaved', { error })
              }
            })
-        } else {
-          console.warn(`Not saving to localStorage for: ${mutation.type}`)
        }
      } catch (e) {
        console.log("Couldn't persist state:")
--- a/src/main.js
+++ b/src/main.js
@ -89,80 +89,87 @@ window.fetch('/api/statusnet/config.json')
    var apiConfig = data.site.pleromafe

    window.fetch('/static/config.json')
-    .then((res) => res.json())
-    .then((data) => {
-      var staticConfig = data
-      // This takes static config and overrides properties that are present in apiConfig
-      var config = Object.assign({}, staticConfig, apiConfig)
+      .then((res) => res.json())
+      .catch((err) => {
+        console.warn('Failed to load static/config.json, continuing without it.')
+        console.warn('Error was: ')
+        console.warn(err)
+        return {}
+      })
+      .then((staticConfig) => {
+        // This takes static config and overrides properties that are present in apiConfig
+        var config = Object.assign({}, staticConfig, apiConfig)

-      var theme = (config.theme)
-      var background = (config.background)
-      var logo = (config.logo)
-      var logoMask = (typeof config.logoMask === 'undefined' ? true : config.logoMask)
-      var logoMargin = (typeof config.logoMargin === 'undefined' ? 0 : config.logoMargin)
-      var redirectRootNoLogin = (config.redirectRootNoLogin)
-      var redirectRootLogin = (config.redirectRootLogin)
-      var chatDisabled = (config.chatDisabled)
-      var showInstanceSpecificPanel = (config.showInstanceSpecificPanel)
-      var scopeOptionsEnabled = (config.scopeOptionsEnabled)
-      var formattingOptionsEnabled = (config.formattingOptionsEnabled)
-      var defaultCollapseMessageWithSubject = (config.collapseMessageWithSubject)
+        var theme = (config.theme)
+        var background = (config.background)
+        var logo = (config.logo)
+        var logoMask = (typeof config.logoMask === 'undefined' ? true : config.logoMask)
+        var logoMargin = (typeof config.logoMargin === 'undefined' ? 0 : config.logoMargin)
+        var redirectRootNoLogin = (config.redirectRootNoLogin)
+        var redirectRootLogin = (config.redirectRootLogin)
+        var chatDisabled = (config.chatDisabled)
+        var showInstanceSpecificPanel = (config.showInstanceSpecificPanel)
+        var scopeOptionsEnabled = (config.scopeOptionsEnabled)
+        var formattingOptionsEnabled = (config.formattingOptionsEnabled)
+        var collapseMessageWithSubject = (config.collapseMessageWithSubject)

-      store.dispatch('setInstanceOption', { name: 'theme', value: theme })
-      store.dispatch('setInstanceOption', { name: 'background', value: background })
-      store.dispatch('setInstanceOption', { name: 'logo', value: logo })
-      store.dispatch('setInstanceOption', { name: 'logoMask', value: logoMask })
-      store.dispatch('setInstanceOption', { name: 'logoMargin', value: logoMargin })
-      store.dispatch('setInstanceOption', { name: 'redirectRootNoLogin', value: redirectRootNoLogin })
-      store.dispatch('setInstanceOption', { name: 'redirectRootLogin', value: redirectRootLogin })
-      store.dispatch('setInstanceOption', { name: 'showInstanceSpecificPanel', value: showInstanceSpecificPanel })
-      store.dispatch('setInstanceOption', { name: 'scopeOptionsEnabled', value: scopeOptionsEnabled })
-      store.dispatch('setInstanceOption', { name: 'formattingOptionsEnabled', value: formattingOptionsEnabled })
-      store.dispatch('setInstanceOption', { name: 'collapseMessageWithSubject', value: defaultCollapseMessageWithSubject })
-      if (chatDisabled) {
-        store.dispatch('disableChat')
-      }
-
-      const routes = [
-        { name: 'root',
-          path: '/',
-          redirect: to => {
-            return (store.state.users.currentUser ? redirectRootLogin : redirectRootNoLogin) || '/main/all'
-          }},
-        { path: '/main/all', component: PublicAndExternalTimeline },
-        { path: '/main/public', component: PublicTimeline },
-        { path: '/main/friends', component: FriendsTimeline },
-        { path: '/tag/:tag', component: TagTimeline },
-        { name: 'conversation', path: '/notice/:id', component: ConversationPage, meta: { dontScroll: true } },
-        { name: 'user-profile', path: '/users/:id', component: UserProfile },
-        { name: 'mentions', path: '/:username/mentions', component: Mentions },
-        { name: 'settings', path: '/settings', component: Settings },
-        { name: 'registration', path: '/registration', component: Registration },
-        { name: 'registration', path: '/registration/:token', component: Registration },
-        { name: 'friend-requests', path: '/friend-requests', component: FollowRequests },
-        { name: 'user-settings', path: '/user-settings', component: UserSettings }
-      ]
-
-      const router = new VueRouter({
-        mode: 'history',
-        routes,
-        scrollBehavior: (to, from, savedPosition) => {
-          if (to.matched.some(m => m.meta.dontScroll)) {
-            return false
-          }
-          return savedPosition || { x: 0, y: 0 }
+        store.dispatch('setInstanceOption', { name: 'theme', value: theme })
+        store.dispatch('setInstanceOption', { name: 'background', value: background })
+        store.dispatch('setInstanceOption', { name: 'logo', value: logo })
+        store.dispatch('setInstanceOption', { name: 'logoMask', value: logoMask })
+        store.dispatch('setInstanceOption', { name: 'logoMargin', value: logoMargin })
+        store.dispatch('setInstanceOption', { name: 'redirectRootNoLogin', value: redirectRootNoLogin })
+        store.dispatch('setInstanceOption', { name: 'redirectRootLogin', value: redirectRootLogin })
+        store.dispatch('setInstanceOption', { name: 'showInstanceSpecificPanel', value: showInstanceSpecificPanel })
+        store.dispatch('setInstanceOption', { name: 'scopeOptionsEnabled', value: scopeOptionsEnabled })
+        store.dispatch('setInstanceOption', { name: 'formattingOptionsEnabled', value: formattingOptionsEnabled })
+        store.dispatch('setInstanceOption', { name: 'collapseMessageWithSubject', value: collapseMessageWithSubject })
+        if (chatDisabled) {
+          store.dispatch('disableChat')
        }
-      })

-      /* eslint-disable no-new */
-      new Vue({
-        router,
-        store,
-        i18n,
-        el: '#app',
-        render: h => h(App)
+        const routes = [
+          { name: 'root',
+            path: '/',
+            redirect: to => {
+              return (store.state.users.currentUser
+                      ? store.state.instance.redirectRootLogin
+                      : store.state.instance.redirectRootNoLogin) || '/main/all'
+            }},
+          { path: '/main/all', component: PublicAndExternalTimeline },
+          { path: '/main/public', component: PublicTimeline },
+          { path: '/main/friends', component: FriendsTimeline },
+          { path: '/tag/:tag', component: TagTimeline },
+          { name: 'conversation', path: '/notice/:id', component: ConversationPage, meta: { dontScroll: true } },
+          { name: 'user-profile', path: '/users/:id', component: UserProfile },
+          { name: 'mentions', path: '/:username/mentions', component: Mentions },
+          { name: 'settings', path: '/settings', component: Settings },
+          { name: 'registration', path: '/registration', component: Registration },
+          { name: 'registration', path: '/registration/:token', component: Registration },
+          { name: 'friend-requests', path: '/friend-requests', component: FollowRequests },
+          { name: 'user-settings', path: '/user-settings', component: UserSettings }
+        ]
+
+        const router = new VueRouter({
+          mode: 'history',
+          routes,
+          scrollBehavior: (to, from, savedPosition) => {
+            if (to.matched.some(m => m.meta.dontScroll)) {
+              return false
+            }
+            return savedPosition || { x: 0, y: 0 }
+          }
+        })
+
+        /* eslint-disable no-new */
+        new Vue({
+          router,
+          store,
+          i18n,
+          el: '#app',
+          render: h => h(App)
+        })
      })
-    })
  })

 window.fetch('/static/terms-of-service.html')
--- a/src/modules/instance.js
+++ b/src/modules/instance.js
@ -1,4 +1,5 @@
 import { set } from 'vue'
+import StyleSetter from '../services/style_setter/style_setter.js'

 const defaultState = {
  // Stuff from static/config.json and apiConfig
@ -7,7 +8,7 @@ const defaultState = {
  textlimit: 5000,
  server: 'http://localhost:4040/',
  theme: 'pleroma-dark',
-  background: 'img.png',
+  background: '/static/aurora_borealis.jpg',
  logo: '/static/logo.png',
  logoMask: true,
  logoMargin: '.2em',
@ -40,7 +41,9 @@ const instance = {
  state: defaultState,
  mutations: {
    setInstanceOption (state, { name, value }) {
-      set(state, name, value)
+      if (typeof value !== 'undefined') {
+        set(state, name, value)
+      }
    }
  },
  actions: {
@ -50,6 +53,8 @@ const instance = {
        case 'name':
          dispatch('setPageTitle')
          break
+        case 'theme':
+          StyleSetter.setPreset(value, commit)
      }
    }
  }
--- a/src/services/api/api.service.js
+++ b/src/services/api/api.service.js
@ -335,7 +335,14 @@ const fetchTimeline = ({timeline, credentials, since = false, until = false, use
  const queryString = map(params, (param) => `${param[0]}=${param[1]}`).join('&')
  url += `?${queryString}`

-  return fetch(url, { headers: authHeaders(credentials) }).then((data) => data.json())
+  return fetch(url, { headers: authHeaders(credentials) })
+    .then((data) => {
+      if (data.ok) {
+        return data
+      }
+      throw new Error('Error fetching timeline')
+    })
+    .then((data) => data.json())
 }

 const verifyCredentials = (user) => {