From 049e2397b156534add9472d3c16cf92ca5a88326 Mon Sep 17 00:00:00 2001
From: Hakaba Hitoyo <hakabahitoyo@example.com>
Date: Mon, 3 Sep 2018 15:23:09 +0900
Subject: update

---
 src/main.js | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/main.js')

diff --git a/src/main.js b/src/main.js
index debd8703..64b223aa 100644
--- a/src/main.js
+++ b/src/main.js
@@ -225,4 +225,6 @@ window.fetch('/nodeinfo/2.0.json')
     const suggestions = data.metadata.suggestions
     store.dispatch('setOption', { name: 'suggestionsEnabled', value: suggestions.enabled })
     store.dispatch('setOption', { name: 'suggestionsWeb', value: suggestions.web })
+
+    store.dispatch('setOption', { name: 'mediaProxyAvailable', value: data.metadata.mediaProxy })
   })
-- 
cgit v1.2.3-70-g09d2


From 65115bfc7f991b9203724eab67f73a34259cf6b2 Mon Sep 17 00:00:00 2001
From: Hakaba Hitoyo <hakabahitoyo@example.com>
Date: Tue, 4 Sep 2018 10:44:25 +0900
Subject: features panes supports chat & gopher

---
 src/components/features_panel/features_panel.js  | 6 +++++-
 src/components/features_panel/features_panel.vue | 4 +++-
 src/main.js                                      | 9 ++++++---
 3 files changed, 14 insertions(+), 5 deletions(-)

(limited to 'src/main.js')

