mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-06-09 08:59:31 +00:00
37b4e6ef9b
- 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 commit 0505a10421
)
46 lines
1.3 KiB
Go
46 lines
1.3 KiB
Go
// Copyright 2023 The Forgejo Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package setting
|
|
|
|
import (
|
|
"net/http"
|
|
|
|
user_model "code.gitea.io/gitea/models/user"
|
|
"code.gitea.io/gitea/modules/base"
|
|
"code.gitea.io/gitea/modules/context"
|
|
"code.gitea.io/gitea/modules/setting"
|
|
)
|
|
|
|
const (
|
|
tplSettingsBlockedUsers base.TplName = "user/settings/blocked_users"
|
|
)
|
|
|
|
// BlockedUsers render the blocked users list page.
|
|
func BlockedUsers(ctx *context.Context) {
|
|
ctx.Data["Title"] = ctx.Tr("settings.blocked_users")
|
|
ctx.Data["PageIsBlockedUsers"] = true
|
|
ctx.Data["BaseLink"] = setting.AppSubURL + "/user/settings/blocked_users"
|
|
ctx.Data["BaseLinkNew"] = setting.AppSubURL + "/user/settings/blocked_users"
|
|
|
|
blockedUsers, err := user_model.ListBlockedUsers(ctx, ctx.Doer.ID)
|
|
if err != nil {
|
|
ctx.ServerError("ListBlockedUsers", err)
|
|
return
|
|
}
|
|
|
|
ctx.Data["BlockedUsers"] = blockedUsers
|
|
ctx.HTML(http.StatusOK, tplSettingsBlockedUsers)
|
|
}
|
|
|
|
// UnblockUser unblocks a particular user for the doer.
|
|
func UnblockUser(ctx *context.Context) {
|
|
if err := user_model.UnblockUser(ctx, ctx.Doer.ID, ctx.FormInt64("user_id")); err != nil {
|
|
ctx.ServerError("UnblockUser", err)
|
|
return
|
|
}
|
|
|
|
ctx.Flash.Success(ctx.Tr("settings.user_unblock_success"))
|
|
ctx.Redirect(setting.AppSubURL + "/user/settings/blocked_users")
|
|
}
|