diff --git a/lib/core/monitor.js b/lib/core/monitor.js index bc83531..1dd2ee6 100644 --- a/lib/core/monitor.js +++ b/lib/core/monitor.js @@ -266,7 +266,7 @@ class Monitor extends Searcher { log.info('筛选动态', `去重后(${protoLotteryInfo.length})`); /**并发查询dyid */ - if (check_if_duplicated === 1 || check_if_duplicated === 2) { + if (check_if_duplicated >= 1) { await Promise.all( [...dyids_map.keys()] .map(it => d_storage @@ -315,8 +315,8 @@ class Monitor extends Searcher { } else { /* 遇到转发过就退出 */ if ( - ((!check_if_duplicated || check_if_duplicated === 2) && is_liked) - || ((check_if_duplicated === 1 || check_if_duplicated === 2) && dyids_map.get(dyid)) + ((!check_if_duplicated || check_if_duplicated >= 2) && is_liked) + || ((check_if_duplicated >= 1) && dyids_map.get(dyid)) ) { log.info("筛选动态", `已转发(https://t.bilibili.com/${dyid})`) return false @@ -592,7 +592,7 @@ class Monitor extends Searcher { } /* 点赞 */ - if (!check_if_duplicated) { + if (!check_if_duplicated || check_if_duplicated === 3) { status = await retryfn( 5, [1, 2, 3], diff --git a/lib/core/searcher.js b/lib/core/searcher.js index 1d34b7a..cffffe6 100644 --- a/lib/core/searcher.js +++ b/lib/core/searcher.js @@ -271,7 +271,7 @@ class Searcher { { origin_dynamic_id } = cur, is_liked = false; - if (!check_if_duplicated || check_if_duplicated === 2) { + if (!check_if_duplicated || check_if_duplicated >= 2) { const card = await bili.getOneDynamicByDyid(origin_dynamic_id) log.info('获取动态', `查看源动态(${origin_dynamic_id})是否点赞 (${length--})`) if (card) { @@ -404,9 +404,9 @@ class Searcher { , { is_liked } = parsed_card; if ( - ((!check_if_duplicated || check_if_duplicated === 2) + ((!check_if_duplicated || check_if_duplicated >= 2) && is_liked) - || ((check_if_duplicated === 1 || check_if_duplicated === 2) + || ((check_if_duplicated >= 1) && await d_storage.searchDyid(dyid)) ) { log.info('获取动态', `动态(${dyid})已转发过`) @@ -479,7 +479,7 @@ class Searcher { let results = await pre , { dyid } = cur; - if (!check_if_duplicated || check_if_duplicated === 2) { + if (!check_if_duplicated || check_if_duplicated >= 2) { log.info('获取动态', `查看动态(${dyid})是否点赞 (${length--})`) const card = await bili.getOneDynamicByDyid(dyid) diff --git a/lib/data/config.js b/lib/data/config.js index 85b3468..261d9cb 100644 --- a/lib/data/config.js +++ b/lib/data/config.js @@ -74,12 +74,14 @@ const config = { */ disable_reserve_lottery: false, + /** * 检查是否重复转发 * - 不检查 -1 - * - 通过是否点赞判断 0 + * - 通过是否点赞判断(自动点赞) 0 * - 检索本地dyids文件 1 - * - 通过是否点赞判断+检索本地dyids文件 2 + * - 通过是否点赞判断(不自动点赞)+检索本地dyids文件 2 + * - 通过是否点赞判断(自动点赞)+检索本地dyids文件 3 */ check_if_duplicated: 1, diff --git a/my_config.example.js b/my_config.example.js index 7a038f6..2b4f7b8 100644 --- a/my_config.example.js +++ b/my_config.example.js @@ -92,9 +92,10 @@ module.exports = Object.freeze({ /** * 检查是否重复转发 * - 不检查 -1 - * - 通过是否点赞判断 0 + * - 通过是否点赞判断(自动点赞) 0 * - 检索本地dyids文件 1 - * - 通过是否点赞判断+检索本地dyids文件 2 + * - 通过是否点赞判断(不自动点赞)+检索本地dyids文件 2 + * - 通过是否点赞判断(自动点赞)+检索本地dyids文件 3 */ check_if_duplicated: 1,