fix: 合并服务器未推送改动并保留手动视频标签

app/api/feed/route.ts

@@ -1,7 +1,8 @@
-import { NextRequest, NextResponse } from "next/server";
-import { prisma } from "@/lib/prisma";
+import { type NextRequest, NextResponse } from "next/server";
 import type { FeedItem, FeedResponse } from "@/app/types/feed";
+import { isVideoContentTag } from "@/lib/video-tags";
 import { getFileUrl } from "@/lib/minio";
+import { prisma } from "@/lib/prisma";
 
 // Contract
 // Inputs: search params { before?: ISOString, limit?: number }
@@ -11,24 +12,45 @@ export async function GET(req: NextRequest) {
   const { searchParams } = new URL(req.url);
   const limitParam = searchParams.get("limit");
   const beforeParam = searchParams.get("before");
+  const rawTag = (searchParams.get("tag") || "").trim();
+  const selectedTag = rawTag && isVideoContentTag(rawTag) ? rawTag : null;
+
+  if (rawTag && !selectedTag) {
+    return NextResponse.json({ error: "Invalid tag" }, { status: 400 });
+  }
 
   const limit = Math.min(Math.max(Number(limitParam ?? "24"), 1), 60); // 1..60
   const before = beforeParam ? new Date(beforeParam) : null;
+  const videoWhere = {
+    ...(before ? { created_at: { lt: before } } : {}),
+    ...(selectedTag
+      ? {
+          manual_content_tags: { has: selectedTag },
+        }
+      : {}),
+  };
 
   // fetch chunk from both tables
   const [videos, posts] = await Promise.all([
     prisma.video.findMany({
-      where: before ? { created_at: { lt: before } } : undefined,
+      where: videoWhere,
       orderBy: { created_at: "desc" },
       take: limit,
-      include: { author: true },
-    }),
-    prisma.imagePost.findMany({
-      where: before ? { created_at: { lt: before } } : undefined,
-      orderBy: { created_at: "desc" },
-      take: limit,
-      include: { author: true, images: { orderBy: { order: "asc" }, take: 1 } },
+      include: {
+        author: true,
+      },
     }),
+    selectedTag
+      ? Promise.resolve([])
+      : prisma.imagePost.findMany({
+          where: before ? { created_at: { lt: before } } : undefined,
+          orderBy: { created_at: "desc" },
+          take: limit,
+          include: {
+            author: true,
+            images: { orderBy: { order: "asc" }, take: 1 },
+          },
+        }),
   ]);
 
   const merged: FeedItem[] = [
@@ -47,29 +69,33 @@ export async function GET(req: NextRequest) {
         sec_uid: v.author.sec_uid,
       },
       likes: Number(v.digg_count),
+      content_tags: v.manual_content_tags,
     })),
-    ...posts.map((p) => ({
-      type: "image" as const,
-      aweme_id: p.aweme_id,
-      created_at: p.created_at,
-      desc: p.desc,
-      cover_url: getFileUrl(p.images?.[0]?.url ?? null),
-      width: p.images?.[0]?.width ?? null,
-      height: p.images?.[0]?.height ?? null,
-      author: {
-        nickname: p.author.nickname,
-        avatar_url: getFileUrl(p.author.avatar_url ?? ""),
-        sec_uid: p.author.sec_uid,
-      },
-      likes: Number(p.digg_count),
-    })),
+    ...posts.map((p) => {
+      const coverPath = p.images?.[0]?.url;
+      return {
+        type: "image" as const,
+        aweme_id: p.aweme_id,
+        created_at: p.created_at,
+        desc: p.desc,
+        cover_url: coverPath ? getFileUrl(coverPath) : null,
+        width: p.images?.[0]?.width ?? null,
+        height: p.images?.[0]?.height ?? null,
+        author: {
+          nickname: p.author.nickname,
+          avatar_url: getFileUrl(p.author.avatar_url ?? ""),
+          sec_uid: p.author.sec_uid,
+        },
+        likes: Number(p.digg_count),
+      };
+    }),
   ]
     .sort((a, b) => +new Date(b.created_at) - +new Date(a.created_at))
     .slice(0, limit);
 
   const nextCursor =
     merged.length > 0
-      ? new Date(merged[merged.length - 1].created_at as any).toISOString()
+      ? new Date(merged[merged.length - 1].created_at).toISOString()
       : null;
   const payload: FeedResponse = { items: merged, nextCursor };
   return NextResponse.json(payload);