fix: SSR colors, SSR crash, and version, close #740, #739

This commit is contained in:
Xylight committed 2026-07-29 17:11:28 -07:00
1 parent ddb1c0855e
commit 6609371a28
5 files changed
+59 -27

No files matched your search

+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "photon-lemmy", "name": "photon-lemmy",
"version": "2.4.0", "version": "2.4.3",
"license": "AGPL-3.0-only", "license": "AGPL-3.0-only",
"devDependencies": { "devDependencies": {
"@capacitor/android": "^8.4.2", "@capacitor/android": "^8.4.2",
+1 -1
View File
@@ -1,5 +1,5 @@
<!doctype html> <!doctype html>
<html class="dark font-sans" lang="en"> <html class="dark font-sans" lang="en" style="/*THEME_VARS*/">
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<link rel="icon" href="%sveltekit.assets%/img/logo-background.svg" /> <link rel="icon" href="%sveltekit.assets%/img/logo-background.svg" />
+33 -1
View File
@@ -1,4 +1,18 @@
import type { HandleServerError } from '@sveltejs/kit' import { aliases, loadTranslations, locales } from '$lib/app/i18n'
import { getDefaultTheme } from '$lib/app/theme/presets'
import { calculateVars } from '$lib/app/theme/theme.svelte'
import type { Handle, HandleServerError } from '@sveltejs/kit'
import { get } from 'svelte/store'
// from https://github.com/mudkipdev/rephoton/commit/af81260173943ed054296ac64fb55555ff3460b9
export const handle: Handle = async ({ event, resolve }) => {
await parseLanguages(event.request)
return await resolve(event, {
transformPageChunk: (page) =>
page.html.replace('/*THEME_VARS*/', calculateVars(getDefaultTheme())),
})
}
export const handleError: HandleServerError = async ({ export const handleError: HandleServerError = async ({
error, error,
@@ -14,3 +28,21 @@ export const handleError: HandleServerError = async ({
console.error(`Status:`, status) console.error(`Status:`, status)
console.error(`Message:`, message) console.error(`Message:`, message)
} }
const parseLanguages = async (request: Request) => {
const languages = request.headers.get('Accept-Language')?.split(',')
const currentLocales = get(locales)
let preferredLanguage = 'en'
if (languages) {
for (const lang of languages.reverse()) {
const splitLang = lang.split(';')[0]
if (currentLocales.includes(splitLang) || aliases.get(splitLang)) {
preferredLanguage = aliases.get(splitLang) || splitLang
}
}
}
await loadTranslations(preferredLanguage)
return
}
+3 -1
View File
@@ -19,7 +19,9 @@
}) })
onDestroy(() => { onDestroy(() => {
portal.remove() if (browser) {
portal.remove()
}
}) })
interface Props { interface Props {
+21 -23
View File
@@ -41,31 +41,29 @@
showSpinner: false, showSpinner: false,
}) })
App.addListener('backButton', () => {
history.back()
})
if (Capacitor.isNativePlatform()) {
navigator.vibrate = (pattern: VibratePattern | Iterable<number>) => {
Haptics.vibrate({
// @ts-expect-error Iterable is a thing
duration: (Array.isArray(pattern) ? pattern[0] : pattern) ?? 100,
})
return true
}
}
onMount(() => { onMount(() => {
if (browser) { if (window.location.hash == 'main') {
if (window.location.hash == 'main') { history.replaceState(
history.replaceState( null,
null, '',
'', window.location.toString().replace('#main', ''),
window.location.toString().replace('#main', ''), )
) }
document.body.querySelector('.loader')?.classList.add('hidden')
App.addListener('backButton', () => {
history.back()
})
if (Capacitor.isNativePlatform()) {
navigator.vibrate = (pattern: VibratePattern | Iterable<number>) => {
Haptics.vibrate({
// @ts-expect-error Iterable is a thing
duration: (Array.isArray(pattern) ? pattern[0] : pattern) ?? 100,
})
return true
} }
document.body.querySelector('.loader')?.classList.add('hidden')
} }
}) })