X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=src%2FIRC%2FIrcHooks.pl;h=8710e2de3aab528e1a076232041ec1ea198c1dbd;hb=dbca81404213906c42343ee09084eb802e71a30e;hp=45fee8b074e0a14fed32232b85a87ce1d6d827a3;hpb=422e644b3f94e392ef091c9a167b143ab43eca2c;p=infobot.git diff --git a/src/IRC/IrcHooks.pl b/src/IRC/IrcHooks.pl index 45fee8b..8710e2d 100644 --- a/src/IRC/IrcHooks.pl +++ b/src/IRC/IrcHooks.pl @@ -7,7 +7,8 @@ # GENERIC. TO COPY. sub on_generic { - my ($self, $event) = @_; + $conn = shift(@_); + my ($event) = @_; my $nick = $event->nick(); my $chan = ($event->to)[0]; @@ -20,7 +21,8 @@ sub on_generic { } sub on_action { - my ($self, $event) = @_; + $conn = shift(@_); + my ($event) = @_; my ($nick, @args) = ($event->nick, $event->args); my $chan = ($event->to)[0]; @@ -34,14 +36,15 @@ sub on_action { } sub on_chat { - my ($self, $event) = @_; + $conn = shift(@_); + my ($event) = @_; my $msg = ($event->args)[0]; my $sock = ($event->to)[0]; my $nick = lc $event->nick(); if (!exists $nuh{$nick}) { &DEBUG("chat: nuh{$nick} doesn't exist; trying WHOIS ."); - $self->whois($nick); + $conn->whois($nick); return; } @@ -69,16 +72,16 @@ sub on_chat { ### TODO: prevent users without CRYPT chatting. if (!defined $crypto) { - &DEBUG("todo: dcc close chat"); + &TODO("dcc close chat"); &msg($who, "nope, no guest logins allowed..."); return; } if (&ckpasswd($msg, $crypto)) { # stolen from eggdrop. - $self->privmsg($sock, "Connected to $ident"); - $self->privmsg($sock, "Commands start with '.' (like '.quit' or '.help')"); - $self->privmsg($sock, "Everything else goes out to the party line."); + $conn->privmsg($sock, "Connected to $ident"); + $conn->privmsg($sock, "Commands start with '.' (like '.quit' or '.help')"); + $conn->privmsg($sock, "Everything else goes out to the party line."); &dccStatus(2) unless (exists $sched{"dccStatus"}{RUNNING}); @@ -89,7 +92,7 @@ sub on_chat { &DEBUG("chat: sock => '$sock'."); ### $sock->close(); delete $dcc{'CHAT'}{$nick}; - &DEBUG("chat: after closing sock. FIXME"); + &FIXME("chat: after closing sock."); ### BUG: close seizes bot. why? } @@ -133,21 +136,20 @@ sub on_chat { # is there isoff? how do we know if someone signs off? sub on_ison { - my ($self, $event) = @_; + $conn = shift(@_); + my ($event) = @_; my $x1 = ($event->args)[0]; my $x2 = ($event->args)[1]; $x2 =~ s/\s$//; -# &nick( $param{'ircNick'} ); - &DEBUG("on_ison: x1 = '$x1', x2 => '$x2'"); } sub on_endofmotd { - my ($self) = @_; + $conn = shift(@_); # update IRCStats. - $ident = $param{'ircNick'}; + $ident = $conn->nick(); $ircstats{'ConnectTime'} = time(); $ircstats{'ConnectCount'}++; if (defined $ircstats{'DisconnectTime'}) { @@ -204,7 +206,7 @@ sub on_endofmotd { $running = 1; # add ourself to notify. - $conn->ison( $param{'ircNick'} ); + $conn->ison($conn->nick()); # Q, as on quakenet.org. if (&IsParam("Q_pass")) { @@ -216,7 +218,8 @@ sub on_endofmotd { } sub on_endofwho { - my ($self, $event) = @_; + $conn = shift(@_); + my ($event) = @_; # &DEBUG("endofwho: chan => $chan"); $chan ||= ($event->args)[1]; # &DEBUG("endofwho: chan => $chan"); @@ -227,13 +230,14 @@ sub on_endofwho { } sub on_dcc { - my ($self, $event) = @_; + $conn = shift(@_); + my ($event) = @_; my $type = uc( ($event->args)[1] ); my $nick = lc $event->nick(); # pity Net::IRC doesn't store nuh. Here's a hack :) if (!exists $nuh{lc $nick}) { - $self->whois($nick); + $conn->whois($nick); $nuh{$nick} = "GETTING-NOW"; # trying. } $type ||= "???"; @@ -243,16 +247,16 @@ sub on_dcc { my $get = ($event->args)[2]; open(DCCGET,">$get"); - $self->new_get($event, \*DCCGET); + $conn->new_get($event, \*DCCGET); } elsif ($type eq 'GET') { # SEND for us? &status("DCC: Initializing SEND for $nick."); - $self->new_send($event->args); + $conn->new_send($event->args); } elsif ($type eq 'CHAT') { &status("DCC: Initializing CHAT for $nick."); - $self->new_chat($event); -# $self->new_chat(1, $nick, $event->host); + $conn->new_chat($event); +# $conn->new_chat(1, $nick, $event->host); } else { &WARN("${b_green}DCC $type$ob (1)"); @@ -260,7 +264,8 @@ sub on_dcc { } sub on_dcc_close { - my ($self, $event) = @_; + $conn = shift(@_); + my ($event) = @_; my $nick = $event->nick(); my $sock = ($event->to)[0]; @@ -287,7 +292,8 @@ sub on_dcc_close { } sub on_dcc_open { - my ($self, $event) = @_; + $conn = shift(@_); + my ($event) = @_; my $type = uc( ($event->args)[0] ); my $nick = lc $event->nick(); my $sock = ($event->to)[0]; @@ -327,7 +333,7 @@ sub on_dcc_open_chat { my(undef, $nick, $sock) = @_; if ($nuh{$nick} eq "GETTING-NOW") { - &DEBUG("getting nuh for $nick failed. FIXME."); + &FIXME("getting nuh for $nick failed."); return; } @@ -344,7 +350,7 @@ sub on_dcc_open_chat { my $crypto = $users{$userHandle}{PASS}; $dcc{'CHAT'}{$nick} = $sock; - # todo: don't make DCC CHAT established in the first place. + # TODO: don't make DCC CHAT established in the first place. if ($userHandle eq "_default") { &dccsay($nick, "_default/guest not allowed"); $sock->close(); @@ -360,7 +366,8 @@ sub on_dcc_open_chat { } sub on_disconnect { - my ($self, $event) = @_; + $conn = shift(@_); + my ($event) = @_; my $from = $event->from(); my $what = ($event->args)[0]; @@ -376,14 +383,14 @@ sub on_disconnect { &clearIRCVars(); - if (!defined $self) { + if (!defined $conn) { &WARN("on_disconnect: self is undefined! WTF"); &DEBUG("running function irc... lets hope this works."); &irc(); return; } - if (!$self->connect()) { + if (!$conn->connect()) { &DEBUG("on_disconnect: 3"); &WARN("not connected? help me. gonna call ircCheck() in 60s"); &clearIRCVars(); @@ -392,7 +399,8 @@ sub on_disconnect { } sub on_endofnames { - my ($self, $event) = @_; + $conn = shift(@_); + my ($event) = @_; my $chan = ($event->args)[1]; # sync time should be done in on_endofwho like in BitchX @@ -429,7 +437,8 @@ sub on_endofnames { } sub on_init { - my ($self, $event) = @_; + $conn = shift(@_); + my ($event) = @_; my (@args) = ($event->args); shift @args; @@ -437,7 +446,8 @@ sub on_init { } sub on_invite { - my ($self, $event) = @_; + $conn = shift(@_); + my ($event) = @_; my $chan = lc( ($event->args)[0] ); my $nick = $event->nick; @@ -460,7 +470,8 @@ sub on_invite { } sub on_join { - my ($self, $event) = @_; + $conn = shift(@_); + my ($event) = @_; my ($user,$host) = split(/\@/, $event->userhost); $chan = lc( ($event->to)[0] ); # CASING!!!! $who = $event->nick(); @@ -474,7 +485,7 @@ sub on_join { } $chanstats{$chan}{'Join'}++; - $userstats{lc $who}{'Join'} = time() if (&IsChanConf("seenStats")); + $userstats{lc $who}{'Join'} = time() if (&IsChanConf("seenStats") > 0); $cache{maxpeeps}{$chan} = $i if ($i > $j); &joinfloodCheck($who, $chan, $event->userhost); @@ -551,7 +562,7 @@ sub on_join { return if ($netsplit); # who == bot. - if ($who eq $ident or $who =~ /^$ident$/i) { + if ($who eq $ident or $who =~ /^\Q$ident\E$/i) { if (defined( my $whojoin = $cache{join}{$chan} )) { &msg($chan, "Okay, I'm here. (courtesy of $whojoin)"); delete $cache{join}{$chan}; @@ -590,7 +601,8 @@ sub on_join { } sub on_kick { - my ($self, $event) = @_; + $conn = shift(@_); + my ($event) = @_; my ($chan,$reason) = $event->args; my $kicker = $event->nick; my $kickee = ($event->to)[0]; @@ -612,7 +624,8 @@ sub on_kick { } sub on_mode { - my ($self, $event) = @_; + $conn = shift(@_); + my ($event) = @_; my ($user, $host) = split(/\@/, $event->userhost); my @args = $event->args(); my $nick = $event->nick(); @@ -630,7 +643,8 @@ sub on_mode { } sub on_modeis { - my ($self, $event) = @_; + $conn = shift(@_); + my ($event) = @_; my ($myself, undef,@args) = $event->args(); my $nick = $event->nick(); $chan = ($event->args())[1]; @@ -639,7 +653,8 @@ sub on_modeis { } sub on_msg { - my ($self, $event) = @_; + $conn = shift(@_); + my ($event) = @_; my $nick = $event->nick; my $msg = ($event->args)[0]; @@ -664,7 +679,8 @@ sub on_msg { } sub on_names { - my ($self, $event) = @_; + $conn = shift(@_); + my ($event) = @_; my @args = $event->args; my $chan = lc $args[2]; # CASING, the last of them! @@ -676,7 +692,8 @@ sub on_names { } sub on_nick { - my ($self, $event) = @_; + $conn = shift(@_); + my ($event) = @_; my $nick = $event->nick(); my $newnick = ($event->args)[0]; @@ -694,7 +711,7 @@ sub on_nick { $channels{$chan}{$mode}{$newnick} = $channels{$chan}{$mode}{$nick}; } } - # todo: do %flood* aswell. + # TODO: do %flood* aswell. &delUserInfo($nick, keys %channels); $nuh{lc $newnick} = $nuh{lc $nick}; @@ -705,16 +722,16 @@ sub on_nick { $ident = $newnick; } else { &status(">>> $b_cyan$nick$ob materializes into $b_green$newnick$ob"); - - if ($nick =~ /^\Q$param{'ircNick'}\E$/i) { + my $mynick=$conn->nick(); + if ($nick =~ /^\Q$mynick\E$/i) { &getNickInUse(); } } } sub on_nick_taken { - my ($self) = @_; - my $nick = $self->nick(); + $conn = shift(@_); + my $nick = $conn->nick(); my $newnick = $nick.int(rand 10); if ($nick eq $ident) { @@ -726,7 +743,7 @@ sub on_nick_taken { &status("nick taken ($nick); preparing nick change."); - $self->whois($nick); + $conn->whois($nick); $conn->schedule(5, sub { &status("nick taken; changing to temporary nick ($nick -> $newnick)."); &nick($newnick); @@ -734,7 +751,8 @@ sub on_nick_taken { } sub on_notice { - my ($self, $event) = @_; + $conn = shift(@_); + my ($event) = @_; my $nick = $event->nick(); my $chan = ($event->to)[0]; my $args = ($event->args)[0]; @@ -786,7 +804,8 @@ sub on_notice { } sub on_other { - my ($self, $event) = @_; + $conn = shift(@_); + my ($event) = @_; my $chan = ($event->to)[0]; my $nick = $event->nick; @@ -795,7 +814,8 @@ sub on_other { } sub on_part { - my ($self, $event) = @_; + $conn = shift(@_); + my ($event) = @_; $chan = lc( ($event->to)[0] ); # CASING!!! my $nick = $event->nick; my $userhost = $event->userhost; @@ -817,7 +837,7 @@ sub on_part { &clearChanVars($chan); } - if (!&IsNickInAnyChan($nick) and &IsChanConf("seenStats")) { + if (!&IsNickInAnyChan($nick) and &IsChanConf("seenStats") > 0) { delete $userstats{lc $nick}; } @@ -825,15 +845,17 @@ sub on_part { } sub on_ping { - my ($self, $event) = @_; + $conn = shift(@_); + my ($event) = @_; my $nick = $event->nick; - $self->ctcp_reply($nick, join(' ', ($event->args))); + $conn->ctcp_reply($nick, join(' ', ($event->args))); &status(">>> ${b_green}CTCP PING$ob request from $b_cyan$nick$ob received."); } sub on_ping_reply { - my ($self, $event) = @_; + $conn = shift(@_); + my ($event) = @_; my $nick = $event->nick; my $t = ($event->args)[1]; if (!defined $t) { @@ -847,7 +869,8 @@ sub on_ping_reply { } sub on_public { - my ($self, $event) = @_; + $conn = shift(@_); + my ($event) = @_; my $msg = ($event->args)[0]; $chan = lc( ($event->to)[0] ); # CASING. my $nick = $event->nick; @@ -855,7 +878,7 @@ sub on_public { $uh = $event->userhost(); $nuh = $nick."!".$uh; $msgType = "public"; - # todo: move this out of hookMsg to here? + # TODO: move this out of hookMsg to here? ($user,$host) = split(/\@/, $uh); $h = $host; @@ -868,7 +891,7 @@ sub on_public { $msgtime = time(); $lastWho{$chan} = $nick; ### TODO: use $nick or lc $nick? - if (&IsChanConf("seenStats")) { + if (&IsChanConf("seenStats") > 0) { $userstats{lc $nick}{'Count'}++; $userstats{lc $nick}{'Time'} = time(); } @@ -899,7 +922,7 @@ sub on_public { $v++; # don't allow ppl to cheat the stats :-) - if (defined $t && $time - $t > 60) { + if (defined $t && $time - $t > 60) { &sqlReplace("stats", { nick => $who, type => $x, @@ -918,7 +941,8 @@ sub on_public { } sub on_quit { - my ($self, $event) = @_; + $conn = shift(@_); + my ($event) = @_; my $nick = $event->nick(); my $reason = ($event->args)[0]; @@ -977,19 +1001,21 @@ sub on_quit { # well.. it's good but weird that this has happened - lets just # be quiet about it. } - delete $userstats{lc $nick} if (&IsChanConf("seenStats")); + delete $userstats{lc $nick} if (&IsChanConf("seenStats") > 0); delete $chanstats{lc $nick}; ### - # does this work? - if ($nick !~ /^\Q$ident\E$/ and $nick =~ /^\Q$param{'ircNick'}\E$/i) { + # FIXME: does this work? + my $mynick = conn->nick(); + if ($nick !~ /^\Q$ident\E$/ and $nick =~ /^\Q$mynick\E$/i) { &status("nickchange: own nickname became free; changing."); - &nick( $param{'ircNick'} ); + &nick($mynick); } } sub on_targettoofast { - my ($self, $event) = @_; + $conn = shift(@_); + my ($event) = @_; my $nick = $event->nick(); my($me,$chan,$why) = $event->args(); @@ -1021,7 +1047,8 @@ sub on_targettoofast { } sub on_topic { - my ($self, $event) = @_; + $conn = shift(@_); + my ($event) = @_; if (scalar($event->args) == 1) { # change. my $topic = ($event->args)[0]; @@ -1054,7 +1081,8 @@ sub on_topic { } sub on_topicinfo { - my ($self, $event) = @_; + $conn = shift(@_); + my ($event) = @_; my ($myself,$chan,$setby,$time) = $event->args(); my $timestr; @@ -1068,7 +1096,8 @@ sub on_topicinfo { } sub on_crversion { - my ($self, $event) = @_; + $conn = shift(@_); + my ($event) = @_; my $nick = $event->nick(); my $ver; @@ -1133,15 +1162,17 @@ sub on_crversion { } sub on_version { - my ($self, $event) = @_; + $conn = shift(@_); + my ($event) = @_; my $nick = $event->nick; &status(">>> ${b_green}CTCP VERSION$ob request from $b_cyan$nick$ob"); - $self->ctcp_reply($nick, "VERSION $bot_version"); + $conn->ctcp_reply($nick, "VERSION $bot_version"); } sub on_who { - my ($self, $event) = @_; + $conn = shift(@_); + my ($event) = @_; my @args = $event->args; my $str = $args[5]."!".$args[2]."\@".$args[3]; @@ -1162,21 +1193,24 @@ sub on_who { } sub on_whois { - my ($self, $event) = @_; + $conn = shift(@_); + my ($event) = @_; my @args = $event->args; $nuh{lc $args[1]} = $args[1]."!".$args[2]."\@".$args[3]; } sub on_whoischannels { - my ($self, $event) = @_; + $conn = shift(@_); + my ($event) = @_; my @args = $event->args; &DEBUG("on_whoischannels: @args"); } sub on_useronchannel { - my ($self, $event) = @_; + $conn = shift(@_); + my ($event) = @_; my @args = $event->args; &DEBUG("on_useronchannel: @args"); @@ -1188,7 +1222,8 @@ sub on_useronchannel { ### sub on_chanfull { - my ($self, $event) = @_; + $conn = shift(@_); + my ($event) = @_; my @args = $event->args; &status(">>> chanfull/$b_blue$args[1]$ob"); @@ -1197,7 +1232,8 @@ sub on_chanfull { } sub on_inviteonly { - my ($self, $event) = @_; + $conn = shift(@_); + my ($event) = @_; my @args = $event->args; &status(">>> inviteonly/$b_cyan$args[1]$ob"); @@ -1206,7 +1242,8 @@ sub on_inviteonly { } sub on_banned { - my ($self, $event) = @_; + $conn = shift(@_); + my ($event) = @_; my @args = $event->args; my $chan = $args[1]; @@ -1216,7 +1253,8 @@ sub on_banned { } sub on_badchankey { - my ($self, $event) = @_; + $conn = shift(@_); + my ($event) = @_; my @args = $event->args; &DEBUG("on_badchankey: args => @args"); @@ -1224,7 +1262,8 @@ sub on_badchankey { } sub on_useronchan { - my ($self, $event) = @_; + $conn = shift(@_); + my ($event) = @_; my @args = $event->args; &DEBUG("on_useronchan: args => @args");