Merge branch 'develop' into chore/remote-unused-option

1 files changed, 29 insertions, 26 deletions

diff --git a/src/modules/instance.js b/src/modules/instance.js
index 0f430e81..94d4176b 100644
--- a/src/modules/instance.js
+++ b/src/modules/instance.js
@@ -4,51 +4,54 @@ import { CURRENT_VERSION } from '../services/theme_data/theme_data.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,
+  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,
+  postContentType: 'text/plain',
+  redirectRootLogin: '/main/friends',
+  redirectRootNoLogin: '/main/all',
+  scopeCopy: true,
   showFeaturesPanel: true,
-  minimalScopesMode: false,
-  greentext: false,
+  showInstanceSpecificPanel: 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,
 
   // Feature-set, apparently, not everything here is reported...
-  mediaProxyAvailable: false,
   chatAvailable: false,
   gopherAvailable: false,
+  mediaProxyAvailable: false,
   suggestionsEnabled: false,
   suggestionsWeb: '',