} else { # dcc chat arena.
- foreach (keys %{$dcc{'CHAT'}}) {
+ foreach (keys %{ $dcc{'CHAT'} }) {
$conn->privmsg($dcc{'CHAT'}{$_}, "<$who> $orig{message}");
}
}
sub on_endofmotd {
my ($self) = @_;
- # what's the following for?
- $ident = $param{'ircNick'};
# update IRCStats.
+ $ident ||= $param{'ircNick'}; # hack.
$ircstats{'ConnectTime'} = time();
$ircstats{'ConnectCount'}++;
$ircstats{'OffTime'} += time() - $ircstats{'DisconnectTime'}
}
if (&IsParam("ircUMode")) {
- &status("Attempting change of user modes to $param{'ircUMode'}.");
+ &VERB("Attempting change of user modes to $param{'ircUMode'}.", 2);
+ if ($param{'ircUMode'} !~ /^[-+]/) {
+ &WARN("ircUMode had no +- prefix; adding +");
+ $param{'ircUMode'} = "+".$param{'ircUMode'};
+ }
+
&rawout("MODE $ident $param{'ircUMode'}");
}
&status("End of motd. Now lets join some channels...");
if (!scalar @joinchan) {
&WARN("joinchan array is empty!!!");
- @joinchan = &getJoinChans();
+ @joinchan = &getJoinChans(1);
}
+ # unfortunately, Net::IRC does not implement this :(
+ # invalid command... what is it?
+# &rawout("NOTIFY $ident");
+# &DEBUG("adding self to NOTIFY list.");
+
&joinNextChan();
}
+sub on_endofwho {
+ my ($self, $event) = @_;
+# &DEBUG("endofwho: chan => $chan");
+ $chan ||= ($event->args)[1];
+# &DEBUG("endofwho: chan => $chan");
+
+ if (exists $cache{countryStats}) {
+ &do_countrystats();
+ }
+}
+
sub on_dcc {
my ($self, $event) = @_;
my $type = uc( ($event->args)[1] );
my ($self, $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", &gettimeofday() - $cache{jointime}{$chan});
+ my $delta_time = sprintf("%.03f", &timedelta($cache{jointime}{$chan}) );
$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.");
}
my $chanstats = join(' || ', @array);
&status("$b_blue$chan$ob: [$chanstats]");
- if (scalar @joinchan) { # remaining channels to join.
- &joinNextChan();
- } else {
- &DEBUG("running ircCheck to get chanserv ops.");
- &ircCheck();
- }
-
- return unless (&IsChanConf("chanServ_ops") > 0);
- return unless ($nickserv);
-
- if (!exists $channels{$chan}{'o'}{$ident}) {
- &status("ChanServ ==> Requesting ops for $chan. (2)");
- &rawout("PRIVMSG ChanServ :OP $chan $ident");
- }
+ &chanServCheck($chan);
+ # schedule used to solve ircu (OPN) "target too fast" problems.
+ $conn->schedule(5, sub { &joinNextChan(); } );
}
sub on_init {
next;
}
- &status("invited to $b_blue$_$ob by $b_cyan$who$ob");
- &joinchan($self, $_);
+ &status("invited to $b_blue$chan$ob by $b_cyan$nick$ob");
+ &joinchan($chan);
}
}
if (exists $netsplit{lc $who}) {
delete $netsplit{lc $who};
$netsplit = 1;
+
+ if (!scalar keys %netsplit) {
+ &DEBUG("on_join: netsplit hash is now empty!");
+ undef %netsplitservers;
+ &netsplitCheck(); # any point in running this?
+ &chanlimitCheck();
+ }
}
- if ($netsplit and !$netsplittime) {
+ if ($netsplit and !exists $cache{netsplit}) {
&DEBUG("on_join: ok.... re-running chanlimitCheck in 60.");
$conn->schedule(60, sub {
&chanlimitCheck();
- $netsplittime = undef;
+ delete $cache{netsplit};
} );
- $netsplittime = time();
+ $cache{netsplit} = time();
}
# how to tell if there's a netjoin???
### 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 = $_;
s/\?/./g;
# no need to go further.
return if ($netsplit);
+
# who == bot.
if ($who eq $ident or $who =~ /^$ident$/i) {
if (defined( my $whojoin = $cache{join}{$chan} )) {
}
### TODO: move this to &joinchan()?
- $cache{jointime}{$chan} = &gettimeofday();
+ $cache{jointime}{$chan} = &timeget();
rawout("WHO $chan");
return;
}
### ROOTWARN:
- &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")) {
}
### chanlimit check.
- &chanLimitVerify($chan);
+# &chanLimitVerify($chan);
### wingate:
&wingateCheck();
&status("SELF attempting to rejoin lost channel $chan");
&joinchan($chan);
} else {
- &DeleteUserInfo($kickee,$chan);
+ &delUserInfo($kickee,$chan);
}
}
sub on_mode {
my ($self, $event) = @_;
my ($user, $host) = split(/\@/, $event->userhost);
- my @args = $event->args();
- my $nick = $event->nick();
- my $chan = ($event->to)[0];
+ my @args = $event->args();
+ my $nick = $event->nick();
+ $chan = ($event->to)[0];
$args[0] =~ s/\s$//;
&status(">>> mode $b_yellow\[$ob$b@args$b_yellow\]$ob by $b_cyan$nick$ob");
} else { # MODE
&status(">>> mode/$b_blue$chan$ob $b_yellow\[$ob$b@args$b_yellow\]$ob by $b_cyan$nick$ob");
- &hookMode($chan, @args);
+ &hookMode($nick, @args);
}
}
sub on_modeis {
my ($self, $event) = @_;
- my $nick = $event->nick();
- my ($myself,$chan,@args) = $event->args();
+ my ($myself, undef,@args) = $event->args();
+ my $nick = $event->nick();
+ $chan = ($event->args())[1];
- &hookMode(lc $chan, @args); # CASING.
+ &hookMode($nick, @args);
}
sub on_msg {
if (exists $netsplit{lc $newnick}) {
&status("Netsplit: $newnick/$nick came back from netsplit and changed to original nick! removing from hash.");
delete $netsplit{lc $newnick};
+ &netsplitCheck() if (time() != $sched{netsplitCheck}{TIME});
}
my ($chan,$mode);
foreach $chan (keys %channels) {
- foreach $mode (keys %{$channels{$chan}}) {
+ foreach $mode (keys %{ $channels{$chan} }) {
next unless (exists $channels{$chan}{$mode}{$nick});
$channels{$chan}{$mode}{$newnick} = $channels{$chan}{$mode}{$nick};
}
# todo: do %flood* aswell.
- &DeleteUserInfo($nick,keys %channels);
+ &delUserInfo($nick, keys %channels);
$nuh{lc $newnick} = $nuh{lc $nick};
delete $nuh{lc $nick};
- # successful self-nick change.
- if ($ident eq "$nick-" or "$ident-" eq $nick) {
- &DEBUG("on_nick: well... we need this bug fixed.");
- &DEBUG("ident => $ident");
- &DEBUG("nick => $nick");
- $ident = $newnick;
- }
-
if ($nick eq $ident) {
&status(">>> I materialized into $b_green$newnick$ob from $nick");
- $ident = $newnick;
+ $ident = $newnick;
} else {
&status(">>> $b_cyan$nick$ob materializes into $b_green$newnick$ob");
+
+ if ($nick =~ /^\Q$param{'ircNick'}\E$/i) {
+ &getNickInUse();
+ }
}
}
sub on_nick_taken {
- my ($self) = @_;
- my $nick = $self->nick;
- my $newnick = substr($nick,0,7)."-";
+ my ($self) = @_;
+ my $nick = $self->nick;
+ my $newnick = $nick."-";
+
+ &status("nick taken ($nick); preparing nick change.");
- &status("nick taken; changing to temporary nick ($nick -> $newnick).");
- &nick($newnick);
- &getNickInUse(1);
+ $self->whois($nick);
+ $conn->schedule(5, sub {
+ &status("nick taken; changing to temporary nick ($nick -> $newnick).");
+ &nick($newnick);
+ } );
}
sub on_notice {
if ($check) {
&status("nickserv told us to register; doing it.");
+
if (&IsParam("nickServ_pass")) {
&status("NickServ: ==> Identifying.");
&rawout("PRIVMSG NickServ :IDENTIFY $param{'nickServ_pass'}");
# password accepted.
if ($args =~ /^Password a/i) {
+ my $done = 0;
+
+ foreach ( &ChanConfList("chanServ_ops") ) {
+ next unless &chanServCheck($_);
+ next if ($done);
+ &DEBUG("nickserv activated or restarted; doing chanserv check.");
+ $done++;
+ }
+
$nickserv++;
}
} elsif ($nick =~ /^ChanServ$/i) { # chanserv.
&status("ChanServ: <== '$args'.");
+
} else {
if ($chan =~ /^$mask{chan}$/) { # channel notice.
&status("-$nick/$chan- $args");
}
$chanstats{$chan}{'Part'}++;
- &DeleteUserInfo($nick,$chan);
- &clearChanVars($chan) if ($nick eq $ident);
+ &delUserInfo($nick,$chan);
+ if ($nick eq $ident) {
+ &DEBUG("on_part: ok, I left $chan... clearChanVars...");
+ &clearChanVars($chan);
+ }
+
if (!&IsNickInAnyChan($nick) and &IsChanConf("seenStats")) {
delete $userstats{lc $nick};
}
# todo: move this out of hookMsg to here?
($user,$host) = split(/\@/, $uh);
+ # rare case should this happen - catch it just in case.
if ($bot_pid != $$) {
&ERROR("run-away fork; exiting.");
&delForked($forker);
}
- ### DEBUGGING.
- if ($statcount < 200) {
- foreach $chan (grep /[A-Z]/, keys %channels) {
- &DEBUG("leak: chan => '$chan'.");
- my ($i,$j);
- foreach $i (keys %{$channels{$chan}}) {
- foreach (keys %{$channels{$chan}{$i}}) {
- &DEBUG("leak: \$channels{$chan}{$i}{$_} ...");
- }
- }
- }
- }
-
- $msgtime = time();
- $lastWho{$chan} = $nick;
+ $msgtime = time();
+ $lastWho{$chan} = $nick;
### TODO: use $nick or lc $nick?
if (&IsChanConf("seenStats")) {
$userstats{lc $nick}{'Count'}++;
$userstats{lc $nick}{'Time'} = time();
}
-# if (&IsChanConf("hehCounter")) {
-# #...
-# }
+ # would this slow things down?
+ if ($_ = &getChanConf("ircTextCounters")) {
+ foreach (split /[\s]+/) {
+ next unless ($msg =~ /^\Q$_\E$/i);
+ &status("textcounters: $_ matched for $who");
+
+ my $v = &dbGet("stats", "counter", "nick='$who' and type='$msg'");
+ $v++;
+
+ &dbReplace("stats", (nick => $who, type => $_, counter => $v) );
+ # does not work, atleast with old mysql!!! :(
+# &dbReplace("stats", (nick => $who, type => $_, -counter => "counter+1") );
+ }
+ }
&hookMsg('public', $chan, $nick, $msg);
$chanstats{$chan}{'PublicMsg'}++;
sub on_quit {
my ($self, $event) = @_;
- my $nick = $event->nick();
- my $reason = ($event->args)[0];
+ my $nick = $event->nick();
+ my $reason = ($event->args)[0];
+
# hack for ICC.
$msgType = "public";
$who = $nick;
&DEBUG("on_quit: nick $nick was not found in any chan.");
}
- &DeleteUserInfo($nick, keys %channels);
+ &delUserInfo($nick, keys %channels);
if (exists $nuh{lc $nick}) {
delete $nuh{lc $nick};
} else {
- &DEBUG("on_quit: nuh{lc $nick} does not exist! FIXME");
+ # 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.
+ if ($reason =~ /^($mask{host})\s($mask{host})$/) { # netsplit.
$reason = "NETSPLIT: $1 <=> $2";
- if (&ChanConfList("chanlimitcheck") and !scalar keys %netsplit) {
- &DEBUG("on_quit: netsplit detected; disabling chan limit.");
- &rawout("MODE $chan -l");
+ # 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'} );
+
+ &DEBUG("on_quit: netsplit detected on $_; disabling chan limit.");
+ &rawout("MODE $_ -l");
}
$netsplit{lc $nick} = time();
if (!exists $netsplitservers{$1}{$2}) {
- &status("netsplit detected between $1 and $2.");
+ &status("netsplit detected between $1 and $2 at [".scalar(localtime)."]");
$netsplitservers{$1}{$2} = time();
}
}
- &status(">>> $b_cyan$nick$ob has signed off IRC $b_red($ob$reason$b_red)$ob");
+ 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$/) {
- &DEBUG("^^^ THIS SHOULD NEVER HAPPEN.");
+ &ERROR("^^^ THIS SHOULD NEVER HAPPEN (10).");
}
+ # does this work?
if ($nick !~ /^\Q$ident\E$/ and $nick =~ /^\Q$param{'ircNick'}\E$/i) {
- &status("own nickname became free; changing.");
+ &status("nickchange: own nickname became free; changing.");
&nick($param{'ircNick'});
}
}
### TODO: incomplete.
if ($why =~ /.* wait (\d+) second/) {
- my $sleep = $1;
- &status("targettoofast: going to sleep for $sleep...");
- sleep $sleep;
- } else {
- if (!exists $cache{TargetTooFast}) {
- &DEBUG("on_ttf: failed: $why");
- $cache{TargetTooFast}++;
+ my $sleep = $1;
+ my $max = 10;
+
+ if ($sleep > $max) {
+ &status("targettoofast: going to sleep for $max ($sleep)...");
+ $sleep = $max;
+ } else {
+ &status("targettoofast: going to sleep for $sleep");
}
+
+ my $delta = time() - ($cache{sleepTime} || 0);
+ if ($delta > $max+2) {
+ sleep $sleep;
+ $cache{sleepTime} = time();
+ }
+
+ return;
+ }
+
+ if (!exists $cache{TargetTooFast}) {
+ &DEBUG("on_ttf: failed: $why");
+ $cache{TargetTooFast}++;
}
}
if ($ver =~ /bitchx/i) {
$ver{bitchx}{$nick} = $ver;
+
} elsif ($ver =~ /xc\!|xchat/i) {
$ver{xchat}{$nick} = $ver;
+
} elsif ($ver =~ /irssi/i) {
$ver{irssi}{$nick} = $ver;
+
} elsif ($ver =~ /epic/i) {
$ver{epic}{$nick} = $ver;
+
} elsif ($ver =~ /mirc/i) {
+ &DEBUG("verstats: mirc: $nick => '$ver'.");
$ver{mirc}{$nick} = $ver;
+
} elsif ($ver =~ /ircle/i) {
$ver{ircle}{$nick} = $ver;
+
} elsif ($ver =~ /ircII/i) {
$ver{ircII}{$nick} = $ver;
+
} elsif ($ver =~ /sirc /i) {
$ver{sirc}{$nick} = $ver;
+
} elsif ($ver =~ /kvirc/i) {
$ver{kvirc}{$nick} = $ver;
+
} elsif ($ver =~ /eggdrop/i) {
$ver{eggdrop}{$nick} = $ver;
+
} elsif ($ver =~ /xircon/i) {
$ver{xircon}{$nick} = $ver;
+
} else {
+ &DEBUG("verstats: other: $nick => '$ver'.");
$ver{other}{$nick} = $ver;
}
}
sub on_who {
my ($self, $event) = @_;
my @args = $event->args;
+ my $str = $args[5]."!".$args[2]."\@".$args[3];
+
+ if ($cache{on_who_Hack}) {
+ $cache{nuhInfo}{lc $args[5]}{Nick} = $args[5];
+ $cache{nuhInfo}{lc $args[5]}{User} = $args[2];
+ $cache{nuhInfo}{lc $args[5]}{Host} = $args[3];
+ return;
+ }
+
+ if ($args[5] =~ /^nickserv$/i and !$nickserv) {
+ &DEBUG("ok... we did a who for nickserv.");
+ &rawout("PRIVMSG NickServ :IDENTIFY $param{'nickServ_pass'}");
+ }
$nuh{lc $args[5]} = $args[5]."!".$args[2]."\@".$args[3];
}
$nuh{lc $args[1]} = $args[1]."!".$args[2]."\@".$args[3];
}
+###
+### since joinnextchan is hooked onto on_endofnames, these are needed.
+###
+
+sub on_chanfull {
+ my ($self, $event) = @_;
+ my @args = $event->args;
+
+ &DEBUG("on_chanfull: args => @args");
+ &joinNextChan();
+}
+
+sub on_inviteonly {
+ my ($self, $event) = @_;
+ my @args = $event->args;
+
+ &DEBUG("on_inviteonly: args => @args");
+ &joinNextChan();
+}
+
+sub on_banned {
+ my ($self, $event) = @_;
+ my @args = $event->args;
+
+ &DEBUG("on_banned: args => @args");
+ &joinNextChan();
+}
+
+sub on_badchankey {
+ my ($self, $event) = @_;
+ my @args = $event->args;
+
+ &DEBUG("on_badchankey: args => @args");
+ &joinNextChan();
+}
+
1;
projects / infobot.git / blobdiff