merged :>
All checks were successful
fetch npm modules / f0ck the f0cker (push) Successful in 18s

This commit is contained in:
Flummi 2024-01-03 14:50:06 +01:00
parent f674fe2a40
commit 6c6f739110

View File

@ -36,16 +36,6 @@ export default async bot => {
if(!e.channel.includes("f0ck") && (!e.message.match(/\!f(0ck)?\b/i) && (typeof e.raw.forward_from == 'undefined')))
return false;
<<<<<<< Updated upstream
//if(e.type === 'tg' && !e.message.match(/\!f(0ck)?\b/i) && typeof e.raw.forward_from == 'undefined')
// return false;
if(e.type === 'tg' &&
!e.message.match(/\!f(0ck)?\b/i) &&
!e.raw.forward_date
) {
return false;
}
=======
if(e.type === 'tg' && // proto: tg
!e.message.match(/\!f(0ck)?\b/i) && // !f / !f0ck
!e.raw.forward_date && // is forwarded?
@ -56,7 +46,6 @@ export default async bot => {
else if(e.raw.media_group_id && e.message.match(/\!f(0ck)?\b/i)) {
mediagroupids.add(e.raw.media_group_id);
}
>>>>>>> Stashed changes
console.log(`parsing ${links.length} link${links.length > 1 ? "s" : ""}...`);