- forgot to delete hash key even if current pid == parent pid.

[infobot.git] / src / IRC / Irc.pl

diff --git a/src/IRC/Irc.pl b/src/IRC/Irc.pl
index e8a3a9243534cac1ebd6f15533103f43df038286..3496cb4cd1720eda09c5b29a02b11e0ab380bdac 100644 (file)
--- a/src/IRC/Irc.pl
+++ b/src/IRC/Irc.pl
@@ -102,7 +102,7 @@ sub irc {
     $conn = $irc->newconn(%args);
 
     if (!defined $conn) {
-       &ERROR("irc: conn was not created!defined!!!");
+       &ERROR("internal: perl IRC connection object does not exist.");
        return 1;
     }
 
@@ -143,6 +143,7 @@ sub irc {
        $conn->add_global_handler('disconnect', \&on_disconnect);
        $conn->add_global_handler([251,252,253,254,255], \&on_init);
 ###    $conn->add_global_handler([251,252,253,254,255,302], \&on_init);
+       $conn->add_global_handler(303, \&on_ison); # notify.
        $conn->add_global_handler(315, \&on_endofwho);
        $conn->add_global_handler(422, \&on_endofwho); # nomotd.
        $conn->add_global_handler(324, \&on_modeis);
@@ -158,6 +159,7 @@ sub irc {
        $conn->add_global_handler(473, \&on_inviteonly);
        $conn->add_global_handler(474, \&on_banned);
        $conn->add_global_handler(475, \&on_badchankey);
+       $conn->add_global_handler(443, \&on_useronchan);
 
     # end of handler stuff.
 
@@ -276,16 +278,13 @@ sub action {
        return;
     }
 
-    my $rawout = "PRIVMSG $target :\001ACTION $txt\001";
-    if (length $rawout > 510) {
+    if (length $txt > 480) {
        &status("action: txt too long; truncating.");
-
-       chop($rawout) while (length($rawout) > 510);
-       $rawout .= "\001";
+       chop($txt) while (length $txt > 480);
     }
 
     &status("* $ident/$target $txt");
-    rawout($rawout);
+    $conn->me($target, $txt);
 }
 
 # Usage: &notice(nick || chan, txt);
@@ -427,23 +426,23 @@ sub dcc_close {
 }
 
 sub joinchan {
-    my ($chankey) = @_;
-    my $chan = lc $chankey;
+    my ($chan) = @_;
+    my $key    = &getChanConf("chankey", $chan) || "";
 
-    if ($chankey =~ s/^($mask{chan}),\S+/ /) {
-       $chan = lc $1;
-    }
+    # forgot for about 2 years to implement channel keys when moving
+    # over to Net::IRC...
 
     # hopefully validChan is right.
     if (&validChan($chan)) {
        &status("join: already on $chan");
     } else {
        &status("joining $b_blue$chan$ob");
-       if (!$conn->join($chan)) {
-           &DEBUG("joinchan: join failed. trying connect!");
-           &clearIRCVars();
-           $conn->connect();
-       }
+
+       return if ($conn->join($chan, $key));
+
+       &DEBUG("joinchan: join failed. trying connect!");
+       &clearIRCVars();
+       $conn->connect();
     }
 }
 
@@ -465,7 +464,7 @@ sub part {
 #          next;
        }
 
-       rawout("PART $chan");
+       $conn->part($chan);
        # deletion of $channels{chan} is done in &entryEvt().
     }
 }
@@ -481,6 +480,7 @@ sub mode {
 
     &DEBUG("mode: MODE $chan $modes");
 
+    # should move to use Net::IRC's $conn->mode()... but too lazy.
     rawout("MODE $chan $modes");
 }
 
@@ -511,21 +511,17 @@ sub kick {
 
     foreach $chan (@chans) {
        if (!&IsNickInChan($nick,$chan)) {
-           &status("Kick: $nick is not on $chan.") if (scalar @chans == 1);
+           &status("kick: $nick is not on $chan.") if (scalar @chans == 1);
            next;
        }
 
        if (!exists $channels{$chan}{o}{$ident}) {
-           &status("Kick: do not have ops on $chan :(");
+           &status("kick: do not have ops on $chan :(");
            next;
        }
 
        &status("Kicking $nick from $chan.");
-       if ($msg eq "") {
-           &rawout("KICK $chan $nick");
-       } else {
-           &rawout("KICK $chan $nick :$msg");
-       }
+       $conn->kick($chan, $nick, $msg);
     }
 }
 
@@ -541,7 +537,7 @@ sub ban {
 
     foreach $chan (@chans) {
        if (!exists $channels{$chan}{o}{$ident}) {
-           &status("Ban: do not have ops on $chan :(");
+           &status("ban: do not have ops on $chan :(");
            next;
        }
 
@@ -603,7 +599,8 @@ sub nick {
     if ($bad) {
        &WARN("Nick: not going to try and get my nick back. [".
                scalar(localtime). "]");
-       return;
+# hrm... over time we lose track of our own nick.
+#      return;
     }
 
     if ($nick =~ /^$mask{nick}$/) {
@@ -611,6 +608,8 @@ sub nick {
 
        if (defined $ident) {
            &status("nick: Changing nick to $nick (from $ident)");
+           # following shouldn't be here :(
+           $ident      = $nick;
        } else {
            &DEBUG("first time nick change.");
            $ident      = $nick;
@@ -625,9 +624,10 @@ sub nick {
 
 sub invite {
     my($who, $chan) = @_;
-    rawout("INVITE $who $chan");
-}
+    # todo: check if $who or $chan are invalid.
 
+    $conn->invite($who, $chan);
+}
 
 ##########
 # Channel related functions...
@@ -717,14 +717,20 @@ sub IsNickInAnyChan {
 
 # Usage: &validChan($chan);
 sub validChan {
+    # todo: use $c instead?
     my ($chan) = @_;
 
+    if (!defined $chan or $chan =~ /^\s*$/) {
+       return 0;
+    }
+
     if (lc $chan ne $chan) {
        &WARN("validChan: lc chan != chan. ($chan); fixing.");
        $chan =~ tr/A-Z/a-z/;
     }
 
-    if (exists $channels{$chan}) {
+    # it's possible that this check creates the hash if empty.
+    if (defined $channels{$chan} or exists $channels{$chan}) {
        if ($chan eq "_default") {
 #          &WARN("validC: chan cannot be _default! returning 0!");
            return 0;
@@ -884,7 +890,7 @@ sub getHostMask {
        return &makeHostMask($nuh{$n});
     } else {
        $cache{on_who_Hack} = 1;
-       &rawout("WHO $n");
+       $conn->who($n);
     }
 }