]> git.madduck.net Git - etc/mailfilter.git/blobdiff - procmail/tickle

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:

do not retickle postponed messages
[etc/mailfilter.git] / procmail / tickle
index 1a3388d860617a01b0dcec93eba56ff943352697..896490371b223712998fb8af1ba4bdee09ae80d8 100644 (file)
@@ -1,11 +1,8 @@
 # The X-Tickle header has priority over the Original-To address
 :0
 # The X-Tickle header has priority over the Original-To address
 :0
+* ! POSTPONED ?? .
 *$ ^X-Tickle:${RE_SPACE}+\/${RE_NOT_SPACE}+
 *$ ^X-Tickle:${RE_SPACE}+\/${RE_NOT_SPACE}+
-{ 
-  TICKLE="$MATCH"
-  :0 fw
-  |$FORMAIL -IX-Tickle
-}
+{ TICKLE="$MATCH" }
 
 :0 E
 * ! POSTPONED ?? .
 
 :0 E
 * ! POSTPONED ?? .
   JUST_DATE
   DAILY_DELIVERY_TIME
 
   JUST_DATE
   DAILY_DELIVERY_TIME
 
-  LOG="tickle:      delaying message until $DELAY$NL"
+  :0
+  { RELEASE="`$BIN_DATE -d \"$DELAY\" +'%s (%c)'`" }
+
+  LOG="tickle:      delaying message until $RELEASE$NL"
   DELAYED_QUEUE=$TICKLER_QUEUE
 
   DELAYED_QUEUE=$TICKLER_QUEUE
 
+  :0 fw
+  |$FORMAIL -I"X-Tickle: $RELEASE"
+
+  # store messages as read
+  MARK_READ=true
+
   # unset DISABLE_DELAYS to always enable delaying for tickle messages
   DISABLE_DELAYS
 }
 
   # unset DISABLE_DELAYS to always enable delaying for tickle messages
   DISABLE_DELAYS
 }
 
-TICKLE
-
 # vim:ft=procmail
 # vim:ft=procmail