- patch from Morten Brix Pedersen <morten@wtf.dk>. Thanks!

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

diff --git a/src/IRC/IrcHooks.pl b/src/IRC/IrcHooks.pl
index 587b4a97939ea265900a1f687513a2494c6753e8..74087d0b474acd2628a64b30e9b078d5e056dc5d 100644 (file)
--- a/src/IRC/IrcHooks.pl
+++ b/src/IRC/IrcHooks.pl
@@ -363,13 +363,22 @@ sub on_disconnect {
     # clear any variables on reconnection.
     $nickserv = 0;
 
+    &DEBUG("on_disconnect: 1");
     &clearIRCVars();
+    &DEBUG("on_disconnect: 2");
+
+    if (!defined $self) {
+       &WARN("on_disconnect: self is undefined! WTF");
+       &DEBUG("running function irc... lets hope this works.");
+       &irc();
+       return;
+    }
+
     if (!$self->connect()) {
+       &DEBUG("on_disconnect: 3");
        &WARN("not connected? help me. gonna call ircCheck() in 60s");
        &clearIRCVars();
        &ScheduleThis(1, "ircCheck");
-#      &ScheduleThis(10, "ircCheck");
-#      &ScheduleThis(30, "ircCheck");
     }
 }
 
@@ -532,6 +541,7 @@ sub on_join {
        if (defined( my $whojoin = $cache{join}{$chan} )) {
            &msg($chan, "Okay, I'm here. (courtesy of $whojoin)");
            delete $cache{join}{$chan};
+           &joinNextChan();    # hack.
        }
 
        ### TODO: move this to &joinchan()?
@@ -1159,7 +1169,8 @@ sub on_chanfull {
     my ($self, $event) = @_;
     my @args   = $event->args;
 
-    &DEBUG("on_chanfull: args => @args");
+    &status(">>> chanfull/$b_blue$args[1]$ob");
+
     &joinNextChan();
 }
 
@@ -1167,15 +1178,18 @@ sub on_inviteonly {
     my ($self, $event) = @_;
     my @args   = $event->args;
 
-    &DEBUG("on_inviteonly: args => @args");
+    &status(">>> inviteonly/$b_cyan$args[1]$ob");
+
     &joinNextChan();
 }
 
 sub on_banned {
     my ($self, $event) = @_;
     my @args   = $event->args;
+    my $chan   = $args[1];
+
+    &status(">>> banned/$b_blue$chan$ob $b_cyan$args[0]$ob");
 
-    &DEBUG("on_banned: args => @args");
     &joinNextChan();
 }
 
@@ -1187,4 +1201,12 @@ sub on_badchankey {
     &joinNextChan();
 }
 
+sub on_useronchan {
+    my ($self, $event) = @_;
+    my @args   = $event->args;
+
+    &DEBUG("on_useronchan: args => @args");
+    &joinNextChan();
+}
+
 1;