mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-12-23 20:17:03 +01:00
2cbc12dc74
- 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 commit217475385a
) (cherry picked from commitf2c38ce5c2
) (cherry picked from commit1edfb68137
)
58 lines
1.5 KiB
Go
58 lines
1.5 KiB
Go
// Copyright 2023 The Forgejo Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
package user
|
|
|
|
import (
|
|
"context"
|
|
|
|
"code.gitea.io/gitea/models/db"
|
|
repo_model "code.gitea.io/gitea/models/repo"
|
|
user_model "code.gitea.io/gitea/models/user"
|
|
)
|
|
|
|
// BlockUser adds a blocked user entry for userID to block blockID.
|
|
// TODO: Figure out if instance admins should be immune to blocking.
|
|
// TODO: Add more mechanism like removing blocked user as collaborator on
|
|
// repositories where the user is an owner.
|
|
func BlockUser(ctx context.Context, userID, blockID int64) error {
|
|
if userID == blockID || user_model.IsBlocked(ctx, userID, blockID) {
|
|
return nil
|
|
}
|
|
|
|
ctx, committer, err := db.TxContext(ctx)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
defer committer.Close()
|
|
|
|
// Add the blocked user entry.
|
|
_, err = db.GetEngine(ctx).Insert(&user_model.BlockedUser{UserID: userID, BlockID: blockID})
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
// Unfollow the user from the block's perspective.
|
|
err = user_model.UnfollowUser(ctx, blockID, userID)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
// Unfollow the user from the doer's perspective.
|
|
err = user_model.UnfollowUser(ctx, userID, blockID)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
// Blocked user unwatch all repository owned by the doer.
|
|
repoIDs, err := repo_model.GetWatchedRepoIDsOwnedBy(ctx, blockID, userID)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
err = repo_model.UnwatchRepos(ctx, blockID, repoIDs)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
return committer.Commit()
|
|
}
|