$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") {
+ &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.
@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");
} 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.");
}
}
$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;
+ &DEBUG("on_disconnect: 1");
&clearIRCVars();
+ &DEBUG("on_disconnect: 2");
+
+ if (!defined $self) {
+ &WARN("on_disconnect: self is undefined! WTF");
+ &DEBUG("running function irc... lets hope this works.");
+ &irc();
+ return;
+ }
+
if (!$self->connect()) {
- &WARN("not connected? help me. gonna call ircCheck() in 1800s");
- &ScheduleThis(30, "ircCheck");
+ &DEBUG("on_disconnect: 3");
+ &WARN("not connected? help me. gonna call ircCheck() in 60s");
+ &clearIRCVars();
+ &ScheduleThis(1, "ircCheck");
}
}
# 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");
+ &rawout("MODE $chan");
my $txt;
my @array;
### 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");
$chan = lc( ($event->to)[0] ); # CASING!!!!
$who = $event->nick();
$msgType = "public";
+ my $i = scalar(keys %{ $channels{$chan} });
+ my $j = $cache{maxpeeps}{$chan} || 0;
$chanstats{$chan}{'Join'}++;
$userstats{lc $who}{'Join'} = time() if (&IsChanConf("seenStats"));
+ $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};
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()?
}
### ROOTWARN:
- # what's the +o requirement?
- &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")) {
$uh = $event->userhost();
$nuh = $nick."!".$uh;
$msgtime = time();
+ $h = $host;
if ($nick eq $ident) { # hopefully ourselves.
if ($msg eq "TEST") {
$who = $nick;
$msgType = "public";
+ if (0 and !exists $channels{$chan}) {
+ &DEBUG("on_part: found out we're on $chan!");
+ $channels{$chan} = 1;
+ }
+
if (exists $floodjoin{$chan}{$nick}{Time}) {
delete $floodjoin{$chan}{$nick};
}
sub on_ping_reply {
my ($self, $event) = @_;
- my $nick = $event->nick;
- my $lag = time() - ($event->args)[1];
+ 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.");
}
$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 != $$) {
# would this slow things down?
if ($_ = &getChanConf("ircTextCounters")) {
+ my $time = time();
+
foreach (split /[\s]+/) {
- next unless ($msg =~ /^\Q$_\E$/i);
- &status("textcounters: $_ matched for $who");
+ my $x = $_;
+
+ # either full word or ends with a space, etc...
+ next unless ($msg =~ /^\Q$x\E[\$\s!.]/i);
- my $v = &dbGet("stats", "counter", "nick='$who' and type='$msg'");
+ &VERB("textcounters: $x matched for $who",2);
+ my $c = $chan || "PRIVATE";
+
+ my ($v,$t) = &dbGet("stats", "counter,time",
+ "nick=". &dbQuote($who)
+ ." AND type=".&dbQuote($x)
+ ." AND channel=".&dbQuote($c)
+ );
$v++;
- &dbReplace("stats", (nick => $who, type => $_, counter => $v) );
+ # don't allow ppl to cheat the stats :-)
+ next unless ($time - $t > 10);
+
+ my %hash = (
+ 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 => $_, -counter => "counter+1") );
+# &dbReplace("stats", (nick => $who, type => $x, -counter => "counter+1") );
}
}
### $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 ( exists $channels{$_}{'l'} );
&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.");
}
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;
$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 {
+sub on_whois {
my ($self, $event) = @_;
my @args = $event->args;
- &DEBUG("on_whoisuser: @args");
-
$nuh{lc $args[1]} = $args[1]."!".$args[2]."\@".$args[3];
}
+sub on_whoischannels {
+ my ($self, $event) = @_;
+ my @args = $event->args;
+
+ &DEBUG("on_whoischannels: @args");
+}
+
+sub on_useronchannel {
+ my ($self, $event) = @_;
+ my @args = $event->args;
+
+ &DEBUG("on_useronchannel: @args");
+ &joinNextChan();
+}
+
###
### since joinnextchan is hooked onto on_endofnames, these are needed.
###
my ($self, $event) = @_;
my @args = $event->args;
- &DEBUG("on_chanfull: args => @args");
+ &status(">>> chanfull/$b_blue$args[1]$ob");
+
&joinNextChan();
}
my ($self, $event) = @_;
my @args = $event->args;
- &DEBUG("on_inviteonly: args => @args");
+ &status(">>> inviteonly/$b_cyan$args[1]$ob");
+
&joinNextChan();
}
sub on_banned {
my ($self, $event) = @_;
my @args = $event->args;
+ my $chan = $args[1];
+
+ &status(">>> banned/$b_blue$chan$ob $b_cyan$args[0]$ob");
- &DEBUG("on_banned: args => @args");
&joinNextChan();
}
&joinNextChan();
}
+sub on_useronchan {
+ my ($self, $event) = @_;
+ my @args = $event->args;
+
+ &DEBUG("on_useronchan: args => @args");
+ &joinNextChan();
+}
+
1;
projects / infobot.git / blobdiff