diff --git a/go-socket b/go-socket index 6dc053a..86c133d 100755 Binary files a/go-socket and b/go-socket differ diff --git a/todo.txt b/todo.txt index cca5150..ef672cf 100644 --- a/todo.txt +++ b/todo.txt @@ -1,6 +1,3 @@ -fix irc - - chat history rewrite to use uuid media support diff --git a/wsServer.go b/wsServer.go index 31294a7..62460ba 100644 --- a/wsServer.go +++ b/wsServer.go @@ -2,7 +2,6 @@ package main import ( "context" - "encoding/json" "errors" "log" "net/http" @@ -63,15 +62,9 @@ func sendMessageStructCloseIfTimeout(user *User, message *Message) { ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second) defer cancel() - jsonMsg, err := json.Marshal(message) - if err != nil { - log.Printf("json marshal error: %v", err) - return - } - err = wsjson.Write(ctx, user.WsConn, jsonMsg) + err := wsjson.Write(ctx, user.WsConn, message) if err != nil { log.Printf("json write error: %v", err) - return } }