mirror of
https://github.com/shanmiteko/LotteryAutoScript.git
synced 2026-06-12 21:03:13 +08:00
fix: 二级转发带有效抽奖
This commit is contained in:
parent
8de74537f7
commit
094e019063
@ -263,23 +263,22 @@ class Monitor extends Searcher {
|
|||||||
[real_uid, realIsFollowed] = lottery_info_type === 'uid'
|
[real_uid, realIsFollowed] = lottery_info_type === 'uid'
|
||||||
? [ori_uid, oriIsFollowed]
|
? [ori_uid, oriIsFollowed]
|
||||||
: [m_uid, mIsFollowed],
|
: [m_uid, mIsFollowed],
|
||||||
description = typeof des === 'string' ? des : '',
|
description = des.split(/\/\/@.*?:/)[0],
|
||||||
needAt = /(?:@|艾特)[^@|(艾特)]*?好友/.test(description),
|
needAt = /(?:@|艾特)[^@|(艾特)]*?好友/.test(description),
|
||||||
needTopic = [...new Set(description.match(/(?<=[带加上](?:话题|tag).*)#.+?#|(?<=[带加上])#.+?#(?=话题|tag)/ig) || [])].join(' '),
|
needTopic = [...new Set(description.match(/(?<=[带加上](?:话题|tag).*)#.+?#|(?<=[带加上])#.+?#(?=话题|tag)/ig) || [])].join(' '),
|
||||||
isRelayDynamic = type === 1,
|
isRelayDynamic = type === 1,
|
||||||
isTwoLevelDynamic = /\/\/@/.test(description),
|
|
||||||
has_key_words = key_words.every(it => new RegExp(it).test(description)),
|
has_key_words = key_words.every(it => new RegExp(it).test(description)),
|
||||||
isBlock = new RegExp(blockword.join('|')).test(description),
|
isBlock = new RegExp(blockword.join('|')).test(description),
|
||||||
isLottery =
|
isLottery =
|
||||||
(is_imitator && lottery_info_type === 'uid' && model !== '00')
|
(is_imitator && lottery_info_type === 'uid' && model !== '00')
|
||||||
|| (hasOfficialLottery && model[0] === '1')
|
|| (hasOfficialLottery && model[0] === '1')
|
||||||
|| (!hasOfficialLottery && model[1] === '1' && !isTwoLevelDynamic && has_key_words),
|
|| (!hasOfficialLottery && model[1] === '1' && has_key_words),
|
||||||
isSendChat =
|
isSendChat =
|
||||||
(is_imitator && lottery_info_type === 'uid' && chatmodel !== '00')
|
(is_imitator && lottery_info_type === 'uid' && chatmodel !== '00')
|
||||||
|| (hasOfficialLottery && chatmodel[0] === '1')
|
|| (hasOfficialLottery && chatmodel[0] === '1')
|
||||||
|| (!hasOfficialLottery && chatmodel[1] === '1');
|
|| (!hasOfficialLottery && chatmodel[1] === '1');
|
||||||
|
|
||||||
log.debug("筛选动态", { real_uid, mIsFollowed, oriIsFollowed, realIsFollowed, needAt, needTopic, isRelayDynamic, isTwoLevelDynamic, key_words, has_key_words, blockword, isBlock, isLottery, isSendChat })
|
log.debug("筛选动态", { real_uid, mIsFollowed, oriIsFollowed, realIsFollowed, needAt, needTopic, isRelayDynamic, key_words, has_key_words, blockword, isBlock, isLottery, isSendChat })
|
||||||
|
|
||||||
/**屏蔽词 */
|
/**屏蔽词 */
|
||||||
if (isBlock) {
|
if (isBlock) {
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user