X-Git-Url: https://git.madduck.net/etc/mailfilter.git/blobdiff_plain/764f42aae3e19194a1d356fa7ed7821223e02ccd..c1b84832deb10b1d35aa30c0e77eb61d19ae7cdd:/procmail/delay-delivery

diff --git a/procmail/delay-delivery b/procmail/delay-delivery
index 9b79534..9e8e02a 100644
--- a/procmail/delay-delivery
+++ b/procmail/delay-delivery
@@ -1,12 +1,27 @@
 #TODO: create config/delay-(disabled|tonight|weekend)
 
 :0
-* ! DISABLE_DELAYS ?? .
-* DELAY ?? .
-* ! DELAYED ?? .
+* POSTPONED ?? .
 {
-  #TODO: for tickling, use header date
-  RELEASE="`$BIN_DATE -d \"$DELAY\" +'%s %c'`"
+  LOG="delay:       not delaying already-postponed message$NL"
+  :0 fw
+  |$FORMAIL -R X-Postponed X-Was-Postponed
+}
+
+:0 E
+* DISABLE_DELAYS ?? .
+{
+  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}+
@@ -17,17 +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"
 
+    RELEASE_TIME
+
     :0 fw
-    |$FORMAIL -I "X-Postponed: $RELEASE_TS ($RELEASE_TIME)"
+    |$FORMAIL -I"X-Postponed: $RELEASE"
 
     INCLUDERC=$PMDIR/record-delayed-mail
-
     :0
     $DELAYED_QUEUE
   }
+  RELEASE_TS
 }