From 541ddfdfc3beb1345d75aaabd638c830ef4ed0e7 Mon Sep 17 00:00:00 2001 From: Amin Bandali Date: Mon, 26 Nov 2018 00:03:39 -0500 Subject: [PATCH 1/1] [rc/pigeonhole] update and slightly simplify the sieve rules a bit --- rc.org | 74 +++++++++++++++++++++++++++++++++------------------------- 1 file changed, 42 insertions(+), 32 deletions(-) diff --git a/rc.org b/rc.org index 7561980..e671f4e 100644 --- a/rc.org +++ b/rc.org @@ -2523,18 +2523,19 @@ prime_gpg_agent() #+end_src ** pigeonhole -*** gnu.sieve +*** amin.sieve :PROPERTIES: -:header-args+: :tangle ~/sieve/gnu.sieve :comments none +:header-args+: :tangle ~/mail/aminb.org/amin/sieve/amin.sieve :comments none :END: #+begin_src conf -require [ "regex", "variables", "fileinto", "envelope", "mailbox", "imap4flags", "include" ]; +require ["regex", "variables", "fileinto", "envelope", + "mailbox", "imap4flags", "include"]; +# webmasters if anyof ( - address :is "from" "webmasters@gnu.org", - address :is "from" "webmasters-comment@gnu.org") { - fileinto :create "webmasters"; + address :is "from" ["webmasters@gnu.org", "webmasters-comment@gnu.org"]) { + fileinto :create "gnu.webmasters"; stop; } @@ -2543,44 +2544,53 @@ include :personal "lists"; *** lists.sieve :PROPERTIES: -:header-args+: :tangle ~/sieve/lists.sieve :comments none +:header-args+: :tangle ~/mail/aminb.org/amin/sieve/lists.sieve :comments none :END: #+begin_src conf -require [ "regex", "variables", "fileinto", "envelope", "mailbox", "imap4flags", - "include" ]; +require ["regex", "variables", "fileinto", "envelope", + "mailbox", "imap4flags", "include"]; +# mailing lists if anyof ( - header :contains "list-id" "", - header :contains "list-id" "", - header :contains "list-id" "", - header :contains "list-id" "", - header :contains "list-id" "", - header :contains "list-id" "", - header :contains "list-id" "", - header :contains "list-id" "", - header :contains "list-id" "", - header :contains "list-id" "", - header :contains "list-id" "", - header :contains "list-id" "", - header :contains "list-id" "", - header :contains "list-id" "") { + header :contains "list-id" + [ "" + , "" + , "" + , "" + , "" + , "" + , "" + , "" + , "" + , "" + , "" + , "" + , "" + , "" + , "" + ] ) { if header :regex "list-id" "<([a-z_0-9-]+)[.@]" { set :lower "listname" "${1}"; - fileinto :create "l/${listname}"; + fileinto :create "gnu.${listname}"; + stop; } } +# sr.ht lists, with dots ('.') omitted if anyof ( - header :contains "list-id" "<~aminb/test-priv@lists.sr.ht>", - header :contains "list-id" "<~sircmpwn/sr.ht-admins@lists.sr.ht>", - header :contains "list-id" "<~sircmpwn/sr.ht-announce@lists.sr.ht>", - header :contains "list-id" "<~sircmpwn/sr.ht-dev@lists.sr.ht>", - header :contains "list-id" "<~sircmpwn/sr.ht-discuss@lists.sr.ht>") { - if header :regex "list-id" "(~[a-z_0-9-]+)/([a-z_0-9.-]+)@" { + header :contains "list-id" + [ "<~bandali/public-inbox@lists.sr.ht>" + , "<~sircmpwn/sr.ht-admins@lists.sr.ht>" + , "<~sircmpwn/sr.ht-announce@lists.sr.ht>" + , "<~sircmpwn/sr.ht-dev@lists.sr.ht>" + , "<~sircmpwn/sr.ht-discuss@lists.sr.ht>" + ] ) { + if header :regex "list-id" "(~[a-z_0-9-]+)/([^.]*)\\.?([^.]*)\\.?([^.]*)\\.?([^.]*)\\.?([^.]*)\\.?([^.]*)@" { set :lower "username" "${1}"; - set :lower "listname" "${2}"; - fileinto :create "l/${username}/${listname}"; + set :lower "listname" "${2}${3}${4}${5}${6}${7}"; + fileinto :create "gnu.${username}.${listname}"; + stop; } } #+end_src -- 2.20.1