fix

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

@@ -324,6 +324,7 @@ const interfaceMod = {
       const getData = async (resource, index, customData, name) => {
         const capitalizedResource = resource[0].toUpperCase() + resource.slice(1)
         const result = {}
+        console.log('GD', resource, index, customData, name)
 
         if (customData) {
           result.nameUsed = 'custom' // custom data overrides name
@@ -331,8 +332,9 @@ const interfaceMod = {
         } else {
           result.nameUsed = name
 
-          if (result.nameUsed === 'stock') {
+          if (result.nameUsed == null) {
             result.dataUsed = null
+            console.log('GDR -', result)
             return result
           }
 
@@ -349,9 +351,12 @@ const interfaceMod = {
           }
           result.dataUsed = await fetchFunc()
         }
+        console.log('GDR +', result)
         return result
       }
 
+      console.log('RSI', rootState.instance)
+
       const {
         style: instanceStyleName,
         palette: instancePaletteName
@@ -448,8 +453,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,
@@ -492,6 +499,20 @@ const interfaceMod = {
           userThemeV2Source || userThemeV2Snapshot,
           userThemeV2Name || instanceThemeV2Name
         )
+        console.log(
+          'V2 INDEX',
+          themesIndex
+        )
+        console.log(
+          'V2 DATA',
+          userThemeV2Source,
+          userThemeV2Snapshot
+        )
+        console.log(
+          'V2 NAME',
+          userThemeV2Name,
+          instanceThemeV2Name
+        )
         // themeNameUsed = theme.nameUsed
         state.themeDataUsed = theme.dataUsed
       }
@@ -545,9 +566,12 @@ const interfaceMod = {
         return result
       })()
 
+      console.log(state.themeNameUsed, state.themeDataUsed)
       const theme2ruleset = state.themeDataUsed && convertTheme2To3(normalizeThemeData(state.themeDataUsed))
       const hacks = []
 
+      console.log('T2R', theme2ruleset)
+
       Object.entries(theme3hacks).forEach(([key, value]) => {
         switch (key) {
           case 'fonts': {