From 6bd19f91b98517af02a3dae766d49c1610967815 Mon Sep 17 00:00:00 2001 From: "jimpop@template.hostname" <> Date: Wed, 4 Nov 2015 21:09:42 +0000 Subject: Auto-Moderate Verbose Members --- Mailman/Handlers/SpamDetect.py | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'Mailman/Handlers/SpamDetect.py') diff --git a/Mailman/Handlers/SpamDetect.py b/Mailman/Handlers/SpamDetect.py index d85cc6a6..6c10bb65 100644 --- a/Mailman/Handlers/SpamDetect.py +++ b/Mailman/Handlers/SpamDetect.py @@ -122,6 +122,12 @@ error, contact the mailing list owner at %(listowner)s.""")) raise Errors.RejectMessage, text elif mlist.dmarc_moderation_action == 4: raise Errors.DiscardMessage + + if Utils.IsVerboseMember(mlist, addr): + mlist.setMemberOption(addr, mm_cfg.Moderate, 1) + syslog('vette', '%s: Automatically Moderated %s for verbose postings.', + mlist.real_name, addr) + if msgdata.get('approved'): return # First do site hard coded header spam checks @@ -169,3 +175,5 @@ error, contact the mailing list owner at %(listowner)s.""")) hold_for_approval(mlist, msg, msgdata, HeaderMatchHold) if action == mm_cfg.ACCEPT: return + + -- cgit v1.2.3 From b8811f8fc2d9bd27d1963c000ddaf05d951b5bda Mon Sep 17 00:00:00 2001 From: "jimpop@template.hostname" <> Date: Wed, 4 Nov 2015 22:49:05 +0000 Subject: Improvements based on feedback from Mark Sapiro https://code.launchpad.net/~jimpop/mailman/mailman-auto-mod-verbose-members/+merge/276706/comments/699744 --- Mailman/Handlers/SpamDetect.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Mailman/Handlers/SpamDetect.py') diff --git a/Mailman/Handlers/SpamDetect.py b/Mailman/Handlers/SpamDetect.py index 6c10bb65..509e1e6e 100644 --- a/Mailman/Handlers/SpamDetect.py +++ b/Mailman/Handlers/SpamDetect.py @@ -123,7 +123,7 @@ error, contact the mailing list owner at %(listowner)s.""")) elif mlist.dmarc_moderation_action == 4: raise Errors.DiscardMessage - if Utils.IsVerboseMember(mlist, addr): + if mlist.member_verbosity_threshold > 0 and Utils.IsVerboseMember(mlist, addr): mlist.setMemberOption(addr, mm_cfg.Moderate, 1) syslog('vette', '%s: Automatically Moderated %s for verbose postings.', mlist.real_name, addr) -- cgit v1.2.3