X-Git-Url: https://git.madduck.net/etc/mailfilter.git/blobdiff_plain/451f66ccde1a608fd45bb8d89db3d7bb1320178e..cd2bc185485e45abd146065d542656bbef56d4d1:/procmail/tickle diff --git a/procmail/tickle b/procmail/tickle index 7aa4db8..4ba44e3 100644 --- a/procmail/tickle +++ b/procmail/tickle @@ -4,37 +4,35 @@ * ORIGINAL_TO ?? ^.+@tickle\.madduck\.net$ * ORIGINAL_TO ?? ^\/[^@]+ { - DELIVERY_TIME=04:20 - 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]$ - { STAMP="$MATCH (`$BIN_DATE -d @$MATCH +%c`)" } + { DELAY="@$MATCH" } :0 E * MATCH ?? ^[0-9]+h$ * MATCH ?? ^\/[^h]+ - { DATESTR="$DATE + $MATCH hours" } - - JUST_DATE="`$BIN_DATE -d \"$DATE\" +%x`" + { DELAY="$DATE + $MATCH hours" } :0 E * MATCH ?? ^[0-9]+m$ * MATCH ?? ^\/[^m]+ - { DATESTR="$JUST_DATE + $MATCH months $DELIVERY_TIME" } + { DELAY="$JUST_DATE + $MATCH months $DAILY_DELIVERY_TIME" } :0 E * MATCH ?? ^[0-9]+w$ * MATCH ?? ^\/[^w]+ - { DATESTR="$JUST_DATE + $MATCH weeks $DELIVERY_TIME" } + { DELAY="$JUST_DATE + $MATCH weeks $DAILY_DELIVERY_TIME" } :0 E * MATCH ?? ^[0-9]+d?$ * MATCH ?? ^\/[^d]+ - { DATESTR="$JUST_DATE + $MATCH days $DELIVERY_TIME" } + { DELAY="$JUST_DATE + $MATCH days $DAILY_DELIVERY_TIME" } JUST_DATE - DELIVERY_TIME + DAILY_DELIVERY_TIME :0 E { @@ -43,25 +41,13 @@ HOST } - :0 - * ! STAMP ?? . - { STAMP=`$BIN_DATE +'%s (%c)' -d "$DATESTR"` } - - :0 - * ! STAMP ?? ^[0-9]+ \([A-Za-z ]+ [0-9 :]+\)$ - { - LOG="tickle: error creating timestamp ($STAMP), using \$now$NL" - STAMP="`$BIN_DATE +%s` (ERROR: original stamp '$STAMP' invalid)" - } - - :0 E - { LOG="tickle: stamping message $MSGID with $STAMP$NL" } - :0 fw - |$FORMAIL -i "X-Tickle: $STAMP" + |$FORMAIL -i "X-Tickle: $DELAY" - :0 - { DEST=$TICKLER_QUEUE } + LOG="tickle: delaying message until $DELAY$NL" + + # unset DISABLE_DELAYS to enable delaying for tickle messages + DISABLE_DELAYS } # vim:ft=procmail