]> 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:

store away signmeup mail
[etc/mailfilter.git] / procmail / delay-delivery
index 634f70f84f5dbe6ea72fd3c075d9d01fa672776d..a7251648534fe60a95cb84c95b6fb173a91795b3 100644 (file)
@@ -1,44 +1,56 @@
-# 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 ?? .
+{
+  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
-  * DELAY ?? ^[0-9]
-  { DELAY="now + $DELAY" }
+  * ! RELEASE ?? .
+  { RELEASE="`$BIN_DATE -d \"$DELAY\" +'%s (%c %Z)'`" }
+  DELAY
 
-  #TODO: for tickling, use header date
-  RELEASE="`date -d \"$DELAY\" +'%s %c'`"
   :0
   *$ RELEASE ?? ^\/${RE_NOT_SPACE}+
   { RELEASE_TS=$MATCH }
 
   :0
-  *$  $RELEASE_TS^0
-  *$ -$OURDATE_TS^0
+  *$  $RELEASE_TS ^0
+  *$ -$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
 }