report which bot

git-svn-id: https://svn.code.sf.net/p/infobot/code/trunk/blootbot@922 c11ca15a-4712-0410-83d8-924469b57eb5

diff --git a/src/IRC/Irc.pl b/src/IRC/Irc.pl
index 8bac6d7ac0f0a629437bb715832601e2a1716713..2fcad8c225769d0f7c2efbf54fdf75f3911d51ef 100644 (file)
--- a/src/IRC/Irc.pl
+++ b/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/src/IRC/IrcHelpers.pl b/src/IRC/IrcHelpers.pl
index 7c8b7725aefc452f4464332b31f5cc63e5293565..a7c5e50b4e31b3502c5952384eebe6f931e15a20 100644 (file)
--- a/src/IRC/IrcHelpers.pl
+++ b/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();