Remove stars when repo goes private (#19904)

Fixes #18600
pull/25077/head^2
Wim 1 year ago committed by GitHub
parent 8e63373c01
commit 62ac3251fa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 14
      models/repo/star.go
  2. 18
      models/repo/star_test.go
  3. 4
      modules/repository/create.go
  4. 1
      options/locale/locale_en-US.ini
  5. 2
      templates/repo/settings/options.tmpl

@ -85,3 +85,17 @@ func GetStargazers(repo *Repository, opts db.ListOptions) ([]*user_model.User, e
users := make([]*user_model.User, 0, 8) users := make([]*user_model.User, 0, 8)
return users, sess.Find(&users) return users, sess.Find(&users)
} }
// ClearRepoStars clears all stars for a repository and from the user that starred it.
// Used when a repository is set to private.
func ClearRepoStars(ctx context.Context, repoID int64) error {
if _, err := db.Exec(ctx, "UPDATE `user` SET num_stars=num_stars-1 WHERE id IN (SELECT `uid` FROM `star` WHERE repo_id = ?)", repoID); err != nil {
return err
}
if _, err := db.Exec(ctx, "UPDATE `repository` SET num_stars = 0 WHERE id = ?", repoID); err != nil {
return err
}
return db.DeleteBeans(ctx, Star{RepoID: repoID})
}

@ -51,3 +51,21 @@ func TestRepository_GetStargazers2(t *testing.T) {
assert.NoError(t, err) assert.NoError(t, err)
assert.Len(t, gazers, 0) assert.Len(t, gazers, 0)
} }
func TestClearRepoStars(t *testing.T) {
assert.NoError(t, unittest.PrepareTestDatabase())
const userID = 2
const repoID = 1
unittest.AssertNotExistsBean(t, &repo_model.Star{UID: userID, RepoID: repoID})
assert.NoError(t, repo_model.StarRepo(userID, repoID, true))
unittest.AssertExistsAndLoadBean(t, &repo_model.Star{UID: userID, RepoID: repoID})
assert.NoError(t, repo_model.StarRepo(userID, repoID, false))
unittest.AssertNotExistsBean(t, &repo_model.Star{UID: userID, RepoID: repoID})
assert.NoError(t, repo_model.ClearRepoStars(db.DefaultContext, repoID))
unittest.AssertNotExistsBean(t, &repo_model.Star{UID: userID, RepoID: repoID})
repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1})
gazers, err := repo_model.GetStargazers(repo, db.ListOptions{Page: 0})
assert.NoError(t, err)
assert.Len(t, gazers, 0)
}

@ -397,6 +397,10 @@ func UpdateRepository(ctx context.Context, repo *repo_model.Repository, visibili
if err != nil { if err != nil {
return err return err
} }
if err = repo_model.ClearRepoStars(ctx, repo.ID); err != nil {
return err
}
} }
// Create/Remove git-daemon-export-ok for git-daemon... // Create/Remove git-daemon-export-ok for git-daemon...

@ -972,6 +972,7 @@ mirror_password_blank_placeholder = (Unset)
mirror_password_help = Change the username to erase a stored password. mirror_password_help = Change the username to erase a stored password.
watchers = Watchers watchers = Watchers
stargazers = Stargazers stargazers = Stargazers
stars_remove_warning = This will remove all stars from this repository.
forks = Forks forks = Forks
reactions_more = and %d more reactions_more = and %d more
unit_disabled = The site administrator has disabled this repository section. unit_disabled = The site administrator has disabled this repository section.

@ -26,7 +26,7 @@
{{if not .Repository.IsFork}} {{if not .Repository.IsFork}}
<div class="inline field"> <div class="inline field">
<label>{{.locale.Tr "repo.visibility"}}</label> <label>{{.locale.Tr "repo.visibility"}}</label>
<div class="ui checkbox"> <div class="ui checkbox{{if and (not .Repository.IsPrivate) (gt .Repository.NumStars 0)}} tooltip{{end}}" data-content="{{.locale.Tr "repo.stars_remove_warning"}}">
{{if .IsAdmin}} {{if .IsAdmin}}
<input name="private" type="checkbox" {{if .Repository.IsPrivate}}checked{{end}}> <input name="private" type="checkbox" {{if .Repository.IsPrivate}}checked{{end}}>
{{else}} {{else}}

Loading…
Cancel
Save