From 58ba1858ef7d7c99212ad2f6f176192931162982 Mon Sep 17 00:00:00 2001
From: timriker <timriker@c11ca15a-4712-0410-83d8-924469b57eb5>
Date: Mon, 22 Mar 2004 19:00:51 +0000
Subject: [PATCH] report which bot

git-svn-id: https://svn.code.sf.net/p/infobot/code/trunk@922 c11ca15a-4712-0410-83d8-924469b57eb5
---
 blootbot/src/IRC/Irc.pl        | 4 +++-
 blootbot/src/IRC/IrcHelpers.pl | 8 ++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/blootbot/src/IRC/Irc.pl b/blootbot/src/IRC/Irc.pl
index 8bac6d7..2fcad8c 100644
--- a/blootbot/src/IRC/Irc.pl
+++ b/blootbot/src/IRC/Irc.pl
@@ -209,13 +209,15 @@ sub rawout {
 
 sub say {
     my ($msg) = @_;
+    my $mynick = $conn->nick();
     if (!defined $msg) {
 	$msg ||= "NULL";
 	&WARN("say: msg == $msg.");
 	return;
     }
 
-    &status("</$talkchannel> $msg");
+
+    &status("<$mynick/$talkchannel> $msg");
     if (&whatInterface() =~ /IRC/) {
 	$msg	= "zero" if ($msg =~ /^0+$/);
 	my $t	= time();
diff --git a/blootbot/src/IRC/IrcHelpers.pl b/blootbot/src/IRC/IrcHelpers.pl
index 7c8b772..a7c5e50 100644
--- a/blootbot/src/IRC/IrcHelpers.pl
+++ b/blootbot/src/IRC/IrcHelpers.pl
@@ -83,6 +83,7 @@ sub hookMsg {
     $message	=~ s/[\cA-\c_]//ig;	# strip control characters
     $message	=~ s/^\s+//;		# initial whitespaces.
     $who	=~ tr/A-Z/a-z/;		# lowercase.
+    my $mynick = $conn->nick();
 
     &showProc();
 
@@ -103,7 +104,6 @@ sub hookMsg {
 
 	if ($message =~ /^($mask{nick})([\;\:\>\, ]+) */) {
 	    my $newmessage = $';
-	    my $mynick = $conn->nick();
 	    if ($1 =~ /^\Q$mynick\E$/i) {
 		$message   = $newmessage;
 		$addressed = 1;
@@ -168,11 +168,11 @@ sub hookMsg {
 	}
 
 	if ($addrchar) {
-	    &status("$b_cyan$who$ob is short-addressing me");
+	    &status("$b_cyan$who$ob is short-addressing $mynick");
 	} elsif ($msgType eq "private") {	# private.
-	    &status("$b_cyan$who$ob is /msg'ing me");
+	    &status("$b_cyan$who$ob is /msg'ing $mynick");
 	} else {				# public?
-	    &status("$b_cyan$who$ob is addressing me");
+	    &status("$b_cyan$who$ob is addressing $mynick");
 	}
 
 	$flood{$floodwho}{$message} = time();
-- 
2.39.5