X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=src%2FIRC%2FIrc.pl;h=49d0438ef576933c861ad69d40632a6ff4f812d5;hb=130fc9d79663d571b32c8a625e3487e7b42c10da;hp=13dcb2280269dbf3fd28441868a60417c48bbb6a;hpb=9470a98f023bb0efa5569b87e825c281014bae14;p=infobot.git diff --git a/src/IRC/Irc.pl b/src/IRC/Irc.pl index 13dcb22..49d0438 100644 --- a/src/IRC/Irc.pl +++ b/src/IRC/Irc.pl @@ -27,7 +27,7 @@ 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; @@ -40,25 +40,25 @@ loop:; } next unless (exists $ircPort{$host}); - my $retval = &irc($host, $ircPort{$host}); - &DEBUG("ircloop: after irc()"); - + my $retval = &irc($host, $ircPort{$host}); next unless (defined $retval and $retval == 0); - $error++; if ($error % 3 == 0 and $error != 0) { - &ERROR("CANNOT connect to this server; next!"); + &status("IRC: Could not connect."); + &status("IRC: "); next; } - if ($error >= 3*3) { - &ERROR("CANNOT connect to any irc server; stopping."); + if ($error >= 3*2) { + &status("IRC: cannot connect to any IRC servers; stopping."); + &shutdown(); exit 1; } } - &DEBUG("ircloop: end... going back."); + &status("IRC: ok, done one cycle of IRC servers; trying again."); + &loadIRCServers(); goto loop; } @@ -90,16 +90,19 @@ sub irc { $irc = new Net::IRC; - $conn = $irc->newconn( + my %args = ( Nick => $param{'ircNick'}, Server => $server, Port => $port, Ircname => $param{'ircName'}, - LocalAddr => $param{'ircHost'}, ); + $args{'LocalAddr'} = $param{'ircHost'} if ($param{'ircHost'}); + $args{'Password'} = $param{'ircPasswd'} if ($param{'ircPasswd'}); + + $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; } @@ -107,6 +110,8 @@ sub irc { # change internal timeout value for scheduler. $irc->{_timeout} = 10; # how about 60? + # Net::IRC debugging. + $irc->{_debug} = 1; $ircstats{'Server'} = "$server:$port"; @@ -131,11 +136,15 @@ sub irc { $conn->add_handler('nick', \&on_nick); $conn->add_handler('quit', \&on_quit); $conn->add_handler('notice', \&on_notice); - $conn->add_handler('whoisuser', \&on_whoisuser); + $conn->add_handler('whoischannels', \&on_whoischannels); + $conn->add_handler('useronchannel', \&on_useronchannel); + $conn->add_handler('whois', \&on_whois); $conn->add_handler('other', \&on_other); $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(315, \&on_endofwho); + $conn->add_global_handler(422, \&on_endofwho); # nomotd. $conn->add_global_handler(324, \&on_modeis); $conn->add_global_handler(333, \&on_topicinfo); $conn->add_global_handler(352, \&on_who); @@ -144,6 +153,12 @@ 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); + $conn->add_global_handler(443, \&on_useronchan); # end of handler stuff. @@ -173,7 +188,7 @@ sub say { my ($msg) = @_; if (!defined $msg) { $msg ||= "NULL"; - &DEBUG("say: msg == $msg."); + &WARN("say: msg == $msg."); return; } @@ -186,11 +201,14 @@ sub say { $pubcount++; $pubsize += length $msg; - if ($pubcount % 4 and $pubcount) { + my $i = &getChanConfDefault("sendPublicLimitLines", 3); + my $j = &getChanConfDefault("sendPublicLimitBytes", 1000); + + if ( ($pubcount % $i) == 0 and $pubcount) { sleep 1; - } elsif ($pubsize > 1500) { + } elsif ($pubsize > $j) { sleep 1; - $pubsize -= 1500; + $pubsize -= $j; } } else { @@ -212,7 +230,14 @@ sub msg { if (!defined $msg) { $msg ||= "NULL"; - &DEBUG("msg: msg == $msg."); + &WARN("msg: msg == $msg."); + return; + } + + if ($msgType =~ /chat/i) { + # todo: warn that we're using msg() to do DCC CHAT? + &dccsay($nick, $msg); + # todo: make dccsay deal with flood protection? return; } @@ -225,11 +250,13 @@ sub msg { $msgcount++; $msgsize += length $msg; - if ($msgcount % 4 and $msgcount) { + my $i = &getChanConfDefault("sendPrivateLimitLines", 3); + my $j = &getChanConfDefault("sendPrivateLimitBytes", 1000); + if ( ($msgcount % $i) == 0 and $msgcount) { sleep 1; - } elsif ($msgsize > 1000) { + } elsif ($msgsize > $j) { sleep 1; - $msgsize -= 1000; + $msgsize -= $j; } } else { @@ -246,7 +273,7 @@ sub msg { sub action { my ($target, $txt) = @_; if (!defined $txt) { - &DEBUG("action: txt == NULL."); + &WARN("action: txt == NULL."); return; } @@ -266,7 +293,7 @@ sub action { sub notice { my ($target, $txt) = @_; if (!defined $txt) { - &DEBUG("action: txt == NULL."); + &WARN("notice: txt == NULL."); return; } @@ -278,29 +305,31 @@ sub notice { $notcount++; $notsize += length $txt; - if ($notcount % 4 and $notcount) { + my $i = &getChanConfDefault("sendNoticeLimitLines", 3); + my $j = &getChanConfDefault("sendNoticeLimitBytes", 1000); + + if ( ($notcount % $i) == 0 and $notcount) { sleep 1; - } elsif ($notsize > 1500) { + } elsif ($notsize > $j) { sleep 1; - $notsize -= 1500; + $notsize -= $j; } } else { $notcount = 0; $nottime = $t; - $notsize = length $msg; + $notsize = length $txt; } $conn->notice($target, $txt); } - sub DCCBroadcast { my ($txt,$flag) = @_; ### FIXME: flag not supported yet. - foreach (keys %{$dcc{'CHAT'}}) { + foreach (keys %{ $dcc{'CHAT'} }) { $conn->privmsg($dcc{'CHAT'}{$_}, $txt); } } @@ -332,7 +361,7 @@ sub performReply { &msg($who, $reply); } elsif ($msgType eq 'chat') { if (!exists $dcc{'CHAT'}{$who}) { - &WARN("pSR: dcc{'CHAT'}{$who} does not exist."); + &VERB("pSR: dcc{'CHAT'}{$who} does not exist.",2); return; } $conn->privmsg($dcc{'CHAT'}{$who}, $reply); @@ -362,17 +391,23 @@ sub performStrictReply { } elsif ($msgType eq 'public') { &say($reply); } elsif ($msgType eq 'chat') { - &dccsay(lc $who,$reply); + &dccsay(lc $who, $reply); } else { &ERROR("pSR: msgType invalid? ($msgType)."); } } sub dccsay { - my ($who, $reply) = @_; + my($who, $reply) = @_; + + if (!defined $reply or $reply =~ /^\s*$/) { + &WARN("dccsay: reply == NULL."); + return; + } + if (!exists $dcc{'CHAT'}{$who}) { - &WARN("pSR: dcc{'CHAT'}{$who} does not exist."); - return ''; + &VERB("pSR: dcc{'CHAT'}{$who} does not exist. (2)",2); + return; } &status("=>$who<= $reply"); # dcc chat. @@ -385,9 +420,10 @@ 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]; + &DEBUG("dcc_close... close $who!"); } } @@ -399,13 +435,14 @@ sub joinchan { $chan = lc $1; } - &status("joining $b_blue$chan$ob"); - + # hopefully validChan is right. if (&validChan($chan)) { &status("join: already on $chan"); } else { + &status("joining $b_blue$chan$ob"); if (!$conn->join($chan)) { - &DEBUG("join failed. trying connect!"); + &DEBUG("joinchan: join failed. trying connect!"); + &clearIRCVars(); $conn->connect(); } } @@ -418,10 +455,15 @@ sub part { next if ($chan eq ""); $chan =~ tr/A-Z/a-z/; # lowercase. + if ($chan !~ /^$mask{chan}$/) { + &WARN("part: chan is invalid ($chan)"); + next; + } + &status("parting $chan"); if (!&validChan($chan)) { - &status("part: not on $chan"); - next; + &WARN("part: not on $chan; doing anyway"); +# next; } rawout("PART $chan"); @@ -438,7 +480,7 @@ sub mode { return; } - &DEBUG("MODE $chan $modes"); + &DEBUG("mode: MODE $chan $modes"); rawout("MODE $chan $modes"); } @@ -536,18 +578,48 @@ sub unban { sub quit { my ($quitmsg) = @_; &status("QUIT $param{'ircNick'} has quit IRC ($quitmsg)"); - $conn->quit($quitmsg); + if (defined $conn) { + $conn->quit($quitmsg); + } else { + &WARN("quit: could not quit!"); + } } sub nick { my ($nick) = @_; + if (!defined $nick) { + &ERROR("nick: nick == NULL."); + return; + } + + if (defined $ident and $nick eq $ident) { + &WARN("nick: nick == ident == '$ident'."); + } + + my $bad = 0; + $bad++ if (exists $nuh{ $param{'ircNick'} }); + $bad++ if (&IsNickInAnyChan($param{'ircNick'})); + + if ($bad) { + &WARN("Nick: not going to try and get my nick back. [". + scalar(localtime). "]"); + return; + } + if ($nick =~ /^$mask{nick}$/) { - &DEBUG("Changing nick to $nick (from $ident)"); rawout("NICK ".$nick); + + if (defined $ident) { + &status("nick: Changing nick to $nick (from $ident)"); + } else { + &DEBUG("first time nick change."); + $ident = $nick; + } + return 1; } - &DEBUG("nick failed... why oh why (nick => $nick)"); + &DEBUG("nick: failed... why oh why (nick => $nick)"); return 0; } @@ -565,46 +637,48 @@ sub invite { # Usage: &joinNextChan(); sub joinNextChan { 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--; + # !scalar @joinchan: + my @c = &getJoinChans(); + if (exists $cache{joinTime} and scalar @c) { + my $delta = time() - $cache{joinTime} - 5; + my $timestr = &Time2String($delta); + my $rate = sprintf("%.1f", $delta / @c); + delete $cache{joinTime}; + + &status("time taken to join all chans: $timestr; rate: $rate sec/join"); } - 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"); - } + # chanserv check: global channels, in case we missed one. + foreach ( &ChanConfList("chanServ_ops") ) { + &chanServCheck($_); } } -# Usage: &GetNickInChans($nick,$chan); -sub GetNickInChans { +# Usage: &getNickInChans($nick); +sub getNickInChans { my ($nick) = @_; 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, $_); } return @array; } -# Usage: &GetNicksInChan($chan); -sub GetNicksInChan { +# Usage: &getNicksInChan($chan); +sub getNicksInChan { my ($chan) = @_; my @array; @@ -621,12 +695,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; } @@ -636,7 +710,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; @@ -644,14 +718,25 @@ 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; + } + return 1; } else { return 0; @@ -659,13 +744,13 @@ sub validChan { } ### -# Usage: &DeleteUserInfo($nick,@chans); -sub DeleteUserInfo { +# Usage: &delUserInfo($nick,@chans); +sub delUserInfo { my ($nick,@chans) = @_; 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}); @@ -685,10 +770,12 @@ sub clearIRCVars { undef %channels; undef %floodjoin; - @joinchan = &getJoinChans(); + @joinchan = &getJoinChans(1); + $cache{joinTime} = time(); } sub getJoinChans { + my($show) = @_; my @chans; my @skip; @@ -712,31 +799,36 @@ sub getJoinChans { push(@chans, $_); } + my $str; if (scalar @skip) { - &status("gJC: channels not auto-joining: @skip"); + $str = "channels not auto-joining: @skip (joining: @chans)"; } else { - &status("gJC: auto-joining all chans."); + $str = "auto-joining all chans: @chans"; } + &status("Chans: ".$str) if ($show); + return @chans; } 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)."); + &status("DCC CHAT: closing DCC $type to $nick."); next unless (defined $dcc{$type}{$nick}); my $ref = $dcc{$type}{$nick}; - &DEBUG("ref => $ref"); - -# $dcc{$type}{$nick}->close(); + &dccsay($nick, "bye bye, $nick") if ($type =~ /^chat$/i); + $dcc{$type}{$nick}->close(); + delete $dcc{$type}{$nick}; + &DEBUG("after close for $nick"); } + delete $dcc{$type}; } } @@ -746,7 +838,7 @@ sub joinfloodCheck { return unless (&IsChanConf("joinfloodCheck")); if (exists $netsplit{lc $who}) { # netsplit join. - &DEBUG("jfC: $who was in netsplit; not checking."); + &DEBUG("joinfloodCheck: $who was in netsplit; not checking."); } if (exists $floodjoin{$chan}{$who}{Time}) { @@ -761,36 +853,46 @@ 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. my $delete = 0; + my $time = time(); foreach $chan (keys %floodjoin) { foreach $who (keys %{ $floodjoin{$chan} }) { - my $time = time() - $floodjoin{$chan}{$who}{Time}; - next unless ($time > 10); + my $t = $floodjoin{$chan}{$who}{Time}; + next unless (defined $t); + + my $delta = $time - $t; + next unless ($delta > 10); + delete $floodjoin{$chan}{$who}; $delete++; } } - &DEBUG("jfC: $delete deleted.") if ($delete); + &DEBUG("joinfloodCheck: $delete deleted.") if ($delete); } sub getHostMask { my($n) = @_; - &FIXME("getHostMask..."); + if (exists $nuh{$n}) { + return &makeHostMask($nuh{$n}); + } else { + $cache{on_who_Hack} = 1; + &rawout("WHO $n"); + } } 1;