@twikoojs/edgeone-makers 2.0.12 → 2.0.13

package/dist/cloud-functions/index.js

@@ -43,7 +43,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __require = /* #__PURE__ */ (() => createRequire(import.meta.url))();
 //#endregion
 //#region ../shared/dist/index.mjs
-/*! @twikoojs/shared v2.0.12 */
+/*! @twikoojs/shared v2.0.13 */
 /**
 * Twikoo 统一版本号常量（构建期占位符）。
 *
@@ -56,7 +56,7 @@ var __require = /* #__PURE__ */ (() => createRequire(import.meta.url))();
 * 占位符字面量由 `@twikoojs/tsdown-config` 的 `VERSION_PLACEHOLDER` 常量定义，
 * 客户端与服务端统一读取本常量，避免版本号在多包之间手工同步。
 */
-const VERSION = "2.0.12";
+const VERSION = "2.0.13";
 /**
 * 后端事件名常量（Scope E：24 个客户端事件 + 1 个服务端内部事件）。
 *
@@ -25659,33 +25659,26 @@ function commentMatchesKeyword(comment, keyword, options = {}) {
 }
 /**
 * 可见性语义展开（1.x getCommentQuery 的 $or 服务层等价形态）：
-* 管理员（未开 HIDE_SPAM）全可见；否则「非垃圾 ∪ 本人评论」双查合并去重。
+* 管理员（未开 HIDE_SPAM）全可见；否则「非垃圾 + 本人垃圾」双查合并，两组互斥。
 * @param db 数据库
 * @param condition 基础条件
 * @param uid 当前用户
 * @param isAdminUser 是否管理员
 * @param config 全量配置
-* @param options 查询选项（sort/limit 透传主查）
-* @returns 合并去重后的评论
+* @param options 查询选项（排序和读取上限同时应用于两个分支）
+* @returns 合并后的评论
 */
 async function queryVisibleComments(db, condition, uid, isAdminUser, config, options) {
 	if (isAdminUser && config.HIDE_SPAM !== "true") return db.getComments(condition, options);
-	const [notSpam, mine] = await Promise.all([db.getComments({
+	const [notSpam, mySpam] = await Promise.all([db.getComments({
 		...condition,
 		isSpam: { [NOT]: true }
 	}, options), db.getComments({
 		...condition,
-		uid
-	})]);
-	const seen = /* @__PURE__ */ new Set();
-	const merged = [];
-	for (const doc of [...notSpam, ...mine]) {
-		const id = String(doc._id);
-		if (!seen.has(id)) {
-			seen.add(id);
-			merged.push(doc);
-		}
-	}
+		uid,
+		isSpam: true
+	}, options)]);
+	const merged = [...notSpam, ...mySpam];
 	if (options?.sort) {
 		const entries = Object.entries(options.sort);
 		merged.sort((a, b) => {
@@ -25786,7 +25779,7 @@ const commentGet = async (ctx) => {
 	};
 };
 /**
-* 可见性计数（1.x count 的 $or 语义：取回命中 id 精确去重后计数）。
+* 可见性计数：非垃圾 + 本人垃圾，两组互斥，避免读取完整文档去重。
 * @param ctx 请求上下文
 * @param condition 基础条件
 * @returns 可见条数
@@ -25794,16 +25787,15 @@ const commentGet = async (ctx) => {
 async function queryVisibleCount(ctx, condition) {
 	const db = ctx.adapters.database;
 	if (isAdmin(ctx.config, ctx.accessToken) && ctx.config.HIDE_SPAM !== "true") return db.countComments(condition);
-	const [a, b] = await Promise.all([db.getComments({
+	const [notSpam, mySpam] = await Promise.all([db.countComments({
 		...condition,
 		isSpam: { [NOT]: true }
-	}), db.getComments({
+	}), db.countComments({
 		...condition,
-		uid: ctx.accessToken
+		uid: ctx.accessToken,
+		isSpam: true
 	})]);
-	const seen = /* @__PURE__ */ new Set();
-	for (const doc of [...a, ...b]) seen.add(String(doc._id));
-	return seen.size;
+	return notSpam + mySpam;
 }
 /**
 * COMMENT_GET_FOR_ADMIN 事件处理器（1.x commentGetForAdmin + getCommentSearchCondition

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@twikoojs/edgeone-makers",
-  "version": "2.0.12",
+  "version": "2.0.13",
   "description": "Twikoo comment system backend for Tencent EdgeOne Makers",
   "license": "MIT",
   "repository": {
@@ -21,14 +21,14 @@
   "dependencies": {
     "@cap.js/server": "^4.0.5",
     "@edgeone/pages-blob": "latest",
-    "@twikoojs/common": "2.0.12",
-    "@twikoojs/shared": "2.0.12",
+    "@twikoojs/common": "2.0.13",
+    "@twikoojs/shared": "2.0.13",
     "bowser": "^2.14.1",
     "form-data": "^4.0.6",
     "html-to-text": "^10.0.1",
     "marked": "^18.0.13",
     "pako": "^3.0.2",
-    "pushoo": "^2.0.12",
+    "pushoo": "^2.0.13",
     "xml2js": "^0.6.2"
   },
   "devDependencies": {