From 8d0e33ba23f0edf31a7429cb40e61de923dadfd0 Mon Sep 17 00:00:00 2001
From: xboard <xboard@xboard.one>
Date: Fri, 7 Nov 2025 19:25:40 +0800
Subject: [PATCH] fix: preserve theme config when upgrading theme

---
 app/Services/ThemeService.php | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/app/Services/ThemeService.php b/app/Services/ThemeService.php
index 666712c..232682d 100644
--- a/app/Services/ThemeService.php
+++ b/app/Services/ThemeService.php
@@ -159,7 +159,8 @@ class ThemeService
                     $this->cleanupThemeFiles($config['name']);
                     File::deleteDirectory($targetPath);
                     File::copyDirectory($sourcePath, $targetPath);
-                    $this->initConfig($config['name']);
+                    // 更新主题时保留用户配置
+                    $this->initConfig($config['name'], true);
                     return true;
                 } else {
                     throw new Exception('Theme exists and not a newer version');
@@ -397,8 +398,11 @@ class ThemeService
 
     /**
      * Initialize theme config
+     * 
+     * @param string $theme 主题名称
+     * @param bool $preserveExisting 是否保留现有配置（更新主题时使用）
      */
-    private function initConfig(string $theme): void
+    private function initConfig(string $theme, bool $preserveExisting = false): void
     {
         $config = $this->readConfigFile($theme);
         if (!$config) {
@@ -408,6 +412,13 @@ class ThemeService
         $defaults = collect($config['configs'] ?? [])
             ->mapWithKeys(fn($col) => [$col['field_name'] => $col['default_value'] ?? ''])
             ->toArray();
-        admin_setting([self::SETTING_PREFIX . $theme => $defaults]);
+
+        if ($preserveExisting) {
+            $existingConfig = admin_setting(self::SETTING_PREFIX . $theme) ?? [];
+            $mergedConfig = array_merge($defaults, $existingConfig);
+            admin_setting([self::SETTING_PREFIX . $theme => $mergedConfig]);
+        } else {
+            admin_setting([self::SETTING_PREFIX . $theme => $defaults]);
+        }
     }
 }