X-Git-Url: https://git.madduck.net/etc/mailfilter.git/blobdiff_plain/45ff291908a431109c67c04807993f654089e24d..78dfb5762b2e175785f25ba5a5eaeafa93ee8fe3:/procmail/delay-delivery diff --git a/procmail/delay-delivery b/procmail/delay-delivery index 3817715..a725164 100644 --- a/procmail/delay-delivery +++ b/procmail/delay-delivery @@ -1,15 +1,34 @@ #TODO: create config/delay-(disabled|tonight|weekend) :0 -* DELAY ?? . -* ! DELAYED ?? . +* POSTPONED ?? . { - :0 - * DELAY ?? ^[0-9] - { DELAY="now + $DELAY" } + 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 +* ! TICKLE ?? . +* ? echo "$FROMEMAIL" | $EGREP -qif $CONF/undelayed-senders +{ + LOG="delay: do not delay mail from $SENDER$NL" +} - #TODO: for tickling, use header date - RELEASE="`$BIN_DATE -d \"$DELAY\" +'%s %c'`" +:0 E +* 1^0 DELAY ?? . +* 1^0 RELEASE ?? . +{ + :0 + * ! RELEASE ?? . + { RELEASE="`$BIN_DATE -d \"$DELAY\" +'%s (%c %Z)'`" } + DELAY :0 *$ RELEASE ?? ^\/${RE_NOT_SPACE}+ @@ -20,17 +39,18 @@ *$ -$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" - :0 fw - |$FORMAIL -I "X-Delayed: $RELEASE_TS ($RELEASE_TIME)" + RELEASE_TIME - INCLUDERC=$PMDIR/record-delayed-mail + :0 fw + |$FORMAIL -I"X-Postponed: $RELEASE" :0 $DELAYED_QUEUE } + RELEASE_TS }