Use auth for owner messages

diff --git a/email.awk b/email.awk
index 1f7724757fff3efcd01c11bef00d8d935cd415ff..7f007b5e277942c830f171521bda2ca03c99da2d 100644 (file)
--- a/email.awk
+++ b/email.awk
@@ -80,7 +80,7 @@ function mail_run(  user, chan, ready, time)
        }
 }
 
-FROM ~ OWNER &&
+AUTH == OWNER &&
 TO == NICK &&
 /^e?mail .* .*/ {
        reply("notifying " $2 " for " $3)
@@ -97,7 +97,7 @@ TO == NICK &&
        mail_enable[_user] = _addr
 }
 
-FROM ~ OWNER &&
+AUTH == OWNER &&
 TO == NICK &&
 /^stfu .*/ {
        reply("well fine then")

diff --git a/rhawk b/rhawk
index 790313047d77f4464f02406a1dd859a4ef1f5581..8e17080981c1c44a64aa52d26ee36efca1e86661 100755 (executable)
--- a/rhawk
+++ b/rhawk
@@ -28,23 +28,23 @@ BEGIN {
 }
 
 # Admin
-FROM == OWNER && TO == NICK && /^die in a fire/ {
+AUTH == OWNER && TO == NICK && /^die in a fire/ {
        say("Ack, argh, barasdjf..")
        quit()
 }
 
-FROM == OWNER && TO == NICK && /^reload/ {
+AUTH == OWNER && TO == NICK && /^reload/ {
        say("Reloading..")
        reload()
 }
 
-FROM == OWNER && TO == NICK && /^rejoin/ {
+AUTH == OWNER && TO == NICK && /^rejoin/ {
        reply("joining..")
        join("#rhnoise")
        next
 }
 
-FROM == OWNER && TO == NICK && /^(join|part)/ {
+AUTH == OWNER && TO == NICK && /^(join|part)/ {
        match(MSG, /(join|part) +(#+\w+)/, arr)
        if (arr[1] && arr[2]) {
                send(toupper(arr[1]) " " arr[2]);
@@ -52,7 +52,7 @@ FROM == OWNER && TO == NICK && /^(join|part)/ {
        }
 }
 
-FROM == OWNER && TO == NICK && /^\.msg/ {
+AUTH == OWNER && TO == NICK && /^\.msg/ {
        match(MSG, /.*\.msg +(#*\w+) +(.*)/, arr)
        send("PRIVMSG " arr[1] " :" arr[2])
 }
@@ -175,7 +175,7 @@ TO == NICK && /^\.?fortune/     {
 }
 
 # Noise
-FROM ~ OWNER && /^go go gadget woop/ {
+AUTH == OWNER && /^go go gadget woop/ {
        for (i=20; i>0; i--)
                say(".delay " i " seconds; .woop " i)
 }
@@ -298,7 +298,7 @@ FROM == "rhnoise" && load_mod {
 #      delete user_scores
 #}
 #
-#FROM == OWNER && length(user_scores) &&
+#AUTH == OWNER && length(user_scores) &&
 #tolower($0) ~ /\<nuclear launch detected\>/ {
 #      for (_i=1; _i<=length(user_scores); _i++)
 #              say(user_scores[_i]["user"] "--");

diff --git a/spades.awk b/spades.awk
index ced873493f3c3e9bc80bc088f0df0d2c47651736..59fba1916c342fa73bb9b5832323c8d85b43163a 100644 (file)
--- a/spades.awk
+++ b/spades.awk
@@ -346,13 +346,13 @@ CMD == "PRIVMSG" &&
        say("Spades! " sp_pretty("As,Ah,Ad,Ac", FROM))
 }
 
-FROM == OWNER &&
+AUTH == OWNER &&
 /^\.savegame/ {
        sp_save("var/sp_save.json");
        say("Game saved.")
 }
 
-FROM == OWNER &&
+AUTH == OWNER &&
 /^\.loadgame/ {
        sp_load("var/sp_save.json");
        say("Game loaded.")
@@ -377,7 +377,7 @@ FROM == OWNER &&
 }
 
 # Debugging
-FROM == OWNER &&
+AUTH == OWNER &&
 /^\.deal (\w+) (.*)/ {
        delete sp_hands[$2]
        for (i=3; i<=NF; i++)
@@ -401,7 +401,7 @@ FROM == OWNER &&
        }
 }
 
-(sp_from == sp_owner || FROM == OWNER) &&
+(sp_from == sp_owner || AUTH == OWNER) &&
 /^\.endgame$/ {
        if (sp_state == "new") {
                reply("There is no game in progress.")