3 files changed, 7 insertions, 11 deletions
diff --git a/api/command.go b/api/command.go
index 1161cc81a..2147196fa 100644
--- a/api/command.go
+++ b/api/command.go
@@ -33,15 +33,6 @@ func GetCommandProvidersProvider(name string) CommandProvider {
 	return nil
 }
 
-// cmds = map[string]string{
-// 		"logoutCommand":   "/logout",
-// 		"joinCommand":     "/join",
-// 		"loadTestCommand": "/loadtest",
-// 		"echoCommand":     "/echo",
-// 		"shrugCommand":    "/shrug",
-// 		"meCommand":       "/me",
-// 	}
-
 func InitCommand(r *mux.Router) {
 	l4g.Debug("Initializing command api routes")
 
diff --git a/api/command_shrug.go b/api/command_shrug.go
index e34f80110..c49bd46ae 100644
--- a/api/command_shrug.go
+++ b/api/command_shrug.go
@@ -25,5 +25,10 @@ func (me *ShrugProvider) GetCommand() *model.Command {
 }
 
 func (me *ShrugProvider) DoCommand(c *Context, channelId string, message string) *model.CommandResponse {
-	return &model.CommandResponse{ResponseType: model.COMMAND_RESPONSE_TYPE_IN_CHANNEL, Text: `¯\_(ツ)_/¯`}
+	rmsg := `¯\\\_(ツ)\_/¯`
+	if len(message) > 0 {
+		rmsg = message + " " + rmsg
+	}
+
+	return &model.CommandResponse{ResponseType: model.COMMAND_RESPONSE_TYPE_IN_CHANNEL, Text: rmsg}
 }
diff --git a/api/command_shrug_test.go b/api/command_shrug_test.go
index 95ef9f115..92cecf664 100644
--- a/api/command_shrug_test.go
+++ b/api/command_shrug_test.go
@@ -39,7 +39,7 @@ func TestShrugCommand(t *testing.T) {
 	if len(p1.Order) != 1 {
 		t.Fatal("Command failed to send")
 	} else {
-		if p1.Posts[p1.Order[0]].Message != `¯\_(ツ)_/¯` {
+		if p1.Posts[p1.Order[0]].Message != `¯\\\_(ツ)\_/¯` {
 			t.Log(p1.Posts[p1.Order[0]].Message)
 			t.Fatal("invalid shrug reponse")
 		}