From 351155d94417bdade7e6cbaff0b04f430566067a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9lestin=20Matte?= Date: Thu, 18 Dec 2025 12:04:08 +0100 Subject: [PATCH 3/3] mail handler: don't send email to users with nomail set --- lib/handlers/mailhandler.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/handlers/mailhandler.py b/lib/handlers/mailhandler.py index 71a7d4e..c248871 100644 --- a/lib/handlers/mailhandler.py +++ b/lib/handlers/mailhandler.py @@ -866,7 +866,7 @@ ORDER BY 1""", 'Mail to list {0} delivered to {1} tags ({2})'.format(self.mlist.name, len(self.tags), ",".join(self.tagnames)), self.messageid) - curs.execute("INSERT INTO outgoing_recipients (outgoing_id, subscriberaddress_id, recipient_headers) SELECT %(outid)s, subscriberaddress_id, CASE WHEN l.disable_list_headers THEN '' ELSE recipient_list_headers(%(webroot)s, %(listid)s, token) END FROM mailinglist_subscribers s INNER JOIN lists_list l ON l.id=s.listid WHERE listid=%(listid)s {0} AND NOT (COALESCE(eliminatecc, false) AND email=ANY(%(cclist)s)) ORDER BY split_part(email, '@', 2)".format(qextra), params) + curs.execute("INSERT INTO outgoing_recipients (outgoing_id, subscriberaddress_id, recipient_headers) SELECT %(outid)s, subscriberaddress_id, CASE WHEN l.disable_list_headers THEN '' ELSE recipient_list_headers(%(webroot)s, %(listid)s, token) END FROM mailinglist_subscribers s INNER JOIN lists_list l ON l.id=s.listid WHERE listid=%(listid)s {0} AND NOT (COALESCE(eliminatecc, false) AND email=ANY(%(cclist)s)) AND not nomail ORDER BY split_part(email, '@', 2)".format(qextra), params) recipientcount = curs.rowcount curs.execute("NOTIFY outgoing") -- 2.52.0