mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Added no/multi from header condition

This commit is contained in:
M66B 2021-12-17 17:35:13 +01:00
parent 29afe62fca
commit f714cdc218
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
FAQ.md
View File

@ -2407,7 +2407,7 @@ $$flagged$
$$deleted$
```
To match *passed* message checks via a header condition (since version 1.1787):
To match *passed* message checks via a header condition (since version 1.1787; no/multi-from since version 1.1791):
```
$$dkim$
@ -2416,6 +2416,8 @@ $$dmarc$
$$mx$
$$blocklist$
$$replydomain$
$$nofrom$
$$multifrom$
```
Note that *regex* should be disable and that there should be no white space.

6
app/src/main/java/eu/faircode/email/EntityRule.java
View File

@ -283,6 +283,12 @@ public class EntityRule {
} else if ("$replydomain".equals(keyword)) {
if (!Boolean.TRUE.equals(message.reply_domain))
return false;
} else if ("$nofrom".equals(keyword)) {
if (message.from != null && message.from.length > 0)
return false;
} else if ("$multifrom".equals(keyword)) {
if (message.from == null || message.from.length < 2)
return false;
} else {
List<String> keywords = new ArrayList<>();
keywords.addAll(Arrays.asList(message.keywords));