# NOTE: Based on code by Kevin Lenzo & Patrick Cole (c) 1997
#
-if (&IsParam("useStrict")) { use strict; }
+use strict;
-use vars qw($nickserv);
-$nickserv = 0;
+no strict 'refs';
+no strict 'subs'; # IN/STDIN
+
+use vars qw(%floodjoin %nuh %dcc %cache %conns %channels %param %mask
+ %chanconf %orig %ircPort %ircstats %last %netsplit);
+use vars qw($irc $nickserv $conn $msgType $who $talkchannel
+ $addressed $postprocess);
+use vars qw($notcount $nottime $notsize $msgcount $msgtime $msgsize
+ $pubcount $pubtime $pubsize);
+use vars qw($b_blue $ob);
+use vars qw(@ircServers);
-# static scalar variables.
-$mask{ip} = '(\d+)\.(\d+)\.(\d+)\.(\d+)';
-$mask{host} = '[\d\w\_\-\/]+\.[\.\d\w\_\-\/]+';
-$mask{chan} = '[\#\&]\S*|_default';
-my $isnick1 = 'a-zA-Z\[\]\{\}\_\`\^\|\\\\';
-my $isnick2 = '0-9\-';
-$mask{nick} = "[$isnick1]{1}[$isnick1$isnick2]*";
-$mask{nuh} = '\S*!\S*\@\S*';
+#use open ':utf8';
+#use open ':std';
+
+$nickserv = 0;
+my $maxlinelen = 400;
sub ircloop {
my $error = 0;
}
next unless (exists $ircPort{$host});
- my $retval = &irc($host, $ircPort{$host});
- &DEBUG("ircloop: after irc()");
-
+ my $retval = &irc($host, $ircPort{$host});
next unless (defined $retval and $retval == 0);
-
$error++;
if ($error % 3 == 0 and $error != 0) {
- &ERROR("CANNOT connect to this server; next!");
+ &status("IRC: Could not connect.");
+ &status("IRC: ");
next;
}
- if ($error >= 3*3) {
- &ERROR("CANNOT connect to any irc server; stopping.");
+ if ($error >= 3*2) {
+ &status("IRC: cannot connect to any IRC servers; stopping.");
+ &shutdown();
exit 1;
}
}
- &DEBUG("ircloop: end... going back.");
+ &status("IRC: ok, done one cycle of IRC servers; trying again.");
+
&loadIRCServers();
goto loop;
}
sub irc {
my ($server,$port) = @_;
+ $irc = new Net::IRC;
+
+ # TODO: move all this to an sql table
my $iaddr = inet_aton($server);
my $paddr = sockaddr_in($port, $iaddr);
my $proto = getprotobyname('tcp');
- select STDOUT;
- &status("Connecting to port $port of server $server ...");
+ # why was this here?
+ #select STDOUT;
# host->ip.
+ my $resolve;
if ($server =~ /\D$/) {
my $packed = scalar(gethostbyname($server));
return 0;
}
- my $resolve = inet_ntoa($packed);
- &status(" resolved to $resolve.");
+ $resolve = inet_ntoa($packed);
### warning in Sys/Hostname line 78???
### caused inside Net::IRC?
}
- $irc = new Net::IRC;
-
- $conn = $irc->newconn(
+ my %args = (
Nick => $param{'ircNick'},
Server => $server,
Port => $port,
Ircname => $param{'ircName'},
- LocalAddr => $param{'ircHost'},
);
-
- if (!defined $conn) {
- &ERROR("irc: conn was not created!defined!!!");
- return 1;
+ $args{'LocalAddr'} = $param{'ircHost'} if ($param{'ircHost'});
+ $args{'Password'} = $param{'ircPasswd'} if ($param{'ircPasswd'});
+
+ foreach my $mynick (split ',', $param{'ircNick'}) {
+ &status("Connecting to port $port of server $server ($resolve) as $mynick ...");
+ $args{'Nick'} = $mynick;
+ $conns{$mynick} = $irc->newconn(%args);
+ if (!defined $conns{$mynick}) {
+ &ERROR("IRC: connection failed.");
+ &ERROR("add \"set ircHost 0.0.0.0\" to your config. If that does not work");
+ &ERROR("Please check /etc/hosts to see if you have a localhost line like:");
+ &ERROR("127.0.0.1 localhost localhost");
+ &ERROR("If this is still a problem, please contact the maintainer.");
+ }
+ $conns{$mynick}->maxlinelen($maxlinelen);
+ # handler stuff.
+ $conns{$mynick}->add_global_handler('caction', \&on_action);
+ $conns{$mynick}->add_global_handler('cdcc', \&on_dcc);
+ $conns{$mynick}->add_global_handler('cping', \&on_ping);
+ $conns{$mynick}->add_global_handler('crping', \&on_ping_reply);
+ $conns{$mynick}->add_global_handler('cversion', \&on_version);
+ $conns{$mynick}->add_global_handler('crversion', \&on_crversion);
+ $conns{$mynick}->add_global_handler('dcc_open', \&on_dcc_open);
+ $conns{$mynick}->add_global_handler('dcc_close', \&on_dcc_close);
+ $conns{$mynick}->add_global_handler('chat', \&on_chat);
+ $conns{$mynick}->add_global_handler('msg', \&on_msg);
+ $conns{$mynick}->add_global_handler('public', \&on_public);
+ $conns{$mynick}->add_global_handler('join', \&on_join);
+ $conns{$mynick}->add_global_handler('part', \&on_part);
+ $conns{$mynick}->add_global_handler('topic', \&on_topic);
+ $conns{$mynick}->add_global_handler('invite', \&on_invite);
+ $conns{$mynick}->add_global_handler('kick', \&on_kick);
+ $conns{$mynick}->add_global_handler('mode', \&on_mode);
+ $conns{$mynick}->add_global_handler('nick', \&on_nick);
+ $conns{$mynick}->add_global_handler('quit', \&on_quit);
+ $conns{$mynick}->add_global_handler('notice', \&on_notice);
+ $conns{$mynick}->add_global_handler('whoischannels', \&on_whoischannels);
+ $conns{$mynick}->add_global_handler('useronchannel', \&on_useronchannel);
+ $conns{$mynick}->add_global_handler('whois', \&on_whois);
+ $conns{$mynick}->add_global_handler('other', \&on_other);
+ $conns{$mynick}->add_global_handler('disconnect', \&on_disconnect);
+ $conns{$mynick}->add_global_handler([251,252,253,254,255], \&on_init);
+# $conns{$mynick}->add_global_handler(302, \&on_init); # userhost
+ $conns{$mynick}->add_global_handler(303, \&on_ison); # notify.
+ $conns{$mynick}->add_global_handler(315, \&on_endofwho);
+ $conns{$mynick}->add_global_handler(422, \&on_endofwho); # nomotd.
+ $conns{$mynick}->add_global_handler(324, \&on_modeis);
+ $conns{$mynick}->add_global_handler(333, \&on_topicinfo);
+ $conns{$mynick}->add_global_handler(352, \&on_who);
+ $conns{$mynick}->add_global_handler(353, \&on_names);
+ $conns{$mynick}->add_global_handler(366, \&on_endofnames);
+ $conns{$mynick}->add_global_handler(376, \&on_endofmotd); # on_connect.
+ $conns{$mynick}->add_global_handler(433, \&on_nick_taken);
+ $conns{$mynick}->add_global_handler(439, \&on_targettoofast);
+ # for proper joinnextChan behaviour
+ $conns{$mynick}->add_global_handler(471, \&on_chanfull);
+ $conns{$mynick}->add_global_handler(473, \&on_inviteonly);
+ $conns{$mynick}->add_global_handler(474, \&on_banned);
+ $conns{$mynick}->add_global_handler(475, \&on_badchankey);
+ $conns{$mynick}->add_global_handler(443, \&on_useronchan);
+ # end of handler stuff.
}
&clearIRCVars();
# change internal timeout value for scheduler.
$irc->{_timeout} = 10; # how about 60?
+ # Net::IRC debugging.
+ $irc->{_debug} = 1;
$ircstats{'Server'} = "$server:$port";
- # handler stuff.
- $conn->add_handler('caction', \&on_action);
- $conn->add_handler('cdcc', \&on_dcc);
- $conn->add_handler('cping', \&on_ping);
- $conn->add_handler('crping', \&on_ping_reply);
- $conn->add_handler('cversion', \&on_version);
- $conn->add_handler('crversion', \&on_crversion);
- $conn->add_handler('dcc_open', \&on_dcc_open);
- $conn->add_handler('dcc_close', \&on_dcc_close);
- $conn->add_handler('chat', \&on_chat);
- $conn->add_handler('msg', \&on_msg);
- $conn->add_handler('public', \&on_public);
- $conn->add_handler('join', \&on_join);
- $conn->add_handler('part', \&on_part);
- $conn->add_handler('topic', \&on_topic);
- $conn->add_handler('invite', \&on_invite);
- $conn->add_handler('kick', \&on_kick);
- $conn->add_handler('mode', \&on_mode);
- $conn->add_handler('nick', \&on_nick);
- $conn->add_handler('quit', \&on_quit);
- $conn->add_handler('notice', \&on_notice);
- $conn->add_handler('whoisuser', \&on_whoisuser);
- $conn->add_handler('other', \&on_other);
- $conn->add_global_handler('disconnect', \&on_disconnect);
- $conn->add_global_handler([251,252,253,254,255], \&on_init);
-### $conn->add_global_handler([251,252,253,254,255,302], \&on_init);
- $conn->add_global_handler(315, \&on_endofwho);
- $conn->add_global_handler(324, \&on_modeis);
- $conn->add_global_handler(333, \&on_topicinfo);
- $conn->add_global_handler(352, \&on_who);
- $conn->add_global_handler(353, \&on_names);
- $conn->add_global_handler(366, \&on_endofnames);
- $conn->add_global_handler(376, \&on_endofmotd); # on_connect.
- $conn->add_global_handler(433, \&on_nick_taken);
- $conn->add_global_handler(439, \&on_targettoofast);
- # for proper joinnextChan behaviour
- $conn->add_global_handler(471, \&on_chanfull);
- $conn->add_global_handler(473, \&on_inviteonly);
- $conn->add_global_handler(474, \&on_banned);
- $conn->add_global_handler(475, \&on_badchankey);
+ # works? needs to actually do something
+ # should likely listen on a tcp port instead
+ #$irc->addfh(STDIN, \&on_stdin, 'r');
- # end of handler stuff.
+ &status("starting main loop");
$irc->start;
}
my ($buf) = @_;
$buf =~ s/\n//gi;
- # slow down a bit if traffic is "high".
+ # slow down a bit if traffic is 'high'.
# need to take into account time of last message sent.
if ($last{buflen} > 256 and length($buf) > 256) {
sleep 1;
sub say {
my ($msg) = @_;
+ my $mynick = $conn->nick();
if (!defined $msg) {
- $msg ||= "NULL";
+ $msg ||= 'NULL';
&WARN("say: msg == $msg.");
return;
}
- &status("</$talkchannel> $msg");
- if (&whatInterface() =~ /IRC/) {
- $msg = "zero" if ($msg =~ /^0+$/);
- my $t = time();
+ if (&getChanConf('silent', $talkchannel)) {
+ &DEBUG("say: silent in $talkchannel, not saying $msg");
+ return;
+ }
+
+ if ( $postprocess ) {
+ undef $postprocess;
+ } elsif ($postprocess = &getChanConf('postprocess', $talkchannel)) {
+ &DEBUG("say: $postprocess $msg");
+ &parseCmdHook($postprocess . ' ' . $msg);
+ undef $postprocess;
+ return;
+ }
- if ($t == $pubtime) {
- $pubcount++;
- $pubsize += length $msg;
+ &status("<$mynick/$talkchannel> $msg");
- my $i = &getChanConfDefault("sendPublicLimitLines", 3);
- my $j = &getChanConfDefault("sendPublicLimitBytes", 1000);
+ return unless (&whatInterface() =~ /IRC/);
- if ( ($pubcount % $i) == 0 and $pubcount) {
- sleep 1;
- } elsif ($pubsize > $j) {
- sleep 1;
- $pubsize -= $j;
- }
+ $msg = 'zero' if ($msg =~ /^0+$/);
- } else {
- $pubcount = 0;
- $pubtime = $t;
- $pubsize = length $msg;
+ my $t = time();
+
+ if ($t == $pubtime) {
+ $pubcount++;
+ $pubsize += length $msg;
+
+ my $i = &getChanConfDefault('sendPublicLimitLines', 3, $chan);
+ my $j = &getChanConfDefault('sendPublicLimitBytes', 1000, $chan);
+
+ if ( ($pubcount % $i) == 0 and $pubcount) {
+ sleep 1;
+ } elsif ($pubsize > $j) {
+ sleep 1;
+ $pubsize -= $j;
}
- $conn->privmsg($talkchannel, $msg);
+ } else {
+ $pubcount = 0;
+ $pubtime = $t;
+ $pubsize = length $msg;
}
+
+ $conn->privmsg($talkchannel, $msg);
}
sub msg {
}
if (!defined $msg) {
- $msg ||= "NULL";
+ $msg ||= 'NULL';
&WARN("msg: msg == $msg.");
return;
}
- &status(">$nick< $msg");
+ # some say() end up here (eg +help)
+ if (&getChanConf('silent', $nick)) {
+ &DEBUG("msg: silent in $nick, not saying $msg");
+ return;
+ }
- if (&whatInterface() =~ /IRC/) {
- my $t = time();
+ &status(">$nick< $msg");
- if ($t == $msgtime) {
- $msgcount++;
- $msgsize += length $msg;
+ return unless (&whatInterface() =~ /IRC/);
+ my $t = time();
- my $i = &getChanConfDefault("sendPrivateLimitLines", 3);
- my $j = &getChanConfDefault("sendPrivateLimitBytes", 1000);
- if ( ($msgcount % $i) == 0 and $msgcount) {
- sleep 1;
- } elsif ($msgsize > $j) {
- sleep 1;
- $msgsize -= $j;
- }
+ if ($t == $msgtime) {
+ $msgcount++;
+ $msgsize += length $msg;
- } else {
- $msgcount = 0;
- $msgtime = $t;
- $msgsize = length $msg;
+ my $i = &getChanConfDefault('sendPrivateLimitLines', 3, $chan);
+ my $j = &getChanConfDefault('sendPrivateLimitBytes', 1000, $chan);
+ if ( ($msgcount % $i) == 0 and $msgcount) {
+ sleep 1;
+ } elsif ($msgsize > $j) {
+ sleep 1;
+ $msgsize -= $j;
}
- $conn->privmsg($nick, $msg);
+ } else {
+ $msgcount = 0;
+ $msgtime = $t;
+ $msgsize = length $msg;
}
+
+ $conn->privmsg($nick, $msg);
}
# Usage: &action(nick || chan, txt);
sub action {
+ my $mynick = $conn->nick();
my ($target, $txt) = @_;
if (!defined $txt) {
&WARN("action: txt == NULL.");
return;
}
- my $rawout = "PRIVMSG $target :\001ACTION $txt\001";
- if (length $rawout > 510) {
- &status("action: txt too long; truncating.");
+ if (&getChanConf('silent', $target)) {
+ &DEBUG("action: silent in $target, not doing $txt");
+ return;
+ }
- chop($rawout) while (length($rawout) > 510);
- $rawout .= "\001";
+ if (length $txt > 480) {
+ &status("action: txt too long; truncating.");
+ chop($txt) while (length $txt > 480);
}
- &status("* $ident/$target $txt");
- rawout($rawout);
+ &status("* $mynick/$target $txt");
+ $conn->me($target, $txt);
}
# Usage: ¬ice(nick || chan, txt);
$notcount++;
$notsize += length $txt;
- my $i = &getChanConfDefault("sendNoticeLimitLines", 3);
- my $j = &getChanConfDefault("sendNoticeLimitBytes", 1000);
+ my $i = &getChanConfDefault('sendNoticeLimitLines', 3, $chan);
+ my $j = &getChanConfDefault('sendNoticeLimitBytes', 1000, $chan);
if ( ($notcount % $i) == 0 and $notcount) {
sleep 1;
$conn->notice($target, $txt);
}
-
sub DCCBroadcast {
my ($txt,$flag) = @_;
# Usage: &performReply($reply);
sub performReply {
my ($reply) = @_;
+
+ if (!defined $reply or $reply =~ /^\s*$/) {
+ &DEBUG("performReply: reply == NULL.");
+ return;
+ }
+
$reply =~ /([\.\?\s]+)$/;
+ # FIXME need real throttling....
+ if (length($reply) > $maxlinelen - 30) {
+ $reply = substr($reply, 0, $maxlinelen - 33);
+ $reply =~ s/ [^ ]*?$/ .../;
+ }
&checkMsgType($reply);
if ($msgType eq 'public') {
$reply = "$reply, ".$orig{who};
}
&say($reply);
+
} elsif ($msgType eq 'private') {
- if (rand() < 0.5) {
- $reply = $reply;
- } else {
+ if (rand() > 0.5) {
$reply = "$reply, ".$orig{who};
}
&msg($who, $reply);
+
} elsif ($msgType eq 'chat') {
if (!exists $dcc{'CHAT'}{$who}) {
- &WARN("pSR: dcc{'CHAT'}{$who} does not exist.");
+ &VERB("pSR: dcc{'CHAT'}{$who} does not exist.",2);
return;
}
$conn->privmsg($dcc{'CHAT'}{$who}, $reply);
+
} else {
&ERROR("PR: msgType invalid? ($msgType).");
}
&performReply(@_);
}
-sub pSReply {
- &performStrictReply(@_);
-}
-
# Usage: &performStrictReply($reply);
sub performStrictReply {
my ($reply) = @_;
+ # FIXME need real throttling....
+ if (length($reply) > $maxlinelen - 30) {
+ $reply = substr($reply, 0, $maxlinelen - 33);
+ $reply =~ s/ [^ ]*?$/ .../;
+ }
&checkMsgType($reply);
if ($msgType eq 'private') {
} elsif ($msgType eq 'public') {
&say($reply);
} elsif ($msgType eq 'chat') {
- &dccsay(lc $who,$reply);
+ &dccsay(lc $who, $reply);
} else {
&ERROR("pSR: msgType invalid? ($msgType).");
}
}
sub dccsay {
- my ($who, $reply) = @_;
+ my($who, $reply) = @_;
+
+ if (!defined $reply or $reply =~ /^\s*$/) {
+ &WARN("dccsay: reply == NULL.");
+ return;
+ }
+
if (!exists $dcc{'CHAT'}{$who}) {
- &WARN("pSR: dcc{'CHAT'}{$who} does not exist.");
- return '';
+ &VERB("pSR: dcc{'CHAT'}{$who} does not exist. (2)",2);
+ return;
}
&status("=>$who<= $reply"); # dcc chat.
my @who = grep /^\Q$who\E$/i, keys %{ $dcc{$type} };
next unless (scalar @who);
$who = $who[0];
+ &DEBUG("dcc_close... close $who!");
}
}
sub joinchan {
- my ($chankey) = @_;
- my $chan = lc $chankey;
-
- if ($chankey =~ s/^($mask{chan}),\S+/ /) {
- $chan = lc $1;
- }
+ my ($chan, $key) = @_;
+ $key ||= &getChanConf('chankey', $chan);
+ $key ||= '';
- &status("joining $b_blue$chan$ob");
+ # forgot for about 2 years to implement channel keys when moving
+ # over to Net::IRC...
+ # hopefully validChan is right.
if (&validChan($chan)) {
- &status("join: already on $chan");
- } else {
- if (!$conn->join($chan)) {
- &DEBUG("joinchan: join failed. trying connect!");
- $conn->connect();
- }
+ &status("join: already on $chan?");
}
+ #} else {
+ &status("joining $b_blue$chan $key$ob");
+
+ return if ($conn->join($chan, $key));
+ return if (&validChan($chan));
+
+ &DEBUG("joinchan: join failed. trying connect!");
+ &clearIRCVars();
+ $conn->connect();
+ #}
}
sub part {
my $chan;
foreach $chan (@_) {
- next if ($chan eq "");
+ next if ($chan eq '');
$chan =~ tr/A-Z/a-z/; # lowercase.
+ if ($chan !~ /^$mask{chan}$/) {
+ &WARN("part: chan is invalid ($chan)");
+ next;
+ }
+
&status("parting $chan");
if (!&validChan($chan)) {
&WARN("part: not on $chan; doing anyway");
# next;
}
- rawout("PART $chan");
+ $conn->part($chan);
# deletion of $channels{chan} is done in &entryEvt().
}
}
&DEBUG("mode: MODE $chan $modes");
+ # should move to use Net::IRC's $conn->mode()... but too lazy.
rawout("MODE $chan $modes");
}
sub op {
my ($chan, @who) = @_;
- my $os = "o" x scalar(@who);
+ my $os = 'o' x scalar(@who);
&mode($chan, "+$os @who");
}
sub deop {
my ($chan, @who) = @_;
- my $os = "o" x scalar(@who);
+ my $os = 'o' x scalar(@who);
&mode($chan, "-$os ".@who);
}
sub kick {
my ($nick,$chan,$msg) = @_;
- my (@chans) = ($chan eq "") ? (keys %channels) : lc($chan);
+ my (@chans) = ($chan eq '') ? (keys %channels) : lc($chan);
+ my $mynick = $conn->nick();
- if ($chan ne "" and &validChan($chan) == 0) {
+ if ($chan ne '' and &validChan($chan) == 0) {
&ERROR("kick: invalid channel $chan.");
return;
}
foreach $chan (@chans) {
if (!&IsNickInChan($nick,$chan)) {
- &status("Kick: $nick is not on $chan.") if (scalar @chans == 1);
+ &status("kick: $nick is not on $chan.") if (scalar @chans == 1);
next;
}
- if (!exists $channels{$chan}{o}{$ident}) {
- &status("Kick: do not have ops on $chan :(");
+ if (!exists $channels{$chan}{o}{$mynick}) {
+ &status("kick: do not have ops on $chan :(");
next;
}
&status("Kicking $nick from $chan.");
- if ($msg eq "") {
- &rawout("KICK $chan $nick");
- } else {
- &rawout("KICK $chan $nick :$msg");
- }
+ $conn->kick($chan, $nick, $msg);
}
}
sub ban {
my ($mask,$chan) = @_;
my (@chans) = ($chan =~ /^\*?$/) ? (keys %channels) : lc($chan);
+ my $mynick = $conn->nick();
my $ban = 0;
if ($chan !~ /^\*?$/ and &validChan($chan) == 0) {
}
foreach $chan (@chans) {
- if (!exists $channels{$chan}{o}{$ident}) {
- &status("Ban: do not have ops on $chan :(");
+ if (!exists $channels{$chan}{o}{$mynick}) {
+ &status("ban: do not have ops on $chan :(");
next;
}
sub unban {
my ($mask,$chan) = @_;
my (@chans) = ($chan =~ /^\*?$/) ? (keys %channels) : lc($chan);
+ my $mynick = $conn->nick();
my $ban = 0;
&DEBUG("unban: mask = $mask, chan = @chans");
foreach $chan (@chans) {
- if (!exists $channels{$chan}{o}{$ident}) {
+ if (!exists $channels{$chan}{o}{$mynick}) {
&status("unBan: do not have ops on $chan :(");
next;
}
sub quit {
my ($quitmsg) = @_;
- &status("QUIT $param{'ircNick'} has quit IRC ($quitmsg)");
- $conn->quit($quitmsg);
+ if (defined $conn) {
+ &status("QUIT " . $conn->nick() . " has quit IRC ($quitmsg)");
+ $conn->quit($quitmsg);
+ } else {
+ &WARN("quit: could not quit!");
+ }
}
sub nick {
- my ($nick) = @_;
+ my ($newnick) = @_;
+ my $mynick = $conn->nick();
- if ($nick =~ /^$mask{nick}$/) {
- &DEBUG("nick: Changing nick to $nick (from $ident)");
- rawout("NICK ".$nick);
- # unfortunately, on_nick doesn't catch ourself.
- $ident = $nick;
- return 1;
+ if (!defined $newnick) {
+ &ERROR("nick: nick == NULL.");
+ return;
+ }
+
+ if (!defined $mynick) {
+ &WARN("nick: mynick == NULL.");
+ return;
+ }
+
+ my $bad = 0;
+ $bad++ if (exists $nuh{$newnick});
+ $bad++ if (&IsNickInAnyChan($newnick));
+
+ if ($bad) {
+ &WARN("Nick: not going to try to change from $mynick to $newnick. [". scalar(gmtime). "]");
+ # hrm... over time we lose track of our own nick.
+ #return;
}
- &DEBUG("nick: failed... why oh why (nick => $nick)");
+ if ($newnick =~ /^$mask{nick}$/) {
+ &status("nick: Changing nick from $mynick to $newnick");
+ # ->nick() will NOT change cause we are using rawout?
+ &rawout("NICK $newnick");
+ return 1;
+ }
+ &DEBUG("nick: failed... why oh why (mynick=$mynick, newnick=$newnick)");
return 0;
}
sub invite {
my($who, $chan) = @_;
- rawout("INVITE $who $chan");
-}
+ # TODO: check if $who or $chan are invalid.
+ $conn->invite($who, $chan);
+}
##########
# Channel related functions...
# Usage: &joinNextChan();
sub joinNextChan {
- &DEBUG("joinNextChan called.");
-
- if (scalar @joinchan) {
- $chan = shift @joinchan;
- &joinchan($chan);
-
- if (my $i = scalar @joinchan) {
- &status("joinNextChan: $i chans to join.");
+ my $joined = 0;
+ foreach (sort keys %conns) {
+ $conn = $conns{$_};
+ my $mynick = $conn->nick();
+ my @join = getJoinChans(1);
+
+ if (scalar @join) {
+ my $chan = shift @join;
+ &joinchan($chan);
+
+ if (my $i = scalar @join) {
+ &status("joinNextChan: $mynick $i chans to join.");
+ }
+ $joined = 1;
}
+ }
+ return if $joined;
- } else {
- if (exists $cache{joinTime}) {
- my $delta = time() - $cache{joinTime};
- my $timestr = &Time2String($delta);
- my $rate = sprintf("%.1f", $delta / &getJoinChans() );
- delete $cache{joinTime};
+ if (exists $cache{joinTime}) {
+ my $delta = time() - $cache{joinTime} - 5;
+ my $timestr = &Time2String($delta);
+ # FIXME: @join should be @in instead (hacked to 10)
+ #my $rate = sprintf("%.1f", $delta / @in);
+ my $rate = sprintf("%.1f", $delta / 10);
+ delete $cache{joinTime};
- &DEBUG("time taken to join all chans: $timestr; rate: $rate sec/join");
- }
- # chanserv check: global channels, in case we missed one.
+ &status("time taken to join all chans: $timestr; rate: $rate sec/join");
+ }
- foreach ( &ChanConfList("chanServ_ops") ) {
- &chanServCheck($_);
- }
+ # chanserv check: global channels, in case we missed one.
+ foreach ( &ChanConfList('chanServ_ops') ) {
+ &chanServCheck($_);
}
}
-# Usage: &GetNickInChans($nick,$chan);
-sub GetNickInChans {
+# Usage: &getNickInChans($nick);
+sub getNickInChans {
my ($nick) = @_;
my @array;
return @array;
}
-# Usage: &GetNicksInChan($chan);
-sub GetNicksInChan {
+# Usage: &getNicksInChan($chan);
+sub getNicksInChan {
my ($chan) = @_;
my @array;
$chan =~ tr/A-Z/a-z/; # not lowercase unfortunately.
+ if ($chan =~ /^$/) {
+ &DEBUG("INIC: chan == NULL.");
+ return 0;
+ }
+
if (&validChan($chan) == 0) {
&ERROR("INIC: invalid channel $chan.");
return 0;
sub IsNickInAnyChan {
my ($nick) = @_;
+ my $chan;
foreach $chan (keys %channels) {
next unless (grep /^\Q$nick\E$/i, keys %{ $channels{$chan}{''} });
# Usage: &validChan($chan);
sub validChan {
+ # TODO: use $c instead?
my ($chan) = @_;
+ if (!defined $chan or $chan =~ /^\s*$/) {
+ return 0;
+ }
+
if (lc $chan ne $chan) {
&WARN("validChan: lc chan != chan. ($chan); fixing.");
$chan =~ tr/A-Z/a-z/;
}
- if (exists $channels{$chan}) {
+ # it's possible that this check creates the hash if empty.
+ if (defined $channels{$chan} or exists $channels{$chan}) {
+ if ($chan =~ /^_?default$/) {
+# &WARN("validC: chan cannot be _default! returning 0!");
+ return 0;
+ }
+
return 1;
} else {
return 0;
}
###
-# Usage: &DeleteUserInfo($nick,@chans);
-sub DeleteUserInfo {
+# Usage: &delUserInfo($nick,@chans);
+sub delUserInfo {
my ($nick,@chans) = @_;
my ($mode,$chan);
}
sub clearIRCVars {
-### &DEBUG("clearIRCVars() called!");
undef %channels;
undef %floodjoin;
- @joinchan = &getJoinChans(1);
$cache{joinTime} = time();
}
sub getJoinChans {
my($show) = @_;
- my @chans;
+
+ my @in;
my @skip;
+ my @join;
+
+ # can't join any if not connected
+ return @join if (!$conn);
+
+ my $nick = $conn->nick();
foreach (keys %chanconf) {
- next if ($_ eq "_default");
+ next if ($_ eq '_default');
- my $val = $chanconf{$_}{autojoin};
my $skip = 0;
+ my $val = $chanconf{$_}{autojoin};
if (defined $val) {
- $skip++ if ($val eq "0");
+ $skip++ if ($val eq '0');
+ if ($val eq '1') {
+ # convert old +autojoin to autojoin <nick>
+ $val = lc $nick;
+ $chanconf{$_}{autojoin} = $val;
+ }
+ $skip++ if (lc $val ne lc $nick);
} else {
$skip++;
}
if ($skip) {
push(@skip, $_);
- next;
+ } else {
+ if (defined $channels{$_} or exists $channels{$_}) {
+ push(@in, $_);
+ } else {
+ push(@join, $_);
+ }
}
-
- push(@chans, $_);
}
my $str;
- if (scalar @skip) {
- $str = "gJC: channels not auto-joining: @skip";
- } else {
- $str = "gJC: auto-joining all chans.";
- }
+ #$str .= ' in:' . join(',', sort @in) if scalar @in;
+ #$str .= ' skip:' . join(',', sort @skip) if scalar @skip;
+ $str .= ' join:' . join(',', sort @join) if scalar @join;
- &status($str) if ($show);
+ &status("Chans: ($nick)$str") if ($show);
- return @chans;
+ return sort @join;
}
sub closeDCC {
-### &DEBUG("closeDCC called.");
+# &DEBUG("closeDCC called.");
+ my $type;
foreach $type (keys %dcc) {
next if ($type ne uc($type));
-
+
+ my $nick;
foreach $nick (keys %{ $dcc{$type} }) {
next unless (defined $nick);
- &DEBUG("closing DCC $type to $nick (FIXME).");
+ &status("DCC CHAT: closing DCC $type to $nick.");
next unless (defined $dcc{$type}{$nick});
my $ref = $dcc{$type}{$nick};
- &DEBUG("ref => $ref");
-
-# $dcc{$type}{$nick}->close();
+ &dccsay($nick, "bye bye, $nick") if ($type =~ /^chat$/i);
+ $dcc{$type}{$nick}->close();
+ delete $dcc{$type}{$nick};
+ &DEBUG("after close for $nick");
}
+ delete $dcc{$type};
}
}
sub joinfloodCheck {
my($who,$chan,$userhost) = @_;
- return unless (&IsChanConf("joinfloodCheck"));
+ return unless (&IsChanConf('joinfloodCheck') > 0);
if (exists $netsplit{lc $who}) { # netsplit join.
&DEBUG("joinfloodCheck: $who was in netsplit; not checking.");
my $time;
foreach (keys %{ $floodjoin{$c} }) {
- $time += $floodjoin{$c}{$_}{Time};
+ my $t = $floodjoin{$c}{$_}{Time};
+ next unless (defined $t);
+
+ $time += $t;
}
&DEBUG("joinflood: time => $time");
$time /= $count;
### Clean it up.
my $delete = 0;
+ my $time = time();
foreach $chan (keys %floodjoin) {
foreach $who (keys %{ $floodjoin{$chan} }) {
- my $time = time() - $floodjoin{$chan}{$who}{Time};
- next unless ($time > 10);
+ my $t = $floodjoin{$chan}{$who}{Time};
+ next unless (defined $t);
+
+ my $delta = $time - $t;
+ next unless ($delta > 10);
+
delete $floodjoin{$chan}{$who};
$delete++;
}
sub getHostMask {
my($n) = @_;
- &FIXME("getHostMask($n) called...");
+ if (exists $nuh{$n}) {
+ return &makeHostMask($nuh{$n});
+ } else {
+ $cache{on_who_Hack} = 1;
+ $conn->who($n);
+ }
}
1;