X-Git-Url: https://git.madduck.net/etc/mailfilter.git/blobdiff_plain/bd01be7c73f0cb65d39bee92874a8d1b2957c852..29eaf6d1140ab9365c64b7edead45e6ac89eaa0d:/procmail/defines

diff --git a/procmail/defines b/procmail/defines
index c38adab..af431c1 100644
--- a/procmail/defines
+++ b/procmail/defines
@@ -36,9 +36,6 @@ TRAINER="$NICE $MAILFILT/bin/train"
 
 SQLITE="$NICE /usr/bin/sqlite3"
 
-OURDATE="`date -R`"
-OURDATE_SHORT=`date +%Y.%m.%d.%H.%M.%N`
-
 BASE=$HOME/.maildir
 
 #DEFAULT="|$DELIVER"
@@ -76,11 +73,25 @@ RE_EXTRACT_HEADER_VALUE="$RE_SPACE*\/$RE_NOT_SPACE.*"
 DEJAVU_HEADER=X-Deja-Vu
 
 NULL=/dev/null
-DELAY_QUEUE=$BASE/.delay/
+DELAYED_QUEUE=$BASE/.delayed/
 TICKLER_QUEUE=$BASE/.tickler/
 DISCARD=$BASE/.discard/
 #DISCARD="'|$DELIVER -m BASE.discard'"
 
+OURDATE="`date +'%s %Y.%m.%d.%H.%M.%N %a, %d %b %Y %T %z'`"
+:0
+*$ OURDATE ?? ^\/${RE_NOT_SPACE}+
+{ OURDATE_TS="$MATCH" }
+:0
+*$ OURDATE ?? ^[0-9]+${RE_SPACE}+\/${RE_NOT_SPACE}+
+{ OURDATE_SHORT="$MATCH" }
+:0
+*$ OURDATE ?? ^[0-9]+${RE_SPACE}+[0-9.]+${RE_SPACE}+\/${RE_NOT_SPACE}+
+{ OURDATE="$MATCH" }
+
+DELAY_NEXT_WEEKEND='next monday 54 hours ago' # fri night, 18:00 CET
+DELAY_TONIGHT='tomorrow 00:00 6 hours ago' # tonight at 18:00 CET
+
 ### variables from the message
 
 ### local recipient data
@@ -125,6 +136,18 @@ INCLUDERC=$PMDIR/get-msgid
 :0 E
 { LOG="NO ORIGINAL_TO: $MSGID" }
 
+:0
+*$ ^X-Trained-As:$RE_EXTRACT_HEADER_VALUE
+{ TRAINED_AS="$MATCH" }
+
+:0
+*$ ^X-Tickle-Delivered:$RE_EXTRACT_HEADER_VALUE
+{ TICKLE_DELIVERED="$MATCH" }
+
+:0
+*$ ^X-Delayed:$RE_EXTRACT_HEADER_VALUE
+{ DELAYED="$MATCH" }
+
 # fix variable values for special cases
 INCLUDERC=$PMDIR/normalise
 
@@ -185,7 +208,3 @@ RETRAIN
 # JUSTME
 # if set, contains reason why justme message was passed
 JUSTME
-
-# TRAINED_AS
-# if set, contains category with which this message has just been trained
-TRAINED_AS