diff options
author | Chris <ccbrown112@gmail.com> | 2017-09-06 17:12:54 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-09-06 17:12:54 -0500 |
commit | 1adfd0e9be69a93c7f63bb7afc742c9fafe31aa3 (patch) | |
tree | 2766bacc1f045fa685ca3d8310cd6174d0311d09 /wsapi | |
parent | b84bd21089d305333fa4114b95be70f5ad94ad1b (diff) | |
download | chat-1adfd0e9be69a93c7f63bb7afc742c9fafe31aa3.tar.gz chat-1adfd0e9be69a93c7f63bb7afc742c9fafe31aa3.tar.bz2 chat-1adfd0e9be69a93c7f63bb7afc742c9fafe31aa3.zip |
app type transition (#7167)
Diffstat (limited to 'wsapi')
-rw-r--r-- | wsapi/api.go | 2 | ||||
-rw-r--r-- | wsapi/status.go | 6 | ||||
-rw-r--r-- | wsapi/system.go | 2 | ||||
-rw-r--r-- | wsapi/user.go | 2 | ||||
-rw-r--r-- | wsapi/webrtc.go | 2 | ||||
-rw-r--r-- | wsapi/websocket_handler.go | 5 |
6 files changed, 10 insertions, 9 deletions
diff --git a/wsapi/api.go b/wsapi/api.go index b7a06e42e..0a737fe5c 100644 --- a/wsapi/api.go +++ b/wsapi/api.go @@ -8,7 +8,7 @@ import ( ) func InitRouter() { - app.Srv.WebSocketRouter = app.NewWebSocketRouter() + app.Global().Srv.WebSocketRouter = app.NewWebSocketRouter() } func InitApi() { diff --git a/wsapi/status.go b/wsapi/status.go index a69603399..58ddf2c1a 100644 --- a/wsapi/status.go +++ b/wsapi/status.go @@ -13,8 +13,8 @@ import ( func InitStatus() { l4g.Debug(utils.T("wsapi.status.init.debug")) - app.Srv.WebSocketRouter.Handle("get_statuses", ApiWebSocketHandler(getStatuses)) - app.Srv.WebSocketRouter.Handle("get_statuses_by_ids", ApiWebSocketHandler(getStatusesByIds)) + app.Global().Srv.WebSocketRouter.Handle("get_statuses", ApiWebSocketHandler(getStatuses)) + app.Global().Srv.WebSocketRouter.Handle("get_statuses_by_ids", ApiWebSocketHandler(getStatusesByIds)) } func getStatuses(req *model.WebSocketRequest) (map[string]interface{}, *model.AppError) { @@ -29,7 +29,7 @@ func getStatusesByIds(req *model.WebSocketRequest) (map[string]interface{}, *mod return nil, NewInvalidWebSocketParamError(req.Action, "user_ids") } - statusMap, err := app.GetStatusesByIds(userIds) + statusMap, err := app.Global().GetStatusesByIds(userIds) if err != nil { return nil, err } diff --git a/wsapi/system.go b/wsapi/system.go index 878bf50a7..ba1f862a5 100644 --- a/wsapi/system.go +++ b/wsapi/system.go @@ -13,7 +13,7 @@ import ( func InitSystem() { l4g.Debug(utils.T("wsapi.system.init.debug")) - app.Srv.WebSocketRouter.Handle("ping", ApiWebSocketHandler(ping)) + app.Global().Srv.WebSocketRouter.Handle("ping", ApiWebSocketHandler(ping)) } func ping(req *model.WebSocketRequest) (map[string]interface{}, *model.AppError) { diff --git a/wsapi/user.go b/wsapi/user.go index 7c4bdfa59..ccb6a3c3d 100644 --- a/wsapi/user.go +++ b/wsapi/user.go @@ -13,7 +13,7 @@ import ( func InitUser() { l4g.Debug(utils.T("wsapi.user.init.debug")) - app.Srv.WebSocketRouter.Handle("user_typing", ApiWebSocketHandler(userTyping)) + app.Global().Srv.WebSocketRouter.Handle("user_typing", ApiWebSocketHandler(userTyping)) } func userTyping(req *model.WebSocketRequest) (map[string]interface{}, *model.AppError) { diff --git a/wsapi/webrtc.go b/wsapi/webrtc.go index feb45b126..4a3638cc3 100644 --- a/wsapi/webrtc.go +++ b/wsapi/webrtc.go @@ -13,7 +13,7 @@ import ( func InitWebrtc() { l4g.Debug(utils.T("wsapi.webtrc.init.debug")) - app.Srv.WebSocketRouter.Handle("webrtc", ApiWebSocketHandler(webrtcMessage)) + app.Global().Srv.WebSocketRouter.Handle("webrtc", ApiWebSocketHandler(webrtcMessage)) } func webrtcMessage(req *model.WebSocketRequest) (map[string]interface{}, *model.AppError) { diff --git a/wsapi/websocket_handler.go b/wsapi/websocket_handler.go index a847a7df4..93f644958 100644 --- a/wsapi/websocket_handler.go +++ b/wsapi/websocket_handler.go @@ -6,10 +6,11 @@ package wsapi import ( l4g "github.com/alecthomas/log4go" + "net/http" + "github.com/mattermost/platform/app" "github.com/mattermost/platform/model" "github.com/mattermost/platform/utils" - "net/http" ) func ApiWebSocketHandler(wh func(*model.WebSocketRequest) (map[string]interface{}, *model.AppError)) webSocketHandler { @@ -23,7 +24,7 @@ type webSocketHandler struct { func (wh webSocketHandler) ServeWebSocket(conn *app.WebConn, r *model.WebSocketRequest) { l4g.Debug("/api/v3/users/websocket:%s", r.Action) - session, sessionErr := app.GetSession(conn.GetSessionToken()) + session, sessionErr := app.Global().GetSession(conn.GetSessionToken()) if sessionErr != nil { l4g.Error(utils.T("api.web_socket_handler.log.error"), "/api/v3/users/websocket", r.Action, r.Seq, conn.UserId, sessionErr.SystemMessage(utils.T), sessionErr.Error()) sessionErr.DetailedError = "" |