коммит произвёл
GitHub
родитель
b45ff0be5d
Коммит
717a4d04a9
@@ -13,12 +13,12 @@ func (api *API) InitStatus() {
|
||||
api.Router.Handle("get_statuses_by_ids", api.APIWebSocketHandler(api.getStatusesByIds))
|
||||
}
|
||||
|
||||
func (api *API) getStatuses(req *model.WebSocketRequest) (map[string]interface{}, *model.AppError) {
|
||||
func (api *API) getStatuses(req *model.WebSocketRequest) (map[string]any, *model.AppError) {
|
||||
statusMap := api.App.GetAllStatuses()
|
||||
return model.StatusMapToInterfaceMap(statusMap), nil
|
||||
}
|
||||
|
||||
func (api *API) getStatusesByIds(req *model.WebSocketRequest) (map[string]interface{}, *model.AppError) {
|
||||
func (api *API) getStatusesByIds(req *model.WebSocketRequest) (map[string]any, *model.AppError) {
|
||||
var userIds []string
|
||||
if userIds = model.ArrayFromInterface(req.Data["user_ids"]); len(userIds) == 0 {
|
||||
mlog.Debug("Error while parsing user_ids", mlog.String("data", model.StringInterfaceToJSON(req.Data)))
|
||||
|
||||
@@ -11,8 +11,8 @@ func (api *API) InitSystem() {
|
||||
api.Router.Handle("ping", api.APIWebSocketHandler(ping))
|
||||
}
|
||||
|
||||
func ping(req *model.WebSocketRequest) (map[string]interface{}, *model.AppError) {
|
||||
data := map[string]interface{}{}
|
||||
func ping(req *model.WebSocketRequest) (map[string]any, *model.AppError) {
|
||||
data := map[string]any{}
|
||||
data["text"] = "pong"
|
||||
data["version"] = model.CurrentVersion
|
||||
data["server_time"] = model.GetMillis()
|
||||
|
||||
@@ -12,7 +12,7 @@ func (api *API) InitUser() {
|
||||
api.Router.Handle("user_update_active_status", api.APIWebSocketHandler(api.userUpdateActiveStatus))
|
||||
}
|
||||
|
||||
func (api *API) userTyping(req *model.WebSocketRequest) (map[string]interface{}, *model.AppError) {
|
||||
func (api *API) userTyping(req *model.WebSocketRequest) (map[string]any, *model.AppError) {
|
||||
api.App.ExtendSessionExpiryIfNeeded(&req.Session)
|
||||
|
||||
if api.App.Srv().Busy.IsBusy() {
|
||||
@@ -40,7 +40,7 @@ func (api *API) userTyping(req *model.WebSocketRequest) (map[string]interface{},
|
||||
return nil, appErr
|
||||
}
|
||||
|
||||
func (api *API) userUpdateActiveStatus(req *model.WebSocketRequest) (map[string]interface{}, *model.AppError) {
|
||||
func (api *API) userUpdateActiveStatus(req *model.WebSocketRequest) (map[string]any, *model.AppError) {
|
||||
var ok bool
|
||||
var userIsActive bool
|
||||
if userIsActive, ok = req.Data["user_is_active"].(bool); !ok {
|
||||
|
||||
@@ -12,13 +12,13 @@ import (
|
||||
"github.com/mattermost/mattermost-server/v6/shared/mlog"
|
||||
)
|
||||
|
||||
func (api *API) APIWebSocketHandler(wh func(*model.WebSocketRequest) (map[string]interface{}, *model.AppError)) webSocketHandler {
|
||||
func (api *API) APIWebSocketHandler(wh func(*model.WebSocketRequest) (map[string]any, *model.AppError)) webSocketHandler {
|
||||
return webSocketHandler{api.App, wh}
|
||||
}
|
||||
|
||||
type webSocketHandler struct {
|
||||
app *app.App
|
||||
handlerFunc func(*model.WebSocketRequest) (map[string]interface{}, *model.AppError)
|
||||
handlerFunc func(*model.WebSocketRequest) (map[string]any, *model.AppError)
|
||||
}
|
||||
|
||||
func (wh webSocketHandler) ServeWebSocket(conn *app.WebConn, r *model.WebSocketRequest) {
|
||||
@@ -50,7 +50,7 @@ func (wh webSocketHandler) ServeWebSocket(conn *app.WebConn, r *model.WebSocketR
|
||||
r.T = conn.T
|
||||
r.Locale = conn.Locale
|
||||
|
||||
var data map[string]interface{}
|
||||
var data map[string]any
|
||||
var err *model.AppError
|
||||
|
||||
if data, err = wh.handlerFunc(r); err != nil {
|
||||
@@ -73,7 +73,7 @@ func (wh webSocketHandler) ServeWebSocket(conn *app.WebConn, r *model.WebSocketR
|
||||
}
|
||||
|
||||
func NewInvalidWebSocketParamError(action string, name string) *model.AppError {
|
||||
return model.NewAppError("websocket: "+action, "api.websocket_handler.invalid_param.app_error", map[string]interface{}{"Name": name}, "", http.StatusBadRequest)
|
||||
return model.NewAppError("websocket: "+action, "api.websocket_handler.invalid_param.app_error", map[string]any{"Name": name}, "", http.StatusBadRequest)
|
||||
}
|
||||
|
||||
func NewServerBusyWebSocketError(action string) *model.AppError {
|
||||
|
||||
Ссылка в новой задаче
Block a user