luckyimnotanigger/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2025-06-23 09:30:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

feat: don't allow blocking the doer

Browse source 
- In the case of organization blocking users, disallow blocking the doer.
- Resolves #5390
- Added integration test.
This commit is contained in:
Gusted 2024-12-30 00:09:07 +01:00
parent d071c09bf7
commit e14f2d0c84
No known key found for this signature in database
GPG key ID: FD821B732837125F
3 changed files with 21 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
routers/web/org/setting/blocked_users.go
View file

@ -53,6 +53,12 @@ func BlockedUsersBlock(ctx *context.Context) {
return
}
if u.ID == ctx.Doer.ID {
ctx.Flash.Error(ctx.Tr("settings.user_block_yourself"))
ctx.Redirect(ctx.Org.OrgLink + "/settings/blocked_users")
return
}
if err := user_service.BlockUser(ctx, ctx.Org.Organization.ID, u.ID); err != nil {
ctx.ServerError("BlockUser", err)
return