diff options
author | Chris <ccbrown112@gmail.com> | 2017-09-27 11:52:34 -0500 |
---|---|---|
committer | Saturnino Abril <saturnino.abril@gmail.com> | 2017-09-28 00:52:34 +0800 |
commit | 8c80cdde38cceb3424b2b1f43eadf7a1aab0c6df (patch) | |
tree | b3563dfe35ad78991774c9d1842dc439376e1db1 /wsapi/user.go | |
parent | 1bd66589a2adc67df5df9c108a2f2ecc77dfdf44 (diff) | |
download | chat-8c80cdde38cceb3424b2b1f43eadf7a1aab0c6df.tar.gz chat-8c80cdde38cceb3424b2b1f43eadf7a1aab0c6df.tar.bz2 chat-8c80cdde38cceb3424b2b1f43eadf7a1aab0c6df.zip |
remove remaining Global() calls (outside of tests) (#7521)
Diffstat (limited to 'wsapi/user.go')
-rw-r--r-- | wsapi/user.go | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/wsapi/user.go b/wsapi/user.go index d79ecab83..c8236c978 100644 --- a/wsapi/user.go +++ b/wsapi/user.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 InitUser() { +func (api *API) InitUser() { l4g.Debug(utils.T("wsapi.user.init.debug")) - app.Global().Srv.WebSocketRouter.Handle("user_typing", ApiWebSocketHandler(userTyping)) + api.Router.Handle("user_typing", api.ApiWebSocketHandler(api.userTyping)) } -func userTyping(req *model.WebSocketRequest) (map[string]interface{}, *model.AppError) { +func (api *API) userTyping(req *model.WebSocketRequest) (map[string]interface{}, *model.AppError) { var ok bool var channelId string if channelId, ok = req.Data["channel_id"].(string); !ok || len(channelId) != 26 { @@ -34,7 +33,7 @@ func userTyping(req *model.WebSocketRequest) (map[string]interface{}, *model.App event := model.NewWebSocketEvent(model.WEBSOCKET_EVENT_TYPING, "", channelId, "", omitUsers) event.Add("parent_id", parentId) event.Add("user_id", req.Session.UserId) - go app.Publish(event) + go api.App.Publish(event) return nil, nil } |