X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=src%2FIRC%2FIrcHooks.pl;h=d105d8e366b8e981f28c55ce16a3fcb7c9eb49db;hb=d3faaba2ad8c02cdf10e1a9698592afc6ed928bc;hp=117daa2d3f03ca0889b2d1e45be3d001f372727f;hpb=8653377807cbd80bd24c5cc7741d0e42b82a526c;p=infobot.git diff --git a/src/IRC/IrcHooks.pl b/src/IRC/IrcHooks.pl index 117daa2..d105d8e 100644 --- a/src/IRC/IrcHooks.pl +++ b/src/IRC/IrcHooks.pl @@ -4,12 +4,12 @@ # Version: 20000126 # NOTE: Based on code by Kevin Lenzo & Patrick Cole (c) 1997 # - -if (&IsParam("useStrict")) { use strict; } +use vars qw(%chanconf); # GENERIC. TO COPY. sub on_generic { - my ($self, $event) = @_; + $conn = shift(@_); + my ($event) = @_; my $nick = $event->nick(); my $chan = ($event->to)[0]; @@ -22,7 +22,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]; @@ -36,14 +37,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; } @@ -71,16 +73,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}); @@ -91,7 +93,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? } @@ -113,7 +115,7 @@ sub on_chat { if ($message =~ s/^\.//) { # dcc chat commands. ### TODO: make use of &Forker(); here? - &loadMyModule( $myModules{'ircdcc'} ); + &loadMyModule('UserDCC'); &DCCBroadcast("#$who# $message","m"); @@ -133,20 +135,32 @@ sub on_chat { return 'DCC CHAT MESSAGE'; } +# is there isoff? how do we know if someone signs off? +sub on_ison { + $conn = shift(@_); + my ($event) = @_; + my $x1 = ($event->args)[0]; + my $x2 = ($event->args)[1]; + $x2 =~ s/\s$//; + + &DEBUG("on_ison: x1 = '$x1', x2 => '$x2'"); +} + sub on_endofmotd { - my ($self) = @_; + $conn = shift(@_); # update IRCStats. - $ident ||= $param{'ircNick'}; # hack. + $ident = $conn->nick(); $ircstats{'ConnectTime'} = time(); $ircstats{'ConnectCount'}++; - $ircstats{'OffTime'} += time() - $ircstats{'DisconnectTime'} - if (defined $ircstats{'DisconnectTime'}); + if (defined $ircstats{'DisconnectTime'}) { + $ircstats{'OffTime'} += time() - $ircstats{'DisconnectTime'}; + } # first time run. if (!exists $users{_default}) { &status("!!! First time run... adding _default user."); - $users{_default}{FLAGS} = "mrt"; + $users{_default}{FLAGS} = "amrt"; $users{_default}{HOSTS}{"*!*@*"} = 1; } @@ -157,7 +171,7 @@ sub on_endofmotd { } # end of first time run. - if (&IsChanConf("wingate")) { + if (&IsChanConf('Wingate') > 0) { my $file = "$bot_base_dir/$param{'ircUser'}.wingate"; open(IN, $file); while () { @@ -169,7 +183,7 @@ sub on_endofmotd { } if ($firsttime) { - &ScheduleThis(1, \&setupSchedulers); + &ScheduleThis(1, "setupSchedulers"); $firsttime = 0; } @@ -183,17 +197,11 @@ sub on_endofmotd { &rawout("MODE $ident $param{'ircUMode'}"); } - &status("End of motd. Now lets join some channels..."); - if (!scalar @joinchan) { - &WARN("joinchan array is empty!"); - @joinchan = &getJoinChans(1); - } - # ok, we're free to do whatever we want now. go for it! $running = 1; - $conn->ison($ident); - &DEBUG("adding self to NOTIFY/ISON."); + # add ourself to notify. + $conn->ison($conn->nick()); # Q, as on quakenet.org. if (&IsParam("Q_pass")) { @@ -201,11 +209,13 @@ sub on_endofmotd { &rawout("PRIVMSG Q\@CServe.quakenet.org :AUTH $param{'Q_user'} $param{'Q_pass'}"); } - &joinNextChan(); + &status("End of motd. Now lets join some channels..."); + #&joinNextChan(); } sub on_endofwho { - my ($self, $event) = @_; + $conn = shift(@_); + my ($event) = @_; # &DEBUG("endofwho: chan => $chan"); $chan ||= ($event->args)[1]; # &DEBUG("endofwho: chan => $chan"); @@ -216,13 +226,16 @@ sub on_endofwho { } sub on_dcc { - my ($self, $event) = @_; + $conn = shift(@_); + my ($event) = @_; my $type = uc( ($event->args)[1] ); my $nick = lc $event->nick(); + &status("on_dcc type=$type nick=$nick sock=$sock"); + # 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 ||= "???"; @@ -230,18 +243,22 @@ sub on_dcc { if ($type eq 'SEND') { # GET for us. # incoming DCC SEND. we're receiving a file. my $get = ($event->args)[2]; - open(DCCGET,">$get"); - - $self->new_get($event, \*DCCGET); + &status("DCC: not Initializing GET from $nick to '$param{tempDir}/$get'"); + # FIXME: do we want to get anything? + return; + #open(DCCGET,">$param{tempDir}/$get"); + #$conn->new_get($event, \*DCCGET); } elsif ($type eq 'GET') { # SEND for us? - &status("DCC: Initializing SEND for $nick."); - $self->new_send($event->args); + &status("DCC: not Initializing SEND for $nick."); + # FIXME: do we want to do anything? + return; + $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)"); @@ -249,7 +266,8 @@ sub on_dcc { } sub on_dcc_close { - my ($self, $event) = @_; + $conn = shift(@_); + my ($event) = @_; my $nick = $event->nick(); my $sock = ($event->to)[0]; @@ -262,7 +280,7 @@ sub on_dcc_close { if (exists $dcc{'SEND'}{$nick} and -f "$param{tempDir}/$nick.txt") { &status("${b_green}DCC SEND$ob close from $b_cyan$nick$ob"); - &status("dcc_close: purging $nick.txt from Debian.pl"); + &status("dcc_close: purging DCC send $nick.txt"); unlink "$param{tempDir}/$nick.txt"; delete $dcc{'SEND'}{$nick}; @@ -276,11 +294,14 @@ 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]; + &status("on_dcc_open type=$type nick=$nick sock=$sock"); + $msgType = 'chat'; $type ||= "???"; ### BUG: who is set to bot's nick? @@ -300,9 +321,9 @@ sub on_dcc_open { } } elsif ($type eq 'SEND') { - &DEBUG("Starting DCC receive."); + &status("Starting DCC receive."); foreach ($event->args) { - &DEBUG(" => '$_'."); + &status(" => '$_'."); } } else { @@ -316,7 +337,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; } @@ -325,7 +346,7 @@ sub on_dcc_open_chat { &verifyUser($nick, $nuh{lc $nick}); if (!exists $users{$userHandle}{HOSTS}) { - &pSReply("you have no hosts defined in my user file; rejecting."); + &performStrictReply("you have no hosts defined in my user file; rejecting."); $sock->close(); return; } @@ -333,7 +354,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(); @@ -349,11 +370,13 @@ sub on_dcc_open_chat { } sub on_disconnect { - my ($self, $event) = @_; + $conn = shift(@_); + my ($event) = @_; my $from = $event->from(); my $what = ($event->args)[0]; + my $mynick=$conn->nick(); - &status("disconnect from $from ($what)."); + &status("$mynick disconnect from $from ($what)."); $ircstats{'DisconnectTime'} = time(); $ircstats{'DisconnectReason'} = $what; $ircstats{'DisconnectCount'}++; @@ -363,27 +386,23 @@ sub on_disconnect { # clear any variables on reconnection. $nickserv = 0; - &DEBUG("on_disconnect: 1"); &clearIRCVars(); - &DEBUG("on_disconnect: 2"); - 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()) { - &DEBUG("on_disconnect: 3"); - &WARN("not connected? help me. gonna call ircCheck() in 60s"); - &clearIRCVars(); - &ScheduleThis(1, "ircCheck"); - } + &WARN("scheduling call ircCheck() in 60s"); + &clearIRCVars(); + &ScheduleThis(1, "ircCheck"); } 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 @@ -420,7 +439,8 @@ sub on_endofnames { } sub on_init { - my ($self, $event) = @_; + $conn = shift(@_); + my ($event) = @_; my (@args) = ($event->args); shift @args; @@ -428,7 +448,8 @@ sub on_init { } sub on_invite { - my ($self, $event) = @_; + $conn = shift(@_); + my ($event) = @_; my $chan = lc( ($event->args)[0] ); my $nick = $event->nick; @@ -451,7 +472,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(); @@ -459,13 +481,13 @@ sub on_join { my $i = scalar(keys %{ $channels{$chan} }); my $j = $cache{maxpeeps}{$chan} || 0; - if (time() > ($sched{shmFlush}{TIME} || time()) + 3600) { + if (!&IsParam("noSHM") && time() > ($sched{shmFlush}{TIME} || time()) + 3600) { &DEBUG("looks like schedulers died somewhere... restarting..."); &setupSchedulers(); } $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); @@ -542,7 +564,7 @@ sub on_join { return if ($netsplit); # who == bot. - if ($who eq $ident or $who =~ /^$ident$/i) { + if ($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}; @@ -558,28 +580,34 @@ sub on_join { ### ROOTWARN: &rootWarn($who,$user,$host,$chan) if ( - &IsChanConf("rootWarn") && - $user =~ /^r(oo|ew|00)t$/i + &IsChanConf('RootWarn') > 0 && + $user =~ /^~?r(oo|ew|00)t$/i ); + ### emit a message based on who just joined + &onjoin($who,$user,$host,$chan) if (&IsChanConf('OnJoin') > 0); + ### NEWS: - if (&IsChanConf("news") && &IsChanConf("newsKeepRead")) { - if (!&loadMyModule("news")) { # just in case. - &DEBUG("could not load news."); + if (&IsChanConf('News') > 0 && &IsChanConf('newsKeepRead') > 0) { + if (!&loadMyModule('News')) { # just in case. + &DEBUG('could not load news.'); } else { &News::latest($chan); } } - ### chanlimit check. -# &chanLimitVerify($chan); + ### botmail: + if (&IsChanConf('botmail') > 0) { + &botmail::check(lc $who); + } ### wingate: &wingateCheck(); } sub on_kick { - my ($self, $event) = @_; + $conn = shift(@_); + my ($event) = @_; my ($chan,$reason) = $event->args; my $kicker = $event->nick; my $kickee = ($event->to)[0]; @@ -601,13 +629,15 @@ 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(); $chan = ($event->to)[0]; - $args[0] =~ s/\s$//; + # last element is empty... so nuke it. + pop @args while ($args[$#args] eq ""); if ($nick eq $chan) { # UMODE &status(">>> mode $b_yellow\[$ob$b@args$b_yellow\]$ob by $b_cyan$nick$ob"); @@ -618,7 +648,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]; @@ -627,7 +658,8 @@ sub on_modeis { } sub on_msg { - my ($self, $event) = @_; + $conn = shift(@_); + my ($event) = @_; my $nick = $event->nick; my $msg = ($event->args)[0]; @@ -652,7 +684,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! @@ -664,8 +697,9 @@ sub on_names { } sub on_nick { - my ($self, $event) = @_; - my $nick = $event->nick(); + $conn = shift(@_); + my ($event) = @_; + my $nick = $event->nick(); my $newnick = ($event->args)[0]; if (exists $netsplit{lc $newnick}) { @@ -682,40 +716,45 @@ 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}; delete $nuh{lc $nick}; - if ($nick eq $ident) { + if ($nick eq $conn->nick()) { &status(">>> I materialized into $b_green$newnick$ob from $nick"); - $ident = $newnick; + $ident = $newnick; + $conn->nick($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; - my $newnick = $nick."-"; + $conn = shift(@_); + my $nick = $conn->nick(); + #my $newnick = $nick . int(rand 10); + my $newnick = $nick . "_"; + + &DEBUG("on_nick_taken: nick => $nick"); &status("nick taken ($nick); preparing nick change."); - $self->whois($nick); - $conn->schedule(5, sub { + $conn->whois($nick); + #$conn->schedule(5, sub { &status("nick taken; changing to temporary nick ($nick -> $newnick)."); &nick($newnick); - } ); + #} ); } sub on_notice { - my ($self, $event) = @_; + $conn = shift(@_); + my ($event) = @_; my $nick = $event->nick(); my $chan = ($event->to)[0]; my $args = ($event->args)[0]; @@ -767,7 +806,8 @@ sub on_notice { } sub on_other { - my ($self, $event) = @_; + $conn = shift(@_); + my ($event) = @_; my $chan = ($event->to)[0]; my $nick = $event->nick; @@ -776,15 +816,17 @@ sub on_other { } sub on_part { - my ($self, $event) = @_; + $conn = shift(@_); + my ($event) = @_; $chan = lc( ($event->to)[0] ); # CASING!!! + my $mynick = $conn->nick(); my $nick = $event->nick; my $userhost = $event->userhost; $who = $nick; $msgType = "public"; - if (0 and !exists $channels{$chan}) { - &DEBUG("on_part: found out we're on $chan!"); + if (!exists $channels{$chan}) { + &DEBUG("on_part: found out $mynick is on $chan!"); $channels{$chan} = 1; } @@ -795,11 +837,10 @@ sub on_part { $chanstats{$chan}{'Part'}++; &delUserInfo($nick,$chan); if ($nick eq $ident) { - &DEBUG("on_part: ok, I left $chan... clearChanVars..."); &clearChanVars($chan); } - if (!&IsNickInAnyChan($nick) and &IsChanConf("seenStats")) { + if (!&IsNickInAnyChan($nick) and &IsChanConf("seenStats") > 0) { delete $userstats{lc $nick}; } @@ -807,15 +848,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) { @@ -829,15 +872,16 @@ sub on_ping_reply { } sub on_public { - my ($self, $event) = @_; - my $msg = ($event->args)[0]; + $conn = shift(@_); + my ($event) = @_; + my $msg = ($event->args)[0]; $chan = lc( ($event->to)[0] ); # CASING. my $nick = $event->nick; $who = $nick; $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; @@ -850,47 +894,45 @@ 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(); } - # would this slow things down? - if ($_ = &getChanConf("ircTextCounters")) { - my $time = time(); - - foreach (split /[\s]+/) { - my $x = $_; - - # either full word or ends with a space, etc... - next unless ($msg =~ /^\Q$x\E[\$\s!.]/i); + # cache it. + my $time = time(); + if (!$cache{ircTextCounters}) { + &DEBUG("caching ircTextCounters for first time."); + my @str = split(/\s+/, &getChanConf("ircTextCounters")); + for (@str) { $_ = quotemeta($_); } + $cache{ircTextCounters} = join('|', @str); + } - &VERB("textcounters: $x matched for $who",2); - my $c = $chan || "PRIVATE"; + my $str = $cache{ircTextCounters}; + if ($str && $msg =~ /^($str)[\s!\.]?$/i) { + my $x = $1; - my ($v,$t) = &dbGet("stats", "counter,time", - "nick=". &dbQuote($who) - ." AND type=".&dbQuote($x) - ." AND channel=".&dbQuote($c) - ); - $v++; + &VERB("textcounters: $x matched for $who",2); + my $c = $chan || "PRIVATE"; - # don't allow ppl to cheat the stats :-) - next unless ($time - $t > 10); + # better to do "counter=counter+1". + # but that will avoid time check. + my ($v,$t) = &sqlSelect("stats", "counter,time", { + nick => $who, + type => $x, + channel => $c, + } ); + $v++; - my %hash = ( + # don't allow ppl to cheat the stats :-) + if (defined $t && $time - $t > 60) { + &sqlReplace("stats", { 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 => $x, -counter => "counter+1") ); + } ); } } @@ -902,7 +944,8 @@ sub on_public { } sub on_quit { - my ($self, $event) = @_; + $conn = shift(@_); + my ($event) = @_; my $nick = $event->nick(); my $reason = ($event->args)[0]; @@ -931,7 +974,7 @@ sub on_quit { # chanlimit code. foreach $chan ( &getNickInChans($nick) ) { - next unless ( &IsChanConf("chanlimitcheck") ); + next unless ( &IsChanConf("chanlimitcheck") > 0); next unless ( exists $channels{$_}{'l'} ); &DEBUG("on_quit: netsplit detected on $_; disabling chan limit."); @@ -940,16 +983,13 @@ sub on_quit { $netsplit{lc $nick} = time(); if (!exists $netsplitservers{$1}{$2}) { - &status("netsplit detected between $1 and $2 at [".scalar(localtime)."]"); + &status("netsplit detected between $1 and $2 at [".scalar(gmtime)."]"); $netsplitservers{$1}{$2} = time(); } } my $chans = join(' ', &getNickInChans($nick) ); &status(">>> $b_cyan$nick$ob has signed off IRC $b_red($ob$reason$b_red)$ob [$chans]"); - if ($nick =~ /^\Q$ident\E$/) { - &ERROR("^^^ THIS SHOULD NEVER HAPPEN (10)."); - } ### ### ok... lets clear out the cache @@ -961,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) { - &status("nickchange: own nickname became free; changing."); - &nick($param{'ircNick'}); + # if we have a temp nick, and whoever is camping on our main nick leaves + # revert to main nick. Note that Net::IRC only knows our main nick + if ($nick eq $conn->nick()) { + &status("nickchange: own nick \"$nick\" became free; changing."); + &nick($mynick); } } sub on_targettoofast { - my ($self, $event) = @_; + $conn = shift(@_); + my ($event) = @_; my $nick = $event->nick(); my($me,$chan,$why) = $event->args(); @@ -1005,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]; @@ -1027,7 +1070,7 @@ sub on_topic { &status(">>> topic/$b_blue$chan$ob by $b_cyan$nick$ob -> $topic"); } else { # join. my ($nick, $chan, $topic) = $event->args; - if (&IsChanConf("topic")) { + if (&IsChanConf('Topic') > 0) { $topic{$chan}{'Current'} = $topic; &topicAddHistory($chan,$topic); } @@ -1038,12 +1081,13 @@ sub on_topic { } sub on_topicinfo { - my ($self, $event) = @_; + $conn = shift(@_); + my ($event) = @_; my ($myself,$chan,$setby,$time) = $event->args(); my $timestr; if (time() - $time > 60*60*24) { - $timestr = "at ". localtime $time; + $timestr = "at ". gmtime $time; } else { $timestr = &Time2String(time() - $time) ." ago"; } @@ -1052,7 +1096,8 @@ sub on_topicinfo { } sub on_crversion { - my ($self, $event) = @_; + $conn = shift(@_); + my ($event) = @_; my $nick = $event->nick(); my $ver; @@ -1117,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]; @@ -1146,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"); @@ -1172,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"); @@ -1181,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"); @@ -1190,29 +1242,41 @@ sub on_inviteonly { } sub on_banned { - my ($self, $event) = @_; + $conn = shift(@_); + my ($event) = @_; my @args = $event->args; my $chan = $args[1]; - &status(">>> banned/$b_blue$chan$ob $b_cyan$args[0]$ob"); - + &status(">>> banned/$b_blue$chan$ob $b_cyan$args[0]$ob, removing autojoin for $chan"); + delete $chanconf{$chan}{autojoin}; &joinNextChan(); } sub on_badchankey { - my ($self, $event) = @_; + $conn = shift(@_); + my ($event) = @_; my @args = $event->args; + my $chan = $args[1]; - &DEBUG("on_badchankey: args => @args"); + &DEBUG("on_badchankey: args => @args, removing autojoin for $chan"); + delete $chanconf{$chan}{autojoin}; &joinNextChan(); } sub on_useronchan { - my ($self, $event) = @_; + $conn = shift(@_); + my ($event) = @_; my @args = $event->args; &DEBUG("on_useronchan: args => @args"); &joinNextChan(); } +# TODO not used yet +sub on_stdin { + my $line = ; + chomp($line); + &FIXME("on_stdin: line => \"$line\""); +} + 1;