X-Git-Url: https://git.madduck.net/etc/mailfilter.git/blobdiff_plain/31877acd11ca3a95cf85fa4cb227f489f3d4877b..3d44894b840daa45d87b12ee8b203f8294eca3df:/procmail/delay-delivery diff --git a/procmail/delay-delivery b/procmail/delay-delivery index 543c01c..c1ca0c0 100644 --- a/procmail/delay-delivery +++ b/procmail/delay-delivery @@ -1,37 +1,47 @@ -:0 -* ^X-Mailer: swaks -{ DELAY="30 seconds" } - # create table messages (msgid text unique not null, filename text # primary key not null unique, release_ts integer not null); +#TODO: create config/delay-(disabled|tonight|weekend) + :0 * DELAY ?? . +* ! DELAYED ?? . { + :0 + * DELAY ?? ^[0-9] + { DELAY="now + $DELAY" } + #TODO: for tickling, use header date - RELEASE="`date -d \"now + $DELAY\" +'%s %c'`" + RELEASE="`$BIN_DATE -d \"$DELAY\" +'%s %c'`" + :0 *$ RELEASE ?? ^\/${RE_NOT_SPACE}+ { RELEASE_TS=$MATCH } + :0 - *$ RELEASE ?? ^[0-9]+${RE_SPACE}+\/.+ - { RELEASE_TIME="$MATCH" } + *$ $RELEASE_TS ^0 + *$ -$OURDATE_TS ^0 + { + :0 + *$ RELEASE ?? ^[0-9]+${RE_SPACE}+\/.+ + { RELEASE_TIME="$MATCH" } - LOG="delay: delay delivery of $MSGID until $RELEASE_TIME$NL" + LOG="delay: delay delivery of $MSGID until $RELEASE_TIME$NL" - DELAYED_QUEUE_DB=$PMVAR/delayed-queue.sqlite - DO_QUERY="$SQLITE $DELAYED_QUEUE_DB" + DELAYED_QUEUE_DB=$PMVAR/delayed-queue.sqlite + DO_QUERY="$SQLITE $DELAYED_QUEUE_DB" - DATA="$MSGID" - INCLUDERC=$PMDIR/sql-escape + DATA="$MSGID" + INCLUDERC=$PMDIR/sql-escape - Q="insert into messages values - ($DATA, '\\'\$DESTFILE\\'', $RELEASE_TS)" - TRAP="$TRAP; $DO_QUERY '$Q'" + Q="insert into messages values + ($DATA, '\\'\$DESTFILE\\'', $RELEASE_TS)" + TRAP="$TRAP; $DO_QUERY '$Q'" - :0 fw - |$FORMAIL -I "X-Delay: $RELEASE_TS ($RELEASE_TIME)" + :0 fw + |$FORMAIL -I "X-Delayed: $RELEASE_TS ($RELEASE_TIME)" - :0 - $DELAYED_QUEUE + :0 + $DELAYED_QUEUE + } }