Merge branch '2.1.0-rc0' into 'master'

2.1.0 into master

See merge request pleroma/pleroma-fe!1217

1 files changed, 50 insertions, 27 deletions

diff --git a/src/modules/instance.js b/src/modules/instance.js
index ffece311..3fe3bbf3 100644
--- a/src/modules/instance.js
+++ b/src/modules/instance.js
@@ -1,55 +1,63 @@
 import { set } from 'vue'
 import { getPreset, applyTheme } from '../services/style_setter/style_setter.js'
 import { CURRENT_VERSION } from '../services/theme_data/theme_data.service.js'
+import apiService from '../services/api/api.service.js'
 import { instanceDefaultProperties } from './config.js'
 
 const defaultState = {
-  // Stuff from static/config.json and apiConfig
+  // Stuff from apiConfig
   name: 'Pleroma FE',
   registrationOpen: true,
-  safeDM: true,
-  textlimit: 5000,
   server: 'http://localhost:4040/',
-  theme: 'pleroma-dark',
+  textlimit: 5000,
   themeData: undefined,
-  background: '/static/aurora_borealis.jpg',
-  logo: '/static/logo.png',
-  logoMask: true,
-  logoMargin: '.2em',
-  redirectRootNoLogin: '/main/all',
-  redirectRootLogin: '/main/friends',
-  showInstanceSpecificPanel: false,
+  vapidPublicKey: undefined,
+
+  // Stuff from static/config.json
   alwaysShowSubjectInput: true,
-  hideMutedPosts: false,
+  defaultAvatar: '/images/avi.png',
+  defaultBanner: '/images/banner.png',
+  background: '/static/aurora_borealis.jpg',
   collapseMessageWithSubject: false,
-  hidePostStats: false,
-  hideUserStats: false,
-  hideFilteredStatuses: false,
   disableChat: false,
-  scopeCopy: true,
-  subjectLineBehavior: 'email',
-  postContentType: 'text/plain',
+  greentext: false,
+  hideFilteredStatuses: false,
+  hideMutedPosts: false,
+  hidePostStats: false,
   hideSitename: false,
+  hideUserStats: false,
+  loginMethod: 'password',
+  logo: '/static/logo.png',
+  logoMargin: '.2em',
+  logoMask: true,
+  minimalScopesMode: false,
   nsfwCensorImage: undefined,
-  vapidPublicKey: undefined,
-  noAttachmentLinks: false,
+  postContentType: 'text/plain',
+  redirectRootLogin: '/main/friends',
+  redirectRootNoLogin: '/main/all',
+  scopeCopy: true,
   showFeaturesPanel: true,
-  minimalScopesMode: false,
-  greentext: false,
+  showInstanceSpecificPanel: false,
+  sidebarRight: false,
+  subjectLineBehavior: 'email',
+  theme: 'pleroma-dark',
 
   // Nasty stuff
-  pleromaBackend: true,
-  emoji: [],
-  emojiFetched: false,
   customEmoji: [],
   customEmojiFetched: false,
-  restrictedNicknames: [],
+  emoji: [],
+  emojiFetched: false,
+  pleromaBackend: true,
   postFormats: [],
+  restrictedNicknames: [],
+  safeDM: true,
+  knownDomains: [],
 
   // Feature-set, apparently, not everything here is reported...
-  mediaProxyAvailable: false,
   chatAvailable: false,
+  pleromaChatMessagesAvailable: false,
   gopherAvailable: false,
+  mediaProxyAvailable: false,
   suggestionsEnabled: false,
   suggestionsWeb: '',
 
@@ -77,6 +85,9 @@ const instance = {
       if (typeof value !== 'undefined') {
         set(state, name, value)
       }
+    },
+    setKnownDomains (state, domains) {
+      state.knownDomains = domains
     }
   },
   getters: {
@@ -179,6 +190,18 @@ const instance = {
         state.emojiFetched = true
         dispatch('getStaticEmoji')
       }
+    },
+
+    async getKnownDomains ({ commit, rootState }) {
+      try {
+        const result = await apiService.fetchKnownDomains({
+          credentials: rootState.users.currentUser.credentials
+        })
+        commit('setKnownDomains', result)
+      } catch (e) {
+        console.warn("Can't load known domains")
+        console.warn(e)
+      }
     }
   }
 }