From f4dc6212e36e0533dcd84b436d1d76c695d6b393 Mon Sep 17 00:00:00 2001
From: Mattias Erming <mattias@mattiaserming.com>
Date: Sat, 2 Aug 2014 05:08:26 -0700
Subject: [PATCH] Fix '/msg' and '/say' commands

---
 config.json               |  2 +-
 lib/plugins/inputs/msg.js | 21 ++++++++++++---------
 package.json              |  2 +-
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/config.json b/config.json
index f16cea1a..8914005b 100644
--- a/config.json
+++ b/config.json
@@ -1,5 +1,5 @@
 {
   "port": 9000,
   "theme": "themes/example.css",
-  "public": false
+  "public": true
 }
diff --git a/lib/plugins/inputs/msg.js b/lib/plugins/inputs/msg.js
index 78a939cd..9606cdc9 100644
--- a/lib/plugins/inputs/msg.js
+++ b/lib/plugins/inputs/msg.js
@@ -6,24 +6,27 @@ module.exports = function(network, chan, cmd, args) {
 		return;
 	}
 	
-	var client = this;
-	var irc = network.irc;
-	
 	if (args.length === 0 || args[0] === "") {
 		return;
 	}
+
+	var client = this;
+	var irc = network.irc;
 	
-	var target = args[0].charAt(0) == "#" ? args[0] : chan.name;
-	if (target !== chan.name) {
-		chan = _.findWhere(network.channels, {
-			name: target
-		});
+	var target = "";
+	if (cmd == "msg") {
+		target = args.shift();
+		if (args.length === 0) {
+			return;
+		}
+	} else {
+		target = chan.name;
 	}
 	
 	var text = args.join(" ");
 	irc.send(target, text);
 	
-	if (typeof chan !== "undefined") {
+	if (target == chan.name && typeof chan !== "undefined") {
 		var msg = new Msg({
 			type: Msg.Type.MESSAGE,
 			from: irc.me,
diff --git a/package.json b/package.json
index 553b9f41..b726de57 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "shout",
   "description": "A web IRC client",
-  "version": "0.8.6",
+  "version": "0.8.7",
   "homepage": "http://github.com/erming/shout",
   "author": {
     "name": "Mattias Erming",