From bb8dcb09a1b0bb38ea1e834e739fe5415ff3ec6b Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@googlemail.com> Date: Fri, 17 Nov 2017 10:27:28 +0000 Subject: [PATCH] use voip turnServers struct from gomatrix for dedup and consistency (#344) Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- .../matrix-org/dendrite/clientapi/routing/voip.go | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/github.com/matrix-org/dendrite/clientapi/routing/voip.go b/src/github.com/matrix-org/dendrite/clientapi/routing/voip.go index c4c48bd73..1a2a87527 100644 --- a/src/github.com/matrix-org/dendrite/clientapi/routing/voip.go +++ b/src/github.com/matrix-org/dendrite/clientapi/routing/voip.go @@ -26,16 +26,10 @@ import ( "github.com/matrix-org/dendrite/clientapi/auth/authtypes" "github.com/matrix-org/dendrite/clientapi/httputil" "github.com/matrix-org/dendrite/common/config" + "github.com/matrix-org/gomatrix" "github.com/matrix-org/util" ) -type turnServerResponse struct { - Username string `json:"username"` - Password string `json:"password"` - URIs []string `json:"uris"` - TTL int `json:"ttl"` -} - // RequestTurnServer implements: // GET /voip/turnServer func RequestTurnServer(req *http.Request, device *authtypes.Device, cfg config.Dendrite) util.JSONResponse { @@ -52,7 +46,7 @@ func RequestTurnServer(req *http.Request, device *authtypes.Device, cfg config.D // Duration checked at startup, err not possible duration, _ := time.ParseDuration(turnConfig.UserLifetime) - resp := turnServerResponse{ + resp := gomatrix.RespTurnServer{ URIs: turnConfig.URIs, TTL: int(duration.Seconds()), }