tt-help-cli-ycl 1.3.63 → 1.3.65

package/src/lib/tiktok-scraper.mjs

@@ -57,11 +57,13 @@ export class TikTokScraper {
     wafTtl = DEFAULT_WAF_TTL,
     warmUrl = DEFAULT_WARM_URL,
     maxRequestsPerPage = DEFAULT_MAX_REQUESTS_PER_PAGE,
+    proxyServer = null,
   } = {}) {
     this.poolSize = poolSize;
     this.wafTtl = wafTtl;
     this.warmUrl = warmUrl;
     this.maxRequestsPerPage = maxRequestsPerPage;
+    this.proxyServer = proxyServer;
     this.browser = null;
     this.context = null;
     this.slots = [];
@@ -77,17 +79,21 @@ export class TikTokScraper {
         "未找到本地浏览器（Chrome/Edge），请先安装浏览器或执行 npx playwright install",
       );
     }
+    const launchArgs = [
+      "--no-sandbox",
+      "--disable-setuid-sandbox",
+      "--disable-dev-shm-usage",
+    ];
+    if (this.proxyServer) {
+      launchArgs.push(`--proxy-server=${this.proxyServer}`);
+    }
     this.browser = await chromium.launch({
       headless: true,
       executablePath,
       handleSIGINT: false,
       handleSIGTERM: false,
       handleSIGHUP: false,
-      args: [
-        "--no-sandbox",
-        "--disable-setuid-sandbox",
-        "--disable-dev-shm-usage",
-      ],
+      args: launchArgs,
     });
     this.context = await this.browser.newContext();
     for (let i = 0; i < this.poolSize; i++) {

package/src/scraper/explore-core.js

@@ -3,7 +3,7 @@ import { detectCaptcha } from "./modules/captcha-handler.js";
 export { ensureBrowserReady };
 import { getUserInfo, collectVideos } from "../videos/core.js";
 import { extractFollowAndFollowers } from "./modules/follow-extractor.js";
-import { extractVideoLocation } from "../lib/scrape.js";
+import { extractVideoLocation, setScraperProxy } from "../lib/scrape.js";
 import {
   DEFAULT_TARGET_LOCATIONS_CSV,
   findFirstMatchingLocation,
@@ -23,6 +23,7 @@ async function processExplore(page, username, options, log) {
     maxFollowing = 50,
     maxFollowers = 50,
     location = DEFAULT_TARGET_LOCATIONS_CSV,
+    proxyServer = null,
   } = options;
 
   const result = {
@@ -45,6 +46,11 @@ async function processExplore(page, username, options, log) {
 
   const locationList = normalizeLocationList(location);
 
+  // 设置 TikTokScraper 的代理，与 CDP 浏览器保持一致
+  if (options.proxyServer) {
+    setScraperProxy(options.proxyServer);
+  }
+
   try {
     log(`  访问 @${username} 主页...`);
     const videoList = await collectVideos(page, username, maxVideos, log);

package/src/watch/data-store.js

@@ -775,6 +775,53 @@ function restoreAttachStuckByCountry(country) {
   return { restored: count, country: normalizedCountry };
 }
 
+function resetPendingByCountry(country) {
+  if (!db) {
+    return { reset: 0, country, error: "db not ready" };
+  }
+
+  const normalizedCountry = String(country == null ? "未知" : country).trim();
+  if (!normalizedCountry) {
+    return {
+      reset: 0,
+      country: normalizedCountry,
+      error: "country is required",
+    };
+  }
+
+  const whereSql = `
+    status = 'pending'
+    AND COALESCE(guessed_location, '未知') = ?
+  `;
+  const count =
+    db
+      .prepare(
+        `
+        SELECT COUNT(*) as c
+        FROM jobs
+        WHERE ${whereSql}
+      `,
+      )
+      .get(normalizedCountry)?.c || 0;
+
+  if (!count) {
+    return { reset: 0, country: normalizedCountry };
+  }
+
+  db.prepare(
+    `
+    UPDATE jobs
+    SET user_update_count = 0,
+        updated_at = ?,
+        claimed_by = NULL,
+        claimed_at = NULL
+    WHERE ${whereSql}
+  `,
+  ).run(Date.now(), normalizedCountry);
+
+  return { reset: count, country: normalizedCountry };
+}
+
 function getRawByCountryFromDb() {
   if (!db) return [];
 
@@ -1077,7 +1124,7 @@ function restoreRawJobById(uniqueId) {
   return { restored: 1, uniqueId: safeId };
 }
 
-function restoreRawJobsByFilter({ search, location }) {
+function restoreRawJobsByFilter({ search, location, hasVideo, hasFollower }) {
   if (!db) {
     return { restored: 0, error: "db not ready" };
   }
@@ -1098,6 +1145,14 @@ function restoreRawJobsByFilter({ search, location }) {
     args.push(location);
   }
 
+  if (hasVideo) {
+    where.push("COALESCE(video_count, 0) > 0");
+  }
+
+  if (hasFollower) {
+    where.push("COALESCE(follower_count, 0) > 0");
+  }
+
   if (where.length === 0) {
     return { restored: 0, error: "at least one filter is required" };
   }
@@ -1140,7 +1195,14 @@ function restoreRawJobsByFilter({ search, location }) {
   return { restored: count };
 }
 
-function getRawJobsPageFromDb({ search, location, limit, offset }) {
+function getRawJobsPageFromDb({
+  search,
+  location,
+  limit,
+  offset,
+  hasVideo,
+  hasFollower,
+}) {
   if (!db) return null;
 
   const safeLimit = Math.max(1, Math.min(200, parseInt(limit) || 50));
@@ -1159,6 +1221,12 @@ function getRawJobsPageFromDb({ search, location, limit, offset }) {
     where.push("COALESCE(guessed_location, '未知') = ?");
     args.push(location);
   }
+  if (hasVideo) {
+    where.push("COALESCE(video_count, 0) > 0");
+  }
+  if (hasFollower) {
+    where.push("COALESCE(follower_count, 0) > 0");
+  }
 
   const whereSql = where.length ? `WHERE ${where.join(" AND ")}` : "";
   const total = db
@@ -1329,6 +1397,62 @@ function getTargetUsersFromDb(targetLocations = []) {
   };
 }
 
+function getTargetUsersByCountryFromDb(targetLocations = []) {
+  if (!db) return null;
+  if (!targetLocations.length) {
+    return { countries: [] };
+  }
+
+  const placeholders = targetLocations.map(() => "?").join(", ");
+  const rows = db
+    .prepare(
+      `
+      SELECT
+        unique_id,
+        nickname,
+        follower_count,
+        video_count,
+        tt_seller,
+        verified,
+        location_created,
+        latest_video_time,
+        refresh_time,
+        status,
+        sources
+      FROM jobs
+      WHERE tt_seller = 1
+        AND verified = 0
+        AND location_created IN (${placeholders})
+      ORDER BY location_created ASC, COALESCE(latest_video_time, 0) DESC
+    `,
+    )
+    .all(...targetLocations)
+    .map(mapJobRow);
+
+  const countryMap = new Map();
+  for (const row of rows) {
+    const country = row.locationCreated || "未知";
+    if (!countryMap.has(country)) {
+      countryMap.set(country, []);
+    }
+    countryMap.get(country).push(row);
+  }
+
+  const countries = [];
+  for (const [country, users] of countryMap) {
+    countries.push({
+      country,
+      count: users.length,
+      users,
+    });
+  }
+
+  return {
+    total: rows.length,
+    countries,
+  };
+}
+
 function snakeToCamel(key) {
   return key.replace(/_([a-z])/g, (_, ch) => ch.toUpperCase());
 }
@@ -3359,12 +3483,14 @@ export function createStore(filePath) {
     getRawByCountry: getRawByCountryFromDb,
     moveJobsToRawByCountry,
     restoreAttachStuckByCountry,
+    resetPendingByCountry,
     restoreRawJobsByCountry,
     restoreRawJobById,
     restoreRawJobsByFilter,
     getUsersPage: getUsersPageFromDb,
     getRawJobsPage: getRawJobsPageFromDb,
     getTargetUsers: getTargetUsersFromDb,
+    getTargetUsersByCountry: getTargetUsersByCountryFromDb,
     getStats,
     getStatusGroups,
     markGroupsDirty,

package/src/watch/public/app.js

@@ -743,44 +743,9 @@ async function batchResetErrors() {
   }
 }
 
-document
-  .getElementById("statTargetCard")
-  .addEventListener("click", async () => {
-    showLoading("正在导出目标用户...");
-    try {
-      const res = await fetch("/api/target-users", {
-        headers: { Accept: "text/csv" },
-      });
-      if (!res.ok) throw new Error("HTTP " + res.status);
-      const blob = await res.blob();
-      const ext = blob.size < 200 ? "json" : "csv";
-      if (ext === "json") {
-        const text = await blob.text();
-        const data = JSON.parse(text);
-        if (!data.users.length) {
-          showToast("暂无目标用户", true);
-          return;
-        }
-        if (navigator.clipboard && navigator.clipboard.writeText) {
-          const ids = data.users.map((u) => "@" + u.uniqueId).join(", ");
-          await navigator.clipboard.writeText(ids);
-          showToast(data.users.length + " 个目标用户 ID 已复制到剪贴板");
-        }
-        return;
-      }
-      const url = URL.createObjectURL(blob);
-      const a = document.createElement("a");
-      a.href = url;
-      a.download = "target-users.csv";
-      a.click();
-      URL.revokeObjectURL(url);
-      showToast("CSV 文件已开始下载");
-    } catch (e) {
-      showToast("获取失败: " + e.message, true);
-    } finally {
-      hideLoading();
-    }
-  });
+document.getElementById("statTargetCard").addEventListener("click", () => {
+  navigateToTarget();
+});
 
 // Hash 路由
 window.addEventListener("hashchange", handleRoute);
@@ -794,6 +759,8 @@ function handleRoute() {
     showUserUpdatePage();
   } else if (hash === "#raw") {
     showRawPage();
+  } else if (hash === "#target") {
+    showTargetPage();
   } else {
     showMainPage();
   }
@@ -820,6 +787,7 @@ function showPendingPage() {
   document.getElementById("pendingPage").classList.add("active");
   document.getElementById("userUpdatePage").classList.remove("active");
   document.getElementById("rawPage").classList.remove("active");
+  document.getElementById("targetPage").classList.remove("active");
   fetchPendingByCountry();
   fetchAttachStuckByCountry();
 }
@@ -829,6 +797,7 @@ function showUserUpdatePage() {
   document.getElementById("pendingPage").classList.remove("active");
   document.getElementById("userUpdatePage").classList.add("active");
   document.getElementById("rawPage").classList.remove("active");
+  document.getElementById("targetPage").classList.remove("active");
   fetchUserUpdateByCountry();
   fetchAttachStuckByCountry();
 }
@@ -845,6 +814,7 @@ function showRawPage() {
   document.getElementById("pendingPage").classList.remove("active");
   document.getElementById("userUpdatePage").classList.remove("active");
   document.getElementById("rawPage").classList.add("active");
+  document.getElementById("targetPage").classList.remove("active");
   fetchRawByCountry();
   fetchRawJobs();
 }
@@ -854,8 +824,221 @@ function showMainPage() {
   document.getElementById("pendingPage").classList.remove("active");
   document.getElementById("userUpdatePage").classList.remove("active");
   document.getElementById("rawPage").classList.remove("active");
+  document.getElementById("targetPage").classList.remove("active");
+}
+
+function navigateToTarget() {
+  window.location.hash = "#target";
+}
+
+function showTargetPage() {
+  document.getElementById("mainPage").classList.add("hidden");
+  document.getElementById("pendingPage").classList.remove("active");
+  document.getElementById("userUpdatePage").classList.remove("active");
+  document.getElementById("rawPage").classList.remove("active");
+  document.getElementById("targetPage").classList.add("active");
+  fetchTargetByCountry();
+  // 同步统计
+  if (currentStats) {
+    document.getElementById("targetPageStatTotal").textContent = formatStatNum(
+      currentStats.targetUsers || 0,
+      { full: true },
+    );
+  }
+}
+
+let currentTargetData = null;
+
+async function fetchTargetByCountry() {
+  try {
+    const res = await fetch("/api/target-users-by-country");
+    const data = await res.json();
+    currentTargetData = data;
+    renderTargetCountryGrid(data.countries || []);
+    renderTargetLocationFilter(data.countries || []);
+    renderTargetTable(data.countries || []);
+    document.getElementById("targetPageStatTotal").textContent = formatStatNum(
+      data.total || 0,
+      { full: true },
+    );
+    document.getElementById("targetPageStatCountries").textContent = (
+      data.countries || []
+    ).length;
+  } catch (e) {
+    console.error("获取目标商家数据失败:", e);
+  }
+}
+
+function renderTargetCountryGrid(countries) {
+  const grid = document.getElementById("targetCountryGrid");
+  if (!countries.length) {
+    grid.innerHTML =
+      '<span style="color:#666;font-size:12px">暂无目标商家</span>';
+    return;
+  }
+  const total = countries.reduce((sum, c) => sum + c.count, 0);
+  grid.innerHTML = countries
+    .map((c) => {
+      const pct = ((c.count / total) * 100).toFixed(1);
+      const safeCountry = escapeJsString(c.country);
+      return `
+      <div class="pending-country-item has-target"
+           onclick="filterTargetByCountry('${safeCountry}')">
+        <div class="country-name">${c.country}</div>
+        <div class="country-count">${c.count}</div>
+        <div class="country-label">${pct}% 目标商家</div>
+      </div>
+    `;
+    })
+    .join("");
+}
+
+function renderTargetLocationFilter(countries) {
+  const sel = document.getElementById("targetLocationFilter");
+  if (!sel) return;
+  const val = sel.value;
+  sel.innerHTML =
+    '<option value="">全部国家</option>' +
+    countries
+      .map(
+        (c) =>
+          `<option value="${c.country}"${val === c.country ? " selected" : ""}>${c.country} (${c.count})</option>`,
+      )
+      .join("");
+}
+
+function renderTargetTable(countries) {
+  const el = document.getElementById("targetTable");
+  const search = document.getElementById("targetSearchInput")
+    ? document.getElementById("targetSearchInput").value.trim().toLowerCase()
+    : "";
+  const location = currentTargetLocation;
+
+  let allUsers = [];
+  for (const c of countries) {
+    if (location && c.country !== location) continue;
+    allUsers = allUsers.concat(c.users);
+  }
+
+  if (search) {
+    allUsers = allUsers.filter(
+      (u) =>
+        (u.uniqueId || "").toLowerCase().includes(search) ||
+        (u.nickname || "").toLowerCase().includes(search),
+    );
+  }
+
+  if (!allUsers.length) {
+    el.innerHTML =
+      '<tr><td colspan="8" style="color:#666;text-align:center;padding:24px">暂无目标商家</td></tr>';
+    return;
+  }
+
+  el.innerHTML = allUsers
+    .map((u) => {
+      const nick = (u.nickname || "")
+        .replace(/</g, "&lt;")
+        .replace(/>/g, "&gt;");
+      const fans = u.followerCount != null ? formatNum(u.followerCount) : "-";
+      const videos = u.videoCount != null ? u.videoCount : "-";
+      const location = u.locationCreated || "-";
+      const latestVideo = u.latestVideoTime
+        ? formatTime(u.latestVideoTime * 1000)
+        : "-";
+      const refreshTime = u.refreshTime ? formatTime(u.refreshTime) : "-";
+      const sources = (u.sources || []).join(", ");
+
+      let statusTag = "";
+      if (u.status === "done")
+        statusTag = '<span class="tag processed">已完成</span>';
+      else if (u.status === "processing")
+        statusTag = '<span class="tag processing">处理中</span>';
+      else if (u.status === "pending")
+        statusTag = '<span class="tag pending">待处理</span>';
+      else if (u.status === "error")
+        statusTag = '<span class="tag error">错误</span>';
+      else if (u.status === "restricted")
+        statusTag = '<span class="tag error">受限</span>';
+      else statusTag = u.status || "-";
+
+      return `<tr>
+      <td class="user-id" data-label="用户名">@${u.uniqueId}</td>
+      <td data-label="昵称">${nick}</td>
+      <td data-label="粉丝">${fans}</td>
+      <td data-label="视频">${videos}</td>
+      <td data-label="国家">${location}</td>
+      <td data-label="最近发布" style="font-size:11px;color:#888">${latestVideo}</td>
+      <td data-label="最近刷新" style="font-size:11px;color:#888">${refreshTime}</td>
+      <td data-label="来源">${sources || "-"}</td>
+      <td data-label="状态">${statusTag}</td>
+    </tr>`;
+    })
+    .join("");
+}
+
+function filterTargetByCountry(country) {
+  currentTargetLocation = country;
+  const sel = document.getElementById("targetLocationFilter");
+  if (sel) sel.value = country;
+  if (currentTargetData) {
+    renderTargetTable(currentTargetData.countries || []);
+  }
 }
 
+function onTargetLocationChange() {
+  const sel = document.getElementById("targetLocationFilter");
+  currentTargetLocation = sel.value;
+  if (currentTargetData) {
+    renderTargetTable(currentTargetData.countries || []);
+  }
+}
+
+function clearTargetFilters() {
+  currentTargetLocation = "";
+  const searchInput = document.getElementById("targetSearchInput");
+  const locationFilter = document.getElementById("targetLocationFilter");
+  if (searchInput) searchInput.value = "";
+  if (locationFilter) locationFilter.value = "";
+  if (currentTargetData) {
+    renderTargetTable(currentTargetData.countries || []);
+  }
+}
+
+let targetSearchTimer = null;
+
+document.getElementById("targetSearchInput").addEventListener("input", () => {
+  if (targetSearchTimer) clearTimeout(targetSearchTimer);
+  targetSearchTimer = setTimeout(() => {
+    if (currentTargetData) {
+      renderTargetTable(currentTargetData.countries || []);
+    }
+  }, 300);
+});
+
+document
+  .getElementById("exportTargetCsvBtn")
+  .addEventListener("click", async () => {
+    showLoading("正在导出目标用户...");
+    try {
+      const res = await fetch("/api/target-users-by-country", {
+        headers: { Accept: "text/csv" },
+      });
+      if (!res.ok) throw new Error("HTTP " + res.status);
+      const blob = await res.blob();
+      const url = URL.createObjectURL(blob);
+      const a = document.createElement("a");
+      a.href = url;
+      a.download = "target-users-by-country.csv";
+      a.click();
+      URL.revokeObjectURL(url);
+      showToast("CSV 文件已开始下载");
+    } catch (e) {
+      showToast("导出失败: " + e.message, true);
+    } finally {
+      hideLoading();
+    }
+  });
+
 async function fetchPendingByCountry() {
   try {
     const res = await fetch("/api/pending-by-country");
@@ -882,7 +1065,10 @@ function renderPendingCountryGrid(countries) {
       return `
       <div class="pending-country-item${isUnknown ? "" : " has-target"}" 
            onclick="filterByPendingCountry('${safeCountry}')">
-        <button class="country-action-btn" title="移到毛料库，暂不处理" onclick="event.stopPropagation(); moveCountryJobsToRaw('pending', '${safeCountry}', ${c.count})">✕</button>
+        <div class="country-action-btns">
+          <button class="country-action-btn restore" title="重置为需要预处理" onclick="event.stopPropagation(); resetPendingByCountry('${safeCountry}', ${c.count})">↺</button>
+          <button class="country-action-btn" title="移到毛料库，暂不处理" onclick="event.stopPropagation(); moveCountryJobsToRaw('pending', '${safeCountry}', ${c.count})">✕</button>
+        </div>
         <div class="country-name">${isUnknown ? "🌍 " : ""}${c.country}</div>
         <div class="country-count">${c.count}</div>
         <div class="country-label">${pct}% 待处理</div>
@@ -936,7 +1122,9 @@ function renderUserUpdateCountryGrid(countries) {
       return `
       <div class="pending-country-item${isUnknown ? "" : " has-target"}" 
            onclick="filterByUserUpdateCountry('${safeCountry}')">
-        <button class="country-action-btn" title="移到毛料库，暂不处理" onclick="event.stopPropagation(); moveCountryJobsToRaw('userUpdate', '${safeCountry}', ${c.count})">✕</button>
+        <div class="country-action-btns">
+          <button class="country-action-btn" title="移到毛料库，暂不处理" onclick="event.stopPropagation(); moveCountryJobsToRaw('userUpdate', '${safeCountry}', ${c.count})">✕</button>
+        </div>
         <div class="country-name">${isUnknown ? "🌍 " : ""}${c.country}</div>
         <div class="country-count">${c.count}</div>
         <div class="country-label">${pct}% 待补资料</div>
@@ -973,7 +1161,9 @@ function renderAttachStuckGrid(gridId, countries) {
       const safeCountry = escapeJsString(c.country);
       return `
       <div class="pending-country-item${isUnknown ? "" : " has-target"}">
-        <button class="country-action-btn restore" title="恢复为待补资料" onclick="event.stopPropagation(); restoreAttachStuckByCountry('${safeCountry}', ${c.count})">↺</button>
+        <div class="country-action-btns">
+          <button class="country-action-btn restore" title="恢复为待补资料" onclick="event.stopPropagation(); restoreAttachStuckByCountry('${safeCountry}', ${c.count})">↺</button>
+        </div>
         <div class="country-name">${isUnknown ? "🌍 " : ""}${c.country}</div>
         <div class="country-count">${c.count}</div>
         <div class="country-label">${pct}% attach 未成功</div>
@@ -1058,6 +1248,40 @@ async function moveCountryJobsToRaw(scope, country, count) {
   }
 }
 
+async function resetPendingByCountry(country, count) {
+  const countText = count != null ? `将重置 ${formatStatNum(count)} 条。` : "";
+  if (
+    !window.confirm(
+      `确认将 ${country} 下已预处理的待处理任务重置为需要预处理吗？${countText}`,
+    )
+  ) {
+    return;
+  }
+  showLoading("正在重置...");
+  try {
+    const res = await fetch("/api/pending-by-country/reset", {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({ country }),
+    });
+    const data = await res.json();
+    if (!res.ok || data.error) {
+      showToast(data.error || "重置失败", true);
+      return;
+    }
+    showToast(`${country} 的待处理任务已重置，共 ${data.reset} 条`);
+    await fetchStats();
+    await fetchPendingByCountry();
+    if (!document.getElementById("mainPage").classList.contains("hidden")) {
+      fetchUsers();
+    }
+  } catch (e) {
+    showToast("重置失败: " + e.message, true);
+  } finally {
+    hideLoading();
+  }
+}
+
 async function fetchRawByCountry() {
   try {
     const res = await fetch("/api/raw-by-country");
@@ -1085,7 +1309,9 @@ function renderRawCountryGrid(countries) {
       return `
       <div class="pending-country-item${isUnknown ? "" : " has-target"}"
            onclick="filterRawByCountry('${safeCountry}')">
-        <button class="country-action-btn restore" title="恢复到 jobs 队列" onclick="event.stopPropagation(); restoreRawJobsByCountry('${safeCountry}', ${c.count})">↺</button>
+        <div class="country-action-btns">
+          <button class="country-action-btn restore" title="恢复到 jobs 队列" onclick="event.stopPropagation(); restoreRawJobsByCountry('${safeCountry}', ${c.count})">↺</button>
+        </div>
         <div class="country-name">${isUnknown ? "🌍 " : ""}${c.country}</div>
         <div class="country-count">${c.count}</div>
         <div class="country-label">${pct}% 毛料库</div>
@@ -1101,6 +1327,11 @@ async function fetchRawJobs() {
     const search = document.getElementById("rawSearchInput").value.trim();
     if (search) params.set("search", search);
     if (currentRawLocation) params.set("location", currentRawLocation);
+    const videoFilter = document.getElementById("rawVideoFilter");
+    if (videoFilter && videoFilter.checked) params.set("hasVideo", "1");
+    const followerFilter = document.getElementById("rawFollowerFilter");
+    if (followerFilter && followerFilter.checked)
+      params.set("hasFollower", "1");
     params.set("limit", "200");
     const res = await fetch("/api/raw-jobs?" + params.toString());
     const data = await res.json();
@@ -1176,8 +1407,16 @@ function clearRawFilters() {
   currentRawLocation = "";
   const rawSearchInput = document.getElementById("rawSearchInput");
   const rawLocationFilter = document.getElementById("rawLocationFilter");
+  const rawVideoFilter = document.getElementById("rawVideoFilter");
+  const rawFollowerFilter = document.getElementById("rawFollowerFilter");
   if (rawSearchInput) rawSearchInput.value = "";
   if (rawLocationFilter) rawLocationFilter.value = "";
+  if (rawVideoFilter) rawVideoFilter.checked = false;
+  if (rawFollowerFilter) rawFollowerFilter.checked = false;
+  fetchRawJobs();
+}
+
+function onRawFilterChange() {
   fetchRawJobs();
 }
 
@@ -1211,10 +1450,20 @@ async function restoreRawJob(uniqueId) {
 async function restoreFilteredRawJobs() {
   const search = document.getElementById("rawSearchInput").value.trim();
   const location = currentRawLocation;
+  const videoFilter = document.getElementById("rawVideoFilter");
+  const hasVideo = videoFilter && videoFilter.checked;
+  const followerFilter = document.getElementById("rawFollowerFilter");
+  const hasFollower = followerFilter && followerFilter.checked;
   let desc = "当前筛选条件";
   if (search && location) desc = `搜索="${search}" + 国家=${location}`;
   else if (search) desc = `搜索="${search}"`;
   else if (location) desc = `国家=${location}`;
+  if (hasVideo || hasFollower) {
+    const tags = [];
+    if (hasVideo) tags.push("有视频");
+    if (hasFollower) tags.push("有粉丝");
+    desc += ` + ${tags.join("、")}`;
+  }
   if (
     !window.confirm(`确认将毛料库中符合【${desc}】的任务恢复到 jobs 队列吗？`)
   ) {
@@ -1225,6 +1474,8 @@ async function restoreFilteredRawJobs() {
     const body = {};
     if (search) body.search = search;
     if (location) body.location = location;
+    if (hasVideo) body.hasVideo = true;
+    if (hasFollower) body.hasFollower = true;
     const res = await fetch("/api/raw-jobs/restore", {
       method: "POST",
       headers: { "Content-Type": "application/json" },