luzifer/automail
1
0
Fork 0
mirror of https://github.com/Luzifer/automail.git synced 2024-12-20 13:01:20 +00:00
Code Issues Releases Wiki Activity

Fix: Use AND matching for match-rules

Browse source 
Signed-off-by: Knut Ahlers <knut@ahlers.me>
This commit is contained in:
Knut Ahlers 2020-06-29 14:06:03 +02:00
parent 96fa816a2d
commit 405a022a97
Signed by: luzifer
GPG key ID: DC2729FDD34BE99E
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
handler.go
View file

@ -21,12 +21,20 @@ type mailHandler struct {
} }
func (m mailHandler) Handles(msg *enmime.Envelope) bool { func (m mailHandler) Handles(msg *enmime.Envelope) bool {
if len(m.Match) == 0 {
// No matcher available: Should not match anything
return false
}
// Do an AND matching: As soon as one matcher fails the whole match fails
for _, ma := range m.Match { for _, ma := range m.Match {
if ma.Match(msg) { if !ma.Match(msg) {
return true return false
} }
} }
return false
// None has failed: It matches
return true
} }
func (m mailHandler) Process(imapClient *client.Client, msg *imap.Message, envelope *enmime.Envelope) error { func (m mailHandler) Process(imapClient *client.Client, msg *imap.Message, envelope *enmime.Envelope) error {