优化自定义去广告接口
This commit is contained in:
@@ -7,17 +7,30 @@ export const runtime = 'nodejs';
|
||||
/**
|
||||
* GET /api/ad-filter
|
||||
* 获取自定义去广告代码配置(公开接口,无需认证)
|
||||
* 返回代码内容和版本号,客户端通过版本号判断是否需要更新缓存
|
||||
* 支持两种模式:
|
||||
* - 不带参数:只返回版本号,用于检查更新
|
||||
* - ?full=true:返回完整代码和版本号
|
||||
*/
|
||||
export async function GET() {
|
||||
export async function GET(request: Request) {
|
||||
try {
|
||||
const config = await getConfig();
|
||||
const { searchParams } = new URL(request.url);
|
||||
const full = searchParams.get('full') === 'true';
|
||||
|
||||
// 返回自定义去广告代码和版本号
|
||||
return NextResponse.json({
|
||||
code: config.SiteConfig?.CustomAdFilterCode || '',
|
||||
version: config.SiteConfig?.CustomAdFilterVersion || 0,
|
||||
});
|
||||
const version = config.SiteConfig?.CustomAdFilterVersion || 0;
|
||||
|
||||
if (full) {
|
||||
// 返回完整代码和版本号
|
||||
return NextResponse.json({
|
||||
code: config.SiteConfig?.CustomAdFilterCode || '',
|
||||
version,
|
||||
});
|
||||
} else {
|
||||
// 只返回版本号
|
||||
return NextResponse.json({
|
||||
version,
|
||||
});
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('获取去广告代码配置失败:', error);
|
||||
return NextResponse.json(
|
||||
|
||||
@@ -232,7 +232,7 @@ function DoubanPageClient() {
|
||||
snapshot1.selectedWeekday === snapshot2.selectedWeekday &&
|
||||
snapshot1.currentPage === snapshot2.currentPage &&
|
||||
JSON.stringify(snapshot1.multiLevelSelection) ===
|
||||
JSON.stringify(snapshot2.multiLevelSelection)
|
||||
JSON.stringify(snapshot2.multiLevelSelection)
|
||||
);
|
||||
},
|
||||
[]
|
||||
@@ -715,12 +715,12 @@ function DoubanPageClient() {
|
||||
return type === 'movie'
|
||||
? '电影'
|
||||
: type === 'tv'
|
||||
? '电视剧'
|
||||
: type === 'anime'
|
||||
? '动漫'
|
||||
: type === 'show'
|
||||
? '综艺'
|
||||
: '自定义';
|
||||
? '电视剧'
|
||||
: type === 'anime'
|
||||
? '动漫'
|
||||
: type === 'show'
|
||||
? '综艺'
|
||||
: '自定义';
|
||||
};
|
||||
|
||||
const getPageDescription = () => {
|
||||
@@ -786,24 +786,24 @@ function DoubanPageClient() {
|
||||
<div className='justify-start grid grid-cols-3 gap-x-2 gap-y-12 px-0 sm:px-2 sm:grid-cols-[repeat(auto-fill,minmax(160px,1fr))] sm:gap-x-8 sm:gap-y-20'>
|
||||
{loading || !selectorsReady
|
||||
? // 显示骨架屏
|
||||
skeletonData.map((index) => <DoubanCardSkeleton key={index} />)
|
||||
skeletonData.map((index) => <DoubanCardSkeleton key={index} />)
|
||||
: // 显示实际数据
|
||||
doubanData.map((item, index) => (
|
||||
<div key={`${item.title}-${index}`} className='w-full'>
|
||||
<VideoCard
|
||||
from='douban'
|
||||
title={item.title}
|
||||
poster={item.poster}
|
||||
douban_id={Number(item.id)}
|
||||
rate={item.rate}
|
||||
year={item.year}
|
||||
type={type === 'movie' ? 'movie' : ''} // 电影类型严格控制,tv 不控
|
||||
isBangumi={
|
||||
type === 'anime' && primarySelection === '每日放送'
|
||||
}
|
||||
/>
|
||||
</div>
|
||||
))}
|
||||
doubanData.map((item, index) => (
|
||||
<div key={`${item.title}-${index}`} className='w-full'>
|
||||
<VideoCard
|
||||
from='douban'
|
||||
title={item.title}
|
||||
poster={item.poster}
|
||||
douban_id={Number(item.id)}
|
||||
rate={item.rate}
|
||||
year={item.year}
|
||||
type={type === 'movie' ? 'movie' : ''} // 电影类型严格控制,tv 不控
|
||||
isBangumi={
|
||||
type === 'anime' && primarySelection === '每日放送'
|
||||
}
|
||||
/>
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
|
||||
{/* 加载更多指示器 */}
|
||||
|
||||
197
src/app/page.tsx
197
src/app/page.tsx
@@ -110,36 +110,39 @@ function HomeClient() {
|
||||
}, []);
|
||||
|
||||
// 处理收藏数据更新的函数
|
||||
const updateFavoriteItems = useCallback(async (allFavorites: Record<string, any>) => {
|
||||
const allPlayRecords = await getAllPlayRecords();
|
||||
const updateFavoriteItems = useCallback(
|
||||
async (allFavorites: Record<string, any>) => {
|
||||
const allPlayRecords = await getAllPlayRecords();
|
||||
|
||||
// 根据保存时间排序(从近到远)
|
||||
const sorted = Object.entries(allFavorites)
|
||||
.sort(([, a], [, b]) => b.save_time - a.save_time)
|
||||
.map(([key, fav]) => {
|
||||
const plusIndex = key.indexOf('+');
|
||||
const source = key.slice(0, plusIndex);
|
||||
const id = key.slice(plusIndex + 1);
|
||||
// 根据保存时间排序(从近到远)
|
||||
const sorted = Object.entries(allFavorites)
|
||||
.sort(([, a], [, b]) => b.save_time - a.save_time)
|
||||
.map(([key, fav]) => {
|
||||
const plusIndex = key.indexOf('+');
|
||||
const source = key.slice(0, plusIndex);
|
||||
const id = key.slice(plusIndex + 1);
|
||||
|
||||
// 查找对应的播放记录,获取当前集数
|
||||
const playRecord = allPlayRecords[key];
|
||||
const currentEpisode = playRecord?.index;
|
||||
// 查找对应的播放记录,获取当前集数
|
||||
const playRecord = allPlayRecords[key];
|
||||
const currentEpisode = playRecord?.index;
|
||||
|
||||
return {
|
||||
id,
|
||||
source,
|
||||
title: fav.title,
|
||||
year: fav.year,
|
||||
poster: fav.cover,
|
||||
episodes: fav.total_episodes,
|
||||
source_name: fav.source_name,
|
||||
currentEpisode,
|
||||
search_title: fav?.search_title,
|
||||
origin: fav?.origin,
|
||||
} as FavoriteItem;
|
||||
});
|
||||
setFavoriteItems(sorted);
|
||||
}, []);
|
||||
return {
|
||||
id,
|
||||
source,
|
||||
title: fav.title,
|
||||
year: fav.year,
|
||||
poster: fav.cover,
|
||||
episodes: fav.total_episodes,
|
||||
source_name: fav.source_name,
|
||||
currentEpisode,
|
||||
search_title: fav?.search_title,
|
||||
origin: fav?.origin,
|
||||
} as FavoriteItem;
|
||||
});
|
||||
setFavoriteItems(sorted);
|
||||
},
|
||||
[]
|
||||
);
|
||||
|
||||
// 当切换到收藏夹时加载收藏数据(使用 ref 防止重复加载)
|
||||
useEffect(() => {
|
||||
@@ -256,30 +259,30 @@ function HomeClient() {
|
||||
<ScrollableRow>
|
||||
{loading
|
||||
? // 加载状态显示灰色占位数据
|
||||
Array.from({ length: 8 }).map((_, index) => (
|
||||
<div
|
||||
key={index}
|
||||
className='min-w-[96px] w-24 sm:min-w-[180px] sm:w-44'
|
||||
>
|
||||
<div className='aspect-[2/3] bg-gray-200 dark:bg-gray-700 rounded-lg animate-pulse mb-2' />
|
||||
<div className='h-4 bg-gray-200 dark:bg-gray-700 rounded animate-pulse w-3/4' />
|
||||
</div>
|
||||
))
|
||||
Array.from({ length: 8 }).map((_, index) => (
|
||||
<div
|
||||
key={index}
|
||||
className='min-w-[96px] w-24 sm:min-w-[180px] sm:w-44'
|
||||
>
|
||||
<div className='aspect-[2/3] bg-gray-200 dark:bg-gray-700 rounded-lg animate-pulse mb-2' />
|
||||
<div className='h-4 bg-gray-200 dark:bg-gray-700 rounded animate-pulse w-3/4' />
|
||||
</div>
|
||||
))
|
||||
: hotMovies.map((movie) => (
|
||||
<div
|
||||
key={movie.id}
|
||||
className='min-w-[96px] w-24 sm:min-w-[180px] sm:w-44'
|
||||
>
|
||||
<VideoCard
|
||||
id={movie.id}
|
||||
poster={movie.poster}
|
||||
title={movie.title}
|
||||
year={movie.year}
|
||||
type='movie'
|
||||
from='douban'
|
||||
/>
|
||||
</div>
|
||||
))}
|
||||
<div
|
||||
key={movie.id}
|
||||
className='min-w-[96px] w-24 sm:min-w-[180px] sm:w-44'
|
||||
>
|
||||
<VideoCard
|
||||
id={movie.id}
|
||||
poster={movie.poster}
|
||||
title={movie.title}
|
||||
year={movie.year}
|
||||
type='movie'
|
||||
from='douban'
|
||||
/>
|
||||
</div>
|
||||
))}
|
||||
</ScrollableRow>
|
||||
</section>
|
||||
|
||||
@@ -300,29 +303,29 @@ function HomeClient() {
|
||||
<ScrollableRow>
|
||||
{loading
|
||||
? Array.from({ length: 8 }).map((_, index) => (
|
||||
<div
|
||||
key={index}
|
||||
className='min-w-[96px] w-24 sm:min-w-[180px] sm:w-44'
|
||||
>
|
||||
<div className='aspect-[2/3] bg-gray-200 dark:bg-gray-700 rounded-lg animate-pulse mb-2' />
|
||||
<div className='h-4 bg-gray-200 dark:bg-gray-700 rounded animate-pulse w-3/4' />
|
||||
</div>
|
||||
))
|
||||
<div
|
||||
key={index}
|
||||
className='min-w-[96px] w-24 sm:min-w-[180px] sm:w-44'
|
||||
>
|
||||
<div className='aspect-[2/3] bg-gray-200 dark:bg-gray-700 rounded-lg animate-pulse mb-2' />
|
||||
<div className='h-4 bg-gray-200 dark:bg-gray-700 rounded animate-pulse w-3/4' />
|
||||
</div>
|
||||
))
|
||||
: hotTvShows.map((tvShow) => (
|
||||
<div
|
||||
key={tvShow.id}
|
||||
className='min-w-[96px] w-24 sm:min-w-[180px] sm:w-44'
|
||||
>
|
||||
<VideoCard
|
||||
id={tvShow.id}
|
||||
poster={tvShow.poster}
|
||||
title={tvShow.title}
|
||||
year={tvShow.year}
|
||||
type='tv'
|
||||
from='douban'
|
||||
/>
|
||||
</div>
|
||||
))}
|
||||
<div
|
||||
key={tvShow.id}
|
||||
className='min-w-[96px] w-24 sm:min-w-[180px] sm:w-44'
|
||||
>
|
||||
<VideoCard
|
||||
id={tvShow.id}
|
||||
poster={tvShow.poster}
|
||||
title={tvShow.title}
|
||||
year={tvShow.year}
|
||||
type='tv'
|
||||
from='douban'
|
||||
/>
|
||||
</div>
|
||||
))}
|
||||
</ScrollableRow>
|
||||
</section>
|
||||
|
||||
@@ -343,29 +346,29 @@ function HomeClient() {
|
||||
<ScrollableRow>
|
||||
{loading
|
||||
? Array.from({ length: 8 }).map((_, index) => (
|
||||
<div
|
||||
key={index}
|
||||
className='min-w-[96px] w-24 sm:min-w-[180px] sm:w-44'
|
||||
>
|
||||
<div className='aspect-[2/3] bg-gray-200 dark:bg-gray-700 rounded-lg animate-pulse mb-2' />
|
||||
<div className='h-4 bg-gray-200 dark:bg-gray-700 rounded animate-pulse w-3/4' />
|
||||
</div>
|
||||
))
|
||||
<div
|
||||
key={index}
|
||||
className='min-w-[96px] w-24 sm:min-w-[180px] sm:w-44'
|
||||
>
|
||||
<div className='aspect-[2/3] bg-gray-200 dark:bg-gray-700 rounded-lg animate-pulse mb-2' />
|
||||
<div className='h-4 bg-gray-200 dark:bg-gray-700 rounded animate-pulse w-3/4' />
|
||||
</div>
|
||||
))
|
||||
: hotVarietyShows.map((varietyShow) => (
|
||||
<div
|
||||
key={varietyShow.id}
|
||||
className='min-w-[96px] w-24 sm:min-w-[180px] sm:w-44'
|
||||
>
|
||||
<VideoCard
|
||||
id={varietyShow.id}
|
||||
poster={varietyShow.poster}
|
||||
title={varietyShow.title}
|
||||
year={varietyShow.year}
|
||||
type='tv'
|
||||
from='douban'
|
||||
/>
|
||||
</div>
|
||||
))}
|
||||
<div
|
||||
key={varietyShow.id}
|
||||
className='min-w-[96px] w-24 sm:min-w-[180px] sm:w-44'
|
||||
>
|
||||
<VideoCard
|
||||
id={varietyShow.id}
|
||||
poster={varietyShow.poster}
|
||||
title={varietyShow.title}
|
||||
year={varietyShow.year}
|
||||
type='tv'
|
||||
from='douban'
|
||||
/>
|
||||
</div>
|
||||
))}
|
||||
</ScrollableRow>
|
||||
</section>
|
||||
|
||||
@@ -414,9 +417,9 @@ function HomeClient() {
|
||||
|
||||
// 找到当前星期对应的番剧数据,并过滤掉没有图片的
|
||||
const todayAnimes =
|
||||
bangumiCalendarData.find(
|
||||
(item) => item.weekday.en === currentWeekday
|
||||
)?.items.filter((anime) => anime.images) || [];
|
||||
bangumiCalendarData
|
||||
.find((item) => item.weekday.en === currentWeekday)
|
||||
?.items.filter((anime) => anime.images) || [];
|
||||
|
||||
return todayAnimes.map((anime, index) => (
|
||||
<div
|
||||
|
||||
@@ -130,18 +130,28 @@ function PlayPageClient() {
|
||||
console.log('使用缓存的去广告代码');
|
||||
}
|
||||
|
||||
// 异步从服务器获取最新版本号,检查是否需要更新
|
||||
const response = await fetch('/api/ad-filter');
|
||||
if (!response.ok) {
|
||||
console.warn('获取去广告代码配置失败,使用缓存');
|
||||
// 第一步:先只获取版本号,检查是否需要更新
|
||||
const versionResponse = await fetch('/api/ad-filter');
|
||||
if (!versionResponse.ok) {
|
||||
console.warn('获取去广告代码版本失败,使用缓存');
|
||||
return;
|
||||
}
|
||||
|
||||
const { code, version } = await response.json();
|
||||
const { version } = await versionResponse.json();
|
||||
|
||||
// 如果版本号不一致或没有缓存,更新缓存
|
||||
// 如果版本号不一致或没有缓存,才获取完整代码
|
||||
if (!cachedVersion || parseInt(cachedVersion) !== version) {
|
||||
console.log('检测到去广告代码更新,更新本地缓存');
|
||||
console.log('检测到去广告代码更新(版本 ' + version + '),获取最新代码');
|
||||
|
||||
// 第二步:获取完整代码
|
||||
const fullResponse = await fetch('/api/ad-filter?full=true');
|
||||
if (!fullResponse.ok) {
|
||||
console.warn('获取完整去广告代码失败,使用缓存');
|
||||
return;
|
||||
}
|
||||
|
||||
const { code } = await fullResponse.json();
|
||||
|
||||
if (code) {
|
||||
localStorage.setItem('custom_ad_filter_code_cache', code);
|
||||
localStorage.setItem('custom_ad_filter_version_cache', version.toString());
|
||||
@@ -152,7 +162,7 @@ function PlayPageClient() {
|
||||
localStorage.removeItem('custom_ad_filter_version_cache');
|
||||
}
|
||||
} else {
|
||||
console.log('去广告代码已是最新版本');
|
||||
console.log('去广告代码已是最新版本(版本 ' + version + ')');
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('获取去广告代码配置失败:', error);
|
||||
|
||||
Reference in New Issue
Block a user