From df5ce20767f35d2c5202ac404e8b2ce123d36e37 Mon Sep 17 00:00:00 2001
From: dms <dms@c11ca15a-4712-0410-83d8-924469b57eb5>
Date: Tue, 6 May 2003 16:22:15 +0000
Subject: [PATCH] - simonrvn found that .say is broken - msg() fixed ;) - .say:
 replaced $1/$2 with their vars.

git-svn-id: https://svn.code.sf.net/p/infobot/code/trunk/blootbot@782 c11ca15a-4712-0410-83d8-924469b57eb5
---
 src/IRC/Irc.pl         | 44 +++++++++++++++++-------------------------
 src/Modules/UserDCC.pl |  4 ++--
 2 files changed, 20 insertions(+), 28 deletions(-)

diff --git a/src/IRC/Irc.pl b/src/IRC/Irc.pl
index a82aa7f..fda5521 100644
--- a/src/IRC/Irc.pl
+++ b/src/IRC/Irc.pl
@@ -244,39 +244,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);
diff --git a/src/Modules/UserDCC.pl b/src/Modules/UserDCC.pl
index f8ac484..02a6807 100644
--- a/src/Modules/UserDCC.pl
+++ b/src/Modules/UserDCC.pl
@@ -339,9 +339,9 @@ sub userDCC {
 	&DEBUG("chan => '$1', msg => '$msg'.");
 
 	if (&validChan($chan)) {
-	    &msg($chan, $2);
+	    &msg($chan, $msg);
 	} else {
-	    &msg($who,"i'm not on \002$1\002, sorry.");
+	    &msg($who,"i'm not on \002$chan\002, sorry.");
 	}
 	return;
     }
-- 
2.39.5