enable delaying for all tickle messages

[etc/mailfilter.git] / procmail / tickle

diff --git a/procmail/tickle b/procmail/tickle
index 1eb4ce6522f0c9c7032477e4b39697e083a2bb71..4ba44e30ec5e2a73d65274756048e2d159b0b8f9 100644 (file)
--- a/procmail/tickle
+++ b/procmail/tickle
@@ -1,31 +1,38 @@
 :0
 :0

+* ! DEST ?? .
+* ! TICKLE_DELIVERED ?? .

 * ORIGINAL_TO ?? ^.+@tickle\.madduck\.net$
 * ORIGINAL_TO ?? ^\/[^@]+
 {
 * ORIGINAL_TO ?? ^.+@tickle\.madduck\.net$
 * ORIGINAL_TO ?? ^\/[^@]+
 {

-  STAMP
+  DAILY_DELIVERY_TIME=04:20
+  JUST_DATE="`$BIN_DATE -d \"$DATE\" +%x`"
+

   :0
   * MATCH ?? ^[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]$
   :0
   * MATCH ?? ^[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]$

-  { STAMP=$MATCH }
+  { DELAY="@$MATCH" }
+
+  :0 E
+  * MATCH ?? ^[0-9]+h$
+  * MATCH ?? ^\/[^h]+
+  { DELAY="$DATE + $MATCH hours" }

 
   :0 E
   * MATCH ?? ^[0-9]+m$
   * MATCH ?? ^\/[^m]+
 
   :0 E
   * MATCH ?? ^[0-9]+m$
   * MATCH ?? ^\/[^m]+

-  { DATESTR="$DATE + $MATCH months 00:00" }
+  { DELAY="$JUST_DATE + $MATCH months $DAILY_DELIVERY_TIME" }

 
   :0 E
   * MATCH ?? ^[0-9]+w$
   * MATCH ?? ^\/[^w]+
 
   :0 E
   * MATCH ?? ^[0-9]+w$
   * MATCH ?? ^\/[^w]+

-  { DATESTR="$DATE + $MATCH weeks 00:00" }
+  { DELAY="$JUST_DATE + $MATCH weeks $DAILY_DELIVERY_TIME" }

 
   :0 E
   * MATCH ?? ^[0-9]+d?$
   * MATCH ?? ^\/[^d]+
 
   :0 E
   * MATCH ?? ^[0-9]+d?$
   * MATCH ?? ^\/[^d]+

-  { DATESTR="$DATE + $MATCH days 00:00" }
+  { DELAY="$JUST_DATE + $MATCH days $DAILY_DELIVERY_TIME" }

 
 

-  :0 E
-  * MATCH ?? ^[0-9]+h$
-  * MATCH ?? ^\/[^h]+
-  { DATESTR="$DATE + $MATCH hours" }
+  JUST_DATE
+  DAILY_DELIVERY_TIME

 
   :0 E
   {
 
   :0 E
   {


@@ -34,15 +41,13 @@
     HOST
   }
 
     HOST
   }
 

-  :0
-  * ! STAMP ?? .
-  { STAMP=`/bin/date +'%s (%c)' -d "$DATESTR"` }
-
-  LOG="tickle:      stamping message $MSGID with $STAMP$NL"
-

   :0 fw
   :0 fw

-  |$FORMAIL -i "X-Tickle: $STAMP"
+  |$FORMAIL -i "X-Tickle: $DELAY"

 
 

-  :0
-  $BASE/.tickler/
+  LOG="tickle:      delaying message until $DELAY$NL"
+
+  # unset DISABLE_DELAYS to enable delaying for tickle messages
+  DISABLE_DELAYS

 }
 }

+
+# vim:ft=procmail