X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=src%2FIRC%2FIrcHooks.pl;h=74087d0b474acd2628a64b30e9b078d5e056dc5d;hb=c68ac9b2d4b88535c1a2cfa695f6c4f683f0373c;hp=42e80187381ce874e9d8a48a5f4f23611ecc0b3a;hpb=330af0c290daac1ba1dc2f817a6ed3255600169d;p=infobot.git diff --git a/src/IRC/IrcHooks.pl b/src/IRC/IrcHooks.pl index 42e8018..74087d0 100644 --- a/src/IRC/IrcHooks.pl +++ b/src/IRC/IrcHooks.pl @@ -55,6 +55,7 @@ sub on_chat { $orig{message} = $msg; $nuh = $nuh{$who}; $uh = (split /\!/, $nuh)[1]; + $h = (split /\@/, $uh)[1]; $addressed = 1; $msgType = 'chat'; @@ -63,6 +64,11 @@ sub on_chat { my $crypto = $users{$userHandle}{PASS}; my $success = 0; + if ($userHandle eq "_default") { + &WARN("DCC CHAT: _default/guest not allowed."); + return; + } + ### TODO: prevent users without CRYPT chatting. if (!defined $crypto) { &DEBUG("todo: dcc close chat"); @@ -139,13 +145,15 @@ sub on_endofmotd { # first time run. if (!exists $users{_default}) { - &status("First time run... adding _default user."); + &status("!!! First time run... adding _default user."); $users{_default}{FLAGS} = "mrt"; - $users{_default}{HOSTS} = "*!*@*"; + $users{_default}{HOSTS}{"*!*@*"} = 1; } if (scalar keys %users < 2) { - &status("Ok... now /msg $ident PASS to get master access through DCC CHAT."); + &status("!"x40); + &status("!!! Ok. Now type '/msg $ident PASS ' to get master access through DCC CHAT."); + &status("!"x40); } # end of first time run. @@ -181,6 +189,9 @@ sub on_endofmotd { @joinchan = &getJoinChans(1); } + # ok, we're free to do whatever we want now. go for it! + $running = 1; + # unfortunately, Net::IRC does not implement this :( # invalid command... what is it? # &rawout("NOTIFY $ident"); @@ -227,9 +238,11 @@ sub on_dcc { } elsif ($type eq 'GET') { # SEND for us? &status("DCC: Initializing SEND for $nick."); $self->new_send($event->args); + } elsif ($type eq 'CHAT') { &status("DCC: Initializing CHAT for $nick."); $self->new_chat($event); + } else { &WARN("${b_green}DCC $type$ob (1)"); } @@ -294,7 +307,6 @@ sub on_dcc_open { } else { &WARN("${b_green}DCC $type$ob (3)"); - } } @@ -314,17 +326,25 @@ sub on_dcc_open_chat { if (!exists $users{$userHandle}{HOSTS}) { &pSReply("you have no hosts defined in my user file; rejecting."); - ### TODO: $sock->close(); + $sock->close(); return; } my $crypto = $users{$userHandle}{PASS}; $dcc{'CHAT'}{$nick} = $sock; + # todo: don't make DCC CHAT established in the first place. + if ($userHandle eq "_default") { + &dccsay($nick, "_default/guest not allowed"); + $sock->close(); + return; + } + if (defined $crypto) { + &status("DCC CHAT: going to use ".$nick."'s crypt."); &dccsay($nick,"Enter your password."); } else { - &dccsay($nick,"Welcome to blootbot DCC CHAT interface, $userHandle."); +# &dccsay($nick,"Welcome to blootbot DCC CHAT interface, $userHandle."); } } @@ -337,15 +357,28 @@ sub on_disconnect { $ircstats{'DisconnectTime'} = time(); $ircstats{'DisconnectReason'} = $what; $ircstats{'DisconnectCount'}++; - $ircstats{'TotalTime'} += time() - $ircstats{'ConnectTime'}; + $ircstats{'TotalTime'} += time() - $ircstats{'ConnectTime'} + if ($ircstats{'ConnectTime'}); # 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()) { - &WARN("not connected? help me. gonna call ircCheck() in 1800s"); - &ScheduleThis(30, "ircCheck"); + &DEBUG("on_disconnect: 3"); + &WARN("not connected? help me. gonna call ircCheck() in 60s"); + &clearIRCVars(); + &ScheduleThis(1, "ircCheck"); } } @@ -356,7 +389,7 @@ sub on_endofnames { # sync time should be done in on_endofwho like in BitchX if (exists $cache{jointime}{$chan}) { my $delta_time = sprintf("%.03f", &timedelta($cache{jointime}{$chan}) ); - $delta_time = 0 if ($delta_time < 0); + $delta_time = 0 if ($delta_time <= 0); if ($delta_time > 100) { &WARN("endofnames: delta_time > 100 ($delta_time)"); } @@ -364,7 +397,7 @@ sub on_endofnames { &status("$b_blue$chan$ob: sync in ${delta_time}s."); } - rawout("MODE $chan"); + &rawout("MODE $chan"); my $txt; my @array; @@ -406,9 +439,10 @@ sub on_invite { ### TODO: join key. if (exists $chanconf{$chan}) { + # it's still buggy :/ if (&validChan($chan)) { &msg($who, "i'm already in \002$chan\002."); - next; +# return; } &status("invited to $b_blue$chan$ob by $b_cyan$nick$ob"); @@ -422,9 +456,12 @@ sub on_join { $chan = lc( ($event->to)[0] ); # CASING!!!! $who = $event->nick(); $msgType = "public"; + my $i = scalar(keys %{ $channels{$chan} }); + my $j = $cache{maxpeeps}{$chan} || 0; $chanstats{$chan}{'Join'}++; $userstats{lc $who}{'Join'} = time() if (&IsChanConf("seenStats")); + $cache{maxpeeps}{$chan} = $i if ($i > $j); &joinfloodCheck($who, $chan, $event->userhost); @@ -443,7 +480,7 @@ sub on_join { } if ($netsplit and !exists $cache{netsplit}) { - &DEBUG("on_join: ok.... re-running chanlimitCheck in 60."); + &VERB("on_join: ok.... re-running chanlimitCheck in 60.",2); $conn->schedule(60, sub { &chanlimitCheck(); delete $cache{netsplit}; @@ -504,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()? @@ -514,11 +552,10 @@ sub on_join { } ### ROOTWARN: - # what's the +o requirement? - &rootWarn($who,$user,$host,$chan) - if (&IsChanConf("rootWarn") && - $user =~ /^r(oo|ew|00)t$/i && - $channels{$chan}{'o'}{$ident}); + &rootWarn($who,$user,$host,$chan) if ( + &IsChanConf("rootWarn") && + $user =~ /^r(oo|ew|00)t$/i + ); ### NEWS: if (&IsChanConf("news") && &IsChanConf("newsKeepRead")) { @@ -593,6 +630,7 @@ sub on_msg { $uh = $event->userhost(); $nuh = $nick."!".$uh; $msgtime = time(); + $h = $host; if ($nick eq $ident) { # hopefully ourselves. if ($msg eq "TEST") { @@ -739,6 +777,11 @@ sub on_part { $who = $nick; $msgType = "public"; + if (0 and !exists $channels{$chan}) { + &DEBUG("on_part: found out we're on $chan!"); + $channels{$chan} = 1; + } + if (exists $floodjoin{$chan}{$nick}{Time}) { delete $floodjoin{$chan}{$nick}; } @@ -767,8 +810,14 @@ sub on_ping { sub on_ping_reply { my ($self, $event) = @_; - my $nick = $event->nick; - my $lag = time() - ($event->args)[1]; + my $nick = $event->nick; + my $t = ($event->args)[1]; + if (!defined $t) { + &WARN("on_ping_reply: t == undefined."); + return; + } + + my $lag = time() - $t; &status(">>> ${b_green}CTCP PING$ob reply from $b_cyan$nick$ob: $lag sec."); } @@ -784,6 +833,7 @@ sub on_public { $msgType = "public"; # todo: move this out of hookMsg to here? ($user,$host) = split(/\@/, $uh); + $h = $host; # rare case should this happen - catch it just in case. if ($bot_pid != $$) { @@ -801,16 +851,40 @@ sub on_public { # would this slow things down? if ($_ = &getChanConf("ircTextCounters")) { + my $time = time(); + foreach (split /[\s]+/) { - next unless ($msg =~ /^\Q$_\E$/i); - &status("textcounters: $_ matched for $who"); + my $x = $_; + + # either full word or ends with a space, etc... + next unless ($msg =~ /^\Q$x\E[\$\s!.]/i); - my $v = &dbGet("stats", "counter", "nick='$who' and type='$msg'"); + &VERB("textcounters: $x matched for $who",2); + my $c = $chan || "PRIVATE"; + + my ($v,$t) = &dbGet("stats", "counter,time", + "nick=". &dbQuote($who) + ." AND type=".&dbQuote($x) + ." AND channel=".&dbQuote($c) + ); $v++; - &dbReplace("stats", (nick => $who, type => $_, counter => $v) ); + # don't allow ppl to cheat the stats :-) + next unless ($time - $t > 10); + + my %hash = ( + nick => $who, + type => $x, + channel => $c, + + time => $time, + counter => $v, + ); + + + &dbReplace("stats", "nick", %hash); # does not work, atleast with old mysql!!! :( -# &dbReplace("stats", (nick => $who, type => $_, -counter => "counter+1") ); +# &dbReplace("stats", (nick => $who, type => $x, -counter => "counter+1") ); } } @@ -832,7 +906,7 @@ sub on_quit { ### $chan = $reason; # no. my $count = 0; - foreach (keys %channels) { + foreach (grep !/^_default$/, keys %channels) { # fixes inconsistent chanstats bug #1. if (!&IsNickInChan($nick,$_)) { $count++; @@ -845,25 +919,11 @@ sub on_quit { &DEBUG("on_quit: nick $nick was not found in any chan."); } - &delUserInfo($nick, keys %channels); - - if (exists $nuh{lc $nick}) { - delete $nuh{lc $nick}; - } else { - # well.. it's good but weird that this has happened - lets just - # be quiet about it. - } - delete $userstats{lc $nick} if (&IsChanConf("seenStats")); - delete $chanstats{lc $nick}; - # should fix chanstats inconsistencies bug #2. if ($reason =~ /^($mask{host})\s($mask{host})$/) { # netsplit. $reason = "NETSPLIT: $1 <=> $2"; # chanlimit code. - my @l = &getNickInChans($nick); - &DEBUG("on_quit: l => ".scalar(@l) ); - foreach $chan ( &getNickInChans($nick) ) { next unless ( &IsChanConf("chanlimitcheck") ); next unless ( exists $channels{$_}{'l'} ); @@ -885,6 +945,20 @@ sub on_quit { &ERROR("^^^ THIS SHOULD NEVER HAPPEN (10)."); } + ### + ### ok... lets clear out the cache + ### + &delUserInfo($nick, keys %channels); + if (exists $nuh{lc $nick}) { + delete $nuh{lc $nick}; + } else { + # well.. it's good but weird that this has happened - lets just + # be quiet about it. + } + delete $userstats{lc $nick} if (&IsChanConf("seenStats")); + delete $chanstats{lc $nick}; + ### + # does this work? if ($nick !~ /^\Q$ident\E$/ and $nick =~ /^\Q$param{'ircNick'}\E$/i) { &status("nickchange: own nickname became free; changing."); @@ -984,7 +1058,7 @@ sub on_crversion { } if (grep /^\Q$nick\E$/i, @vernick) { - &WARN("nick $nick found in vernick; skipping."); + &WARN("nick $nick found in vernick ($ver); skipping."); return; } push(@vernick, $nick); @@ -998,18 +1072,25 @@ sub on_crversion { } elsif ($ver =~ /irssi/i) { $ver{irssi}{$nick} = $ver; - } elsif ($ver =~ /epic/i) { + } elsif ($ver =~ /epic|(Third Eye)/i) { $ver{epic}{$nick} = $ver; + } elsif ($ver =~ /ircII|PhoEniX/i) { + $ver{ircII}{$nick} = $ver; + } elsif ($ver =~ /mirc/i) { - &DEBUG("verstats: mirc: $nick => '$ver'."); +# &DEBUG("verstats: mirc: $nick => '$ver'."); $ver{mirc}{$nick} = $ver; +# ok... then we get to the lesser known/used clients. } elsif ($ver =~ /ircle/i) { $ver{ircle}{$nick} = $ver; - } elsif ($ver =~ /ircII/i) { - $ver{ircII}{$nick} = $ver; + } elsif ($ver =~ /chatzilla/i) { + $ver{chatzilla}{$nick} = $ver; + + } elsif ($ver =~ /pirch/i) { + $ver{pirch}{$nick} = $ver; } elsif ($ver =~ /sirc /i) { $ver{sirc}{$nick} = $ver; @@ -1046,6 +1127,7 @@ sub on_who { $cache{nuhInfo}{lc $args[5]}{Nick} = $args[5]; $cache{nuhInfo}{lc $args[5]}{User} = $args[2]; $cache{nuhInfo}{lc $args[5]}{Host} = $args[3]; + $cache{nuhInfo}{lc $args[5]}{NUH} = "$args[5]!$args[2]\@$args[3]"; return; } @@ -1057,15 +1139,28 @@ sub on_who { $nuh{lc $args[5]} = $args[5]."!".$args[2]."\@".$args[3]; } -sub on_whoisuser { +sub on_whois { my ($self, $event) = @_; my @args = $event->args; - &DEBUG("on_whoisuser: @args"); - $nuh{lc $args[1]} = $args[1]."!".$args[2]."\@".$args[3]; } +sub on_whoischannels { + my ($self, $event) = @_; + my @args = $event->args; + + &DEBUG("on_whoischannels: @args"); +} + +sub on_useronchannel { + my ($self, $event) = @_; + my @args = $event->args; + + &DEBUG("on_useronchannel: @args"); + &joinNextChan(); +} + ### ### since joinnextchan is hooked onto on_endofnames, these are needed. ### @@ -1074,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(); } @@ -1082,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(); } @@ -1102,4 +1201,12 @@ sub on_badchankey { &joinNextChan(); } +sub on_useronchan { + my ($self, $event) = @_; + my @args = $event->args; + + &DEBUG("on_useronchan: args => @args"); + &joinNextChan(); +} + 1;