Merge branch 'main' into feat/backend

解决 zh-CN locale 末尾追加冲突：保留日志导出键。

apps/app-frontend/src/components/ui/RemoteAnnouncements.vue

@@ -8,12 +8,14 @@ import {
 	useVIntl,
 } from '@modrinth/ui'
 import { renderString } from '@modrinth/utils'
+import { fetch as tauriFetch } from '@tauri-apps/plugin-http'
 import { openUrl } from '@tauri-apps/plugin-opener'
 import { computed, nextTick, onMounted, onUnmounted, reactive, ref, watch } from 'vue'
 
 import {
 	announcementKey,
 	isAnnouncementActive,
+	mapBroadcastAnnouncements,
 	OPEN_REMOTE_ANNOUNCEMENT_CENTER_EVENT,
 	parseAnnouncements,
 	REMOTE_ANNOUNCEMENTS_UPDATED_EVENT,
@@ -21,6 +23,12 @@ import {
 	safeAnnouncementUrl,
 } from '@/helpers/remote-announcements'
 
+import {
+	requestSkinSiteDownloadToken,
+	skinSiteStatus,
+	waitForSkinSiteSession,
+} from '@/composables/skin-site-session.ts'
+
 const props = defineProps<{ ready: boolean; previewOnly?: boolean }>()
 const { formatMessage } = useVIntl()
 const { hasModal } = useModalStack()
@@ -61,7 +69,7 @@ const queuedThisSession = new Set<string>()
 const startupNotified = new Set<string>()
 let items: RemoteAnnouncement[] = []
 let pending: RemoteAnnouncement[] = []
-let cacheKey = ''
+let cacheKey = 'starlight-remote-announcements-cache-v1'
 let cacheLoaded = false
 let disposed = false
 let interval: ReturnType<typeof setInterval> | undefined
@@ -202,11 +210,35 @@ function loadCache() {
 		// Ignore malformed or expired cache payloads
 	}
 }
