From fb34a3558b4ee63a35e1ac3cd00cfc48fba65943 Mon Sep 17 00:00:00 2001
From: Meng Sen <qyg2297248353@gmail.com>
Date: Thu, 14 Aug 2025 10:35:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=BA=94=E7=94=A8=20MoonTV?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Meng Sen <qyg2297248353@gmail.com>
---
 apps/moontv/{latest => 2.1.0}/data.yml        | 75 ++++++++++++-------
 .../{latest => 2.1.0}/docker-compose.yml      |  4 +-
 .../moontv/{latest => 2.1.0}/envs/default.env |  0
 apps/moontv/{latest => 2.1.0}/envs/global.env |  0
 apps/moontv/{latest => 2.1.0}/scripts/init.sh |  0
 .../{latest => 2.1.0}/scripts/uninstall.sh    |  0
 .../{latest => 2.1.0}/scripts/upgrade.sh      |  0
 7 files changed, 48 insertions(+), 31 deletions(-)
 rename apps/moontv/{latest => 2.1.0}/data.yml (72%)
 rename apps/moontv/{latest => 2.1.0}/docker-compose.yml (81%)
 rename apps/moontv/{latest => 2.1.0}/envs/default.env (100%)
 rename apps/moontv/{latest => 2.1.0}/envs/global.env (100%)
 rename apps/moontv/{latest => 2.1.0}/scripts/init.sh (100%)
 rename apps/moontv/{latest => 2.1.0}/scripts/uninstall.sh (100%)
 rename apps/moontv/{latest => 2.1.0}/scripts/upgrade.sh (100%)

diff --git a/apps/moontv/latest/data.yml b/apps/moontv/2.1.0/data.yml
similarity index 72%
rename from apps/moontv/latest/data.yml
rename to apps/moontv/2.1.0/data.yml
index 33411e412..50e9cbc1d 100644
--- a/apps/moontv/latest/data.yml
+++ b/apps/moontv/2.1.0/data.yml
@@ -14,13 +14,6 @@ additionalProperties:
       values:
         - label: Redis
           value: redis
-    - default: "/home/moontv"
-      edit: true
-      envKey: MOONTV_ROOT_PATH
-      labelZh: 数据持久化路径
-      labelEn: Data persistence path
-      required: true
-      type: text
     - default: 3000
       edit: true
       envKey: PANEL_APP_PORT_HTTP
@@ -50,7 +43,45 @@ additionalProperties:
       labelEn: Search result maximum number of pages
       required: true
       type: number
-    - default: "localstorage"
+    - default: ""
+      edit: true
+      envKey: USERNAME
+      labelZh:
+      labelEn:
+      required: true
+      type: text
+    - default: ""
+      edit: true
+      envKey: PASSWORD
+      labelZh:
+      labelEn:
+      required: true
+      type: password
+    - default: "false"
+      edit: true
+      envKey: NEXT_PUBLIC_ENABLE_REGISTER
+      labelZh: 是否允许注册
+      labelEn: Enable Register
+      required: true
+      type: select
+      values:
+        - label: 允许注册
+          value: "true"
+        - label: 禁用注册
+          value: "false"
+    - default: "false"
+      edit: true
+      envKey: NEXT_PUBLIC_DISABLE_YELLOW_FILTER
+      labelZh: 关闭色情内容过滤
+      labelEn: Disable Yellow Filter
+      required: true
+      type: select
+      values:
+        - label: 开启过滤
+          value: "true"
+        - label: 禁用过滤
+          value: "false"
+    - default: "redis"
       edit: true
       envKey: NEXT_PUBLIC_STORAGE_TYPE
       labelZh: 数据存储类型
@@ -58,8 +89,8 @@ additionalProperties:
       required: true
       type: select
       values:
-        - label: 本地浏览器存储
-          value: "localstorage"
+        - label: Upstash
+          value: "upstash"
         - label: Redis
           value: "redis"
     - default: "redis://127.0.0.1:6379"
@@ -71,27 +102,15 @@ additionalProperties:
       type: text
     - default: ""
       edit: true
-      envKey: USERNAME
-      labelZh: Redis 用户 (Redis 存储)
-      labelEn: Redis User (Redis Storage)
+      envKey: UPSTASH_URL
+      labelZh: Upstash 地址 (Upstash 存储)
+      labelEn: Upstash Address (Upstash Storage)
       required: false
       type: text
     - default: ""
       edit: true
-      envKey: PASSWORD
-      labelZh: Redis 密码 (Redis 存储)
-      labelEn: Redis Password (Redis Storage)
+      envKey: UPSTASH_TOKEN
+      labelZh: Upstash 授权码 (Upstash 存储)
+      labelEn: Upstash Token (Upstash Storage)
       required: false
       type: password
-    - default: "false"
-      edit: true
-      envKey: NEXT_PUBLIC_ENABLE_REGISTER
-      labelZh: 是否允许注册
-      labelEn: Enable Register
-      required: true
-      type: select
-      values:
-        - label: 允许注册 (Redis 存储)
-          value: "true"
-        - label: 禁用注册
-          value: "false"
diff --git a/apps/moontv/latest/docker-compose.yml b/apps/moontv/2.1.0/docker-compose.yml
similarity index 81%
rename from apps/moontv/latest/docker-compose.yml
rename to apps/moontv/2.1.0/docker-compose.yml
index 5eb45d3a5..398090c3d 100644
--- a/apps/moontv/latest/docker-compose.yml
+++ b/apps/moontv/2.1.0/docker-compose.yml
@@ -4,7 +4,7 @@ networks:
 
 services:
   moontv:
-    image: ghcr.io/senshinya/moontv:latest
+    image: ghcr.io/moontechlab/lunatv:2.1.0
     container_name: ${CONTAINER_NAME}
     labels:
       createdBy: "Apps"
@@ -16,7 +16,5 @@ services:
     env_file:
       - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env}
       - ${ENV_FILE:-/etc/1panel/envs/default.env}
-    volumes:
-      - ${MOONTV_ROOT_PATH}/data:/data
     environment:
       - TZ=Asia/Shanghai
diff --git a/apps/moontv/latest/envs/default.env b/apps/moontv/2.1.0/envs/default.env
similarity index 100%
rename from apps/moontv/latest/envs/default.env
rename to apps/moontv/2.1.0/envs/default.env
diff --git a/apps/moontv/latest/envs/global.env b/apps/moontv/2.1.0/envs/global.env
similarity index 100%
rename from apps/moontv/latest/envs/global.env
rename to apps/moontv/2.1.0/envs/global.env
diff --git a/apps/moontv/latest/scripts/init.sh b/apps/moontv/2.1.0/scripts/init.sh
similarity index 100%
rename from apps/moontv/latest/scripts/init.sh
rename to apps/moontv/2.1.0/scripts/init.sh
diff --git a/apps/moontv/latest/scripts/uninstall.sh b/apps/moontv/2.1.0/scripts/uninstall.sh
similarity index 100%
rename from apps/moontv/latest/scripts/uninstall.sh
rename to apps/moontv/2.1.0/scripts/uninstall.sh
diff --git a/apps/moontv/latest/scripts/upgrade.sh b/apps/moontv/2.1.0/scripts/upgrade.sh
similarity index 100%
rename from apps/moontv/latest/scripts/upgrade.sh
rename to apps/moontv/2.1.0/scripts/upgrade.sh