From 0f39d65b75ee825068a1dc1d8a543fb4b0f041c6 Mon Sep 17 00:00:00 2001
From: kuekhaoyang <kuekhaoyang@Gmail.com>
Date: Wed, 8 Jul 2026 23:00:09 +0800
Subject: [PATCH] fix: default homepage to popular tab
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Ensure the homepage always opens on the 热门 tag instead of automatically selecting 为你推荐, even when viewing history exists or cached tags omit the popular tag.

Fixes #182

Fixes #190
---
 components/home/PopularFeatures.tsx    |  8 ++---
 components/home/hooks/useTagManager.ts | 44 +++++++++++++++-----------
 2 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/components/home/PopularFeatures.tsx b/components/home/PopularFeatures.tsx
index 6204afe..021bb1d 100644
--- a/components/home/PopularFeatures.tsx
+++ b/components/home/PopularFeatures.tsx
@@ -55,9 +55,9 @@ export function PopularFeatures({ onSearch }: PopularFeaturesProps) {
     loadMoreRef: recommendLoadMoreRef,
   } = usePersonalizedRecommendations(false);
 
-  const [hasSelectedRegularTag, setHasSelectedRegularTag] = useState(false);
+  const [isRecommendSelected, setIsRecommendSelected] = useState(false);
 
-  const effectiveRecommendSelected = hasHistory && !hasSelectedRegularTag;
+  const effectiveRecommendSelected = hasHistory && isRecommendSelected;
 
   const {
     movies,
@@ -78,7 +78,7 @@ export function PopularFeatures({ onSearch }: PopularFeaturesProps) {
   };
 
   const handleRecommendSelect = () => {
-    setHasSelectedRegularTag(false);
+    setIsRecommendSelected(true);
   };
 
   const handleRegularTagSelect = (tagId: string) => {
@@ -86,7 +86,7 @@ export function PopularFeatures({ onSearch }: PopularFeaturesProps) {
       window.location.href = '/premium';
       return;
     }
-    setHasSelectedRegularTag(true);
+    setIsRecommendSelected(false);
     setSelectedTag(tagId);
   };
 
diff --git a/components/home/hooks/useTagManager.ts b/components/home/hooks/useTagManager.ts
index 220ca42..cdc62aa 100644
--- a/components/home/hooks/useTagManager.ts
+++ b/components/home/hooks/useTagManager.ts
@@ -1,19 +1,32 @@
 import { useState, useEffect } from 'react';
 import { DragEndEvent } from '@dnd-kit/core';
 import { arrayMove } from '@dnd-kit/sortable';
+import type { Tag } from '../SortableTag';
 
 const DEFAULT_TAG = { id: 'popular', label: '热门', value: '热门' };
 
 const STORAGE_KEY_PREFIX = 'kvideo_custom_tags_';
 
+const ensureDefaultTag = (tags: Tag[]) => {
+    if (tags.some((tag) => tag.id === DEFAULT_TAG.id || tag.value === DEFAULT_TAG.value)) {
+        return tags.map((tag) =>
+            tag.id === DEFAULT_TAG.id || tag.value === DEFAULT_TAG.value
+                ? { ...DEFAULT_TAG, ...tag, id: DEFAULT_TAG.id, value: DEFAULT_TAG.value }
+                : tag
+        );
+    }
+
+    return [DEFAULT_TAG, ...tags];
+};
+
 export function useTagManager() {
     const [contentType, setContentType] = useState<'movie' | 'tv'>(() => {
         if (typeof window === 'undefined') return 'movie';
         const saved = localStorage.getItem('kvideo_default_content_type');
         return saved === 'tv' ? 'tv' : 'movie';
     });
-    const [selectedTag, setSelectedTag] = useState(DEFAULT_TAG.value);
-    const [tags, setTags] = useState<any[]>([]);
+    const [selectedTag, setSelectedTag] = useState(DEFAULT_TAG.id);
+    const [tags, setTags] = useState<Tag[]>([]);
     const [isLoadingTags, setIsLoadingTags] = useState(false);
     const [newTagInput, setNewTagInput] = useState('');
     const [showTagManager, setShowTagManager] = useState(false);
@@ -32,7 +45,8 @@ export function useTagManager() {
             const saved = localStorage.getItem(storageKey);
             if (saved) {
                 try {
-                    setTags(JSON.parse(saved));
+                    const parsedTags = JSON.parse(saved);
+                    setTags(Array.isArray(parsedTags) ? ensureDefaultTag(parsedTags) : [DEFAULT_TAG]);
                     return;
                 } catch (e) {
                     console.error('Failed to parse saved tags', e);
@@ -51,12 +65,7 @@ export function useTagManager() {
                         value: label,
                     }));
 
-                    // If "热门" isn't in the list, add it to the front
-                    if (!mappedTags.some((t: any) => t.value === '热门')) {
-                        mappedTags.unshift(DEFAULT_TAG);
-                    }
-
-                    setTags(mappedTags);
+                    setTags(ensureDefaultTag(mappedTags));
                     // Also save to localStorage to avoid repeated fetches if desired
                     // Actually, let's just keep them in memory for now unless they customize
                 } else {
@@ -71,10 +80,10 @@ export function useTagManager() {
         };
 
         loadTags();
-        setSelectedTag(DEFAULT_TAG.value);
+        setSelectedTag(DEFAULT_TAG.id);
     }, [contentType, storageKey]);
 
-    const saveTags = (newTags: any[]) => {
+    const saveTags = (newTags: Tag[]) => {
         setTags(newTags);
         localStorage.setItem(storageKey, JSON.stringify(newTags));
     };
@@ -92,9 +101,11 @@ export function useTagManager() {
     };
 
     const handleDeleteTag = (tagId: string) => {
+        if (tagId === DEFAULT_TAG.id) return;
+
         saveTags(tags.filter(t => t.id !== tagId));
         if (selectedTag === tagId) {
-            setSelectedTag('popular');
+            setSelectedTag(DEFAULT_TAG.id);
         }
     };
 
@@ -111,19 +122,16 @@ export function useTagManager() {
                     label,
                     value: label,
                 }));
-                if (!mappedTags.some((t: any) => t.value === '热门')) {
-                    mappedTags.unshift(DEFAULT_TAG);
-                }
-                setTags(mappedTags);
+                setTags(ensureDefaultTag(mappedTags));
             } else {
                 setTags([DEFAULT_TAG]);
             }
-        } catch (error) {
+        } catch {
             setTags([DEFAULT_TAG]);
         } finally {
             setIsLoadingTags(false);
         }
-        setSelectedTag(DEFAULT_TAG.value);
+        setSelectedTag(DEFAULT_TAG.id);
         setShowTagManager(false);
     };