mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-05-28 21:28:30 +00:00
eff5b43d2e
- Resolves #476 - Follow up for: #540 - Ensure that the doer and blocked person cannot follow each other. - Ensure that the block person cannot watch doer's repositories. - Add unblock button to the blocked user list. - Add blocked since information to the blocked user list. - Add extra testing to moderation code. - Blocked user will unwatch doer's owned repository upon blocking. - Add flash messages to let the user know the block/unblock action was successful. - Add "You haven't blocked any users" message. - Add organization blocking a user. Co-authored-by: Gusted <postmaster@gusted.xyz> Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/802 (cherry picked from commit0505a10421) (cherry picked from commit37b4e6ef9b) (cherry picked from commitc17c121f2c) [MODERATION] organization blocking a user (#802) (squash) Changes to adapt to:6bbccdd177Improve AJAX link and modal confirm dialog (#25210) Refs: https://codeberg.org/forgejo/forgejo/pulls/882/files#issuecomment-945962 Refs: https://codeberg.org/forgejo/forgejo/pulls/882#issue-330561 (cherry picked from commit523635f83c) (cherry picked from commit4743eaa6a0)
62 lines
1.7 KiB
Go
62 lines
1.7 KiB
Go
// Copyright 2023 The Forgejo Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package setting
|
|
|
|
import (
|
|
"net/http"
|
|
"strings"
|
|
|
|
user_model "code.gitea.io/gitea/models/user"
|
|
"code.gitea.io/gitea/modules/context"
|
|
"code.gitea.io/gitea/routers/utils"
|
|
user_service "code.gitea.io/gitea/services/user"
|
|
)
|
|
|
|
const tplBlockedUsers = "org/settings/blocked_users"
|
|
|
|
// BlockedUsers renders the blocked users page.
|
|
func BlockedUsers(ctx *context.Context) {
|
|
ctx.Data["Title"] = ctx.Tr("settings.blocked_users")
|
|
ctx.Data["PageIsSettingsBlockedUsers"] = true
|
|
|
|
blockedUsers, err := user_model.ListBlockedUsers(ctx, ctx.Org.Organization.ID)
|
|
if err != nil {
|
|
ctx.ServerError("ListBlockedUsers", err)
|
|
return
|
|
}
|
|
|
|
ctx.Data["BlockedUsers"] = blockedUsers
|
|
|
|
ctx.HTML(http.StatusOK, tplBlockedUsers)
|
|
}
|
|
|
|
// BlockedUsersBlock blocks a particular user from the organization.
|
|
func BlockedUsersBlock(ctx *context.Context) {
|
|
uname := utils.RemoveUsernameParameterSuffix(strings.ToLower(ctx.FormString("uname")))
|
|
u, err := user_model.GetUserByName(ctx, uname)
|
|
if err != nil {
|
|
ctx.ServerError("GetUserByName", err)
|
|
return
|
|
}
|
|
|
|
if err := user_service.BlockUser(ctx, ctx.Org.Organization.ID, u.ID); err != nil {
|
|
ctx.ServerError("BlockUser", err)
|
|
return
|
|
}
|
|
|
|
ctx.Flash.Success(ctx.Tr("settings.user_block_success"))
|
|
ctx.Redirect(ctx.Org.OrgLink + "/settings/blocked_users")
|
|
}
|
|
|
|
// BlockedUsersUnblock unblocks a particular user from the organization.
|
|
func BlockedUsersUnblock(ctx *context.Context) {
|
|
if err := user_model.UnblockUser(ctx, ctx.Org.Organization.ID, ctx.FormInt64("user_id")); err != nil {
|
|
ctx.ServerError("BlockUser", err)
|
|
return
|
|
}
|
|
|
|
ctx.Flash.Success(ctx.Tr("settings.user_unblock_success"))
|
|
ctx.Redirect(ctx.Org.OrgLink + "/settings/blocked_users")
|
|
}
|