]>
git.madduck.net Git - etc/mailfilter.git/blobdiff - procmail/delay-delivery
madduck's git repository
Every one of the projects in this repository is available at the canonical
URL git://git.madduck.net/madduck/pub/<projectpath> — see
each project's metadata for the exact URL.
All patches and comments are welcome. Please squash your changes to logical
commits before using git-format-patch and git-send-email to
patches@ git. madduck. net .
If you'd read over the Git project's submission guidelines and adhered to them,
I'd be especially grateful.
SSH access, as well as push access can be individually
arranged .
If you use my repositories frequently, consider adding the following
snippet to ~/.gitconfig and using the third clone URL listed for each
project:
[url "git://git.madduck.net/madduck/"]
insteadOf = madduck:
-# 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)
-* DELAY ?? .
-* ! DELAYED ?? .
- #TODO: for tickling, use header date
- RELEASE="`date -d \"now + $DELAY\" +'%s %c'`"
+ 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"
+}
+
+:0 E
+* 1^0 DELAY ?? .
+* 1^0 RELEASE ?? .
+{
+ :0
+ * ! RELEASE ?? .
+ { RELEASE="`$BIN_DATE -d \"$DELAY\" +'%s (%c)'`" }
+ DELAY
+
:0
*$ RELEASE ?? ^\/${RE_NOT_SPACE}+
{ RELEASE_TS=$MATCH }
:0
*$ RELEASE ?? ^\/${RE_NOT_SPACE}+
{ RELEASE_TS=$MATCH }
- :0
- *$ RELEASE ?? ^[0-9]+${RE_SPACE}+\/.+
- { RELEASE_TIME="$MATCH" }
- LOG="delay: delay delivery of $MSGID until $RELEASE_TIME$NL"
-
- DELAYED_QUEUE_DB=$PMVAR/delayed-queue.sqlite
- DO_QUERY="$SQLITE $DELAYED_QUEUE_DB"
+ :0
+ *$ $RELEASE_TS ^0
+ *$ -$OURDATE_TS ^0
+ {
+ :0
+ *$ RELEASE ?? ^[0-9]+${RE_SPACE}+\(\/[^)]+
+ { RELEASE_TIME="$MATCH" }
- DATA="$MSGID"
- INCLUDERC=$PMDIR/sql-escape
+ LOG="delay: delay delivery of $MSGID until $RELEASE_TIME$NL"
- Q="insert into messages values
- ($DATA, '\\'\$DESTFILE\\'', $RELEASE_TS)"
- TRAP="$TRAP; $DO_QUERY '$Q'"
- :0 fw
- |$FORMAIL -I "X-Delayed: $RELEASE_TS ($RELEASE_TIME) "
+ :0 fw
+ |$FORMAIL -I"X-Postponed: $RELEASE "
+ :0
+ $DELAYED_QUEUE
+ }
+ RELEASE_TS
projects / etc / mailfilter.git / blobdiff