From: dms <dms@c11ca15a-4712-0410-83d8-924469b57eb5>
Date: Thu, 6 Mar 2003 18:39:57 +0000 (+0000)
Subject: - kick now accepts kick message.  Patch from <morten@wtf.dk>.  Thanks!
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=d28cde49f0eab17f28c9d329c2e23912d651e568;p=infobot.git

- kick now accepts kick message.  Patch from <morten@wtf.dk>.  Thanks!


git-svn-id: https://svn.code.sf.net/p/infobot/code/trunk/blootbot@772 c11ca15a-4712-0410-83d8-924469b57eb5
---

diff --git a/src/Modules/UserDCC.pl b/src/Modules/UserDCC.pl
index 2622764..39bf575 100644
--- a/src/Modules/UserDCC.pl
+++ b/src/Modules/UserDCC.pl
@@ -135,14 +135,17 @@ sub userDCC {
     }
 
     # kick.
-    if ($message =~ /^kick(\s+(\S+)(\s+(\S+))?)?/) {
+    if ($message =~ /^kick(\s+(.*?))$/) {
 	return unless (&hasFlag("o"));
-	my ($nick,$chan) = (lc $2,lc $4);
 
-	if ($nick eq "") {
+	my $arg = $2;
+
+	if ($arg eq "") {
 	    &help("kick");
 	    return;
 	}
+	my @args = split(/\s+/, $arg);
+	my ($nick,$chan,$reason) = @args;
 
 	if (&validChan($chan) == 0) {
 	    &msg($who,"error: invalid channel \002$chan\002");
@@ -154,12 +157,12 @@ sub userDCC {
 	    return;
 	}
 
-	&kick($nick,$chan);
+	&kick($nick,$chan,$reason);
 
 	return;
     }
 
-    # kick.
+    # mode.
     if ($message =~ /^mode(\s+(.*))?$/) {
 	return unless (&hasFlag("n"));
 	my ($chan,$mode) = split /\s+/,$2,2;
@@ -1150,7 +1153,6 @@ sub userDCC {
 
 	&writeUserFile();
 	&writeChanFile();
-	&News::writeNews() if (&ChanConfList("news"));
 
 	return;
     }