Merge branch 'themes3-grand-finale-maybe' into shigusegubu-themes3

src/boot/after_store.js

@@ -123,6 +123,8 @@ const setSettings = async ({ apiConfig, staticConfig, store }) => {
   }
 
   copyInstanceOption('theme')
+  copyInstanceOption('style')
+  copyInstanceOption('palette')
   copyInstanceOption('nsfwCensorImage')
   copyInstanceOption('background')
   copyInstanceOption('hidePostStats')

src/modules/instance.js

@@ -99,6 +99,8 @@ const defaultState = {
   sidebarRight: false,
   subjectLineBehavior: 'email',
   theme: 'pleroma-dark',
+  palette: null,
+  style: null,
   emojiReactionsScale: 0.5,
   textSize: '14px',
   emojiSize: '2.2rem',

src/modules/interface.js

@@ -331,7 +331,7 @@ const interfaceMod = {
         } else {
           result.nameUsed = name
 
-          if (result.nameUsed === 'stock') {
+          if (result.nameUsed == null) {
             result.dataUsed = null
             return result
           }
@@ -339,6 +339,9 @@ const interfaceMod = {
           let fetchFunc = index[result.nameUsed]
           // Fallbacks
           if (!fetchFunc) {
+            if (resource === 'style' || resource === 'palette') {
+              return result
+            }
             const newName = Object.keys(index)[0]
             fetchFunc = index[newName]
             console.warn(`${capitalizedResource} with id '${state.styleNameUsed}' not found, trying back to '${newName}'`)
@@ -448,8 +451,10 @@ const interfaceMod = {
         )
         state.paletteNameUsed = palette.nameUsed
         state.paletteDataUsed = palette.dataUsed
-        state.paletteDataUsed.link = state.paletteDataUsed.link || state.paletteDataUsed.accent
+        if (state.paletteDataUsed) {
-        state.paletteDataUsed.accent = state.paletteDataUsed.accent || state.paletteDataUsed.link
+          state.paletteDataUsed.link = state.paletteDataUsed.link || state.paletteDataUsed.accent
+          state.paletteDataUsed.accent = state.paletteDataUsed.accent || state.paletteDataUsed.link
+        }
         if (Array.isArray(state.paletteDataUsed)) {
           const [
             name,