X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=src%2FIRC%2FIrc.pl;h=615b62f49c5f3c80b524c1eabfef7adeb4d258b3;hb=61d2bab8e7754a3eeaf58d108cbe3c84aba339ad;hp=076cb8279a518b47fbc971f4d5abc6949045a558;hpb=7aa3e87845f366ac77aff212e2fcec272b2e18a0;p=infobot.git diff --git a/src/IRC/Irc.pl b/src/IRC/Irc.pl index 076cb82..615b62f 100644 --- a/src/IRC/Irc.pl +++ b/src/IRC/Irc.pl @@ -23,37 +23,44 @@ sub ircloop { my $error = 0; my $lastrun = 0; - while (1) { +loop:; + while (my $host = shift @ircServers) { # JUST IN CASE. irq was complaining about this. if ($lastrun == time()) { - &DEBUG("hrm... lastrun == time()"); + &DEBUG("ircloop: hrm... lastrun == time()"); $error++; sleep 10; next; } - foreach (@ircServers) { - if (!defined $_) { - &DEBUG("ircloop: ircServers[x] = NULL."); - $lastrun = time(); - next; - } - next unless (exists $ircPort{$_}); + if (!defined $host) { + &DEBUG("ircloop: ircServers[x] = NULL."); + $lastrun = time(); + next; + } + next unless (exists $ircPort{$host}); - my $retval = &irc($_, $ircPort{$_}); - next unless (defined $retval and $retval == 0); - $error++; - if ($error % 3 == 0 and $error != 0) { - &ERROR("CANNOT connect to this server; next!"); - next; - } + my $retval = &irc($host, $ircPort{$host}); + &DEBUG("ircloop: after irc()"); - if ($error >= 3*3) { - &ERROR("CANNOT connect to any irc server; stopping."); - exit 1; - } + next unless (defined $retval and $retval == 0); + + $error++; + + if ($error % 3 == 0 and $error != 0) { + &ERROR("CANNOT connect to this server; next!"); + next; + } + + if ($error >= 3*3) { + &ERROR("CANNOT connect to any irc server; stopping."); + exit 1; } } + + &DEBUG("ircloop: end... going back."); + &loadIRCServers(); + goto loop; } sub irc { @@ -137,6 +144,11 @@ sub irc { $conn->add_global_handler(376, \&on_endofmotd); # on_connect. $conn->add_global_handler(433, \&on_nick_taken); $conn->add_global_handler(439, \&on_targettoofast); + # for proper joinnextChan behaviour + $conn->add_global_handler(471, \&on_chanfull); + $conn->add_global_handler(473, \&on_inviteonly); + $conn->add_global_handler(474, \&on_banned); + $conn->add_global_handler(475, \&on_badchankey); # end of handler stuff. @@ -166,19 +178,31 @@ sub say { my ($msg) = @_; if (!defined $msg) { $msg ||= "NULL"; - &DEBUG("say: msg == $msg."); + &WARN("say: msg == $msg."); return; } - if ($msg eq $last{say} and length($msg) > 256) { - &status("say: detected repeated message; skipping."); - return; - } - $last{say} = $msg; - &status(" $msg"); if (&whatInterface() =~ /IRC/) { - $msg = "zero" if ($msg =~ /^0+$/); + $msg = "zero" if ($msg =~ /^0+$/); + my $t = time(); + + if ($t == $pubtime) { + $pubcount++; + $pubsize += length $msg; + + if ( ($pubcount % 4) == 0 and $pubcount) { + sleep 1; + } elsif ($pubsize > 1500) { + sleep 1; + $pubsize -= 1500; + } + + } else { + $pubcount = 0; + $pubtime = $t; + $pubsize = length $msg; + } $conn->privmsg($talkchannel, $msg); } @@ -193,25 +217,41 @@ sub msg { if (!defined $msg) { $msg ||= "NULL"; - &DEBUG("msg: msg == $msg."); + &WARN("msg: msg == $msg."); return; } - if ($msg eq $last{msg} and length($msg) > 256) { - &status("msg: detected repeated message; skipping."); - return; - } - $last{msg} = $msg; - &status(">$nick< $msg"); - $conn->privmsg($nick, $msg) if (&whatInterface() =~ /IRC/); + + if (&whatInterface() =~ /IRC/) { + my $t = time(); + + if ($t == $msgtime) { + $msgcount++; + $msgsize += length $msg; + + if ( ($msgcount % 4) == 0 and $msgcount) { + sleep 1; + } elsif ($msgsize > 1000) { + sleep 1; + $msgsize -= 1000; + } + + } else { + $msgcount = 0; + $msgtime = $t; + $msgsize = length $msg; + } + + $conn->privmsg($nick, $msg); + } } # Usage: &action(nick || chan, txt); sub action { my ($target, $txt) = @_; if (!defined $txt) { - &DEBUG("action: txt == NULL."); + &WARN("action: txt == NULL."); return; } @@ -227,16 +267,35 @@ sub action { rawout($rawout); } -# Usage: &action(nick || chan, txt); -sub notice{ +# Usage: ¬ice(nick || chan, txt); +sub notice { my ($target, $txt) = @_; if (!defined $txt) { - &DEBUG("action: txt == NULL."); + &WARN("notice: txt == NULL."); return; } &status("-$target- $txt"); + my $t = time(); + + if ($t == $nottime) { + $notcount++; + $notsize += length $txt; + + if ( ($notcount % 3) == 0 and $notcount) { + sleep 1; + } elsif ($notsize > 1000) { + sleep 1; + $notsize -= 1000; + } + + } else { + $notcount = 0; + $nottime = $t; + $notsize = length $txt; + } + $conn->notice($target, $txt); } @@ -246,7 +305,7 @@ sub DCCBroadcast { ### FIXME: flag not supported yet. - foreach (keys %{$dcc{'CHAT'}}) { + foreach (keys %{ $dcc{'CHAT'} }) { $conn->privmsg($dcc{'CHAT'}{$_}, $txt); } } @@ -308,7 +367,7 @@ sub performStrictReply { } elsif ($msgType eq 'public') { &say($reply); } elsif ($msgType eq 'chat') { - &dccsay($who,$reply); + &dccsay(lc $who,$reply); } else { &ERROR("pSR: msgType invalid? ($msgType)."); } @@ -331,7 +390,7 @@ sub dcc_close { foreach $type (keys %dcc) { &FIXME("dcc_close: $who"); - my @who = grep /^\Q$who\E$/i, keys %{$dcc{$type}}; + my @who = grep /^\Q$who\E$/i, keys %{ $dcc{$type} }; next unless (scalar @who); $who = $who[0]; } @@ -350,7 +409,10 @@ sub joinchan { if (&validChan($chan)) { &status("join: already on $chan"); } else { - $conn->join($chan); + if (!$conn->join($chan)) { + &DEBUG("joinchan: join failed. trying connect!"); + $conn->connect(); + } } } @@ -363,8 +425,8 @@ sub part { &status("parting $chan"); if (!&validChan($chan)) { - &status("part: not on $chan"); - next; + &WARN("part: not on $chan; doing anyway"); +# next; } rawout("PART $chan"); @@ -381,7 +443,7 @@ sub mode { return; } - &DEBUG("MODE $chan $modes"); + &DEBUG("mode: MODE $chan $modes"); rawout("MODE $chan $modes"); } @@ -390,7 +452,7 @@ sub op { my ($chan, @who) = @_; my $os = "o" x scalar(@who); - &mode($chan, "+$os ".@who); + &mode($chan, "+$os @who"); } sub deop { @@ -433,22 +495,15 @@ sub kick { sub ban { my ($mask,$chan) = @_; - my (@chans) = ($chan eq "") ? (keys %channels) : lc($chan); + my (@chans) = ($chan =~ /^\*?$/) ? (keys %channels) : lc($chan); my $ban = 0; - if ($chan ne "" and &validChan($chan) == 0) { + if ($chan !~ /^\*?$/ and &validChan($chan) == 0) { &ERROR("ban: invalid channel $chan."); return; } - $nick =~ tr/A-Z/a-z/; - foreach $chan (@chans) { - if (!&IsNickInChan($nick,$chan) and scalar @chans == 1) { - &status("Ban: $nick is not on $chan."); - next; - } - if (!exists $channels{$chan}{o}{$ident}) { &status("Ban: do not have ops on $chan :("); next; @@ -462,6 +517,27 @@ sub ban { return $ban; } +sub unban { + my ($mask,$chan) = @_; + my (@chans) = ($chan =~ /^\*?$/) ? (keys %channels) : lc($chan); + my $ban = 0; + + &DEBUG("unban: mask = $mask, chan = @chans"); + + foreach $chan (@chans) { + if (!exists $channels{$chan}{o}{$ident}) { + &status("unBan: do not have ops on $chan :("); + next; + } + + &status("Removed ban $mask from $chan."); + &rawout("MODE $chan -b $mask"); + $ban++; + } + + return $ban; +} + sub quit { my ($quitmsg) = @_; &status("QUIT $param{'ircNick'} has quit IRC ($quitmsg)"); @@ -472,9 +548,11 @@ sub nick { my ($nick) = @_; if ($nick =~ /^$mask{nick}$/) { + &DEBUG("nick: Changing nick to $nick (from $ident)"); rawout("NICK ".$nick); return 1; } + &DEBUG("nick: failed... why oh why (nick => $nick)"); return 0; } @@ -491,28 +569,21 @@ sub invite { # Usage: &joinNextChan(); sub joinNextChan { + &DEBUG("joinNextChan called."); + if (scalar @joinchan) { - my $chan = shift @joinchan; + $chan = shift @joinchan; &joinchan($chan); if (my $i = scalar @joinchan) { &status("joinNextChan: $i chans to join."); } - return; - } - if (&IsParam("nickServ_pass") and $nickserv < 1) { - &WARN("jNC: nickserv/chanserv not up.") if (!$nickserv); - $nickserv--; - } + } else { + # chanserv check: global channels, in case we missed one. - my %chan = &getChanConfList("chanServ"); - foreach $chan (keys %chan) { - next unless ($chan{$chan} > 0); - - if (!exists $channels{$chan}{'o'}{$ident}) { - &status("ChanServ ==> Requesting ops for $chan."); - &rawout("PRIVMSG ChanServ :OP $chan $ident"); + foreach ( &ChanConfList("chanServ_ops") ) { + &chanServCheck($_); } } } @@ -523,7 +594,7 @@ sub GetNickInChans { my @array; foreach (keys %channels) { - next unless (grep /^\Q$nick\E$/i, keys %{$channels{$_}{''}}); + next unless (grep /^\Q$nick\E$/i, keys %{ $channels{$_}{''} }); push(@array, $_); } @@ -548,12 +619,12 @@ sub IsNickInChan { return 0; } - if (grep /^\Q$nick\E$/i, keys %{$channels{$chan}{''}}) { + if (grep /^\Q$nick\E$/i, keys %{ $channels{$chan}{''} }) { return 1; } else { foreach (keys %channels) { next unless (/[A-Z]/); - &DEBUG("hash channels contains mixed cased chan!!!"); + &DEBUG("iNIC: hash channels contains mixed cased chan!!!"); } return 0; } @@ -563,7 +634,7 @@ sub IsNickInAnyChan { my ($nick) = @_; foreach $chan (keys %channels) { - next unless (grep /^\Q$nick\E$/i, keys %{$channels{$chan}{''}}); + next unless (grep /^\Q$nick\E$/i, keys %{ $channels{$chan}{''} }); return 1; } return 0; @@ -592,7 +663,7 @@ sub DeleteUserInfo { my ($mode,$chan); foreach $chan (@chans) { - foreach $mode (keys %{$channels{$chan}}) { + foreach $mode (keys %{ $channels{$chan} }) { # use grep here? next unless (exists $channels{$chan}{$mode}{$nick}); @@ -608,7 +679,7 @@ sub clearChanVars { } sub clearIRCVars { - &DEBUG("clearIRCVars() called!"); +### &DEBUG("clearIRCVars() called!"); undef %channels; undef %floodjoin; @@ -649,17 +720,20 @@ sub getJoinChans { } sub closeDCC { - &DEBUG("closeDCC called."); +### &DEBUG("closeDCC called."); foreach $type (keys %dcc) { next if ($type ne uc($type)); - foreach $nick (keys %{$dcc{$type}}) { + foreach $nick (keys %{ $dcc{$type} }) { next unless (defined $nick); &DEBUG("closing DCC $type to $nick (FIXME)."); next unless (defined $dcc{$type}{$nick}); - $dcc{$type}{$nick}->close(); + my $ref = $dcc{$type}{$nick}; + &DEBUG("ref => $ref"); + +# $dcc{$type}{$nick}->close(); } } } @@ -670,7 +744,7 @@ sub joinfloodCheck { return unless (&IsChanConf("joinfloodCheck")); if (exists $netsplit{lc $who}) { # netsplit join. - &DEBUG("jfC: $who was in netsnipe; not checking."); + &DEBUG("joinfloodCheck: $who was in netsplit; not checking."); } if (exists $floodjoin{$chan}{$who}{Time}) { @@ -685,16 +759,16 @@ sub joinfloodCheck { my $c = $_; my $count = scalar keys %{ $floodjoin{$c} }; next unless ($count > 5); - &DEBUG("count => $count"); + &DEBUG("joinflood: count => $count"); my $time; foreach (keys %{ $floodjoin{$c} }) { $time += $floodjoin{$c}{$_}{Time}; } - &DEBUG("time => $time"); + &DEBUG("joinflood: time => $time"); $time /= $count; - &DEBUG("new time => $time"); + &DEBUG("joinflood: new time => $time"); } ### Clean it up. @@ -708,13 +782,13 @@ sub joinfloodCheck { } } - &DEBUG("jfC: $delete deleted.") if ($delete); + &DEBUG("joinfloodCheck: $delete deleted.") if ($delete); } sub getHostMask { my($n) = @_; - &FIXME("getHostMask..."); + &FIXME("getHostMask($n) called..."); } 1;