From 8c80cdde38cceb3424b2b1f43eadf7a1aab0c6df Mon Sep 17 00:00:00 2001 From: Chris Date: Wed, 27 Sep 2017 11:52:34 -0500 Subject: remove remaining Global() calls (outside of tests) (#7521) --- wsapi/webrtc.go | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'wsapi/webrtc.go') diff --git a/wsapi/webrtc.go b/wsapi/webrtc.go index a2e1a18ce..42e749ebb 100644 --- a/wsapi/webrtc.go +++ b/wsapi/webrtc.go @@ -5,18 +5,17 @@ package wsapi import ( l4g "github.com/alecthomas/log4go" - "github.com/mattermost/mattermost-server/app" "github.com/mattermost/mattermost-server/model" "github.com/mattermost/mattermost-server/utils" ) -func InitWebrtc() { +func (api *API) InitWebrtc() { l4g.Debug(utils.T("wsapi.webtrc.init.debug")) - app.Global().Srv.WebSocketRouter.Handle("webrtc", ApiWebSocketHandler(webrtcMessage)) + api.Router.Handle("webrtc", api.ApiWebSocketHandler(api.webrtcMessage)) } -func webrtcMessage(req *model.WebSocketRequest) (map[string]interface{}, *model.AppError) { +func (api *API) webrtcMessage(req *model.WebSocketRequest) (map[string]interface{}, *model.AppError) { var ok bool var toUserId string if toUserId, ok = req.Data["to_user_id"].(string); !ok || len(toUserId) != 26 { @@ -25,7 +24,7 @@ func webrtcMessage(req *model.WebSocketRequest) (map[string]interface{}, *model. event := model.NewWebSocketEvent(model.WEBSOCKET_EVENT_WEBRTC, "", "", toUserId, nil) event.Data = req.Data - go app.Publish(event) + go api.App.Publish(event) return nil, nil } -- cgit v1.2.3-1-g7c22