tt-help-cli-ycl 1.4.13 → 1.4.15

package/src/watch/data-store.js

@@ -50,6 +50,7 @@ import {
   getJobRow,
   getJobBaseRow,
   getJob,
+  getBulkAuthorLocations,
   getAllJobs,
   getVideoRow,
   getAllVideoRows,
@@ -96,6 +97,9 @@ import {
   rawQuery,
   normalizeTags,
   clearTags,
+  getProductiveRefreshTask,
+  claimRefreshTag,
+  reportRefreshResult,
 } from "./db-tags.js";
 
 // LLM 打分
@@ -391,6 +395,7 @@ function getTargetUsersByCountryFromDb(targetLocations = [], options = {}) {
         refresh_time,
         top_video_play_count,
         top_video_href,
+        top_video_is_ad,
         status,
         sources
       FROM jobs
@@ -490,6 +495,54 @@ function getTargetUsersByCountryFromDb(targetLocations = [], options = {}) {
   };
 }
 
+/**
+ * 查询已修改（modified_at IS NOT NULL）且 location_created 不在 targetLocations 中的目标商家，
+ * 按国家分组返回。
+ */
+function getModifiedTargetUsersOutsideLocations(targetLocations = []) {
+  if (!getDb()) return { countries: [], total: 0 };
+
+  const placeholders = targetLocations.map(() => "?").join(", ");
+  const rows = getDb()
+    .prepare(
+      `
+      SELECT unique_id, nickname, follower_count, video_count,
+             location_created, confirmed_location, modified_at, latest_video_time, refresh_time
+      FROM jobs
+      WHERE tt_seller = 1
+        AND verified = 0
+        AND modified_at IS NOT NULL
+        AND location_created IS NOT NULL
+        AND location_created NOT 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, { users: [], userCount: 0 });
+    }
+    const entry = countryMap.get(country);
+    entry.users.push(row);
+    entry.userCount++;
+  }
+
+  const countries = [];
+  for (const [country, entry] of countryMap) {
+    countries.push({
+      country,
+      count: entry.userCount,
+      users: entry.users,
+    });
+  }
+
+  return { total: rows.length, countries };
+}
+
 export function createStore(filePath, options = {}) {
   if (!filePath) {
     throw new Error("createStore requires an explicit .db path");
@@ -2292,6 +2345,7 @@ export function createStore(filePath, options = {}) {
       if (result.topRecentVideo && typeof result.topRecentVideo === "object") {
         user.topVideoPlayCount = result.topRecentVideo.playCount || null;
         user.topVideoHref = result.topRecentVideo.href || null;
+        user.topVideoIsAd = result.topRecentVideo.isAd ?? null;
       }
       user.sources = [...new Set([...(user.sources || []), "processed"])];
     }
@@ -2518,6 +2572,7 @@ export function createStore(filePath, options = {}) {
       if (result.topRecentVideo && typeof result.topRecentVideo === "object") {
         user.topVideoPlayCount = result.topRecentVideo.playCount || null;
         user.topVideoHref = result.topRecentVideo.href || null;
+        user.topVideoIsAd = result.topRecentVideo.isAd ?? null;
       }
       const newUsers = processDiscoveredUsers(result);
       const ret = updateJobInfo(uniqueId, user, false);
@@ -2543,6 +2598,7 @@ export function createStore(filePath, options = {}) {
     if (result.topRecentVideo && typeof result.topRecentVideo === "object") {
       user.topVideoPlayCount = result.topRecentVideo.playCount || null;
       user.topVideoHref = result.topRecentVideo.href || null;
+      user.topVideoIsAd = result.topRecentVideo.isAd ?? null;
     }
     const newUsers = processDiscoveredUsers(result);
     return { saved: true, newUsers };
@@ -3241,6 +3297,7 @@ export function createStore(filePath, options = {}) {
     getProcessedUsers,
     getAllUsers,
     getUserDbCount,
+    getBulkAuthorLocations,
     getJobsCount,
     getRawJobsCount,
     getPendingJobsCount,
@@ -3260,6 +3317,8 @@ export function createStore(filePath, options = {}) {
     getRawJobsPage: getRawJobsPageFromDb,
     getTargetUsers: getTargetUsersFromDb,
     getTargetUsersByCountry: getTargetUsersByCountryFromDb,
+    getModifiedTargetUsersOutsideLocations: (loc) =>
+      getModifiedTargetUsersOutsideLocations(loc),
     getStats,
     getStatusGroups,
     markGroupsDirty,
@@ -3310,6 +3369,9 @@ export function createStore(filePath, options = {}) {
     getTagStats,
     normalizeTags,
     clearTags,
+    getProductiveRefreshTask,
+    claimRefreshTag,
+    reportRefreshResult,
     data,
   };
 

package/src/watch/db-columns.js

@@ -48,6 +48,7 @@ export const JOB_EXT_COLUMNS = [
   "user_create_time",
   "top_video_play_count",
   "top_video_href",
+  "top_video_is_ad",
 ];
 
 // 完整的 jobs 列 = 核心列 + 扩展列
@@ -88,6 +89,7 @@ export const WRITABLE_JOB_COLUMNS = new Set([
   "latest_video_time",
   "top_video_play_count",
   "top_video_href",
+  "top_video_is_ad",
   "user_create_time",
 ]);
 

package/src/watch/db-crud.js

@@ -327,6 +327,34 @@ export function getJob(uniqueId) {
   return mapJobRow(getJobRow(uniqueId));
 }
 
+/**
+ * 批量查询作者的国家信息
+ * 从 jobs 和 jobs_base 表中查找已知的 location_created
+ * @param {string[]} uniqueIds
+ * @returns {Record<string, string>} { uniqueId: locationCreated }
+ */
+export function getBulkAuthorLocations(uniqueIds) {
+  const db = getDb();
+  if (!db || uniqueIds.length === 0) return {};
+  // SQLite 的 IN 子句不支持数组参数，动态构建占位符
+  const placeholders = uniqueIds.map(() => "?").join(",");
+  const sql = `
+    SELECT unique_id, location_created FROM jobs
+    WHERE unique_id IN (${placeholders}) AND location_created IS NOT NULL AND location_created != ''
+    UNION
+    SELECT unique_id, location_created FROM jobs_base
+    WHERE unique_id IN (${placeholders}) AND location_created IS NOT NULL AND location_created != ''
+  `;
+  const rows = db.prepare(sql).all(...uniqueIds, ...uniqueIds);
+  const result = {};
+  for (const r of rows) {
+    if (!result[r.unique_id]) {
+      result[r.unique_id] = r.location_created;
+    }
+  }
+  return result;
+}
+
 export function getAllJobs() {
   const db = getDb();
   if (!db) return [];

package/src/watch/db-schema.js

@@ -127,6 +127,7 @@ export function initDb(filePath) {
     bio_link: "TEXT",
     top_video_play_count: "INTEGER",
     top_video_href: "TEXT",
+    top_video_is_ad: "INTEGER",
     user_create_time: "INTEGER",
   });
 
@@ -280,6 +281,8 @@ export function initDb(filePath) {
     strategy: "TEXT",
     dead_reason: "TEXT",
     direction_id: "INTEGER",
+    refreshing: "INTEGER DEFAULT 0",
+    refreshed_at: "TEXT",
   });
 
   // ===== tag_directions 表（分层探索：通用词/分类/产品） =====

package/src/watch/db-tags.js

@@ -1234,3 +1234,98 @@ function getLang(country) {
   };
   return COUNTRY_LANG[country] || "en";
 }
+
+// ===== Tag 刷新 CRUD（productive 标签轮询重新抓取） =====
+
+/**
+ * 获取一个待刷新的 productive 标签（score > 70 且未被刷新锁定）
+ * 按 refreshed_at ASC 排序（最久未刷新的优先），NULL 排最前
+ */
+export function getProductiveRefreshTask() {
+  const db = getDb();
+  if (!db) return null;
+
+  // 先清理超时的 refreshing 锁（超过 30 分钟未释放）
+  db.prepare(
+    `UPDATE tags SET refreshing = 0 
+     WHERE refreshing = 1 AND refreshed_at IS NOT NULL 
+     AND refreshed_at < datetime('now', '-30 minutes')`,
+  ).run();
+
+  const row = db
+    .prepare(
+      `SELECT * FROM tags 
+       WHERE status = 'productive' AND score > 70 AND refreshing = 0 
+       ORDER BY refreshed_at IS NULL DESC, refreshed_at ASC 
+       LIMIT 1`,
+    )
+    .get();
+  return row ? parseTagRow(row) : null;
+}
+
+/**
+ * 锁定一个 productive 标签用于刷新（防并发冲突）
+ */
+export function claimRefreshTag(tag) {
+  const db = getDb();
+  if (!db) return { ok: false, error: "db not ready" };
+
+  const normalized = tag.replace(/^#+/, "").trim().toLowerCase();
+  if (!normalized || normalized.length < 2) {
+    return { ok: false, error: "invalid tag" };
+  }
+
+  // 同时尝试匹配带 # 和不带 # 的格式（兼容旧数据）
+  const result = db
+    .prepare(
+      `UPDATE tags SET refreshing = 1, refreshed_at = datetime('now') 
+       WHERE (tag = ? OR tag = ?) AND status = 'productive' AND score > 70 AND refreshing = 0`,
+    )
+    .run(normalized, `#${normalized}`);
+  if (result.changes === 0) {
+    const row = db
+      .prepare("SELECT status, refreshing FROM tags WHERE tag = ? OR tag = ?")
+      .get(normalized, `#${normalized}`);
+    if (!row) return { ok: false, error: "tag not found" };
+    if (row.refreshing) return { ok: false, error: "already being refreshed" };
+    return {
+      ok: false,
+      error: `tag status is ${row.status}, not eligible for refresh`,
+    };
+  }
+  return { ok: true, tag: normalized };
+}
+
+/**
+ * 报告刷新结果并解锁标签（不改变 score/status，只更新 refreshed_at 和 pushed_users）
+ */
+export function reportRefreshResult(tag, fields) {
+  const db = getDb();
+  if (!db) return { ok: false, error: "db not ready" };
+  const { pushedUsers, error } = fields;
+  const now = new Date().toISOString();
+  const normalized = tag.replace(/^#+/, "").trim().toLowerCase();
+
+  try {
+    const result = db
+      .prepare(
+        `UPDATE tags SET 
+          refreshing = 0, 
+          refreshed_at = ?,
+          pushed_users = COALESCE(pushed_users, 0) + COALESCE(?, 0),
+          last_error = COALESCE(?, last_error),
+          score_count = score_count + 1
+        WHERE tag = ? OR tag = ?`,
+      )
+      .run(
+        now,
+        pushedUsers ?? null,
+        error ?? null,
+        normalized,
+        `#${normalized}`,
+      );
+    return { ok: result.changes > 0, tag: normalized };
+  } catch (e) {
+    return { ok: false, error: e.message };
+  }
+}

package/src/watch/public/app.js

@@ -735,6 +735,9 @@ async function selectLocation(uniqueId, location) {
       userInMem.locationCreated = location;
       userInMem.modifiedAt = Date.now();
     }
+
+    // 刷新"其他国家"区域（修改后可能需要更新统计）
+    fetchTargetOtherCountries();
   } catch (e) {
     showToast("更新失败: " + e.message, true);
   } finally {
@@ -1023,6 +1026,30 @@ document.getElementById("statTargetCard").addEventListener("click", () => {
 window.addEventListener("hashchange", handleRoute);
 window.addEventListener("DOMContentLoaded", handleRoute);
 
+// 回顶部按钮：仅在 targetPage 激活时监听滚动
+window.addEventListener(
+  "scroll",
+  function () {
+    const btn = document.getElementById("backToTop");
+    if (!btn) return;
+    const targetPage = document.getElementById("targetPage");
+    if (!targetPage || !targetPage.classList.contains("active")) {
+      btn.classList.remove("visible");
+      return;
+    }
+    if (window.scrollY > 400) {
+      btn.classList.add("visible");
+    } else {
+      btn.classList.remove("visible");
+    }
+  },
+  { passive: true },
+);
+
+function scrollToTop() {
+  window.scrollTo({ top: 0, behavior: "smooth" });
+}
+
 function handleRoute() {
   const hash = window.location.hash;
   if (hash === "#pending") {
@@ -1410,18 +1437,20 @@ function renderTagsTable() {
       const created = t.created_at || "-";
       const score = t.score != null ? t.score.toFixed(1) : "-";
       const authorCount = t.author_count ?? "-";
-      const totalPosts = t.total_posts ?? "-";
       const matchedAuthors = t.matched_authors ?? "-";
       const pushedUsers = t.pushed_users ?? "-";
+      const refreshedAt = t.refreshed_at
+        ? t.refreshed_at.slice(0, 16).replace("T", " ")
+        : "-";
 
       return `<tr>
       <td style="color:#9ca3af;font-size:12px;text-align:center">${i + 1}</td>
       <td style="font-weight:600;color:#e0e0e0">#${escapeHtml(t.tag)}</td>
-      <td style="color:${t.score >= 5 ? "#22c55e" : t.score >= 3 ? "#facc15" : "#888"}">${score}</td>
-      <td>${authorCount}</td>
-      <td>${totalPosts}</td>
-      <td>${matchedAuthors}</td>
-      <td>${pushedUsers}</td>
+      <td style="text-align:center;color:${t.score >= 5 ? "#22c55e" : t.score >= 3 ? "#facc15" : "#888"}">${score}</td>
+      <td style="text-align:center">${authorCount}</td>
+      <td style="text-align:center;font-size:11px;color:#9ca3af">${refreshedAt}</td>
+      <td style="text-align:center">${matchedAuthors}</td>
+      <td style="text-align:center">${pushedUsers}</td>
       <td style="font-size:11px">${countries}</td>
       <td>${statusTag}</td>
       <td style="font-size:11px;color:#888">${source}</td>
@@ -1517,6 +1546,7 @@ function showTargetPage() {
   document.getElementById("tagsPage").classList.remove("active");
   showLoading("正在加载目标商家数据...");
   fetchTargetByCountry();
+  fetchTargetOtherCountries();
   // 同步统计
   if (currentStats) {
     document.getElementById("targetPageStatTotal").textContent = formatStatNum(
@@ -1535,6 +1565,44 @@ let currentTargetSeq = 0;
 let currentTargetSort = { key: null, asc: true };
 const TARGET_PAGE_SIZE = 200;
 
+async function fetchTargetOtherCountries() {
+  try {
+    const res = await fetch("/api/target-users-other-countries");
+    const data = await res.json();
+    renderTargetOtherCountries(data.countries || []);
+  } catch (e) {
+    console.error("获取其他国家数据失败:", e);
+  }
+}
+
+function renderTargetOtherCountries(countries) {
+  const section = document.getElementById("targetOtherSection");
+  const grid = document.getElementById("targetOtherGrid");
+  if (!section || !grid) return;
+
+  if (!countries.length) {
+    section.style.display = "none";
+    return;
+  }
+  section.style.display = "block";
+  const total = countries.reduce((sum, c) => sum + (c.count || 0), 0);
+  grid.innerHTML = countries
+    .map((c) => {
+      const cnt = c.count || 0;
+      const pct = total > 0 ? ((cnt / total) * 100).toFixed(1) : "0.0";
+      const safeCountry = escapeJsString(c.country);
+      const sel = currentTargetLocation === c.country ? " selected" : "";
+      return `
+      <div class="pending-country-item other-country-item${sel}"
+           onclick="filterTargetByCountry('${safeCountry}')">
+        <div class="country-name">${c.country}</div>
+        <div class="country-count">${cnt}</div>
+        <div class="country-label">${pct}%</div>
+      </div>`;
+    })
+    .join("");
+}
+
 async function fetchTargetByCountry() {
   try {
     const res = await fetch("/api/target-users-by-country?summary=1");
@@ -1712,9 +1780,12 @@ function renderTargetTable() {
         u.topVideoPlayCount != null && u.topVideoPlayCount >= 1000
           ? formatNum(u.topVideoPlayCount)
           : "-";
+      const adTag = u.topVideoIsAd
+        ? ' <span style="color:red">(AD)</span>'
+        : "";
       const topPlayCountCell = u.topVideoHref
-        ? `<td data-label="最大播放量" style="font-size:11px;color:#888"><a href="${u.topVideoHref}" target="_blank" style="color:#3b82f6;text-decoration:none" title="点击查看视频">${topPlayCount}</a></td>`
-        : `<td data-label="最大播放量" style="font-size:11px;color:#888">${topPlayCount}</td>`;
+        ? `<td data-label="最大播放量" style="font-size:11px;color:#888"><a href="${u.topVideoHref}" target="_blank" style="color:#3b82f6;text-decoration:none" title="点击查看视频">${topPlayCount}${adTag}</a></td>`
+        : `<td data-label="最大播放量" style="font-size:11px;color:#888">${topPlayCount}${adTag}</td>`;
 
       const editIcon = ' <span style="font-size:10px;opacity:0.5">✏️</span>';
       const locationCell = u.modifiedAt
@@ -1782,13 +1853,9 @@ function filterTargetByCountry(country) {
 }
 
 function clearTargetFilters() {
-  currentTargetLocation = "";
+  // 只清空搜索关键词，保留当前选中的国家筛选
   const searchInput = document.getElementById("targetSearchInput");
-  const locationFilter = document.getElementById("targetLocationFilter");
   if (searchInput) searchInput.value = "";
-  if (locationFilter) locationFilter.value = "";
-  const btn = document.getElementById("targetReprocessBtn");
-  if (btn) btn.style.display = "none";
   if (currentTargetSummary) {
     renderTargetCountryGrid(currentTargetSummary.countries || []);
     loadTargetUsersPage();

package/src/watch/public/index.html

@@ -328,6 +328,11 @@
           <span style="color:#666;font-size:12px">加载中...</span>
         </div>
         <div class="muted-tip">点击国家卡片可筛选列表。</div>
+        <div class="target-other-section" id="targetOtherSection" style="display:none">
+          <h3 style="color:#f59e0b;margin-top:20px;margin-bottom:12px">🌍 其他国家 (已修改)</h3>
+          <div class="pending-country-grid" id="targetOtherGrid"></div>
+          <div class="muted-tip">这些商家已被手动修改到非目标国家。</div>
+        </div>
       </div>
       <div class="target-table-card">
         <h3>目标商家列表</h3>
@@ -361,6 +366,7 @@
         </div>
       </div>
     </div>
+    <div id="backToTop" title="回到顶部" onclick="scrollToTop()">↑</div>
   </div>
   <div id="tagsPage">
     <div class="stats" style="margin-bottom:16px">
@@ -415,7 +421,7 @@
                 <th style="min-width:120px">关键词</th>
                 <th class="sortable-tag" data-sort="score">评分 <span class="sort-icon">↕</span></th>
                 <th class="sortable-tag" data-sort="author_count">作者数 <span class="sort-icon">↕</span></th>
-                <th class="sortable-tag" data-sort="total_posts">帖子数 <span class="sort-icon">↕</span></th>
+                <th class="sortable-tag" data-sort="refreshed_at">最近刷新 <span class="sort-icon">↕</span></th>
                 <th class="sortable-tag" data-sort="matched_authors">匹配作者 <span class="sort-icon">↕</span></th>
                 <th class="sortable-tag" data-sort="pushed_users">推送用户 <span class="sort-icon">↕</span></th>
                 <th>国家</th>

package/src/watch/public/style.css

@@ -839,6 +839,36 @@ td.user-id:hover {
   display: block;
 }
 
+#backToTop {
+  position: fixed;
+  bottom: 32px;
+  right: 32px;
+  width: 44px;
+  height: 44px;
+  border-radius: 50%;
+  background: rgba(254, 44, 85, 0.85);
+  color: #fff;
+  font-size: 20px;
+  display: none;
+  align-items: center;
+  justify-content: center;
+  cursor: pointer;
+  z-index: 999;
+  box-shadow: 0 4px 16px rgba(254, 44, 85, 0.35);
+  transition: opacity 0.25s, transform 0.25s, background 0.2s;
+  user-select: none;
+}
+
+#backToTop:hover {
+  background: #e61944;
+  transform: translateY(-2px);
+  box-shadow: 0 6px 20px rgba(254, 44, 85, 0.5);
+}
+
+#backToTop.visible {
+  display: flex;
+}
+
 #mainPage.hidden {
   display: none;
 }
@@ -1004,6 +1034,19 @@ td.user-id:hover {
   color: #ddd6fe;
 }
 
+.other-country-item {
+  border-color: #f59e0b;
+}
+
+.other-country-item .country-name {
+  color: #f59e0b;
+}
+
+.other-country-item:hover {
+  border-color: #fbbf24;
+  background: #3a3520;
+}
+
 .back-btn {
   padding: 6px 14px;
   border: 1px solid #333;