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");
# 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 <pass> to get master access through DCC CHAT.");
+ &status("!"x40);
+ &status("!!! Ok. Now type '/msg $ident PASS <pass>' to get master access through DCC CHAT.");
+ &status("!"x40);
}
# end of first time run.
} 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)");
}
} else {
&WARN("${b_green}DCC $type$ob (3)");
-
}
}
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.");
}
}
&clearIRCVars();
if (!$self->connect()) {
- &WARN("not connected? help me. gonna call ircCheck() in 1800s");
- &ScheduleThis(30, "ircCheck");
+ &WARN("not connected? help me. gonna call ircCheck() in 60s");
+ &ScheduleThis(1, "ircCheck");
+# &ScheduleThis(10, "ircCheck");
+# &ScheduleThis(30, "ircCheck");
}
}
# sync time should be done in on_endofwho like in BitchX
if (exists $cache{jointime}{$chan}) {
- my $delta_time = sprintf("%.03f", &timeget() - $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: [$chanstats]");
&chanServCheck($chan);
- &joinNextChan();
+ # schedule used to solve ircu (OPN) "target too fast" problems.
+ $conn->schedule(5, sub { &joinNextChan(); } );
}
sub on_init {
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) {
- &DEBUG("on_join: ok.... re-running chanlimitCheck in 60.");
+ if ($netsplit and !exists $cache{netsplit}) {
+ &VERB("on_join: ok.... re-running chanlimitCheck in 60.",2);
$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} )) {
}
### 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")) {
sub on_modeis {
my ($self, $event) = @_;
- my $nick = $event->nick();
my ($myself, undef,@args) = $event->args();
+ my $nick = $event->nick();
$chan = ($event->args())[1];
&hookMode($nick, @args);
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);
if ($check) {
&status("nickserv told us to register; doing it.");
+
if (&IsParam("nickServ_pass")) {
&status("NickServ: ==> Identifying.");
&rawout("PRIVMSG NickServ :IDENTIFY $param{'nickServ_pass'}");
}
} elsif ($nick =~ /^ChanServ$/i) { # chanserv.
&status("ChanServ: <== '$args'.");
+
} else {
if ($chan =~ /^$mask{chan}$/) { # channel notice.
&status("-$nick/$chan- $args");
$chanstats{$chan}{'Part'}++;
&delUserInfo($nick,$chan);
- &clearChanVars($chan) if ($nick eq $ident);
+ if ($nick eq $ident) {
+ &DEBUG("on_part: ok, I left $chan... clearChanVars...");
+ &clearChanVars($chan);
+ }
+
if (!&IsNickInAnyChan($nick) and &IsChanConf("seenStats")) {
delete $userstats{lc $nick};
}
$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);
+ &VERB("textcounters: $_ matched for $who",2);
+
+ my $v = &dbGet("stats", "counter", "nick=".&dbQuote($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'}++;
&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 {
- &DEBUG("on_quit: nuh{lc $nick} does not exist! FIXME");
- }
- 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.
- if (&ChanConfList("chanlimitcheck") and !scalar keys %netsplit) {
- &DEBUG("on_quit: netsplit detected on $chan; disabling chan limit.");
- &rawout("MODE $chan -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();
}
}
&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.");
&nick($param{'ircNick'});
$cache{sleepTime} = time();
}
- } else {
- if (!exists $cache{TargetTooFast}) {
- &DEBUG("on_ttf: failed: $why");
- $cache{TargetTooFast}++;
- }
+ 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;
$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;
}
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();
}