diff --git a/src/components/features_panel/features_panel.js b/src/components/features_panel/features_panel.js
index 75a671f2..21d78e19 100644
--- a/src/components/features_panel/features_panel.js
+++ b/src/components/features_panel/features_panel.js
@@ -1,7 +1,11 @@
 const FeaturesPanel = {
   computed: {
-    mediaProxy: function () { return this.$store.state.config.mediaProxyAvailable },
+    chat: function () {
+      return this.$store.state.config.chatAvailable && (!this.$store.state.chatDisabled)
+    },
+    gopher: function () { return this.$store.state.config.gopherAvailable },
     whoToFollow: function () { return this.$store.state.config.suggestionsEnabled },
+    mediaProxy: function () { return this.$store.state.config.mediaProxyAvailable },
     scopeOptions: function () { return this.$store.state.config.scopeOptionsEnabled },
     formattingOptions: function () { return this.$store.state.config.formattingOptionsEnabled },
     textlimit: function () { return this.$store.state.config.textlimit }
diff --git a/src/components/features_panel/features_panel.vue b/src/components/features_panel/features_panel.vue
index 5ec4d255..5c532f1a 100644
--- a/src/components/features_panel/features_panel.vue
+++ b/src/components/features_panel/features_panel.vue
@@ -8,8 +8,10 @@
       </div>
       <div class="panel-body features-panel">
         <ul>
-          <li v-if="mediaProxy">Media proxy</li>
+          <li v-if="chat">Chat</li>
+          <li v-if="gopher">Gopher</li>
           <li v-if="whoToFollow">Who to follow</li>
+          <li v-if="mediaProxy">Media proxy</li>
           <li v-if="scopeOptions">Scope options</li>
           <li v-if="formattingOptions">Formatting options</li>
           <li>Text limit = {{textlimit}}</li>
diff --git a/src/main.js b/src/main.js
index 64b223aa..58f520db 100644
--- a/src/main.js
+++ b/src/main.js
@@ -222,9 +222,12 @@ window.fetch('/instance/panel.html')
 window.fetch('/nodeinfo/2.0.json')
   .then((res) => res.json())
   .then((data) => {
-    const suggestions = data.metadata.suggestions
+    const metadata = data.metadata
+    store.dispatch('setOption', { name: 'mediaProxyAvailable', value: data.metadata.mediaProxy })
+    store.dispatch('setOption', { name: 'chatAvailable', value: data.metadata.chat })
+    store.dispatch('setOption', { name: 'gopherAvailable', value: data.metadata.gopher })
+
+    const suggestions = metadata.suggestions
     store.dispatch('setOption', { name: 'suggestionsEnabled', value: suggestions.enabled })
     store.dispatch('setOption', { name: 'suggestionsWeb', value: suggestions.web })
-
-    store.dispatch('setOption', { name: 'mediaProxyAvailable', value: data.metadata.mediaProxy })
   })
-- 
cgit v1.2.3-70-g09d2


From dbf24e1fbf3dde87e89ff0cee94323a23df72067 Mon Sep 17 00:00:00 2001
From: hakabahitoyo <hakabahitoyo@example.com>
Date: Tue, 4 Sep 2018 11:15:00 +0900
Subject: Remove outdated settings

---
 src/main.js | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'src/main.js')

diff --git a/src/main.js b/src/main.js
index debd8703..289cd857 100644
--- a/src/main.js
+++ b/src/main.js
@@ -114,9 +114,6 @@ window.fetch('/api/statusnet/config.json')
       var redirectRootNoLogin = (config.redirectRootNoLogin)
       var redirectRootLogin = (config.redirectRootLogin)
       var chatDisabled = (config.chatDisabled)
-      var showWhoToFollowPanel = (config.showWhoToFollowPanel)
-      var whoToFollowProvider = (config.whoToFollowProvider)
-      var whoToFollowLink = (config.whoToFollowLink)
       var showInstanceSpecificPanel = (config.showInstanceSpecificPanel)
       var scopeOptionsEnabled = (config.scopeOptionsEnabled)
       var formattingOptionsEnabled = (config.formattingOptionsEnabled)
@@ -127,9 +124,6 @@ window.fetch('/api/statusnet/config.json')
       store.dispatch('setOption', { name: 'logo', value: logo })
       store.dispatch('setOption', { name: 'logoMask', value: logoMask })
       store.dispatch('setOption', { name: 'logoMargin', value: logoMargin })
-      store.dispatch('setOption', { name: 'showWhoToFollowPanel', value: showWhoToFollowPanel })
-      store.dispatch('setOption', { name: 'whoToFollowProvider', value: whoToFollowProvider })
-      store.dispatch('setOption', { name: 'whoToFollowLink', value: whoToFollowLink })
       store.dispatch('setOption', { name: 'showInstanceSpecificPanel', value: showInstanceSpecificPanel })
       store.dispatch('setOption', { name: 'scopeOptionsEnabled', value: scopeOptionsEnabled })
       store.dispatch('setOption', { name: 'formattingOptionsEnabled', value: formattingOptionsEnabled })
-- 
cgit v1.2.3-70-g09d2


From 5726be68307f0215470d2e5baea105718b5039fe Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Sat, 8 Sep 2018 05:16:25 +0300
Subject: fix

---
 src/main.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/main.js')

diff --git a/src/main.js b/src/main.js
index debd8703..068563fd 100644
--- a/src/main.js
+++ b/src/main.js
@@ -120,7 +120,7 @@ window.fetch('/api/statusnet/config.json')
       var showInstanceSpecificPanel = (config.showInstanceSpecificPanel)
       var scopeOptionsEnabled = (config.scopeOptionsEnabled)
       var formattingOptionsEnabled = (config.formattingOptionsEnabled)
-      var collapseMessageWithSubject = (config.collapseMessageWithSubject)
+      var defaultCollapseMessageWithSubject = (config.collapseMessageWithSubject)
 
       store.dispatch('setOption', { name: 'theme', value: theme })
       store.dispatch('setOption', { name: 'background', value: background })
@@ -133,7 +133,7 @@ window.fetch('/api/statusnet/config.json')
       store.dispatch('setOption', { name: 'showInstanceSpecificPanel', value: showInstanceSpecificPanel })
       store.dispatch('setOption', { name: 'scopeOptionsEnabled', value: scopeOptionsEnabled })
       store.dispatch('setOption', { name: 'formattingOptionsEnabled', value: formattingOptionsEnabled })
-      store.dispatch('setOption', { name: 'collapseMessageWithSubject', value: collapseMessageWithSubject })
+      store.dispatch('setOption', { name: 'defaultCollapseMessageWithSubject', value: defaultCollapseMessageWithSubject })
       if (chatDisabled) {
         store.dispatch('disableChat')
       }
-- 
cgit v1.2.3-70-g09d2


From 2db991fc7fb1eda11b94d585d3b56f9d94c81286 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Sun, 9 Sep 2018 19:36:13 +0300
Subject: some recategorization of options...

---
 src/App.js                                  |  6 ++--
 src/components/login_form/login_form.js     |  2 +-
 src/components/registration/registration.js |  4 +--
 src/components/settings/settings.js         |  3 +-
 src/components/settings/settings.vue        | 16 +++++----
 src/main.js                                 | 13 ++++---
 src/modules/config.js                       | 28 +--------------
 src/modules/interface.js                    | 53 +++++++++++++++++++++++++++++
 8 files changed, 78 insertions(+), 47 deletions(-)
 create mode 100644 src/modules/interface.js

(limited to 'src/main.js')

diff --git a/src/App.js b/src/App.js
index be6548f3..251fdfca 100644
--- a/src/App.js
+++ b/src/App.js
@@ -60,10 +60,10 @@ export default {
     },
     logo () { return this.$store.state.config.logo },
     style () { return { 'background-image': `url(${this.background})` } },
-    sitename () { return this.$store.state.config.name },
+    sitename () { return this.$store.state.interface.name },
     chat () { return this.$store.state.chat.channel.state === 'joined' },
-    suggestionsEnabled () { return this.$store.state.config.suggestionsEnabled },
-    showInstanceSpecificPanel () { return this.$store.state.config.showInstanceSpecificPanel }
+    suggestionsEnabled () { return this.$store.state.interface.suggestionsEnabled },
+    showInstanceSpecificPanel () { return this.$store.state.interface.showInstanceSpecificPanel }
   },
   methods: {
     activatePanel (panelName) {
diff --git a/src/components/login_form/login_form.js b/src/components/login_form/login_form.js
index a117b76f..12144324 100644
--- a/src/components/login_form/login_form.js
+++ b/src/components/login_form/login_form.js
@@ -5,7 +5,7 @@ const LoginForm = {
   }),
   computed: {
     loggingIn () { return this.$store.state.users.loggingIn },
-    registrationOpen () { return this.$store.state.config.registrationOpen }
+    registrationOpen () { return this.$store.state.interface.registrationOpen }
   },
   methods: {
     submit () {
diff --git a/src/components/registration/registration.js b/src/components/registration/registration.js
index 73840608..e53fa4e5 100644
--- a/src/components/registration/registration.js
+++ b/src/components/registration/registration.js
@@ -5,11 +5,11 @@ const registration = {
     registering: false
   }),
   created () {
-    if ((!this.$store.state.config.registrationOpen && !this.token) || !!this.$store.state.users.currentUser) {
+    if ((!this.$store.state.interface.registrationOpen && !this.token) || !!this.$store.state.users.currentUser) {
       this.$router.push('/main/all')
     }
     // Seems like this doesn't work at first page open for some reason
-    if (this.$store.state.config.registrationOpen && this.token) {
+    if (this.$store.state.interface.registrationOpen && this.token) {
       this.$router.push('/registration')
     }
   },
diff --git a/src/components/settings/settings.js b/src/components/settings/settings.js
index 5e28c1af..6d481820 100644
--- a/src/components/settings/settings.js
+++ b/src/components/settings/settings.js
@@ -44,8 +44,7 @@ const settings = {
       return this.$store.state.users.currentUser
     },
     currentSaveStateNotice () {
-      console.log(this.$store.state.config._internal.currentSaveStateNotice && this.$store.state.config._internal.currentSaveStateNotice.error)
-      return this.$store.state.config._internal.currentSaveStateNotice
+      return this.$store.state.interface.settings.currentSaveStateNotice
     }
   },
   watch: {
diff --git a/src/components/settings/settings.vue b/src/components/settings/settings.vue
index be7c64a7..481cdf09 100644
--- a/src/components/settings/settings.vue
+++ b/src/components/settings/settings.vue
@@ -5,15 +5,17 @@
       {{$t('settings.settings')}}
     </div>
 
-    <template v-if="currentSaveStateNotice">
-      <div @click.prevent class="alert error" v-if="currentSaveStateNotice.error">
-        Errr
-      </div>
+    <transition name="fade">
+      <template v-if="currentSaveStateNotice">
+        <div @click.prevent class="alert error" v-if="!currentSaveStateNotice.error">
+          Errr
+        </div>
 
-      <div @click.prevent class="alert success" v-if="!currentSaveStateNotice.error">
-        Succ
-      </div>
+        <div @click.prevent class="alert success" v-if="!currentSaveStateNotice.error">
+          Succ
+        </div>
     </template>
+    </transition>
   </div>
   <div class="panel-body">
     <tab-switcher>
diff --git a/src/main.js b/src/main.js
index 75c2bab2..1f3c5da9 100644
--- a/src/main.js
+++ b/src/main.js
@@ -14,6 +14,7 @@ import Registration from './components/registration/registration.vue'
 import UserSettings from './components/user_settings/user_settings.vue'
 import FollowRequests from './components/follow_requests/follow_requests.vue'
 
+import interfaceModule from './modules/interface.js'
 import statusesModule from './modules/statuses.js'
 import usersModule from './modules/users.js'
 import apiModule from './modules/api.js'
@@ -67,8 +68,9 @@ const persistedStateOptions = {
   ]
 }
 
-const store = new Vuex.Store({
+const store = console.log('interfaceModule') || new Vuex.Store({
   modules: {
+    interface: interfaceModule,
     statuses: statusesModule,
     users: usersModule,
     api: apiModule,
@@ -92,10 +94,11 @@ window.fetch('/api/statusnet/config.json')
   .then((data) => {
     const {name, closed: registrationClosed, textlimit, server} = data.site
 
-    store.dispatch('setOption', { name: 'name', value: name })
-    store.dispatch('setOption', { name: 'registrationOpen', value: (registrationClosed === '0') })
-    store.dispatch('setOption', { name: 'textlimit', value: parseInt(textlimit) })
-    store.dispatch('setOption', { name: 'server', value: server })
+    console.log(store)
+    store.dispatch('setInstanceOption', { name: 'name', value: name })
+    store.dispatch('setInstanceOption', { name: 'registrationOpen', value: (registrationClosed === '0') })
+    store.dispatch('setInstanceOption', { name: 'textlimit', value: parseInt(textlimit) })
+    store.dispatch('setInstanceOption', { name: 'server', value: server })
 
     var apiConfig = data.site.pleromafe
 
diff --git a/src/modules/config.js b/src/modules/config.js
index cb59acaa..375d0167 100644
--- a/src/modules/config.js
+++ b/src/modules/config.js
@@ -4,7 +4,6 @@ import StyleSetter from '../services/style_setter/style_setter.js'
 const browserLocale = (window.navigator.language || 'en').split('-')[0]
 
 const defaultState = {
-  name: 'Pleroma FE',
   colors: {},
   collapseMessageWithSubject: false,
   hideAttachments: false,
@@ -26,11 +25,7 @@ const defaultState = {
   },
   muteWords: [],
   highlight: {},
-  interfaceLanguage: browserLocale,
-  _internal: {
-    currentSaveStateNotice: {},
-    noticeClearTimeout: null
-  }
+  interfaceLanguage: browserLocale
 }
 
 const config = {
@@ -46,36 +41,15 @@ const config = {
       } else {
         del(state.highlight, user)
       }
-    },
-    settingsSaved (state, { success, error }) {
-      if (success) {
-        if (state.noticeClearTimeout) {
-          clearTimeout(state.noticeClearTimeout)
-        }
-        set(state._internal, 'currentSaveStateNotice', { error: false, data: success })
-        set(state._internal, 'noticeClearTimeout',
-            setTimeout(() => del(state._internal, 'currentSaveStateNotice'), 2000))
-      } else {
-        set(state._internal, 'currentSaveStateNotice', { error: true, errorData: error })
-      }
     }
   },
   actions: {
-    setPageTitle ({state}, option = '') {
-      document.title = `${option} ${state.name}`
-    },
     setHighlight ({ commit, dispatch }, { user, color, type }) {
       commit('setHighlight', {user, color, type})
     },
-    settingsSaved ({ commit, dispatch }, { success, error }) {
-      commit('settingsSaved', { success, error })
-    },
     setOption ({ commit, dispatch }, { name, value }) {
       commit('setOption', {name, value})
       switch (name) {
-        case 'name':
-          dispatch('setPageTitle')
-          break
         case 'theme':
           StyleSetter.setPreset(value, commit)
           break
diff --git a/src/modules/interface.js b/src/modules/interface.js
new file mode 100644
index 00000000..0067ee64
--- /dev/null
+++ b/src/modules/interface.js
@@ -0,0 +1,53 @@
+import { set, delete as del } from 'vue'
+
+const defaultState = {
+  name: 'Pleroma FE',
+  registrationOpen: true,
+  textlimit: 5000,
+  server: 'http://localhost:4040/',
+  settings: {
+    currentSaveStateNotice: null,
+    noticeClearTimeout: null
+  }
+}
+
+const interfaceMod = {
+  state: defaultState,
+  mutations: {
+    setInstanceOption (state, { name, value }) {
+      console.log(state)
+      console.log(name)
+      set(state, name, value)
+    },
+    settingsSaved (state, { success, error }) {
+      if (success) {
+        if (state.noticeClearTimeout) {
+          clearTimeout(state.noticeClearTimeout)
+        }
+        set(state.settings, 'currentSaveStateNotice', { error: false, data: success })
+        set(state.settings, 'noticeClearTimeout',
+            setTimeout(() => del(state.settings, 'currentSaveStateNotice'), 2000))
+      } else {
+        set(state.settings, 'currentSaveStateNotice', { error: true, errorData: error })
+      }
+    }
+  },
+  actions: {
+    setPageTitle ({state}, option = '') {
+      document.title = `${option} ${state.name}`
+    },
+    settingsSaved ({ commit, dispatch }, { success, error }) {
+      commit('settingsSaved', { success, error })
+    },
+    setInstanceOption ({ commit, dispatch }, { name, value }) {
+      commit('setInstanceOption', {name, value})
+      switch (name) {
+        case 'name':
+          dispatch('setPageTitle')
+          break
+      }
+    }
+  }
+}
+
+export default interfaceMod
-- 
cgit v1.2.3-70-g09d2


From 82fa5d08c4f441fa9df20edab214b99ecb7776b3 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Sun, 9 Sep 2018 21:21:23 +0300
Subject: more refactoring

---
 src/App.js                                         |  6 +--
 src/components/features_panel/features_panel.js    | 10 ++---
 src/components/login_form/login_form.js            |  2 +-
 .../post_status_form/post_status_form.js           |  8 ++--
 src/components/registration/registration.js        |  6 +--
 src/components/settings/settings.js                | 35 ++++++++--------
 src/components/settings/settings.vue               |  2 +-
 src/components/user_settings/user_settings.js      |  4 +-
 src/main.js                                        | 44 ++++++++++----------
 src/modules/instance.js                            | 47 ++++++++++++++++++++++
 src/modules/interface.js                           | 21 +---------
 11 files changed, 109 insertions(+), 76 deletions(-)
 create mode 100644 src/modules/instance.js

(limited to 'src/main.js')

diff --git a/src/App.js b/src/App.js
index 251fdfca..a58a2bc5 100644
--- a/src/App.js
+++ b/src/App.js
@@ -60,10 +60,10 @@ export default {
     },
     logo () { return this.$store.state.config.logo },
     style () { return { 'background-image': `url(${this.background})` } },
-    sitename () { return this.$store.state.interface.name },
+    sitename () { return this.$store.state.instance.name },
     chat () { return this.$store.state.chat.channel.state === 'joined' },
-    suggestionsEnabled () { return this.$store.state.interface.suggestionsEnabled },
-    showInstanceSpecificPanel () { return this.$store.state.interface.showInstanceSpecificPanel }
+    suggestionsEnabled () { return this.$store.state.instance.suggestionsEnabled },
+    showInstanceSpecificPanel () { return this.$store.state.instance.showInstanceSpecificPanel }
   },
   methods: {
     activatePanel (panelName) {
diff --git a/src/components/features_panel/features_panel.js b/src/components/features_panel/features_panel.js
index 80f5c966..945165bb 100644
--- a/src/components/features_panel/features_panel.js
+++ b/src/components/features_panel/features_panel.js
@@ -3,11 +3,11 @@ const FeaturesPanel = {
     chat: function () {
       return this.$store.state.config.chatAvailable && (!this.$store.state.chatDisabled)
     },
-    gopher: function () { return this.$store.state.config.gopherAvailable },
-    whoToFollow: function () { return this.$store.state.config.suggestionsEnabled },
-    mediaProxy: function () { return this.$store.state.config.mediaProxyAvailable },
-    scopeOptions: function () { return this.$store.state.config.scopeOptionsEnabled },
-    textlimit: function () { return this.$store.state.config.textlimit }
+    gopher: function () { return this.$store.state.instance.gopherAvailable },
+    whoToFollow: function () { return this.$store.state.instance.suggestionsEnabled },
+    mediaProxy: function () { return this.$store.state.instance.mediaProxyAvailable },
+    scopeOptions: function () { return this.$store.state.instance.scopeOptionsEnabled },
+    textlimit: function () { return this.$store.state.instance.textlimit }
   }
 }
 
diff --git a/src/components/login_form/login_form.js b/src/components/login_form/login_form.js
index 12144324..4405fb92 100644
--- a/src/components/login_form/login_form.js
+++ b/src/components/login_form/login_form.js
@@ -5,7 +5,7 @@ const LoginForm = {
   }),
   computed: {
     loggingIn () { return this.$store.state.users.loggingIn },
-    registrationOpen () { return this.$store.state.interface.registrationOpen }
+    registrationOpen () { return this.$store.state.instance.registrationOpen }
   },
   methods: {
     submit () {
diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js
index 7babe236..dc92f009 100644
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@@ -120,10 +120,10 @@ const PostStatusForm = {
       return this.$store.state.users.users
     },
     emoji () {
-      return this.$store.state.config.emoji || []
+      return this.$store.state.instance.emoji || []
     },
     customEmoji () {
-      return this.$store.state.config.customEmoji || []
+      return this.$store.state.instance.customEmoji || []
     },
     statusLength () {
       return this.newStatus.status.length
@@ -141,10 +141,10 @@ const PostStatusForm = {
       return this.hasStatusLengthLimit && (this.statusLength > this.statusLengthLimit)
     },
     scopeOptionsEnabled () {
-      return this.$store.state.config.scopeOptionsEnabled
+      return this.$store.state.instance.scopeOptionsEnabled
     },
     formattingOptionsEnabled () {
-      return this.$store.state.config.formattingOptionsEnabled
+      return this.$store.state.instance.formattingOptionsEnabled
     }
   },
   methods: {
diff --git a/src/components/registration/registration.js b/src/components/registration/registration.js
index e53fa4e5..8f59878d 100644
--- a/src/components/registration/registration.js
+++ b/src/components/registration/registration.js
@@ -5,16 +5,16 @@ const registration = {
     registering: false
   }),
   created () {
-    if ((!this.$store.state.interface.registrationOpen && !this.token) || !!this.$store.state.users.currentUser) {
+    if ((!this.$store.state.instance.registrationOpen && !this.token) || !!this.$store.state.users.currentUser) {
       this.$router.push('/main/all')
     }
     // Seems like this doesn't work at first page open for some reason
-    if (this.$store.state.interface.registrationOpen && this.token) {
+    if (this.$store.state.instance.registrationOpen && this.token) {
       this.$router.push('/registration')
     }
   },
   computed: {
-    termsofservice () { return this.$store.state.config.tos },
+    termsofservice () { return this.$store.state.instance.tos },
     token () { return this.$route.params.token }
   },
   methods: {
diff --git a/src/components/settings/settings.js b/src/components/settings/settings.js
index 6d481820..856ca40e 100644
--- a/src/components/settings/settings.js
+++ b/src/components/settings/settings.js
@@ -6,25 +6,26 @@ import { filter, trim } from 'lodash'
 
 const settings = {
   data () {
-    const config = this.$store.state.config
+    const user = this.$store.state.config
+    const instance = this.$store.state.instance
 
     return {
-      hideAttachmentsLocal: config.hideAttachments,
-      hideAttachmentsInConvLocal: config.hideAttachmentsInConv,
-      hideNsfwLocal: config.hideNsfw,
-      notificationVisibilityLocal: config.notificationVisibility,
-      replyVisibilityLocal: config.replyVisibility,
-      loopVideoLocal: config.loopVideo,
-      loopVideoSilentOnlyLocal: config.loopVideoSilentOnly,
-      muteWordsString: config.muteWords.join('\n'),
-      autoLoadLocal: config.autoLoad,
-      streamingLocal: config.streaming,
-      pauseOnUnfocusedLocal: config.pauseOnUnfocused,
-      hoverPreviewLocal: config.hoverPreview,
-      collapseMessageWithSubjectLocal: typeof config.collapseMessageWithSubject === 'undefined'
-        ? config.defaultCollapseMessageWithSubject
-        : config.collapseMessageWithSubject,
-      stopGifs: config.stopGifs,
+      hideAttachmentsLocal: user.hideAttachments,
+      hideAttachmentsInConvLocal: user.hideAttachmentsInConv,
+      hideNsfwLocal: user.hideNsfw,
+      notificationVisibilityLocal: user.notificationVisibility,
+      replyVisibilityLocal: user.replyVisibility,
+      loopVideoLocal: user.loopVideo,
+      loopVideoSilentOnlyLocal: user.loopVideoSilentOnly,
+      muteWordsString: user.muteWords.join('\n'),
+      autoLoadLocal: user.autoLoad,
+      streamingLocal: user.streaming,
+      pauseOnUnfocusedLocal: user.pauseOnUnfocused,
+      hoverPreviewLocal: user.hoverPreview,
+      collapseMessageWithSubjectLocal: typeof user.collapseMessageWithSubject === 'undefined'
+        ? instance.collapseMessageWithSubject
+        : user.collapseMessageWithSubject,
+      stopGifs: user.stopGifs,
       loopSilentAvailable:
         // Firefox
         Object.getOwnPropertyDescriptor(HTMLVideoElement.prototype, 'mozHasAudio') ||
diff --git a/src/components/settings/settings.vue b/src/components/settings/settings.vue
index 481cdf09..55ffa591 100644
--- a/src/components/settings/settings.vue
+++ b/src/components/settings/settings.vue
@@ -7,7 +7,7 @@
 
     <transition name="fade">
       <template v-if="currentSaveStateNotice">
-        <div @click.prevent class="alert error" v-if="!currentSaveStateNotice.error">
+        <div @click.prevent class="alert error" v-if="currentSaveStateNotice.error">
           Errr
         </div>
 
diff --git a/src/components/user_settings/user_settings.js b/src/components/user_settings/user_settings.js
index 0b13a668..70463f2a 100644
--- a/src/components/user_settings/user_settings.js
+++ b/src/components/user_settings/user_settings.js
@@ -32,10 +32,10 @@ const UserSettings = {
       return this.$store.state.users.currentUser
     },
     pleromaBackend () {
-      return this.$store.state.config.pleromaBackend
+      return this.$store.state.instance.pleromaBackend
     },
     scopeOptionsEnabled () {
-      return this.$store.state.config.scopeOptionsEnabled
+      return this.$store.state.instance.scopeOptionsEnabled
     },
     vis () {
       return {
diff --git a/src/main.js b/src/main.js
index 1f3c5da9..23bd2cd3 100644
--- a/src/main.js
+++ b/src/main.js
@@ -15,6 +15,7 @@ import UserSettings from './components/user_settings/user_settings.vue'
 import FollowRequests from './components/follow_requests/follow_requests.vue'
 
 import interfaceModule from './modules/interface.js'
+import instanceModule from './modules/instance.js'
 import statusesModule from './modules/statuses.js'
 import usersModule from './modules/users.js'
 import apiModule from './modules/api.js'
@@ -68,9 +69,10 @@ const persistedStateOptions = {
   ]
 }
 
-const store = console.log('interfaceModule') || new Vuex.Store({
+const store = new Vuex.Store({
   modules: {
     interface: interfaceModule,
+    instance: instanceModule,
     statuses: statusesModule,
     users: usersModule,
     api: apiModule,
@@ -122,15 +124,15 @@ window.fetch('/api/statusnet/config.json')
       var formattingOptionsEnabled = (config.formattingOptionsEnabled)
       var defaultCollapseMessageWithSubject = (config.collapseMessageWithSubject)
 
-      store.dispatch('setOption', { name: 'theme', value: theme })
-      store.dispatch('setOption', { name: 'background', value: background })
-      store.dispatch('setOption', { name: 'logo', value: logo })
-      store.dispatch('setOption', { name: 'logoMask', value: logoMask })
-      store.dispatch('setOption', { name: 'logoMargin', value: logoMargin })
-      store.dispatch('setOption', { name: 'showInstanceSpecificPanel', value: showInstanceSpecificPanel })
-      store.dispatch('setOption', { name: 'scopeOptionsEnabled', value: scopeOptionsEnabled })
-      store.dispatch('setOption', { name: 'formattingOptionsEnabled', value: formattingOptionsEnabled })
-      store.dispatch('setOption', { name: 'defaultCollapseMessageWithSubject', value: defaultCollapseMessageWithSubject })
+      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: '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')
       }
@@ -180,7 +182,7 @@ window.fetch('/api/statusnet/config.json')
 window.fetch('/static/terms-of-service.html')
   .then((res) => res.text())
   .then((html) => {
-    store.dispatch('setOption', { name: 'tos', value: html })
+    store.dispatch('setInstanceOption', { name: 'tos', value: html })
   })
 
 window.fetch('/api/pleroma/emoji.json')
@@ -191,11 +193,11 @@ window.fetch('/api/pleroma/emoji.json')
           const emoji = Object.keys(values).map((key) => {
             return { shortcode: key, image_url: values[key] }
           })
-          store.dispatch('setOption', { name: 'customEmoji', value: emoji })
-          store.dispatch('setOption', { name: 'pleromaBackend', value: true })
+          store.dispatch('setInstanceOption', { name: 'customEmoji', value: emoji })
+          store.dispatch('setInstanceOption', { name: 'pleromaBackend', value: true })
         },
         (failure) => {
-          store.dispatch('setOption', { name: 'pleromaBackend', value: false })
+          store.dispatch('setInstanceOption', { name: 'pleromaBackend', value: false })
         }
       ),
     (error) => console.log(error)
@@ -207,24 +209,24 @@ window.fetch('/static/emoji.json')
     const emoji = Object.keys(values).map((key) => {
       return { shortcode: key, image_url: false, 'utf': values[key] }
     })
-    store.dispatch('setOption', { name: 'emoji', value: emoji })
+    store.dispatch('setInstanceOption', { name: 'emoji', value: emoji })
   })
 
 window.fetch('/instance/panel.html')
   .then((res) => res.text())
   .then((html) => {
-    store.dispatch('setOption', { name: 'instanceSpecificPanelContent', value: html })
+    store.dispatch('setInstanceOption', { name: 'instanceSpecificPanelContent', value: html })
   })
 
 window.fetch('/nodeinfo/2.0.json')
   .then((res) => res.json())
   .then((data) => {
     const metadata = data.metadata
-    store.dispatch('setOption', { name: 'mediaProxyAvailable', value: data.metadata.mediaProxy })
-    store.dispatch('setOption', { name: 'chatAvailable', value: data.metadata.chat })
-    store.dispatch('setOption', { name: 'gopherAvailable', value: data.metadata.gopher })
+    store.dispatch('setInstanceOption', { name: 'mediaProxyAvailable', value: data.metadata.mediaProxy })
+    store.dispatch('setInstanceOption', { name: 'chatAvailable', value: data.metadata.chat })
+    store.dispatch('setInstanceOption', { name: 'gopherAvailable', value: data.metadata.gopher })
 
     const suggestions = metadata.suggestions
-    store.dispatch('setOption', { name: 'suggestionsEnabled', value: suggestions.enabled })
-    store.dispatch('setOption', { name: 'suggestionsWeb', value: suggestions.web })
+    store.dispatch('setInstanceOption', { name: 'suggestionsEnabled', value: suggestions.enabled })
+    store.dispatch('setInstanceOption', { name: 'suggestionsWeb', value: suggestions.web })
   })
diff --git a/src/modules/instance.js b/src/modules/instance.js
new file mode 100644
index 00000000..228cee4c
--- /dev/null
+++ b/src/modules/instance.js
@@ -0,0 +1,47 @@
+import { set } from 'vue'
+
+const defaultState = {
+  name: 'Pleroma FE',
+  registrationOpen: true,
+  textlimit: 5000,
+  server: 'http://localhost:4040/',
+  theme: 'pleroma-dark',
+  background: 'img.png',
+  logo: '/static/logo.png',
+  logoMask: true,
+  logoMargin: '.2em',
+  redirectRootNoLogin: '/main/all',
+  redirectRootLogin: '/main/friends',
+  showInstanceSpecificPanel: false,
+  scopeOptionsEnabled: true,
+  formattingOptionsEnabled: false,
+  collapseMessageWithSubject: false,
+  disableChat: false,
+  // Nasty stuff
+  pleromaBackend: true,
+  customEmoji: [],
+  // Html stuff
+  instanceSpecificPanelContent: '',
+  tos: ''
+}
+
+const instance = {
+  state: defaultState,
+  mutations: {
+    setInstanceOption (state, { name, value }) {
+      set(state, name, value)
+    }
+  },
+  actions: {
+    setInstanceOption ({ commit, dispatch }, { name, value }) {
+      commit('setInstanceOption', {name, value})
+      switch (name) {
+        case 'name':
+          dispatch('setPageTitle')
+          break
+      }
+    }
+  }
+}
+
+export default instance
diff --git a/src/modules/interface.js b/src/modules/interface.js
index 0067ee64..07489685 100644
--- a/src/modules/interface.js
+++ b/src/modules/interface.js
@@ -1,10 +1,6 @@
 import { set, delete as del } from 'vue'
 
 const defaultState = {
-  name: 'Pleroma FE',
-  registrationOpen: true,
-  textlimit: 5000,
-  server: 'http://localhost:4040/',
   settings: {
     currentSaveStateNotice: null,
     noticeClearTimeout: null
@@ -14,11 +10,6 @@ const defaultState = {
 const interfaceMod = {
   state: defaultState,
   mutations: {
-    setInstanceOption (state, { name, value }) {
-      console.log(state)
-      console.log(name)
-      set(state, name, value)
-    },
     settingsSaved (state, { success, error }) {
       if (success) {
         if (state.noticeClearTimeout) {
@@ -33,19 +24,11 @@ const interfaceMod = {
     }
   },
   actions: {
-    setPageTitle ({state}, option = '') {
-      document.title = `${option} ${state.name}`
+    setPageTitle ({ rootState }, option = '') {
+      document.title = `${option} ${rootState.instance.name}`
     },
     settingsSaved ({ commit, dispatch }, { success, error }) {
       commit('settingsSaved', { success, error })
-    },
-    setInstanceOption ({ commit, dispatch }, { name, value }) {
-      commit('setInstanceOption', {name, value})
-      switch (name) {
-        case 'name':
-          dispatch('setPageTitle')
-          break
-      }
     }
   }
 }
-- 
cgit v1.2.3-70-g09d2


From 580aae1b545331b284724e54cc31c99e52862f57 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Sun, 9 Sep 2018 21:51:40 +0300
Subject: Added more stuff that's actually being added to instanceConfig,
 simplified the whitelist.

---
 src/lib/persisted_state.js |  1 +
 src/main.js                | 20 +++-----------------
 src/modules/instance.js    | 11 +++++++++++
 3 files changed, 15 insertions(+), 17 deletions(-)

(limited to 'src/main.js')

diff --git a/src/lib/persisted_state.js b/src/lib/persisted_state.js
index 007515cd..c9eac91f 100644
--- a/src/lib/persisted_state.js
+++ b/src/lib/persisted_state.js
@@ -16,6 +16,7 @@ const saveImmedeatelyActions = [
   'markNotificationsAsSeen',
   'clearCurrentUser',
   'setCurrentUser',
+  'setHighlight',
   'setOption'
 ]
 
diff --git a/src/main.js b/src/main.js
index 23bd2cd3..4e7b55bb 100644
--- a/src/main.js
+++ b/src/main.js
@@ -47,23 +47,7 @@ Vue.use(VueChatScroll)
 
 const persistedStateOptions = {
   paths: [
-    'config.collapseMessageWithSubject',
-    'config.hideAttachments',
-    'config.hideAttachmentsInConv',
-    'config.hideNsfw',
-    'config.replyVisibility',
-    'config.notificationVisibility',
-    'config.autoLoad',
-    'config.hoverPreview',
-    'config.streaming',
-    'config.muteWords',
-    'config.customTheme',
-    'config.highlight',
-    'config.loopVideo',
-    'config.loopVideoSilentOnly',
-    'config.pauseOnUnfocused',
-    'config.stopGifs',
-    'config.interfaceLanguage',
+    'config',
     'users.lastLoginName',
     'statuses.notifications.maxSavedId'
   ]
@@ -129,6 +113,8 @@ window.fetch('/api/statusnet/config.json')
       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 })
diff --git a/src/modules/instance.js b/src/modules/instance.js
index 228cee4c..a4fc9651 100644
--- a/src/modules/instance.js
+++ b/src/modules/instance.js
@@ -1,6 +1,7 @@
 import { set } from 'vue'
 
 const defaultState = {
+  // Stuff from static/config.json and apiConfig
   name: 'Pleroma FE',
   registrationOpen: true,
   textlimit: 5000,
@@ -17,9 +18,19 @@ const defaultState = {
   formattingOptionsEnabled: false,
   collapseMessageWithSubject: false,
   disableChat: false,
+
   // Nasty stuff
   pleromaBackend: true,
+  emoji: [],
   customEmoji: [],
+
+  // Feature-set, apparently, not everything here is reported...
+  mediaProxyAvailable: false,
+  chatAvailable: false,
+  gopherAvailable: false,
+  suggestionsEnabled: false,
+  suggestionsWeb: '',
+
   // Html stuff
   instanceSpecificPanelContent: '',
   tos: ''
-- 
cgit v1.2.3-70-g09d2


From 40a175389a90dbbc7fc46e2ec532e7e21576f2ff Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Mon, 17 Sep 2018 18:00:56 +0300
Subject: Removed warning. Added support for working without static/config.json

---
 src/lib/persisted_state.js |   2 -
 src/main.js                | 147 +++++++++++++++++++++++----------------------
 2 files changed, 76 insertions(+), 73 deletions(-)

(limited to 'src/main.js')

diff --git a/src/lib/persisted_state.js b/src/lib/persisted_state.js
index c9eac91f..006107e2 100644
--- 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:")
diff --git a/src/main.js b/src/main.js
index 4e7b55bb..5314437b 100644
--- a/src/main.js
+++ b/src/main.js
@@ -89,80 +89,85 @@ 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)
-
-      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)
-
-      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 }
-        }
+      .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)
+
+        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')
+        }
 
-      /* 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 ? 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 }
+          }
+        })
+
+        /* eslint-disable no-new */
+        new Vue({
+          router,
+          store,
+          i18n,
+          el: '#app',
+          render: h => h(App)
+        })
       })
-    })
   })
 
 window.fetch('/static/terms-of-service.html')
-- 
cgit v1.2.3-70-g09d2


From 9467462ef0c3ed450332a1e2335dce52b7d578f1 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Mon, 17 Sep 2018 18:54:08 +0300
Subject: made FE work even without either api or static config

---
 src/main.js             | 4 +++-
 src/modules/instance.js | 9 +++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

(limited to 'src/main.js')

diff --git a/src/main.js b/src/main.js
index 5314437b..b8dfcf68 100644
--- a/src/main.js
+++ b/src/main.js
@@ -132,7 +132,9 @@ window.fetch('/api/statusnet/config.json')
           { name: 'root',
             path: '/',
             redirect: to => {
-              return (store.state.users.currentUser ? redirectRootLogin : redirectRootNoLogin) || '/main/all'
+              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 },
diff --git a/src/modules/instance.js b/src/modules/instance.js
index a4fc9651..cb724821 100644
--- 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)
       }
     }
   }
-- 
cgit v1.2.3-70-g09d2


From e53f23827866da38195108a881f375c61ded5d67 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Mon, 17 Sep 2018 18:54:48 +0300
Subject: undo rename because it makes less sense now.

---
 src/main.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/main.js')

diff --git a/src/main.js b/src/main.js
index b8dfcf68..31607f0d 100644
--- a/src/main.js
+++ b/src/main.js
@@ -111,7 +111,7 @@ window.fetch('/api/statusnet/config.json')
         var showInstanceSpecificPanel = (config.showInstanceSpecificPanel)
         var scopeOptionsEnabled = (config.scopeOptionsEnabled)
         var formattingOptionsEnabled = (config.formattingOptionsEnabled)
-        var defaultCollapseMessageWithSubject = (config.collapseMessageWithSubject)
+        var collapseMessageWithSubject = (config.collapseMessageWithSubject)
 
         store.dispatch('setInstanceOption', { name: 'theme', value: theme })
         store.dispatch('setInstanceOption', { name: 'background', value: background })
@@ -123,7 +123,7 @@ window.fetch('/api/statusnet/config.json')
         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 })
+        store.dispatch('setInstanceOption', { name: 'collapseMessageWithSubject', value: collapseMessageWithSubject })
         if (chatDisabled) {
           store.dispatch('disableChat')
         }
-- 
cgit v1.2.3-70-g09d2


From 419744080ff2dfcf4b860f01692463b78f30c40a Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Mon, 17 Sep 2018 19:16:33 +0300
Subject: console.log cleanup

---
 src/main.js                     | 2 --
 src/services/api/api.service.js | 2 --
 2 files changed, 4 deletions(-)

(limited to 'src/main.js')

diff --git a/src/main.js b/src/main.js
index 31607f0d..367db881 100644
--- a/src/main.js
+++ b/src/main.js
@@ -80,7 +80,6 @@ window.fetch('/api/statusnet/config.json')
   .then((data) => {
     const {name, closed: registrationClosed, textlimit, server} = data.site
 
-    console.log(store)
     store.dispatch('setInstanceOption', { name: 'name', value: name })
     store.dispatch('setInstanceOption', { name: 'registrationOpen', value: (registrationClosed === '0') })
     store.dispatch('setInstanceOption', { name: 'textlimit', value: parseInt(textlimit) })
@@ -92,7 +91,6 @@ window.fetch('/api/statusnet/config.json')
       .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 {}
       })
diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js
index e973667b..83a83e91 100644
--- a/src/services/api/api.service.js
+++ b/src/services/api/api.service.js
@@ -133,8 +133,6 @@ const updateBanner = ({credentials, params}) => {
 const updateProfile = ({credentials, params}) => {
   let url = PROFILE_UPDATE_URL
 
-  console.log(params)
-
   const form = new FormData()
 
   each(params, (value, key) => {
-- 
cgit v1.2.3-70-g09d2