Automatic Merge
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
12dce033d6
Коммит
21a86506f9
@@ -274,7 +274,7 @@ func (i *InviteProvider) checkPermissions(a *app.App, c request.CTX, args *model
|
||||
for _, targetChannel := range targetChannels {
|
||||
switch targetChannel.Type {
|
||||
case model.ChannelTypeOpen:
|
||||
if !a.HasPermissionToChannel(c, args.UserId, targetChannel.Id, model.PermissionManagePublicChannelMembers) {
|
||||
if ok, _ := a.HasPermissionToChannel(c, args.UserId, targetChannel.Id, model.PermissionManagePublicChannelMembers); !ok {
|
||||
*resps = append(*resps, args.T("api.command_invite.permission.app_error", map[string]any{
|
||||
"User": targetUser.Username,
|
||||
"Channel": targetChannel.Name,
|
||||
@@ -282,7 +282,7 @@ func (i *InviteProvider) checkPermissions(a *app.App, c request.CTX, args *model
|
||||
continue
|
||||
}
|
||||
case model.ChannelTypePrivate:
|
||||
if !a.HasPermissionToChannel(c, args.UserId, targetChannel.Id, model.PermissionManagePrivateChannelMembers) {
|
||||
if ok, _ := a.HasPermissionToChannel(c, args.UserId, targetChannel.Id, model.PermissionManagePrivateChannelMembers); !ok {
|
||||
if _, err = a.GetChannelMember(c, targetChannel.Id, args.UserId); err == nil {
|
||||
// User doing the inviting is a member of the channel.
|
||||
*resps = append(*resps, args.T("api.command_invite.permission.app_error", map[string]any{
|
||||
|
||||
Ссылка в новой задаче
Block a user