X-Git-Url: https://git.madduck.net/etc/mailfilter.git/blobdiff_plain/98cee263303225880082bf968764b951bfe03ede..d31cff0854bc8b4ae11fc482aa623fbd5f8728f1:/procmail/delay-delivery

diff --git a/procmail/delay-delivery b/procmail/delay-delivery
index 38f7c4e..9e8e02a 100644
--- a/procmail/delay-delivery
+++ b/procmail/delay-delivery
@@ -3,16 +3,25 @@
 :0
 * POSTPONED ?? .
 {
+  LOG="delay:       not delaying already-postponed message$NL"
   :0 fw
   |$FORMAIL -R X-Postponed X-Was-Postponed
 }
 
 :0 E
-* ! DISABLE_DELAYS ?? .
-* DELAY ?? .
+* DISABLE_DELAYS ?? .
 {
-  #TODO: for tickling, use header date
-  RELEASE="`$BIN_DATE -d \"$DELAY\" +'%s %c'`"
+  LOG="delay:       delays disabled, thus not delaying$NL"
+}
+
+:0 E
+* 1^0 DELAY ?? .
+* 1^0 RELEASE ?? .
+{
+  :0
+  * ! RELEASE ?? .
+  { RELEASE="`$BIN_DATE -d \"$DELAY\" +'%s (%c)'`" }
+  DELAY
 
   :0
   *$ RELEASE ?? ^\/${RE_NOT_SPACE}+
@@ -23,16 +32,19 @@
   *$ -$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"
+
+    INCLUDERC=$PMDIR/record-delayed-mail
     :0
     $DELAYED_QUEUE
   }
+  RELEASE_TS
 }