if (&IsParam("useStrict")) { use strict; }
-my $nickserv = 0;
-
# GENERIC. TO COPY.
sub on_generic {
my ($self, $event) = @_;
my $sock = ($event->to)[0];
my $nick = $event->nick();
- if (!exists $nuh{lc $nick}) {
- &DEBUG("chat: nuh{$nick} doesn't exist; hrm should retry.");
+ $userHandle = ""; # reset.
+
+ # who is set to bot's name, why?
+
+ if (!exists $nuh{$who}) {
+ &DEBUG("chat: nuh{$who} doesn't exist; hrm should retry.");
return;
} else {
$message = $msg;
$msgType = 'chat';
}
- if (!exists $dcc{'CHAT'}{$nick}) {
- my $userHandle = &verifyUser($who, $nuh);
- my $crypto = $userList{$userHandle}{'pass'};
+ if (!exists $dcc{'CHATvrfy'}{$nick}) {
+ $userHandle = &verifyUser($who, $nuh);
+ my $crypto = $users{$userHandle}{PASS};
my $success = 0;
+ ### TODO: prevent users without CRYPT chatting.
if (!defined $crypto) {
&DEBUG("chat: no pass required.");
$success++;
+
} elsif (&ckpasswd($msg, $crypto)) {
- $self->privmsg($sock,"Authorized.");
- $self->privmsg($sock,"I'll respond as if through /msg and addressed in public. Addition to that, access to 'user' commands will be allowed, like 'die' and 'jump'.");
- # hrm... it's stupid to ask for factoids _within_ dcc chat.
- # perhaps it should be default to commands, especially
- # commands only authorized through DCC CHAT.
- &status("DCC CHAT: passwd is ok.");
+ # 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.");
+
+ &dccStatus(2) if (scalar keys %{ $dcc{'CHAT'} } == 1);
+
$success++;
+
} else {
&status("DCC CHAT: incorrect pass; closing connection.");
&DEBUG("chat: sock => '$sock'.");
### $sock->close();
+ delete $dcc{'CHAT'}{$nick};
&DEBUG("chat: after closing sock. FIXME");
### BUG: close seizes bot. why?
}
if ($success) {
&status("DCC CHAT: user $nick is here!");
- $dcc{'CHAT'}{$nick} = $sock;
- &DCCBroadcast("$nick ($uh) has joined the chat arena.");
+ &DCCBroadcast("*** $nick ($uh) joined the party line.");
+
+ $dcc{'CHATvrfy'}{$nick} = $userHandle;
+
+ return if ($userHandle eq "_default");
+
+ &dccsay($nick,"Flags: $users{$userHandle}{FLAGS}");
}
return;
}
+### REMOVE IF OK.
+# &DEBUG("IrcHooks.pl: line 104: userHandle => $userHandle");
+# $userHandle = &verifyUser($who, $nuh);
- $userHandle = &verifyUser($who, $nuh);
&status("$b_red=$b_cyan$who$b_red=$ob $message");
+
if ($message =~ s/^\.//) { # dcc chat commands.
### TODO: make use of &Forker(); here?
- &loadMyModule($myModules{'ircdcc'});
- return '$noreply from userD' if (&userDCC() eq $noreply);
+ &loadMyModule( $myModules{'ircdcc'} );
+
+ &DCCBroadcast("#$who# $message","m");
+
+ my $retval = &userDCC();
+ return unless (defined $retval);
+ return if ($retval eq $noreply);
+
$conn->privmsg($dcc{'CHAT'}{$who}, "Invalid command.");
} else { # dcc chat arena.
+
foreach (keys %{$dcc{'CHAT'}}) {
$conn->privmsg($dcc{'CHAT'}{$_}, "<$who> $orig{message}");
}
sub on_endofmotd {
my ($self) = @_;
- if (&IsParam("wingate")) {
+ # what's the following for?
+ $ident = $param{'ircNick'};
+ # update IRCStats.
+ $ircstats{'ConnectTime'} = time();
+ $ircstats{'ConnectCount'}++;
+
+ if (&IsChanConf("wingate")) {
my $file = "$bot_base_dir/$param{'ircUser'}.wingate";
open(IN, $file);
while (<IN>) {
close IN;
}
- ### TODO: move this to end of &joinNextChan()?
if ($firsttime) {
- &DEBUG("on_EOM: calling sS in 60s.");
$conn->schedule(60, \&setupSchedulers, "");
$firsttime = 0;
}
if (&IsParam("ircUMode")) {
- &status("Changing user modes to $param{'ircUMode'}.");
+ &status("Attempting change of user modes to $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 = split /[\t\s]+/, $param{'join_channels'};
+ @joinchan = &getJoinChans();
}
&joinNextChan();
# pity Net::IRC doesn't store nuh. Here's a hack :)
$self->whois($nick);
+ $type ||= "???";
- if ($type eq 'SEND') {
+ if ($type eq 'SEND') { # GET for us.
# incoming DCC SEND. we're receiving a file.
- $self->new_get($event, \*FH);
+ 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
+ );
+ } elsif ($type eq 'GET') { # SEND for us?
+ &DEBUG("starting get.");
+ $self->new_send($event->args);
} elsif ($type eq 'CHAT') {
+ &DEBUG("starting chat.");
$self->new_chat($event);
} else {
- &status("${b_green}DCC $type$ob unknown ...");
+ &WARN("${b_green}DCC $type$ob (1)");
}
}
my $nick = $event->nick();
my $sock = ($event->to)[0];
- &DEBUG("dcc_close: nick => '$nick'.");
+ # DCC CHAT close on fork exit workaround.
+ if ($bot_pid != $$) {
+ &WARN("run-away fork; exiting.");
+ &delForked($forker);
+ }
- if (exists $dcc{'SEND'}{$nick} and -f "temp/$nick.txt") {
+ 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");
- unlink "temp/$nick.txt";
+ unlink "$param{tempDir}/$nick.txt";
delete $dcc{'SEND'}{$nick};
} elsif (exists $dcc{'CHAT'}{$nick} and $dcc{'CHAT'}{$nick} eq $sock) {
&status("${b_green}DCC CHAT$ob close from $b_cyan$nick$ob");
delete $dcc{'CHAT'}{$nick};
+ delete $dcc{'CHATvrfy'}{$nick};
} else {
- &status("${b_green}DCC$ob UNKNOWN close from $b_cyan$nick$ob");
+ &status("${b_green}DCC$ob UNKNOWN close from $b_cyan$nick$ob (2)");
}
}
my $sock = ($event->to)[0];
$msgType = 'chat';
+ $type ||= "???";
+
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 ($nuh{$nick})");
- my $userHandle = &verifyUser($nick, $nuh{lc $nick});
- my $crypto = $userList{$userHandle}{'pass'};
+ &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});
+ my $crypto = $users{$userHandle}{PASS};
+ $dcc{'CHAT'}{$nick} = $sock;
+
+ foreach (keys %{ $users{$userHandle} }) {
+ &VERB(" $_ => $users{$userHandle}{$_}",2);
+ }
+
if (defined $crypto) {
- $self->privmsg($sock,"Enter Password, $userHandle.");
+### &dccsay($nick,"Enter your password, $userHandle.");
+ &dccsay($nick,"Enter your password.");
} else {
- $self->privmsg($sock,"Welcome to blootbot DCC CHAT interface, $userHandle.");
+ &dccsay($nick,"Welcome to blootbot DCC CHAT interface, $userHandle.");
+ }
+ } elsif ($type eq 'SEND') {
+ &DEBUG("Starting DCC receive.");
+ foreach ($event->args) {
+ &DEBUG(" => '$_'.");
}
} else {
- &status("${b_green}DCC $type$ob unknown ...");
+ &WARN("${b_green}DCC $type$ob (3)");
}
}
my $what = ($event->args)[0];
&status("disconnect from $from ($what).");
- $ircstats{'DisconnectReason'} = $what;
+ $ircstats{'DisconnectTime'} = time();
+ $ircstats{'DisconnectReason'} = $what;
+ $ircstats{'DisconnectCount'}++;
# clear any variables on reconnection.
$nickserv = 0;
### 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 (&IsParam("chanServ_ops"));
+ return unless (&IsChanConf("chanServ_ops") > 0);
return unless ($nickserv);
- my @chans = split(/[\s\t]+/, $param{'chanServ_ops'});
-
- foreach $chan (keys %channels) {
- next unless (grep /^$chan$/i, @chans);
-
- if (!exists $channels{$chan}{'o'}{$ident}) {
- &status("ChanServ ==> Requesting ops for $chan.");
- rawout("PRIVMSG ChanServ :OP $chan $ident");
- }
+ if (!exists $channels{$chan}{'o'}{$ident}) {
+ &status("ChanServ ==> Requesting ops for $chan.");
+ &rawout("PRIVMSG ChanServ :OP $chan $ident");
}
}
-
}
sub on_init {
$who = $event->nick();
$chanstats{$chan}{'Join'}++;
- $userstats{lc $who}{'Join'} = time() if (&IsParam("seenStats"));
+ $userstats{lc $who}{'Join'} = time() if (&IsChanConf("seenStats"));
+
+ &joinfloodCheck($who, $chan, $event->userhost);
# netjoin detection.
my $netsplit = 0;
$netsplit = 1;
}
+ if ($netsplit and !$netsplittime) {
+ &status("ok.... re-running chanlimitCheck in 60.");
+ $conn->schedule(60, sub {
+ &chanlimitCheck();
+ $netsplittime = undef;
+ } );
+
+ $netsplittime = time();
+ }
+
# how to tell if there's a netjoin???
my $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;
+ }
+ }
+
### ROOTWARN:
&rootWarn($who,$user,$host,$chan)
- if (&IsParam("rootWarn") &&
+ if (&IsChanConf("rootWarn") &&
$user =~ /^r(oo|ew|00)t$/i &&
$channels{$chan}{'o'}{$ident});
&status(">>> kick/$b_blue$chan$ob [$b$kickee!$uh$ob] by $b_cyan$kicker$ob $b_yellow($ob$reason$b_yellow)$ob");
+ $chan = lc $chan; # forgot about this, found by xsdg, 20001229.
$chanstats{$chan}{'Kick'}++;
if ($kickee eq $ident) {
sub on_msg {
my ($self, $event) = @_;
my $nick = $event->nick;
- my $chan = lc ( ($event->to)[0] ); # CASING.
- my $msg = ($event->args)[0];
+ my $msg = ($event->args)[0];
($user,$host) = split(/\@/, $event->userhost);
$uh = $event->userhost();
$nuh = $nick."!".$uh;
- &hookMsg('private', $chan, $nick, $msg);
+ &hookMsg('private', undef, $nick, $msg);
}
sub on_names {
my $newnick = ($event->args)[0];
if (exists $netsplit{lc $newnick}) {
- &DEBUG("on_nick: $newnick/$nick came back from netsplit and changed to original nick! removing from hash.");
+ &status("Netsplit: $newnick/$nick came back from netsplit and changed to original nick! removing from hash.");
delete $netsplit{lc $newnick};
}
my $nick = $event->nick;
my $userhost = $event->userhost;
+ if (exists $floodjoin{$chan}{$nick}{Time}) {
+ delete $floodjoin{$chan}{$nick};
+ }
+
$chanstats{$chan}{'Part'}++;
&DeleteUserInfo($nick,$chan);
&clearChanVars($chan) if ($nick eq $ident);
- if (!&IsNickInAnyChan($nick) and &IsParam("seenStats")) {
+ if (!&IsNickInAnyChan($nick) and &IsChanConf("seenStats")) {
delete $userstats{lc $nick};
}
$nuh = $nick."!".$uh;
($user,$host) = split(/\@/, $uh);
+ if ($bot_pid != $$) {
+ &ERROR("run-away fork; exiting.");
+ &delForked($forker);
+ }
+
### DEBUGGING.
if ($statcount < 200) {
foreach $chan (grep /[A-Z]/, keys %channels) {
$msgtime = time();
$lastWho{$chan} = $nick;
### TODO: use $nick or lc $nick?
- if (&IsParam("seenStats")) {
+ if (&IsChanConf("seenStats")) {
$userstats{lc $nick}{'Count'}++;
$userstats{lc $nick}{'Time'} = time();
}
-# if (&IsParam("hehCounter")) {
+# if (&IsChanConf("hehCounter")) {
# #...
# }
} else {
&DEBUG("on_quit: nuh{lc $nick} does not exist! FIXME");
}
- delete $userstats{lc $nick} if (&IsParam("seenStats"));
+ delete $userstats{lc $nick} if (&IsChanConf("seenStats"));
# should fix chanstats inconsistencies bug #2.
if ($reason=~/^($mask{host})\s($mask{host})$/) { # netsplit.
&status(">>> $b_cyan$nick$ob has signed off IRC $b_red($ob$reason$b_red)$ob");
if ($nick =~ /^\Q$ident\E$/) {
- &DEBUG("!!! THIS SHOULD NEVER HAPPEN. FIXME HOPEFULLY");
+ &DEBUG("^^^ THIS SHOULD NEVER HAPPEN.");
}
+
if ($nick !~ /^\Q$ident\E$/ and $nick =~ /^\Q$param{'ircNick'}\E$/i) {
&status("own nickname became free; changing.");
&nick($param{'ircNick'});
}
### .* wait (\d+) second/) {
- &status($msg);
+ &status("X1 $msg");
my $sleep = $3 + 10;
&status("going to sleep for $sleep...");
# this may be fixed at a later date with topic queueing.
###
- $topic{$chan}{'Current'} = $topic if (1 and &IsParam("topic") == 1);
+ $topic{$chan}{'Current'} = $topic if (1 and &IsChanConf("topic") == 1);
$chanstats{$chan}{'Topic'}++;
&status(">>> topic/$b_blue$chan$ob by $b_cyan$nick$ob -> $topic");
} else { # join.
my ($nick, $chan, $topic) = $event->args;
- if (&IsParam("topic")) {
+ if (&IsChanConf("topic")) {
$topic{$chan}{'Current'} = $topic;
&topicAddHistory($chan,$topic);
}
&status(">>> set by $b_cyan$setby$ob $timestr");
}
+sub on_crversion {
+ my ($self, $event) = @_;
+ my $nick = $event->nick();
+ my $ver;
+
+ if (scalar $event->args() != 1) { # old.
+ $ver = join ' ', $event->args();
+ $ver =~ s/^VERSION //;
+ } else { # new.
+ $ver = ($event->args())[0];
+ }
+
+ if (grep /^\Q$nick\E$/i, @vernick) {
+ &WARN("nick $nick found in vernick; skipping.");
+ return;
+ }
+ push(@vernick, $nick);
+
+ 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) {
+ $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 {
+ $ver{other}{$nick} = $ver;
+ }
+}
+
sub on_version {
my ($self, $event) = @_;
my $nick = $event->nick;
}
# modes w/ target affecting nick => cache it.
- if ($mode =~ /[ov]/) {
+ if ($mode =~ /[bov]/) {
$channels{$chan}{$mode}{$target}++ if $parity;
delete $channels{$chan}{$mode}{$target} if !$parity;
}
push(@who, grep /^\Q$message\E$/i, keys %{$flood{$_}});
}
if (scalar @who) {
- &msg($who, "you already said what ".join(@who)." have said.");
+ &msg($who, "you already said what ".
+ join(' ', @who)." have said.");
} else {
&msg($who,"Someone already said that ". (time - $time) ." seconds ago" );
}
&status("FLOOD overflow detected from $floodwho; ignoring");
my $expire = $param{'ignoreAutoExpire'} || 5;
- $ignoreList{"*!$uh"} = time() + ($expire * 60);
+ &ignoreAdd("*!$uh", $chan, $expire, "flood overflow auto-detected.");
return;
}
$flood{$floodwho}{$message} = time();
}
- # public.
- if ($msgType =~ /public/i) {
- $talkchannel = $chan;
+ if ($msgType =~ /public/i) { # public.
+ $talkchannel = $chan;
&status("<$orig{who}/$chan> $orig{message}");
- }
-
- # private.
- if ($msgType =~ /private/i) {
+ } elsif ($msgType =~ /private/i) { # private.
&status("[$orig{who}] $orig{message}");
+ $talkchannel = undef;
+ $chan = "_default";
+ } else {
+ &DEBUG("unknown msgType => $msgType.");
}
- if ((&IsParam("seenStoreAll") or !$skipmessage) and
- &IsParam("seen") and
- $msgType =~ /public/ and
+ if ((!$skipmessage or &IsChanConf("seenStoreAll")) and
+ &IsChanConf("seen") and
+ $msgType =~ /public/
) {
$seencache{$who}{'time'} = time();
$seencache{$who}{'nick'} = $orig{who};
return if ($skipmessage);
return unless (&IsParam("minVolunteerLength") or $addressed);
- local $ignore = 0;
- foreach (keys %ignoreList) {
- my $ignoreRE = $_;
- my @parts = split /\*/, "a${ignoreRE}a";
- my $recast = join '\S*', map quotemeta($_), @parts;
- $recast =~ s/^a(.*)a$/$1/;
- if ($nuh =~ /^$recast$/) {
+ local $ignore = 0;
+ if (exists $ignore{lc $chan}) {
+ foreach (keys %{ $ignore{lc $chan} }) {
+ s/\*/\\S*/g;
+
+ next unless ($nuh =~ /^\Q$_\E$/i);
$ignore++;
last;
}
}
if (defined $nuh) {
- $userHandle = &verifyUser($who, $nuh);
+ if (!defined $userHandle) {
+ &DEBUG("line 1074: need verifyUser?");
+ &verifyUser($who, $nuh);
+ }
} else {
&DEBUG("hookMsg: 'nuh' not defined?");
}
projects / infobot.git / blobdiff