X-Git-Url: https://git.madduck.net/etc/mailfilter.git/blobdiff_plain/18ac4f995c4d175bc636fdd78919a18e131afdcf..daa03f3e22bbaeb5c4cbd1ad4df4207a7689828d:/procmail/delay-delivery

diff --git a/procmail/delay-delivery b/procmail/delay-delivery
index c1ca0c0..a725164 100644
--- a/procmail/delay-delivery
+++ b/procmail/delay-delivery
@@ -1,18 +1,34 @@
-# 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 ?? .
+* 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
+}
 
-  #TODO: for tickling, use header date
-  RELEASE="`$BIN_DATE -d \"$DELAY\" +'%s %c'`"
+: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 %Z)'`" }
+  DELAY
 
   :0
   *$ RELEASE ?? ^\/${RE_NOT_SPACE}+
@@ -23,25 +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"
 
-    DELAYED_QUEUE_DB=$PMVAR/delayed-queue.sqlite
-    DO_QUERY="$SQLITE $DELAYED_QUEUE_DB"
-
-    DATA="$MSGID"
-    INCLUDERC=$PMDIR/sql-escape
-
-    Q="insert into messages values
-      ($DATA, '\\'\$DESTFILE\\'', $RELEASE_TS)"
-    TRAP="$TRAP; $DO_QUERY '$Q'"
+    RELEASE_TIME
 
     :0 fw
-    |$FORMAIL -I "X-Delayed: $RELEASE_TS ($RELEASE_TIME)"
+    |$FORMAIL -I"X-Postponed: $RELEASE"
 
     :0
     $DELAYED_QUEUE
   }
+  RELEASE_TS
 }