From 1d90f443157ad79de534fe2fcb1dead485958321 Mon Sep 17 00:00:00 2001
From: Juliusz Chroboczek <jch@irif.fr>
Date: Sat, 25 Apr 2020 20:47:49 +0200
Subject: [PATCH] Kill Message field in clientMessage.

Having both Message and Value is confusing.
---
 client.go     | 5 ++---
 group.go      | 4 ++--
 static/sfu.js | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/client.go b/client.go
index ec1a96c..38063a0 100644
--- a/client.go
+++ b/client.go
@@ -93,7 +93,6 @@ type clientMessage struct {
 	Permissions userPermission             `json:"permissions,omitempty"`
 	Group       string                     `json:"group,omitempty"`
 	Value       string                     `json:"value,omitempty"`
-	Message     string                     `json:"message,omitempty"`
 	Me          bool                       `json:"me,omitempty"`
 	Offer       *webrtc.SessionDescription `json:"offer,omitempty"`
 	Answer      *webrtc.SessionDescription `json:"answer,omitempty"`
@@ -136,8 +135,8 @@ func startClient(conn *websocket.Conn) (err error) {
 			m, e := errorToWSCloseMessage(err)
 			if m != "" {
 				c.write(clientMessage{
-					Type:    "error",
-					Message: m,
+					Type:  "error",
+					Value: m,
 				})
 			}
 			select {
diff --git a/group.go b/group.go
index b16e9c4..72821d6 100644
--- a/group.go
+++ b/group.go
@@ -278,8 +278,8 @@ func (c *client) error(err error) error {
 	switch e := err.(type) {
 	case userError:
 		return c.write(clientMessage{
-			Type:    "error",
-			Message: "The server said: " + string(e),
+			Type:  "error",
+			Value: "The server said: " + string(e),
 		})
 	default:
 		return err
diff --git a/static/sfu.js b/static/sfu.js
index a673d3e..3b93655 100644
--- a/static/sfu.js
+++ b/static/sfu.js
@@ -338,7 +338,7 @@ function serverConnect() {
                 addToChatbox(m.id, m.username, m.value, m.me);
                 break;
             case 'error':
-                displayError(m.message);
+                displayError(m.value);
                 break;
             default:
                 console.warn('Unexpected server message', m.type);