IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

MM-15485: In-channel system behaviour for at-mentions and slash commands for group-constrained channels. (#10855)

Browse Source 
* MM-15108: Prevent non-group-members from being added to group-constrained channels.

* MM-15485: Updates ephemeral message when non-group member is invited to group-constrained channel.

* MM-15485: Prevent group-permitted members from being removed from group-constrained channels. Show custom ephemeral when attempting /kick or /remove.
This commit is contained in:
Martin Kraft
2019-05-17 07:43:19 -04:00
committed by George Goldberg
parent 6d2fa0f3d2
commit 8d8a4d8614
11 changed files with 72 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/command_remove.go
View File

@@ -135,10 +135,16 @@ func doCommand(a *App, args *model.CommandArgs, message string) *model.CommandRe
}
if err = a.RemoveUserFromChannel(userProfile.Id, args.UserId, channel); err != nil {
return &model.CommandResponse{
Text: args.T(err.Id, map[string]interface{}{
var text string
if err.Id == "api.channel.remove_members.denied" {
text = args.T("api.command_remove.group_constrained_user_denied")
} else {
text = args.T(err.Id, map[string]interface{}{
"Channel": model.DEFAULT_CHANNEL,
}),
})
}
return &model.CommandResponse{
Text: text,
ResponseType: model.COMMAND_RESPONSE_TYPE_EPHEMERAL,
}
}