zlax/hptoad
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge pull request #2 from betrok/master

Browse Source 
Trim plugins output again
This commit is contained in:
Alexey Derlaft
2015-08-19 20:59:38 +03:00
parent e86ab7dd40 25ae83b538
commit 1b8b17ae8a
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
main.go
View File

@@ -155,7 +155,7 @@ func SelfHandler(Conn *xmpp.Conn, Msg *xmpp.ClientMessage) {
Conn.Send(Msg.From, "chat", err.Error()) Conn.Send(Msg.From, "chat", err.Error())
return return
} }
Conn.Send(Msg.From, "chat", string(out)) Conn.Send(Msg.From, "chat", strings.TrimRight(string(out), " \t\n"))
} }
var call = regexp.MustCompile("^" + name + "[:,]") var call = regexp.MustCompile("^" + name + "[:,]")
@@ -192,9 +192,9 @@ func MessageHandler(Conn *xmpp.Conn, Msg *xmpp.ClientMessage) {
outerr, _ := ioutil.ReadAll(stderr) outerr, _ := ioutil.ReadAll(stderr)
cmd.Wait() cmd.Wait()
if len(outerr) != 0 && in(admin, Msg.From) { 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 case call.MatchString(Msg.Body): //chat
command, err := GetCommand(call.ReplaceAllString(Msg.Body, "!answer"), Msg.From, "./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 return
} }
Conn.Send(room, "groupchat", string(out)) Conn.Send(room, "groupchat", strings.TrimRight(string(out), " \t\n"))
} }
} }