fix unsetting autojoin when trying to join invite-only channel

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

diff --git a/src/IRC/IrcHooks.pl b/src/IRC/IrcHooks.pl
index ff8203b6ed02dfa89562ff2adc9666625a169799..bcb6fcabe9146d4da5f50e0cae074ebc49b667fd 100644 (file)
--- a/src/IRC/IrcHooks.pl
+++ b/src/IRC/IrcHooks.pl
@@ -463,8 +463,10 @@ sub on_endofnames {
 
     &chanServCheck($chan);
 
+    # FIXME: scheduler is b0rken! flood join for now
     # schedule used to solve ircu (OPN) 'target too fast' problems.
-    $conn->schedule( 5, sub { &joinNextChan(); } );
+    #$conn->schedule( 5, sub { &joinNextChan(); } );
+    &joinNextChan();
 }
 
 sub on_init {
@@ -620,7 +622,8 @@ sub on_join {
     ### ROOTWARN:
     &rootWarn( $who, $user, $host, $chan )
       if ( &IsChanConf('RootWarn') > 0
-        && $user =~ /^~?r(oo|ew|00)t$/i );
+        && $user eq 'root' );
+        #&& $user =~ /^~?r(oo|ew|00)t$/i );
 
     ### emit a message based on who just joined
     &onjoin( $who, $user, $host, $chan ) if ( &IsChanConf('OnJoin') > 0 );
@@ -1327,8 +1330,8 @@ sub on_chanfull {
     my ($event) = @_;
     my @args = $event->args;
 
-    &status(">>> chanfull/$b_blue$args[1]$ob");
-
+    &status(">>> chanfull/$b_blue$args[1]$ob, removing autojoin");
+    delete $chanconf{$chan}{autojoin};
     &joinNextChan();
 }
 
@@ -1336,9 +1339,10 @@ sub on_inviteonly {
     $conn = shift(@_);
     my ($event) = @_;
     my @args = $event->args;
+    my $chan = $args[1];
 
-    &status(">>> inviteonly/$b_cyan$args[1]$ob");
-
+    &status(">>> inviteonly/$b_cyan$chan$ob, removing autojoin");
+    delete $chanconf{$chan}{autojoin};
     &joinNextChan();
 }