let undelayed senders still be tickled

[etc/mailfilter.git] / procmail / tickle

diff --git a/procmail/tickle b/procmail/tickle
index 65578489063b6d0fe28542b57ab87eedebf93826..503841072394506f86f6bb5e18e91f5d65a58c53 100644 (file)
--- a/procmail/tickle
+++ b/procmail/tickle
@@ -4,6 +4,7 @@
 { TICKLE="$MATCH" }
 
 :0 E
+* ! POSTPONED ?? .
 * ORIGINAL_TO ?? ^.+@tickle\.madduck\.net$
 * ORIGINAL_TO ?? ^\/[^@]+
 { TICKLE="$MATCH" }
@@ -49,13 +50,17 @@
   JUST_DATE
   DAILY_DELIVERY_TIME
 
-  LOG="tickle:      delaying message until $DELAY$NL"
+  :0
+  { RELEASE="`$BIN_DATE -d \"$DELAY\" +'%s (%c)'`" }
+
+  LOG="tickle:      delaying message until $RELEASE$NL"
   DELAYED_QUEUE=$TICKLER_QUEUE
 
-  # unset DISABLE_DELAYS to enable delaying for tickle messages
+  :0 fw
+  |$FORMAIL -I"X-Tickle: $RELEASE"
+
+  # unset DISABLE_DELAYS to always enable delaying for tickle messages
   DISABLE_DELAYS
 }
 
-TICKLE
-
 # vim:ft=procmail