Automatic Merge
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
452bad21e9
Коммит
83006ff8ca
@@ -64,7 +64,7 @@ func (*MuteProvider) DoCommand(a *app.App, c request.CTX, args *model.CommandArg
|
|||||||
|
|
||||||
channelMember, err := a.ToggleMuteChannel(c, channel.Id, args.UserId)
|
channelMember, err := a.ToggleMuteChannel(c, channel.Id, args.UserId)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return &model.CommandResponse{Text: args.T("api.command_mute.not_member.error", map[string]any{"Channel": channelName}), ResponseType: model.CommandResponseTypeEphemeral}
|
return &model.CommandResponse{Text: args.T("api.command_mute.error", map[string]any{"Channel": channelName}), ResponseType: model.CommandResponseTypeEphemeral}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Direct and Group messages won't have a nice channel title, omit it
|
// Direct and Group messages won't have a nice channel title, omit it
|
||||||
|
|||||||
@@ -130,13 +130,14 @@ func TestMuteCommandNotMember(t *testing.T) {
|
|||||||
|
|
||||||
cmd := &MuteProvider{}
|
cmd := &MuteProvider{}
|
||||||
|
|
||||||
// First mute the channel
|
// Muting a channel that the user is not a member of should return
|
||||||
|
// the same error as a non-existent channel to prevent channel enumeration
|
||||||
resp := cmd.DoCommand(th.App, th.Context, &model.CommandArgs{
|
resp := cmd.DoCommand(th.App, th.Context, &model.CommandArgs{
|
||||||
T: i18n.IdentityTfunc(),
|
T: i18n.IdentityTfunc(),
|
||||||
ChannelId: channel1.Id,
|
ChannelId: channel1.Id,
|
||||||
UserId: th.BasicUser.Id,
|
UserId: th.BasicUser.Id,
|
||||||
}, channel2.Name)
|
}, channel2.Name)
|
||||||
assert.Equal(t, "api.command_mute.not_member.error", resp.Text)
|
assert.Equal(t, "api.command_mute.error", resp.Text)
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestMuteCommandNotChannel(t *testing.T) {
|
func TestMuteCommandNotChannel(t *testing.T) {
|
||||||
|
|||||||
@@ -1241,10 +1241,6 @@
|
|||||||
"id": "api.command_mute.no_channel.error",
|
"id": "api.command_mute.no_channel.error",
|
||||||
"translation": "Could not find the specified channel. Please use the [channel handle](https://docs.mattermost.com/messaging/managing-channels.html#naming-a-channel) to identify channels."
|
"translation": "Could not find the specified channel. Please use the [channel handle](https://docs.mattermost.com/messaging/managing-channels.html#naming-a-channel) to identify channels."
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"id": "api.command_mute.not_member.error",
|
|
||||||
"translation": "Could not mute channel {{.Channel}} as you are not a member."
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"id": "api.command_mute.success_mute",
|
"id": "api.command_mute.success_mute",
|
||||||
"translation": "You will not receive notifications for {{.Channel}} until channel mute is turned off."
|
"translation": "You will not receive notifications for {{.Channel}} until channel mute is turned off."
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user