+function saveCache(next: RemoteAnnouncement[]) {
+	if (!cacheKey) return
+	try {
+		localStorage.setItem(cacheKey, JSON.stringify({ savedAt: Date.now(), items: next }))
+	} catch {
+		// localStorage may be unavailable (private mode / quota)
+	}
+}
 async function refresh() {
-	// Remote fetching is disabled until Starlight has its own announcements API.
-	// We still load any previously cached items so the center has content to show.
 	if (disposed) return
 	loadCache()
+	if (skinSiteStatus.value !== 'signed-in') return
+	try {
+		await waitForSkinSiteSession()
+		const token = await requestSkinSiteDownloadToken()
+		const response = await tauriFetch('https://skin.starlight.cool/starlight/skin/broadcast/all', {
+			method: 'GET',
+			headers: { Authorization: `Bearer ${token}` },
+		})
+		if (!response.ok) return
+		const data = await response.json()
+		const parsed = mapBroadcastAnnouncements((data as { payload?: unknown } | null)?.payload)
+		if (parsed && !disposed) {
+			sync(parsed, true)
+			saveCache(parsed)
+		}
+	} catch {
+		// Remote fetch failed; previously cached items remain displayed
+	}
 }
 async function openLink(value: unknown) {
 	const url = safeAnnouncementUrl(value)

apps/app-frontend/src/components/ui/instance_settings/WindowSettings.vue

@@ -36,24 +36,29 @@ const fullscreenSetting: Ref<boolean> = ref(
 	instance.value.force_fullscreen ?? globalSettings.force_fullscreen,
 )
 const maximizeWindowSetting = ref(instance.value.maximize_window ?? globalSettings.maximize_window)
+const windowTitle = ref(instance.value.window_title ?? '')
 
 const editInstanceObject = computed(() => {
+	const title = windowTitle.value.trim() ? windowTitle.value.trim() : null
 	if (!overrideWindowSettings.value) {
 		return {
 			force_fullscreen: null,
 			maximize_window: null,
 			game_resolution: null,
+			// The title is independent of the window-size override checkbox.
+			window_title: title,
 		}
 	}
 	return {
 		force_fullscreen: fullscreenSetting.value,
 		maximize_window: maximizeWindowSetting.value,
 		game_resolution: fullscreenSetting.value ? null : resolution.value,
+		window_title: title,
 	}
 })
 
 watch(
-	[overrideWindowSettings, resolution, fullscreenSetting, maximizeWindowSetting],
+	[overrideWindowSettings, resolution, fullscreenSetting, maximizeWindowSetting, windowTitle],
 	async () => {
 		await edit(instance.value.id, editInstanceObject.value)
 	},
@@ -109,6 +114,18 @@ const messages = defineMessages({
 		id: 'instance.settings.tabs.window.height.enter',
 		defaultMessage: 'Enter height...',
 	},
+	windowTitle: {
+		id: 'instance.settings.tabs.window.window-title',
+		defaultMessage: 'Window title',
+	},
+	windowTitleDescription: {
+		id: 'instance.settings.tabs.window.window-title.description',
+		defaultMessage: 'Customize the Minecraft window title. Leave empty to keep the default.',
+	},
+	enterWindowTitle: {
+		id: 'instance.settings.tabs.window.window-title.enter',
+		defaultMessage: 'Enter window title...',
+	},
 })
 </script>
 
@@ -200,5 +217,25 @@ const messages = defineMessages({
 				:placeholder="formatMessage(messages.enterHeight)"
 			/>
 		</div>
+		<div
+			v-if="globalSettings.custom_window_title_enabled"
+			class="flex items-center gap-4 justify-between"
+		>
+			<div class="flex flex-col gap-1">
+				<h2 class="m-0 inline-flex items-center gap-2 text-lg font-semibold text-contrast">
+					{{ formatMessage(messages.windowTitle) }}
+				</h2>
+				<p class="m-0">
+					{{ formatMessage(messages.windowTitleDescription) }}
+				</p>
+			</div>
+			<StyledInput
+				id="window-title"
+				v-model="windowTitle"
+				autocomplete="off"
+				type="text"
+				:placeholder="formatMessage(messages.enterWindowTitle)"
+			/>
+		</div>
 	</div>
 </template>

apps/app-frontend/src/components/ui/settings/DefaultInstanceSettings.vue

@@ -38,6 +38,26 @@ const messages = defineMessages({
 		id: 'app.settings.defaults.maximize-window.unsupported',
 		defaultMessage: 'Not supported on this operating system.',
 	},
+	windowTitleEnabled: {
+		id: 'app.settings.defaults.window-title.enabled',
+		defaultMessage: 'Custom Minecraft window title',
+	},
+	windowTitleEnabledDescription: {
+		id: 'app.settings.defaults.window-title.enabled-description',
+		defaultMessage: 'Allow instances to customize the Minecraft window title.',
+	},
+	defaultWindowTitle: {
+		id: 'app.settings.defaults.window-title.default',
+		defaultMessage: 'Default window title',
+	},
+	defaultWindowTitleDescription: {
+		id: 'app.settings.defaults.window-title.default-description',
+		defaultMessage: 'Used when an instance leaves its window title empty.',
+	},
+	defaultWindowTitlePlaceholder: {
+		id: 'app.settings.defaults.window-title.default-placeholder',
+		defaultMessage: 'Enter default window title...',
+	},
 	width: { id: 'app.settings.defaults.width', defaultMessage: 'Width' },
 	widthDescription: {
 		id: 'app.settings.defaults.width-description',
@@ -212,6 +232,36 @@ watch(
 					/>
 				</template>
 			</SettingsRow>
+			<SettingsRow>
+				<template #label>
+					<span id="settings-target-defaults-window-title" tabindex="-1">
+						{{ formatMessage(messages.windowTitleEnabled) }}
+					</span>
+				</template>
+				<template #description>{{
+					formatMessage(messages.windowTitleEnabledDescription)
+				}}</template>
+				<template #control>
+					<Toggle id="custom-window-title-enabled" v-model="settings.custom_window_title_enabled" />
+				</template>
+			</SettingsRow>
+			<SettingsRow stacked>
+				<template #label>{{ formatMessage(messages.defaultWindowTitle) }}</template>
+				<template #description>{{
+					formatMessage(messages.defaultWindowTitleDescription)
+				}}</template>
+				<template #control>
+					<StyledInput
+						id="default-window-title"
+						v-model="settings.default_window_title"
+						:disabled="!settings.custom_window_title_enabled"
+						autocomplete="off"
+						type="text"
+						:placeholder="formatMessage(messages.defaultWindowTitlePlaceholder)"
+						wrapper-class="w-full"
+					/>
+				</template>
+			</SettingsRow>
 		</SettingsSection>
 
 		<SettingsSection>