diff --git a/lib/core/monitor.js b/lib/core/monitor.js index fe9cf91..520df8c 100644 --- a/lib/core/monitor.js +++ b/lib/core/monitor.js @@ -279,7 +279,7 @@ class Monitor extends Searcher { || (hasOfficialLottery && chatmodel[0] === '1') || (!hasOfficialLottery && chatmodel[1] === '1'); - log.debug("筛选动态", { real_uid, mIsFollowed, oriIsFollowed, realIsFollowed, needAt, needTopic, isRelayDynamic, isTwoLevelDynamic, key_words, has_key_words, isBlock, isLottery, isSendChat }) + log.debug("筛选动态", { real_uid, mIsFollowed, oriIsFollowed, realIsFollowed, needAt, needTopic, isRelayDynamic, isTwoLevelDynamic, key_words, has_key_words, blockword, isBlock, isLottery, isSendChat }) /**屏蔽词 */ if (isBlock) { @@ -304,7 +304,7 @@ class Monitor extends Searcher { : blacklist; if ((new RegExp(dyid + '|' + m_uid + '|' + ori_uid)).test(new_blacklist)) { - log.info("筛选动态", `黑名单用户(https://t.bilibili.com/${dyid})`) + log.info("筛选动态", `公共黑名单用户(https://t.bilibili.com/${dyid})`) return false } diff --git a/lib/core/searcher.js b/lib/core/searcher.js index 2ac3f98..6c79615 100644 --- a/lib/core/searcher.js +++ b/lib/core/searcher.js @@ -75,7 +75,10 @@ function parseDynamicCard(dynamic_detail_card) { /* 是否有官方抽奖 */ obj.hasOfficialLottery = extension && extension.lott && true; /* 转发者的描述 后两个分别是视频动态的描述和视频本身的描述*/ - obj.description = (item && (item.content || item.description || cardToJson.dynamic || cardToJson.desc)) || ''; + obj.description = + (item && (item.content + item.description)) + || (cardToJson.dynamic + cardToJson.desc) + || ''; if (obj.type === 1) { const { origin_extension, origin } = cardToJson , originToJson = strToJson(origin) @@ -93,7 +96,10 @@ function parseDynamicCard(dynamic_detail_card) { /* 被转发者的name */ obj.origin_uname = (user && (user.name || user.uname)) || ''; /* 被转发者的描述 */ - obj.origin_description = (item && (item.content || item.description || originToJson.dynamic || originToJson.desc)) || ''; + obj.origin_description = + (item && (item.content + item.description)) + || (originToJson.dynamic + originToJson.desc) + || ''; } return obj