X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=email.awk;h=7f007b5e277942c830f171521bda2ca03c99da2d;hb=04c91944b336aeda3df629cb0baf6ee14699ff1d;hp=cf9c102d9430bb3da52b9108c2c6d8501062c0b8;hpb=71f9b0ff84f80ef284f10795d6bdf06e95818c62;p=~andy%2Frhawk

diff --git a/email.awk b/email.awk
index cf9c102..7f007b5 100644
--- a/email.awk
+++ b/email.awk
@@ -1,21 +1,31 @@
 @include "json.awk"
 
 # Save email addresses
-BEGIN { json_load("var/mail.txt", mail_enable) }
-END   { json_save("var/mail.txt", mail_enable) }
+END {
+	json_save("var/mail.json", mail_enable)
+}
+
+BEGIN {
+	json_load("var/mail.json", mail_enable)
+	for (_user in mail_enable)
+		debug("watching " mail_enable[_user] " for " _user)
+}
+
+TO == NICK && /^sync/ {
+	json_load("var/mail.json", mail_enable)
+	for (_user in mail_enable)
+		debug("watching " mail_enable[_user] " for " _user)
+}
 
 # Email notifications
 BEGIN {
-	mail_hist   = 2*60 # If the users has not spoken withn mail_before before 
-	mail_before = 2*60 # someone mentions their name and does not reply within
-	mail_after  = 2*60 # mail_after seconds, email them hist seconds of the backlog
+	mail_hist   = 5*60 # If the users has not spoken withn mail_before before
+	mail_before = 5*60 # someone mentions their name and does not reply within
+	mail_after  = 5*60 # mail_after seconds, email them hist seconds of the backlog
 
 	mail_from   = NICK "<andy753421@gmail.com>"
 	mail_err    = "If you received this message in error,\n" \
 	              "someone in #rhnoise is being a jerk"
-
-	for (_user in mail_enable) 
-		debug("watching " mail_enable[_user] " for " _user)
 }
 
 function mail_send(addr, subj, body,
@@ -43,7 +53,7 @@ function mail_prep(user, chan,
 	for (si = 1; si <= sn; si++) {
 		sec = ss[si]
 		mn = length(mail_log[chan][sec])
-		for (mi = 0; mi < mn; mi++) { 
+		for (mi = 0; mi < mn; mi++) {
 			msg = mail_log[chan][sec][mi]
 			if (sec > mail_ready[user][chan] - mail_hist) {
 				if (msg ~ user)
@@ -70,7 +80,7 @@ function mail_run(  user, chan, ready, time)
 	}
 }
 
-FROM ~ OWNER &&
+AUTH == OWNER &&
 TO == NICK &&
 /^e?mail .* .*/ {
 	reply("notifying " $2 " for " $3)
@@ -87,7 +97,7 @@ TO == NICK &&
 	mail_enable[_user] = _addr
 }
 
-FROM ~ OWNER &&
+AUTH == OWNER &&
 TO == NICK &&
 /^stfu .*/ {
 	reply("well fine then")