mirror of
https://github.com/jech/galene.git
synced 2024-12-22 23:35:46 +01:00
Kill Message field in clientMessage.
Having both Message and Value is confusing.
This commit is contained in:
parent
695cbad31c
commit
1d90f44315
3 changed files with 5 additions and 6 deletions
|
@ -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 {
|
||||
|
|
4
group.go
4
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
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Reference in a new issue