X-Git-Url: https://git.madduck.net/etc/mailfilter.git/blobdiff_plain/bfbb91fbfd5ab6d4e3321fa01db21a5bd96be303..9ad2d49ba3ef23f08fa59de55fb2dd4a869567c2:/procmail/delay-delivery

diff --git a/procmail/delay-delivery b/procmail/delay-delivery
index 6a4717c..cf4837d 100644
--- a/procmail/delay-delivery
+++ b/procmail/delay-delivery
@@ -15,10 +15,20 @@
 }
 
 :0 E
-* DELAY ?? .
+* ! TICKLE ?? .
+* ? echo "$FROMEMAIL" | $EGREP -qif $CONF/undelayed-senders
 {
-  #TODO: for tickling, use header date
-  RELEASE="`$BIN_DATE -d \"$DELAY\" +'%s %c'`"
+  LOG="delay:       do not delay mail from $SENDER$NL"
+}
+
+:0 E
+* 1^0 DELAY ?? .
+* 1^0 RELEASE ?? .
+{
+  :0
+  * ! RELEASE ?? .
+  { RELEASE="`$BIN_DATE -d \"$DELAY\" +'%s (%c)'`" }
+  DELAY
 
   :0
   *$ RELEASE ?? ^\/${RE_NOT_SPACE}+
@@ -29,16 +39,18 @@
   *$ -$OURDATE_TS ^0
   {
     :0
-    *$ RELEASE ?? ^[0-9]+${RE_SPACE}+\/.+
+    *$ RELEASE ?? ^[0-9]+${RE_SPACE}+\(\/[^)]+
     { RELEASE_TIME="$MATCH" }
 
     LOG="delay:       delay delivery of $MSGID until $RELEASE_TIME$NL"
-    POSTPONED="$RELEASE_TS ($RELEASE_TIME)"
 
-    INCLUDERC=$PMDIR/record-delayed-mail
-    INCLUDERC=$PMDIR/addheaders
+    RELEASE_TIME
+
+    :0 fw
+    |$FORMAIL -I"X-Postponed: $RELEASE"
 
     :0
     $DELAYED_QUEUE
   }
+  RELEASE_TS
 }