qugalet/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

fix some broken themes found in wild

Browse source
This commit is contained in:
Henry Jameson 2024-07-25 19:19:46 +03:00
parent d5157fd4ca
commit 3baad46309
1 changed files with 28 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
src/modules/interface.js
View file

@ -237,11 +237,11 @@ const interfaceMod = {
} else if (themeName) { } else if (themeName) {
promise = getPreset(themeName).then(themeData => normalizeThemeData(themeData)) promise = getPreset(themeName).then(themeData => normalizeThemeData(themeData))
} else if (userThemeSource || userThemeSnapshot) { } else if (userThemeSource || userThemeSnapshot) {
if (userThemeSource && userThemeSource.themeEngineVersion === CURRENT_VERSION) { promise = Promise.resolve(normalizeThemeData({
promise = Promise.resolve(normalizeThemeData(userThemeSource)) _pleroma_theme_version: 2,
} else { theme: userThemeSnapshot,
promise = Promise.resolve(normalizeThemeData(userThemeSnapshot)) source: userThemeSource
} }))
} else if (actualThemeName && actualThemeName !== 'custom') { } else if (actualThemeName && actualThemeName !== 'custom') {
promise = getPreset(actualThemeName).then(themeData => { promise = getPreset(actualThemeName).then(themeData => {
const realThemeData = normalizeThemeData(themeData) const realThemeData = normalizeThemeData(themeData)
@ -355,10 +355,8 @@ const interfaceMod = {
export default interfaceMod export default interfaceMod
export const normalizeThemeData = (input) => { export const normalizeThemeData = (input) => {
let themeData = input if (Array.isArray(input)) {
const themeData = { colors: {} }
if (Array.isArray(themeData)) {
themeData = { colors: {} }
themeData.colors.bg = input[1] themeData.colors.bg = input[1]
themeData.colors.fg = input[2] themeData.colors.fg = input[2]
themeData.colors.text = input[3] themeData.colors.text = input[3]
@ -370,18 +368,32 @@ export const normalizeThemeData = (input) => {
return generatePreset(themeData).theme return generatePreset(themeData).theme
} }
if (themeData.themeFileVerison === 1) { let themeData, themeSource
return generatePreset(themeData).theme
}
if (input.themeFileVerison === 1) {
// this might not be even used at all, some leftover of unimplemented code in V2 editor
return generatePreset(input).theme
} else if (
Object.prototype.hasOwnProperty.call(input, '_pleroma_theme_version') ||
Object.prototype.hasOwnProperty.call(input, 'source') ||
Object.prototype.hasOwnProperty.call(input, 'theme')
) {
// We got passed a full theme file
themeData = input.theme
themeSource = input.source
} else if (Object.prototype.hasOwnProperty.call(input, 'themeEngineVersion')) {
// We got passed a source/snapshot
themeData = input
themeSource = input
}
// New theme presets don't have 'theme' property, they use 'source' // New theme presets don't have 'theme' property, they use 'source'
const themeSource = themeData.source
let out // shout, shout let it all out let out // shout, shout let it all out
if (!themeData.theme || (themeSource && themeSource.themeEngineVersion === CURRENT_VERSION)) { if (themeSource && themeSource.themeEngineVersion === CURRENT_VERSION) {
out = themeSource || themeData // There are some themes in wild that have completely broken source
out = { ...(themeData || {}), ...themeSource }
} else { } else {
out = themeData.theme out = themeData
} }
// generatePreset here basically creates/updates "snapshot", // generatePreset here basically creates/updates "snapshot",