diff options
author | Jason Blais <jason@spinpunch.com> | 2017-11-06 13:23:15 -0500 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2017-11-06 10:23:15 -0800 |
commit | 4731057e5063c2d50ede9f4b621414881b520daf (patch) | |
tree | 9c1b4e0b388c30b470de5b50799a76f930ce5eea /model/webrtc.go | |
parent | 1af182c198c67e0ea068308992772d4867cb0d40 (diff) | |
download | chat-4731057e5063c2d50ede9f4b621414881b520daf.tar.gz chat-4731057e5063c2d50ede9f4b621414881b520daf.tar.bz2 chat-4731057e5063c2d50ede9f4b621414881b520daf.zip |
Revert PLT-7809 (#7793)
* Update webrtc_test.go
* Update webrtc.go
* Update config.go
* Update webrtc.go
Diffstat (limited to 'model/webrtc.go')
-rw-r--r-- | model/webrtc.go | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/model/webrtc.go b/model/webrtc.go index 3318128fe..fa15a4b71 100644 --- a/model/webrtc.go +++ b/model/webrtc.go @@ -11,24 +11,19 @@ import ( type WebrtcInfoResponse struct { Token string `json:"token"` GatewayUrl string `json:"gateway_url"` - GatewayType string `json:"gateway_type"` StunUri string `json:"stun_uri,omitempty"` TurnUri string `json:"turn_uri,omitempty"` TurnPassword string `json:"turn_password,omitempty"` TurnUsername string `json:"turn_username,omitempty"` } -type JanusGatewayResponse struct { +type GatewayResponse struct { Status string `json:"janus"` } -type KopanoWebmeetingsResponse struct { - Value string `json:"value"` -} - -func JanusGatewayResponseFromJson(data io.Reader) *JanusGatewayResponse { +func GatewayResponseFromJson(data io.Reader) *GatewayResponse { decoder := json.NewDecoder(data) - var o JanusGatewayResponse + var o GatewayResponse err := decoder.Decode(&o) if err == nil { return &o @@ -56,13 +51,3 @@ func WebrtcInfoResponseFromJson(data io.Reader) *WebrtcInfoResponse { return nil } } - -func KopanoWebmeetingsResponseFromJson(data io.Reader) *KopanoWebmeetingsResponse { - decoder := json.NewDecoder(data) - var o KopanoWebmeetingsResponse - err := decoder.Decode(&o) - if err == nil { - return &o - } - return nil -} |