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-54555 - Include channel name in error (#24614)

Browse Source 
* include channel name in error

* update multiple returns

---------

Co-authored-by: Mattermost Build <build@mattermost.com>
This commit is contained in:
Scott Bishel 2023-10-02 16:55:21 -06:00 committed by GitHub
parent 7e3c0dfa4c
commit ae1decd1a7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
server/channels/app/slashcommands/command_invite.go
View File

@ -71,7 +71,7 @@ func (i *InviteProvider) doCommand(a *app.App, c request.CTX, args *model.Comman
targetChannels = i.checkPermissions(a, c, args, resps, targetUsers[0], targetChannels)
// track errors returned for various users.
differentChannels := make([]string, 0, 1)
differentChannels := make(map[string][]string)
nonTeamUsers := make(map[string][]string)
channelConstrained := make([]string, 0, 1)
usersInChannel := make([]string, 0, 1)
@ -83,7 +83,7 @@ func (i *InviteProvider) doCommand(a *app.App, c request.CTX, args *model.Comman
userError := i.addUserToChannel(a, c, args, targetUser, targetChannel)
if userError == NoError {
if args.ChannelId != targetChannel.Id {
differentChannels = append(differentChannels, targetUser.Username)
differentChannels[targetChannel.Name] = append(differentChannels[targetChannel.Name], targetUser.Username)
}
} else if userError == UserNotInTeam {
if targetTeamDisplay == "" {
@ -124,22 +124,24 @@ func (i *InviteProvider) doCommand(a *app.App, c request.CTX, args *model.Comman
}
if len(differentChannels) > 0 {
if len(differentChannels) > 10 {
*resps = append(*resps,
args.T("api.command_invite.successOverflow", map[string]any{
"FirstUser": "@" + differentChannels[0],
"Others": len(differentChannels) - 1,
"Channel": "",
}),
)
} else {
usersString := map[string]any{
"Users": "@" + strings.Join(differentChannels, ", @"),
"Channel": "test",
for k, v := range differentChannels {
if len(v) > 10 {
*resps = append(*resps,
args.T("api.command_invite.successOverflow", map[string]any{
"FirstUser": "@" + v[0],
"Others": len(v) - 1,
"Channel": k,
}),
)
} else {
usersString := map[string]any{
"User": "@" + strings.Join(v, ", @"),
"Channel": k,
}
*resps = append(*resps,
args.T("api.command_invite.success", usersString),
)
}
*resps = append(*resps,
args.T("api.command_invite.success", usersString),
)
}
}

2
server/channels/app/slashcommands/command_invite_test.go
View File

@ -74,7 +74,7 @@ func TestInviteProvider(t *testing.T) {
channel2 := th.createChannel(th.BasicTeam, model.ChannelTypeOpen)
msg := "@" + th.BasicUser2.Username + " @" + anotherUser.Username + " ~" + channel1.Name + " ~" + channel2.Name
expected := "api.command_invite.success"
expected := "api.command_invite.success\napi.command_invite.success"
runCmd(msg, expected)
checkIsMember(channel1.Id, th.BasicUser2.Id)
checkIsMember(channel2.Id, th.BasicUser2.Id)