oss/FrankerFaceZ
oss/FrankerFaceZ
1
0
Fork 0
mirror of https://github.com/FrankerFaceZ/FrankerFaceZ.git synced 2025-09-17 18:26:57 +00:00
Code Wiki Activity

Add test that posts to /pub_msg, test infrastructure

Browse source
This commit is contained in:
Kane York 2015-10-26 11:22:06 -07:00
parent 730ce39f72
commit 0be3693c99
6 changed files with 193 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

12
socketserver/internal/server/handlecore.go
View file

@ -1,4 +1,4 @@
package server // import "bitbucket.org/stendec/frankerfacez/socketserver/server"
package server // import "bitbucket.org/stendec/frankerfacez/socketserver/internal/server"
import (
"crypto/tls"
@ -262,13 +262,21 @@ func UnmarshalClientMessage(data []byte, payloadType byte, v interface{}) (err e
dataStr = dataStr[spaceIdx+1:]
argumentsJson := dataStr
out.origArguments = argumentsJson
err = json.Unmarshal([]byte(argumentsJson), &out.Arguments)
err = out.parseOrigArguments()
if err != nil {
return
}
return nil
}
func (cm *ClientMessage) parseOrigArguments() error {
err := json.Unmarshal([]byte(cm.origArguments), &cm.Arguments)
if err != nil {
return err
}
return nil
}
func MarshalClientMessage(clientMessage interface{}) (data []byte, payloadType byte, err error) {
var msg ClientMessage
var ok bool