nodemailer/wildduck
1
1
Fork 0
mirror of https://github.com/nodemailer/wildduck.git synced 2025-10-05 03:14:48 +08:00
Code Issues Projects Releases Packages Wiki Activity

fixed spam score filtering

Browse source
This commit is contained in:
Andris Reinman 2018-12-29 12:56:06 +02:00
parent 05c79b680f
commit 56d82657c7
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
imap-core/lib/commands/append.js
View file

@ -128,8 +128,8 @@ module.exports = {
this._server.onAppend(path, flags, internaldate, raw, this.session, (err, success, info) => { this._server.onAppend(path, flags, internaldate, raw, this.session, (err, success, info) => {
Object.keys(info || {}).forEach(key => { Object.keys(info || {}).forEach(key => {
let vkey = '_' + key.replace(/[A-Z]+/g, c => '_' + c.toLowerCase()); let vkey = '_' + key.replace(/[A-Z]+/g, c => '_' + c.toLowerCase());
if (vkey === '_id') { if (['_id', '_status'].includes(vkey)) {
vkey = '_append_id'; vkey = '_append' + vkey;
} }
logdata[vkey] = info[key]; logdata[vkey] = info[key];
}); });

12
lib/filter-handler.js
View file

@ -248,28 +248,28 @@ class FilterHandler {
isSpam = false; isSpam = false;
filterActions.set('spam', false); filterActions.set('spam', false);
} else if (!filterActions.has('spam')) { } else if (!filterActions.has('spam')) {
let spamLevel; let spamScore;
switch (meta.spamAction) { switch (meta.spamAction) {
case 'reject': case 'reject':
spamLevel = 25; spamScore = 75;
break; break;
case 'rewrite subject': case 'rewrite subject':
case 'soft reject': case 'soft reject':
spamLevel = 50; spamScore = 50;
break; break;
case 'greylist': case 'greylist':
case 'add header': case 'add header':
spamLevel = 75; spamScore = 25;
break; break;
case 'no action': case 'no action':
default: default:
spamLevel = 100; spamScore = 0;
break; break;
} }
isSpam = userData.spamLevel >= spamLevel; isSpam = spamScore >= userData.spamLevel;
} }
if (isSpam && !filterActions.has('spam')) { if (isSpam && !filterActions.has('spam')) {