- if in private, "is addressing" => "is /msg'ing".

- dccStatus fix ups.
- use ScheduleThis where possible.

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

diff --git a/src/IRC/IrcHooks.pl b/src/IRC/IrcHooks.pl
index b590d0b528e1e22afc7c82aa0216a99d769aeb28..0054a08a289eee404c9d94f899917ffea1f4c677 100644 (file)
--- a/src/IRC/IrcHooks.pl
+++ b/src/IRC/IrcHooks.pl
@@ -75,7 +75,7 @@ sub on_chat {
            $self->privmsg($sock, "Commands start with '.' (like '.quit' or '.help')");
            $self->privmsg($sock, "Everything else goes out to the party line.");
 
-           &dccStatus(2) if (scalar keys %{ $dcc{'CHAT'} } == 1);
+           &dccStatus(2) unless (exists $sched{"dccStatus"}{RUNNING});
 
            $success++;
 
@@ -147,7 +147,7 @@ sub on_endofmotd {
     }
 
     if ($firsttime) {
-       $conn->schedule(60, \&setupSchedulers, "");
+       &ScheduleThis(1, \&setupSchedulers);
        $firsttime = 0;
     }
 
@@ -312,7 +312,7 @@ sub on_disconnect {
     &clearIRCVars();
     if (!$self->connect()) {
        &WARN("not connected? help me. gonna call ircCheck() in 1800s");
-       $conn->schedule(1800, \&ircCheck(), "");
+       &ScheduleThis(30, "ircCheck");
     }
 }
 
@@ -1026,7 +1026,9 @@ sub hookMsg {
 
        if ($addrchar) {
            &status("$b_cyan$who$ob is short-addressing me");
-       } else {
+       } elsif ($msgType eq "private") {       # private.
+           &status("$b_cyan$who$ob is /msg'ing me");
+       } else {                                # public?
            &status("$b_cyan$who$ob is addressing me");
        }