X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=src%2FIRC%2FIrc.pl;h=ad557ae6cc9dd8ec75037aedc794193fada20894;hb=f7cae48a17d6decd0a9bd997188271daa0a885b1;hp=b6eb283c6b8fe8f49c38caca3d3389a6ff481815;hpb=8a79d430aef83402420b5a8378e78cfa01051c93;p=infobot.git

diff --git a/src/IRC/Irc.pl b/src/IRC/Irc.pl
index b6eb283..ad557ae 100644
--- a/src/IRC/Irc.pl
+++ b/src/IRC/Irc.pl
@@ -6,6 +6,7 @@
 #
 
 use strict;
+no strict 'refs';
 
 use vars qw(%floodjoin %nuh %dcc %cache %channels %param %mask
 	%chanconf %orig %ircPort %ircstats %last %netsplit);
@@ -16,15 +17,6 @@ use vars qw($notcount $nottime $notsize $msgcount $msgtime $msgsize
 use vars qw($b_blue $ob);
 use vars qw(@joinchan @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*';
-
 $nickserv	= 0;
 
 sub ircloop {
@@ -110,7 +102,11 @@ sub irc {
     $conn = $irc->newconn(%args);
 
     if (!defined $conn) {
-	&ERROR("internal: perl IRC connection object does not exist.");
+	&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.");
 	return 1;
     }
 
@@ -243,39 +239,31 @@ sub msg {
 	return;
     }
 
-    if ($msgType =~ /chat/i) {
-	# todo: warn that we're using msg() to do DCC CHAT?
-	&dccsay($nick, $msg);
-	# todo: make dccsay deal with flood protection?
-	return;
-    }
-
     &status(">$nick< $msg");
 
-    if (&whatInterface() =~ /IRC/) {
-	my $t = time();
+    return unless (&whatInterface() =~ /IRC/);
+    my $t = time();
 
-	if ($t == $msgtime) {
-	    $msgcount++;
-	    $msgsize += length $msg;
+    if ($t == $msgtime) {
+	$msgcount++;
+	$msgsize += length $msg;
 
-	    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;
-	    }
-
-	} else {
-	    $msgcount	= 0;
-	    $msgtime	= $t;
-	    $msgsize	= length $msg;
+	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;
 	}
 
-	$conn->privmsg($nick, $msg);
+    } else {
+	$msgcount	= 0;
+	$msgtime	= $t;
+	$msgsize	= length $msg;
     }
+
+    $conn->privmsg($nick, $msg);
 }
 
 # Usage: &action(nick || chan, txt);
@@ -347,6 +335,12 @@ sub DCCBroadcast {
 # Usage: &performReply($reply);
 sub performReply {
     my ($reply) = @_;
+
+    if (!defined $reply or $reply =~ /^\s*$/) {
+	&DEBUG("performReply: reply == NULL.");
+	return;
+    }
+
     $reply =~ /([\.\?\s]+)$/;
 
     &checkMsgType($reply);
@@ -358,19 +352,20 @@ sub performReply {
 	    $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}) {
 	    &VERB("pSR: dcc{'CHAT'}{$who} does not exist.",2);
 	    return;
 	}
 	$conn->privmsg($dcc{'CHAT'}{$who}, $reply);
+
     } else {
 	&ERROR("PR: msgType invalid? ($msgType).");
     }
@@ -598,6 +593,7 @@ sub nick {
 
     if (defined $ident and $nick eq $ident) {
 	&WARN("nick: nick == ident == '$ident'.");
+	return;
     }
 
     my $bad     = 0;
@@ -606,13 +602,13 @@ sub nick {
 
     if ($bad) {
 	&WARN("Nick: not going to try and get my nick back. [".
-		scalar(localtime). "]");
+		scalar(gmtime). "]");
 # hrm... over time we lose track of our own nick.
 #	return;
     }
 
     if ($nick =~ /^$mask{nick}$/) {
-	rawout("NICK ".$nick);
+	&rawout("NICK ".$nick);
 
 	if (defined $ident) {
 	    &status("nick: Changing nick to $nick (from $ident)");
@@ -697,6 +693,11 @@ sub IsNickInChan {
 
     $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;
@@ -774,7 +775,6 @@ sub clearChanVars {
 }
 
 sub clearIRCVars {
-    &DEBUG("clearIRCVars() called!");
     undef %channels;
     undef %floodjoin;
 
@@ -825,7 +825,7 @@ sub closeDCC {
 
     foreach $type (keys %dcc) {
 	next if ($type ne uc($type));
- 
+
 	my $nick;
 	foreach $nick (keys %{ $dcc{$type} }) {
 	    next unless (defined $nick);
@@ -867,7 +867,10 @@ sub joinfloodCheck {
 
 	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;