From 8d66523ba7d9a77129844be476732ebfd5272d64 Mon Sep 17 00:00:00 2001 From: Harrison Healey Date: Fri, 26 Jan 2018 13:35:50 -0500 Subject: Used a consistent tense for system messages (#8079) --- app/team.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/team.go') diff --git a/app/team.go b/app/team.go index 71eb00569..de5e3fa30 100644 --- a/app/team.go +++ b/app/team.go @@ -681,7 +681,7 @@ func (a *App) postRemoveFromTeamMessage(user *model.User, channel *model.Channel Type: model.POST_REMOVE_FROM_TEAM, UserId: user.Id, Props: model.StringInterface{ - "removedUsername": user.Username, + "username": user.Username, }, } -- cgit v1.2.3-1-g7c22 From 5d7ae48841d7004c16ec516ec9f86312b9c6cae9 Mon Sep 17 00:00:00 2001 From: Saturnino Abril Date: Thu, 1 Feb 2018 22:46:24 +0800 Subject: [PLT-8494] Add delete_team websocket event (#8167) * add delete_team websocket event * add to PermanentDeleteTeam --- app/team.go | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'app/team.go') diff --git a/app/team.go b/app/team.go index de5e3fa30..21b8e5879 100644 --- a/app/team.go +++ b/app/team.go @@ -104,7 +104,7 @@ func (a *App) UpdateTeam(team *model.Team) (*model.Team, *model.AppError) { return nil, result.Err } - a.sendUpdatedTeamEvent(oldTeam) + a.sendTeamEvent(oldTeam, model.WEBSOCKET_EVENT_UPDATE_TEAM) return oldTeam, nil } @@ -122,17 +122,17 @@ func (a *App) PatchTeam(teamId string, patch *model.TeamPatch) (*model.Team, *mo return nil, err } - a.sendUpdatedTeamEvent(updatedTeam) + a.sendTeamEvent(updatedTeam, model.WEBSOCKET_EVENT_UPDATE_TEAM) return updatedTeam, nil } -func (a *App) sendUpdatedTeamEvent(team *model.Team) { +func (a *App) sendTeamEvent(team *model.Team, event string) { sanitizedTeam := &model.Team{} *sanitizedTeam = *team sanitizedTeam.Sanitize() - message := model.NewWebSocketEvent(model.WEBSOCKET_EVENT_UPDATE_TEAM, "", "", "", nil) + message := model.NewWebSocketEvent(event, "", "", "", nil) message.Add("team", sanitizedTeam.ToJson()) a.Go(func() { a.Publish(message) @@ -820,6 +820,8 @@ func (a *App) PermanentDeleteTeam(team *model.Team) *model.AppError { return result.Err } + a.sendTeamEvent(team, model.WEBSOCKET_EVENT_DELETE_TEAM) + return nil } @@ -834,6 +836,8 @@ func (a *App) SoftDeleteTeam(teamId string) *model.AppError { return result.Err } + a.sendTeamEvent(team, model.WEBSOCKET_EVENT_DELETE_TEAM) + return nil } -- cgit v1.2.3-1-g7c22