# 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];
}
sub on_action {
- my ($self, $event) = @_;
- my ($nick, @args) = ($event->nick, $event->args);
+ $conn = shift(@_);
+ my ($event) = @_;
+ my ($nick, $args) = ($event->nick, $event->args);
my $chan = ($event->to)[0];
- shift @args;
-
if ($chan eq $ident) {
- &status("* [$nick] @args");
+ &status("* [$nick] $args");
} else {
- &status("* $nick/$chan @args");
+ &status("* $nick/$chan $args");
}
}
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;
}
### set vars that would have been set in hookMsg.
- $userHandle = ""; # reset.
+ $userHandle = ''; # reset.
$who = lc $nick;
$message = $msg;
$orig{who} = $nick;
$orig{message} = $msg;
$nuh = $nuh{$who};
$uh = (split /\!/, $nuh)[1];
+ $h = (split /\@/, $uh)[1];
$addressed = 1;
$msgType = 'chat';
my $crypto = $users{$userHandle}{PASS};
my $success = 0;
- if ($userHandle eq "_default") {
+ 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");
+ &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});
+ &dccStatus(2) unless (exists $sched{'dccStatus'}{RUNNING});
$success++;
&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?
}
$dcc{'CHATvrfy'}{$nick} = $userHandle;
- return if ($userHandle eq "_default");
+ return if ($userHandle eq '_default');
&dccsay($nick,"Flags: $users{$userHandle}{FLAGS}");
}
if ($message =~ s/^\.//) { # dcc chat commands.
### TODO: make use of &Forker(); here?
- &loadMyModule( $myModules{'ircdcc'} );
+ &loadMyModule('UserDCC');
- &DCCBroadcast("#$who# $message","m");
+ &DCCBroadcast("#$who# $message",'m');
my $retval = &userDCC();
return unless (defined $retval);
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;
}
}
# end of first time run.
- if (&IsChanConf("wingate")) {
+ if (&IsChanConf('Wingate') > 0) {
my $file = "$bot_base_dir/$param{'ircUser'}.wingate";
open(IN, $file);
while (<IN>) {
}
if ($firsttime) {
- &ScheduleThis(1, \&setupSchedulers);
+ &ScheduleThis(1, 'setupSchedulers');
$firsttime = 0;
}
- if (&IsParam("ircUMode")) {
+ if (&IsParam('ircUMode')) {
&VERB("Attempting change of user modes to $param{'ircUMode'}.", 2);
if ($param{'ircUMode'} !~ /^[-+]/) {
&WARN("ircUMode had no +- prefix; adding +");
&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;
- # unfortunately, Net::IRC does not implement this :(
- # invalid command... what is it?
-# &rawout("NOTIFY $ident");
-# &DEBUG("adding self to NOTIFY list.");
+ # add ourself to notify.
+ $conn->ison($conn->nick());
- &joinNextChan();
+ # Q, as on quakenet.org.
+ if (&IsParam('Q_pass')) {
+ &status("Authing to Q...");
+ &rawout("PRIVMSG Q\@CServe.quakenet.org :AUTH $param{'Q_user'} $param{'Q_pass'}");
+ }
+
+ &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");
}
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 ||= "???";
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($nick,
- ($event->args)[2],
- ($event->args)[3],
- ($event->args)[4],
- ($event->args)[5],
- \*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);
+ $conn->new_chat($event);
+# $conn->new_chat(1, $nick, $event->host);
} else {
&WARN("${b_green}DCC $type$ob (1)");
}
sub on_dcc_close {
- my ($self, $event) = @_;
+ $conn = shift(@_);
+ my ($event) = @_;
my $nick = $event->nick();
my $sock = ($event->to)[0];
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};
}
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?
### TODO: run ScheduleThis inside on_dcc_open_chat recursively
### 1,3,5,10 seconds then fail.
if ($nuh{$nick} eq "GETTING-NOW") {
- &ScheduleThis(3/60, "on_dcc_open_chat", $nick, $sock);
+ &ScheduleThis(3/60, 'on_dcc_open_chat', $nick, $sock);
} else {
on_dcc_open_chat(undef, $nick, $sock);
}
} elsif ($type eq 'SEND') {
- &DEBUG("Starting DCC receive.");
+ &status("Starting DCC receive.");
foreach ($event->args) {
- &DEBUG(" => '$_'.");
+ &status(" => '$_'.");
}
} else {
my(undef, $nick, $sock) = @_;
if ($nuh{$nick} eq "GETTING-NOW") {
- &DEBUG("getting nuh for $nick failed. FIXME.");
+ &FIXME("getting nuh for $nick failed.");
return;
}
&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;
}
my $crypto = $users{$userHandle}{PASS};
$dcc{'CHAT'}{$nick} = $sock;
- # todo: don't make DCC CHAT established in the first place.
- if ($userHandle eq "_default") {
+ # TODO: don't make DCC CHAT established in the first place.
+ if ($userHandle eq '_default') {
&dccsay($nick, "_default/guest not allowed");
$sock->close();
return;
&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 infobot DCC CHAT interface, $userHandle.");
}
}
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'}++;
- $ircstats{'TotalTime'} += time() - $ircstats{'ConnectTime'};
+ $ircstats{'TotalTime'} += time() - $ircstats{'ConnectTime'}
+ if ($ircstats{'ConnectTime'});
# clear any variables on reconnection.
$nickserv = 0;
&clearIRCVars();
- if (!$self->connect()) {
- &WARN("not connected? help me. gonna call ircCheck() in 1800s");
- &ScheduleThis(30, "ircCheck");
+
+ if (!defined $conn) {
+ &WARN("on_disconnect: self is undefined! WTF");
+ &DEBUG("running function irc... lets hope this works.");
+ &irc();
+ return;
}
+
+ &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
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)");
}
&status("$b_blue$chan$ob: sync in ${delta_time}s.");
}
- rawout("MODE $chan");
+ $conn->mode($chan);
my $txt;
my @array;
- foreach ("o","v","") {
+ foreach ('o','v','') {
my $count = scalar(keys %{ $channels{$chan}{$_} });
next unless ($count);
- $txt = "total" if ($_ eq "");
- $txt = "voice" if ($_ eq "v");
- $txt = "ops" if ($_ eq "o");
+ $txt = 'total' if ($_ eq '');
+ $txt = 'voice' if ($_ eq 'v');
+ $txt = 'ops' if ($_ eq 'o');
push(@array, "$count $txt");
}
}
sub on_init {
- my ($self, $event) = @_;
+ $conn = shift(@_);
+ my ($event) = @_;
my (@args) = ($event->args);
shift @args;
}
sub on_invite {
- my ($self, $event) = @_;
+ $conn = shift(@_);
+ my ($event) = @_;
my $chan = lc( ($event->args)[0] );
my $nick = $event->nick;
### 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");
}
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();
- $msgType = "public";
+ $msgType = 'public';
+ my $i = scalar(keys %{ $channels{$chan} });
+ my $j = $cache{maxpeeps}{$chan} || 0;
+
+ 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);
}
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};
# how to tell if there's a netjoin???
- my $netsplitstr = "";
+ my $netsplitstr = '';
$netsplitstr = " $b_yellow\[${ob}NETSPLIT VICTIM$b_yellow]$ob" if ($netsplit);
&status(">>> join/$b_blue$chan$ob $b_cyan$who$ob $b_yellow($ob$user\@$host$b_yellow)$ob$netsplitstr");
### on-join bans.
my @bans;
push(@bans, keys %{ $bans{$chan} }) if (exists $bans{$chan});
- push(@bans, keys %{ $bans{"*"} }) if (exists $bans{"*"});
+ push(@bans, keys %{ $bans{'*'} }) if (exists $bans{'*'});
foreach (@bans) {
my $ban = $_;
}
my $reason = "no reason";
- foreach ($chan, "*") {
+ foreach ($chan, '*') {
next unless (exists $bans{$_});
next unless (exists $bans{$_}{$ban});
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};
+ &joinNextChan(); # hack.
}
### TODO: move this to &joinchan()?
$cache{jointime}{$chan} = &timeget();
- rawout("WHO $chan");
+ $conn->who($chan);
return;
}
### 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];
}
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");
}
sub on_modeis {
- my ($self, $event) = @_;
+ $conn = shift(@_);
+ my ($event) = @_;
my ($myself, undef,@args) = $event->args();
my $nick = $event->nick();
$chan = ($event->args())[1];
}
sub on_msg {
- my ($self, $event) = @_;
+ $conn = shift(@_);
+ my ($event) = @_;
my $nick = $event->nick;
my $msg = ($event->args)[0];
$uh = $event->userhost();
$nuh = $nick."!".$uh;
$msgtime = time();
+ $h = $host;
if ($nick eq $ident) { # hopefully ourselves.
- if ($msg eq "TEST") {
+ if ($msg eq 'TEST') {
&status("IRCTEST: Yes, we're alive.");
delete $cache{connect};
return;
}
&hookMsg('private', undef, $nick, $msg);
- $who = "";
- $chan = "";
- $msgType = "";
+ $who = '';
+ $chan = '';
+ $msgType = '';
}
sub on_names {
- my ($self, $event) = @_;
+ $conn = shift(@_);
+ my ($event) = @_;
my @args = $event->args;
my $chan = lc $args[2]; # CASING, the last of them!
}
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}) {
$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];
if ($check) {
&status("nickserv told us to register; doing it.");
- if (&IsParam("nickServ_pass")) {
+ if (&IsParam('nickServ_pass')) {
&status("NickServ: ==> Identifying.");
&rawout("PRIVMSG NickServ :IDENTIFY $param{'nickServ_pass'}");
return;
if ($args =~ /^Password a/i) {
my $done = 0;
- foreach ( &ChanConfList("chanServ_ops") ) {
+ foreach ( &ChanConfList('chanServ_ops') ) {
next unless &chanServCheck($_);
next if ($done);
&DEBUG("nickserv activated or restarted; doing chanserv check.");
$nickserv++;
}
+
} elsif ($nick =~ /^ChanServ$/i) { # chanserv.
&status("ChanServ: <== '$args'.");
}
sub on_other {
- my ($self, $event) = @_;
+ $conn = shift(@_);
+ my ($event) = @_;
my $chan = ($event->to)[0];
my $nick = $event->nick;
}
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";
+ $msgType = 'public';
+
+ if (!exists $channels{$chan}) {
+ &DEBUG("on_part: found out $mynick is on $chan!");
+ $channels{$chan} = 1;
+ }
if (exists $floodjoin{$chan}{$nick}{Time}) {
delete $floodjoin{$chan}{$nick};
$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};
}
}
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) = @_;
- my $nick = $event->nick;
- my $lag = time() - ($event->args)[1];
+ $conn = shift(@_);
+ my ($event) = @_;
+ 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.");
}
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?
+ $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 != $$) {
$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")) {
- foreach (split /[\s]+/) {
- next unless ($msg =~ /^\Q$_\E$/i);
- &status("textcounters: $_ matched for $who");
+ # 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);
+ }
+
+ my $str = $cache{ircTextCounters};
+ if ($str && $msg =~ /^($str)[\s!\.]?$/i) {
+ my $x = $1;
- my $v = &dbGet("stats", "counter", "nick='$who' and type='$msg'");
- $v++;
+ &VERB("textcounters: $x matched for $who",2);
+ my $c = $chan || 'PRIVATE';
- &dbReplace("stats", (nick => $who, type => $_, counter => $v) );
- # does not work, atleast with old mysql!!! :(
-# &dbReplace("stats", (nick => $who, type => $_, -counter => "counter+1") );
+ # 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++;
+
+ # don't allow ppl to cheat the stats :-)
+ if ((defined $t && $time - $t > 60) or (!defined $t)) {
+ &sqlSet('stats', {'nick' => $who}, {
+ type => $x,
+ channel => $c,
+ time => $time,
+ counter => $v,
+ } );
}
}
&hookMsg('public', $chan, $nick, $msg);
$chanstats{$chan}{'PublicMsg'}++;
- $who = "";
- $chan = "";
- $msgType = "";
+ $who = '';
+ $chan = '';
+ $msgType = '';
}
sub on_quit {
- my ($self, $event) = @_;
+ $conn = shift(@_);
+ my ($event) = @_;
my $nick = $event->nick();
my $reason = ($event->args)[0];
# hack for ICC.
- $msgType = "public";
+ $msgType = 'public';
$who = $nick;
### $chan = $reason; # no.
my $count = 0;
- foreach (keys %channels) {
+ foreach (grep !/^_default$/, keys %channels) {
# fixes inconsistent chanstats bug #1.
if (!&IsNickInChan($nick,$_)) {
$count++;
&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 ( &IsChanConf('chanlimitcheck') > 0);
next unless ( exists $channels{$_}{'l'} );
&DEBUG("on_quit: netsplit detected on $_; disabling chan limit.");
- &rawout("MODE $_ -l");
+ $conn->mode($_, "-l");
}
$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
+ ###
+ &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') > 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();
}
sub on_topic {
- my ($self, $event) = @_;
+ $conn = shift(@_);
+ my ($event) = @_;
if (scalar($event->args) == 1) { # change.
my $topic = ($event->args)[0];
&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);
}
}
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";
}
}
sub on_crversion {
- my ($self, $event) = @_;
+ $conn = shift(@_);
+ my ($event) = @_;
my $nick = $event->nick();
my $ver;
}
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);
} 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;
}
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];
$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;
}
$nuh{lc $args[5]} = $args[5]."!".$args[2]."\@".$args[3];
}
-sub on_whoisuser {
- my ($self, $event) = @_;
+sub on_whois {
+ $conn = shift(@_);
+ my ($event) = @_;
my @args = $event->args;
- &DEBUG("on_whoisuser: @args");
-
$nuh{lc $args[1]} = $args[1]."!".$args[2]."\@".$args[3];
}
+sub on_whoischannels {
+ $conn = shift(@_);
+ my ($event) = @_;
+ my @args = $event->args;
+
+ &DEBUG("on_whoischannels: @args");
+}
+
+sub on_useronchannel {
+ $conn = shift(@_);
+ my ($event) = @_;
+ my @args = $event->args;
+
+ &DEBUG("on_useronchannel: @args");
+ &joinNextChan();
+}
+
###
### since joinnextchan is hooked onto on_endofnames, these are needed.
###
sub on_chanfull {
- my ($self, $event) = @_;
+ $conn = shift(@_);
+ my ($event) = @_;
my @args = $event->args;
- &DEBUG("on_chanfull: args => @args");
+ &status(">>> chanfull/$b_blue$args[1]$ob");
+
&joinNextChan();
}
sub on_inviteonly {
- my ($self, $event) = @_;
+ $conn = shift(@_);
+ my ($event) = @_;
my @args = $event->args;
- &DEBUG("on_inviteonly: args => @args");
+ &status(">>> inviteonly/$b_cyan$args[1]$ob");
+
&joinNextChan();
}
sub on_banned {
- my ($self, $event) = @_;
+ $conn = shift(@_);
+ my ($event) = @_;
my @args = $event->args;
+ my $chan = $args[1];
- &DEBUG("on_banned: args => @args");
+ &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, removing autojoin for $chan");
+ delete $chanconf{$chan}{autojoin};
+ &joinNextChan();
+}
+
+sub on_useronchan {
+ $conn = shift(@_);
+ my ($event) = @_;
my @args = $event->args;
- &DEBUG("on_badchankey: args => @args");
+ &DEBUG("on_useronchan: args => @args");
&joinNextChan();
}
+# TODO not used yet
+sub on_stdin {
+ my $line = <STDIN>;
+ chomp($line);
+ &FIXME("on_stdin: line => \"$line\"");
+}
+
1;
+
+# vim:ts=4:sw=4:expandtab:tw=80
projects / infobot.git / blobdiff