From 25ae83b5384bbeac35e527a78c155388e6fc3456 Mon Sep 17 00:00:00 2001 From: betrok Date: Wed, 19 Aug 2015 20:53:56 +0300 Subject: [PATCH] Trim plugins output again --- main.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/main.go b/main.go index 1e0adbb..b85e2b7 100644 --- a/main.go +++ b/main.go @@ -155,7 +155,7 @@ func SelfHandler(Conn *xmpp.Conn, Msg *xmpp.ClientMessage) { Conn.Send(Msg.From, "chat", err.Error()) return } - Conn.Send(Msg.From, "chat", string(out)) + Conn.Send(Msg.From, "chat", strings.TrimRight(string(out), " \t\n")) } var call = regexp.MustCompile("^" + name + "[:,]") @@ -192,9 +192,9 @@ func MessageHandler(Conn *xmpp.Conn, Msg *xmpp.ClientMessage) { outerr, _ := ioutil.ReadAll(stderr) cmd.Wait() if len(outerr) != 0 && in(admin, Msg.From) { - Conn.Send(Msg.From, "chat", string(outerr)) + Conn.Send(Msg.From, "chat", strings.TrimRight(string(outerr), " \t\n")) } - Conn.Send(room, "groupchat", string(out)) + Conn.Send(room, "groupchat", strings.TrimRight(string(out), " \t\n")) case call.MatchString(Msg.Body): //chat command, err := GetCommand(call.ReplaceAllString(Msg.Body, "!answer"), Msg.From, "./chat/") @@ -210,7 +210,7 @@ func MessageHandler(Conn *xmpp.Conn, Msg *xmpp.ClientMessage) { } return } - Conn.Send(room, "groupchat", string(out)) + Conn.Send(room, "groupchat", strings.TrimRight(string(out), " \t\n")) } }