summaryrefslogtreecommitdiff
path: root/src/mailman/rules/moderation.py
diff options
context:
space:
mode:
authorAurélien Bompard2016-02-09 12:23:38 +0100
committerBarry Warsaw2016-03-31 18:29:27 -0400
commit71cfeda5fb51c49fd87b6d34e00221a3725b9ec0 (patch)
treed571db90e7010643ea7cca81ab91eaee89e0f378 /src/mailman/rules/moderation.py
parent011d278abcc25d417673f70a4eac0a8a78137d95 (diff)
downloadmailman-71cfeda5fb51c49fd87b6d34e00221a3725b9ec0.tar.gz
mailman-71cfeda5fb51c49fd87b6d34e00221a3725b9ec0.tar.zst
mailman-71cfeda5fb51c49fd87b6d34e00221a3725b9ec0.zip
Diffstat (limited to 'src/mailman/rules/moderation.py')
-rw-r--r--src/mailman/rules/moderation.py9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/mailman/rules/moderation.py b/src/mailman/rules/moderation.py
index fdecd1d5f..9c89cf0b2 100644
--- a/src/mailman/rules/moderation.py
+++ b/src/mailman/rules/moderation.py
@@ -42,8 +42,10 @@ class MemberModeration:
"""See `IRule`."""
for sender in msg.senders:
member = mlist.members.get_member(sender)
- action = (None if member is None
- else member.moderation_action)
+ if member is None:
+ return False
+ action = (member.moderation_action
+ or mlist.default_member_action)
if action is Action.defer:
# The regular moderation rules apply.
return False
@@ -112,7 +114,8 @@ class NonmemberModeration:
_record_action(msgdata, action, sender,
reason.format(action))
return True
- action = nonmember.moderation_action
+ action = (nonmember.moderation_action
+ or mlist.default_nonmember_action)
if action is Action.defer:
# The regular moderation rules apply.
return False