X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=rhawk;h=713c7995b267806f457b5a142ae3447faa0955fa;hb=ba197f8ee6cc9bb2423d155ae7acd053e5a9bbb4;hp=80de4ba1b902201ba2a0943e996eef0b1bdeae2e;hpb=7efea6d3b6102be2957bdf9303ddb98ab80d2e7b;p=~andy%2Frhawk

diff --git a/rhawk b/rhawk
index 80de4ba..713c799 100755
--- a/rhawk
+++ b/rhawk
@@ -7,8 +7,9 @@
 
 # Initialization
 BEGIN {
-	json_load("var/login.json", login);
-	json_load("var/plain.json", plain);
+	json_load("var/login.json",     login);
+	json_load("var/nounicode.json", nounicode);
+	json_load("var/nocolor.json",   nocolors);
 
 	OWNER = login["owner"];
 
@@ -21,7 +22,7 @@ BEGIN {
 	delete login
 
 	if (FIRST) {
-		join("#rhnoise")
+		join("#rhtest")
 		join("#rhspades")
 		join("#sfvlug")
 	}
@@ -75,15 +76,25 @@ CMD == "NICK" && FROM in bots {
 }
 
 
-# Unicode
+# Fancy output
 /[Uu]nicode :-?\(/ {
-	plain[FROM] = 1
-	json_save("var/plain.json", plain);
+	nounicode[FROM] = 1
+	json_save("var/nounicode.json", nounicode);
 }
 
 /[Uu]nicode :-?\)/ {
-	delete plain[FROM]
-	json_save("var/plain.json", plain);
+	delete nounicode[FROM]
+	json_save("var/nounicode.json", nounicode);
+}
+
+/[Cc]olors :-?\(/ {
+	nocolor[FROM] = 1
+	json_save("var/nocolor.json", nocolor);
+}
+
+/[Cc]olors :-?\)/ {
+	delete nocolor[FROM]
+	json_save("var/nocolor.json", nocolor);
 }
 
 # SFV Lug
@@ -134,6 +145,11 @@ BEGIN { pollchan = "#sfvlug" }
 }
 
 # Versin/Uptime
+function head(cmd, var) {
+	cmd | getline var
+	close(cmd)
+	return var
+}
 function uptime(time,  fmt) {
 	fmt = "%d:%02d:%02d:%02d"
 	fmt = "%d days %02d:%02d:%02d"
@@ -144,13 +160,13 @@ function uptime(time,  fmt) {
 		time / (1       ) % 60)
 }
 BEGIN {
-	_cmd = "git describe --always --dirty";
-	_cmd | getline up_version;
-	close(_cmd);
-	up_reload = systime();
+	up_version = head("git describe --always --dirty")
+	up_author  = head("git log -n1 --format=format:%an")
+	up_message = head("git log -n1 --format=format:%s")
+	up_reload  = systime();
 }
-/^\.version/ {
-	say("version: " up_version)
+/^\.(version|rev)/ {
+	say("version: " up_version " - " up_author " - " up_message)
 }
 /^\.uptime/ {
 	_now = systime();
@@ -333,6 +349,15 @@ FROM == "rhnoise" && $2 == "slaps" && $3 == NICK {
 	say("THE LARCH");
 }
 
+/(for what|that for)\?$/ {
+	say("For great justice!");
+}
+
+/\<nazi/ {
+	say("And now it's...");
+	say("Springtime for Hitler and Germany!");
+}
+
 # God damn commands
 FROM == "rhnoise" && load_mod {
 	say(".load " load_mod)
@@ -363,29 +388,41 @@ FROM == "rhnoise" && load_mod {
 }
 
 # Decrementer
-#BEGIN {
-#	user_scores[0] = 1
-#}
-#
-#FROM == "rhnoise" && !length(user_scores) {
-#	if (split(MSG, _parts, /, /)) {
-#		for (_i=1; _i<=length(_parts); _i++) {
-#			split(_parts[_i], _tmp, ": ");
-#			user_scores[_i]["user"]  = _tmp[1];
-#			user_scores[_i]["score"] = _tmp[2];
-#		}
-#	}
-#}
-#
-#FROM == "rhnoise" && /^User Scores:$/ {
-#	delete 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"] "--");
-#}
+BEGIN {
+	user_scores[0] = 1;
+}
+
+/^\.(scores|scoreboard)$/ {
+	delete user_scores
+}
+
+FROM == "rhnoise" && !length(user_scores) {
+	if (split(MSG, _parts, /, /)) {
+		for (_i=1; _i<=length(_parts); _i++) {
+			split(_parts[_i], _tmp, ": ");
+			user_scores[_i]["user"]  = _tmp[1];
+			user_scores[_i]["score"] = _tmp[2];
+		}
+	}
+}
+
+length(user_scores) &&
+tolower($0) ~ /\<nuclear launch detected\>/ {
+	_count = 0;
+	for (_i=1; _i<=length(user_scores); _i++) {
+		_user  = user_scores[_i]["user"];
+		_score = user_scores[_i]["score"];
+		if (_user in USERS) continue
+		if (_score ==  1) { say(_user "--"); _count++; }
+		if (_score == -1) { say(_user "++"); _count++; }
+	}
+	if (_count) {
+		delete user_scores;
+		say(".scores");
+	} else {
+		say("looks like you're safe.. for now..");
+	}
+}
 
 # Misc
 { fflush("") }