my $sock = ($event->to)[0];
my $nick = $event->nick();
- $userHandle = ""; # reset.
-
- # who is set to bot's name, why?
-
- if (!exists $nuh{$who}) {
- &DEBUG("chat: nuh{$who} doesn't exist; hrm should retry.");
+ if (!exists $nuh{$nick}) {
+ &DEBUG("chat: nuh{$nick} doesn't exist; trying WHOIS .");
+ $self->whois($nick);
return;
- } else {
- $message = $msg;
- $who = lc $nick;
- $orig{who} = $nick;
- $orig{message} = $msg;
- $nuh = $nuh{$who};
- $uh = (split /\!/, $nuh)[1];
- $addressed = 1;
- $msgType = 'chat';
}
+ ### set vars that would have been set in hookMsg.
+ $userHandle = ""; # reset.
+ $who = lc $nick;
+ $message = $msg;
+ $orig{who} = $nick;
+ $orig{message} = $msg;
+ $nuh = $nuh{$who};
+ $uh = (split /\!/, $nuh)[1];
+ $addressed = 1;
+ $msgType = 'chat';
+
if (!exists $dcc{'CHATvrfy'}{$nick}) {
$userHandle = &verifyUser($who, $nuh);
my $crypto = $users{$userHandle}{PASS};
### TODO: prevent users without CRYPT chatting.
if (!defined $crypto) {
&DEBUG("chat: no pass required.");
- $success++;
+### $success++;
} elsif (&ckpasswd($msg, $crypto)) {
# stolen from eggdrop.
$self->privmsg($sock, "Commands start with '.' (like '.quit' or '.help')");
$self->privmsg($sock, "Everything else goes out to the party line.");
- &dccStatus(2) if (scalar keys %{ $dcc{'CHAT'} } == 1);
+ &dccStatus(2) unless (exists $sched{"dccStatus"}{RUNNING});
$success++;
return;
}
-### REMOVE IF OK.
-# &DEBUG("IrcHooks.pl: line 104: userHandle => $userHandle");
-# $userHandle = &verifyUser($who, $nuh);
-
&status("$b_red=$b_cyan$who$b_red=$ob $message");
if ($message =~ s/^\.//) { # dcc chat commands.
}
if ($firsttime) {
- $conn->schedule(60, \&setupSchedulers, "");
+ &ScheduleThis(1, \&setupSchedulers);
$firsttime = 0;
}
my $nick = $event->nick();
# pity Net::IRC doesn't store nuh. Here's a hack :)
- $self->whois($nick);
+ if (!exists $nuh{lc $nick}) {
+ $self->whois($nick);
+ $nuh{lc $nick} = "GETTING-NOW"; # trying.
+ }
$type ||= "???";
if ($type eq 'SEND') { # GET for us.
\*DCCGET
);
} elsif ($type eq 'GET') { # SEND for us?
- &DEBUG("starting get.");
+ &status("DCC: Initializing SEND for $nick.");
$self->new_send($event->args);
} elsif ($type eq 'CHAT') {
- &DEBUG("starting chat.");
+ &status("DCC: Initializing CHAT for $nick.");
$self->new_chat($event);
} else {
&WARN("${b_green}DCC $type$ob (1)");
my $type = uc( ($event->args)[0] );
my $nick = $event->nick();
my $sock = ($event->to)[0];
- $msgType = 'chat';
+ $msgType = 'chat';
$type ||= "???";
+ ### BUG: who is set to bot's nick?
+ # lets do it.
if ($type eq 'SEND') {
-
&status("${b_green}DCC lGET$ob established with $b_cyan$nick$ob");
} elsif ($type eq 'CHAT') {
-
- &status("${b_green}DCC CHAT$ob established with $b_cyan$nick$ob $b_yellow($ob$nuh{$nick}$b_yellow)$ob");
-
- &verifyUser($nick, $nuh{lc $nick});
-
- if (!exists $users{$userHandle}{HOSTS}) {
- &pSReply("you have no hosts defined in my user file; rejecting.");
- ### TODO: $sock->close();
- return;
- }
-
- my $crypto = $users{$userHandle}{PASS};
- $dcc{'CHAT'}{$nick} = $sock;
- foreach (keys %{ $users{$userHandle} }) {
- &VERB(" $_ => $users{$userHandle}{$_}",2);
- }
-
- if (defined $crypto) {
-### &dccsay($nick,"Enter your password, $userHandle.");
- &dccsay($nick,"Enter your password.");
+ # very cheap hack.
+ ### 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);
} else {
- &dccsay($nick,"Welcome to blootbot DCC CHAT interface, $userHandle.");
+ on_dcc_open_chat(undef, $nick, $sock);
}
} elsif ($type eq 'SEND') {
-
&DEBUG("Starting DCC receive.");
foreach ($event->args) {
&DEBUG(" => '$_'.");
}
} else {
-
&WARN("${b_green}DCC $type$ob (3)");
+
+ }
+}
+
+# really custom sub to get NUH since Net::IRC doesn't appear to support
+# it.
+sub on_dcc_open_chat {
+ my(undef, $nick,$sock) = @_;
+
+ if ($nuh{$nick} eq "GETTING-NOW") {
+ &DEBUG("getting nuh for $nick failed. FIXME.");
+ return;
+ }
+
+ &status("${b_green}DCC CHAT$ob established with $b_cyan$nick$ob $b_yellow($ob$nuh{$nick}$b_yellow)$ob");
+
+ &verifyUser($nick, $nuh{lc $nick});
+
+ if (!exists $users{$userHandle}{HOSTS}) {
+ &pSReply("you have no hosts defined in my user file; rejecting.");
+ ### TODO: $sock->close();
+ return;
+ }
+
+ my $crypto = $users{$userHandle}{PASS};
+ $dcc{'CHAT'}{$nick} = $sock;
+
+ if (defined $crypto) {
+ &dccsay($nick,"Enter your password.");
+ } else {
+ &dccsay($nick,"Welcome to blootbot DCC CHAT interface, $userHandle.");
}
}
&clearIRCVars();
if (!$self->connect()) {
&WARN("not connected? help me. gonna call ircCheck() in 1800s");
- $conn->schedule(1800, \&ircCheck(), "");
+ &ScheduleThis(30, "ircCheck");
}
}
my ($self, $event) = @_;
my $chan = ($event->args)[1];
- if (exists $jointime{$chan}) {
- my $delta_time = sprintf("%.03f", &gettimeofday() - $jointime{$chan});
+ if (exists $cache{jointime}{$chan}) {
+ my $delta_time = sprintf("%.03f", &gettimeofday() - $cache{jointime}{$chan});
$delta_time = 0 if ($delta_time < 0);
&status("$b_blue$chan$ob: sync in ${delta_time}s.");
if (scalar @joinchan) { # remaining channels to join.
&joinNextChan();
- } else {
- ### chanserv support.
- ### TODO: what if we rejoin a channel.. need to set a var that
- ### we've done the request-for-ops-on-join.
- return unless (&IsChanConf("chanServ_ops") > 0);
- return unless ($nickserv);
-
- if (!exists $channels{$chan}{'o'}{$ident}) {
- &status("ChanServ ==> Requesting ops for $chan.");
- &rawout("PRIVMSG ChanServ :OP $chan $ident");
- }
+ }
+
+ return unless (&IsChanConf("chanServ_ops") > 0);
+ return unless ($nickserv);
+
+ if (!exists $channels{$chan}{'o'}{$ident}) {
+ &status("ChanServ ==> Requesting ops for $chan.");
+ &rawout("PRIVMSG ChanServ :OP $chan $ident");
}
}
sub on_invite {
my ($self, $event) = @_;
- my $chan = ($event->args)[0];
+ my $chan = lc( ($event->args)[0] );
my $nick = $event->nick;
- &DEBUG("on_invite: chan => '$chan', nick => '$nick'.");
-
- # chan + possible_key.
- ### do we need to know the key if we're invited???
- ### grep the channel list?
- foreach (split /[\s\t]+/, $param{'join_channels'}) {
- next unless /^\Q$chan\E(,\S+)?$/i;
- s/,/ /;
+ if ($nick =~ /^\Q$ident\E$/) {
+ &DEBUG("on_invite: self invite.");
+ return;
+ }
- next if ($nick =~ /^\Q$ident\E$/);
+ ### TODO: join key.
+ if (exists $chanconf{$chan}) {
if (&validChan($chan)) {
&msg($who, "i'm already in \002$chan\002.");
next;
}
if ($netsplit and !$netsplittime) {
- &status("ok.... re-running chanlimitCheck in 60.");
+ &DEBUG("on_join: ok.... re-running chanlimitCheck in 60.");
$conn->schedule(60, sub {
&chanlimitCheck();
$netsplittime = undef;
&status(">>> join/$b_blue$chan$ob $b_cyan$who$ob $b_yellow($ob$user\@$host$b_yellow)$ob$netsplitstr");
$channels{$chan}{''}{$who}++;
- $nuh{lc $who} = $who."!".$user."\@".$host unless (exists $nuh{lc $who});
-
- ### on-join ban. (TODO: kick)
- if (exists $bans{$chan}) {
- ### TODO: need to do $chan and _default
- foreach (keys %{ $bans{$chan} }) {
- s/\*/\\S*/g;
- next unless /^\Q$nuh\E$/i;
-
- foreach (keys %{ $channels{$chan}{'b'} }) {
- &DEBUG(" bans_on_chan($chan) => $_");
- }
-
- ### TODO: check $channels{$chan}{'b'} if ban already exists.
- &ban( "*!*@".&makeHostMask($host), $chan);
- last;
+ $nuh = $who."!".$user."\@".$host;
+ $nuh{lc $who} = $nuh unless (exists $nuh{lc $who});
+
+ ### on-join bans.
+ my @bans = keys %{ $bans{$chan} };
+ push(@bans, keys %{ $bans{"*"} });
+ foreach (@bans) {
+ s/\*/\\S*/g;
+ next unless /^\Q$nuh\E$/i;
+
+ ### TODO: check $channels{$chan}{'b'} if ban already exists.
+ foreach (keys %{ $channels{$chan}{'b'} }) {
+ &DEBUG(" bans_on_chan($chan) => $_");
}
+
+ ### TODO: kick
+ &ban( "*!*@".&makeHostMask($host), $chan);
+ last;
}
### ROOTWARN:
$user =~ /^r(oo|ew|00)t$/i &&
$channels{$chan}{'o'}{$ident});
+ ### chanlimit check.
+ &chanLimitVerify($chan);
+
# used to determine sync time.
if ($who =~ /^$ident$/i) {
- if (defined( my $whojoin = $joinverb{$chan} )) {
+ if (defined( my $whojoin = $cache{join}{$chan} )) {
&msg($chan, "Okay, I'm here. (courtesy of $whojoin)");
- delete $joinverb{$chan};
+ delete $cache{join}{$chan};
}
### TODO: move this to &joinchan()?
- $jointime{$chan} = &gettimeofday();
+ $cache{jointime}{$chan} = &gettimeofday();
rawout("WHO $chan");
} else {
### TODO: this may go wild on a netjoin :)
my $nick = $event->nick();
my $reason = ($event->args)[0];
+ my $count = 0;
foreach (keys %channels) {
# fixes inconsistent chanstats bug #1.
- next unless (&IsNickInChan($nick,$_));
+ if (!&IsNickInChan($nick,$_)) {
+ $count++;
+ next;
+ }
$chanstats{$_}{'SignOff'}++;
}
+
+ if ($count == scalar keys %channels) {
+ &DEBUG("on_quit: nick $nick was not found in any chan.");
+ }
+
&DeleteUserInfo($nick, keys %channels);
+
if (exists $nuh{lc $nick}) {
delete $nuh{lc $nick};
} else {
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");
+ }
+
$netsplit{lc $nick} = time();
if (!exists $netsplitservers{$1}{$2}) {
&status("netsplit detected between $1 and $2.");
sub on_targettoofast {
my ($self, $event) = @_;
my $nick = $event->nick();
- my $chan = ($event->to)[0];
-
- &DEBUG("on_targettoofast: nick => '$nick'.");
- &DEBUG("on_targettoofast: chan => '$chan'.");
-
- foreach ($event->args) {
- &DEBUG("on_targettoofast: args => '$_'.");
- }
+ my($me,$chan,$why) = $event->args();
+ ### TODO: incomplete.
### .* wait (\d+) second/) {
- &status("X1 $msg");
- my $sleep = $3 + 10;
-
+ &status("on_ttf: X1 $msg") if (defined $msg);
+ my $sleep = 5;
&status("going to sleep for $sleep...");
sleep $sleep;
&joinNextChan();
# this may be fixed at a later date with topic queueing.
###
- $topic{$chan}{'Current'} = $topic if (1 and &IsChanConf("topic") == 1);
+ $topic{$chan}{'Current'} = $topic if (1);
$chanstats{$chan}{'Topic'}++;
&status(">>> topic/$b_blue$chan$ob by $b_cyan$nick$ob -> $topic");
my ($self, $event) = @_;
my @args = $event->args;
+ &DEBUG("on_whoisuser: @args");
+
$nuh{lc $args[1]} = $args[1]."!".$args[2]."\@".$args[3];
}
}
# Determine floodwho.
+ my $c = "_default";
if ($msgType =~ /public/i) { # public.
- $floodwho = lc $chan;
+ $floodwho = $c = lc $chan;
} elsif ($msgType =~ /private/i) { # private.
$floodwho = lc $who;
} else { # dcc?
&DEBUG("FIXME: floodwho = ???");
}
- my ($count, $interval) = split(/:/, $param{'floodRepeat'} || "2:10");
+ my $val = &getChanConfDefault("floodRepeat", "2:10", $c);
+ my ($count, $interval) = split /:/, $val;
# flood repeat protection.
if ($addressed) {
### public != personal who so the below is kind of pointless.
my @who;
foreach (keys %flood) {
- next if (/^\Q$floodwho\E$/ or /^\Q$chan\E$/);
+ next if (/^\Q$floodwho\E$/);
+ next if (defined $chan and /^\Q$chan\E$/);
+
push(@who, grep /^\Q$message\E$/i, keys %{$flood{$_}});
}
+
if (scalar @who) {
&msg($who, "you already said what ".
join(' ', @who)." have said.");
if ($addrchar) {
&status("$b_cyan$who$ob is short-addressing me");
- } else {
+ } elsif ($msgType eq "private") { # private.
+ &status("$b_cyan$who$ob is /msg'ing me");
+ } else { # public?
&status("$b_cyan$who$ob is addressing me");
}
$flood{$floodwho}{$message} = time();
}
- ($count, $interval) = split(/:/, $param{'floodMessages'} || "5:30");
+ $val = &getChanConfDefault("floodMessages", "5:30", $c);
+ ($count, $interval) = split /:/, $val;
+
# flood overflow protection.
if ($addressed) {
foreach (keys %{$flood{$floodwho}}) {
$flood{$floodwho}{$message} = time();
}
+ my @ignore;
if ($msgType =~ /public/i) { # public.
$talkchannel = $chan;
&status("<$orig{who}/$chan> $orig{message}");
+ @ignore = keys %{ $ignore{$chan} };
} elsif ($msgType =~ /private/i) { # private.
&status("[$orig{who}] $orig{message}");
$talkchannel = undef;
} else {
&DEBUG("unknown msgType => $msgType.");
}
+ push(@ignore, keys %{ $ignore{"*"} });
if ((!$skipmessage or &IsChanConf("seenStoreAll")) and
&IsChanConf("seen") and
return if ($skipmessage);
return unless (&IsParam("minVolunteerLength") or $addressed);
- local $ignore = 0;
- if (exists $ignore{lc $chan}) {
- foreach (keys %{ $ignore{lc $chan} }) {
- s/\*/\\S*/g;
+ foreach (@ignore) {
+ s/\*/\\S*/g;
- next unless ($nuh =~ /^\Q$_\E$/i);
- $ignore++;
- last;
- }
+ next unless (eval { $nuh =~ /^$_$/i });
+
+ &status("IGNORE <$who> $message");
+ return;
}
if (defined $nuh) {
return;
}
+sub chanLimitVerify {
+ my($chan) = @_;
+ my $l = $channels{$chan}{'l'};
+
+ # only change it if it's not set.
+ if (defined $l and &IsChanConf("chanlimitcheck")) {
+ my $plus = &getChanConfDefault("chanlimitcheckPlus", 5, $chan);
+ my $nowl = scalar(keys %{ $channels{$chan}{''} });
+ my $delta = $nowl - $l;
+ $delta =~ s/^\-//;
+
+ if ($plus <= 3) {
+ &WARN("clc: stupid to have plus at $plus, fix it!");
+ }
+
+ ### todo: check if we have ops.
+ ### todo: if not, check if nickserv/chanserv is avail.
+ ### todo: unify code with chanlimitcheck()
+ if ($delta > 3) {
+ &WARN("clc: nowl($nowl) > l($l) - 3");
+ &rawout("MODE $chan +l ".($nowl+$plus) );
+ }
+ }
+}
+
1;
projects / infobot.git / blobdiff