mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2026-07-25 02:48:05 +00:00
**Backport:** https://codeberg.org/forgejo/forgejo/pulls/10927
Continuation of #10598
Closes #7254
Implement repo granular watch selection
I adopted a lot of the frontend from #10598 while redoing the entire back-end. I propose this new model:
- Remove the WatchMode enum.
- Add the WatchSelection struct, which represents the granular selection. Notice that there is no `watching` bool. I tried very hard to keep the structure as simple and redundancy-free as possible. Therefore, people not watching a repo at all either don't have a watch record or one with an entirely unselected WatchSelection struct.
- Add the WatchSource enum. It replaces the WatchMode enum and has a single purpose: determine whether a watch was explicitly or automatically initiated.
Notice that replacing this
```go
And("`watch`.mode<>?", WatchModeDont).
```
with this is correct:
```go
And(
builder.Or(
builder.Eq{"`watch`.watch_selection_issues": true},
builder.Eq{"`watch`.watch_selection_pull_requests": true},
builder.Eq{"`watch`.watch_selection_releases": true},
),
).
```
That's because there are four modes: dont, none, auto and normal. When `<>` with dont, we look for auto and normal, because there are no records with none. Therefore, the old code looks for records that indicate watching. The code I replaced this with does so, too, just more granular.
Also notice that I've prepared a future `user preset` in a few places. See below for a little more info on that.
## Next PR
I plan to continue working on this. I want to implement a `user preset` option. The user sets that `user preset` in her settings and may use them in any repo.
<details>
- rename account settings to account and notifications
- user preset (always use this preset for newly accessible repos (according to AutoWatchOnChanges and AutoWatchNewRepos))
</details>
## Further PRs
- make api able to granular watch
- move (email) notifications to new notifications tab
Co-authored-by: 0ko <0ko@noreply.codeberg.org>
Co-authored-by: Gusted <postmaster@gusted.xyz>
Co-authored-by: pat-s <patrick.schratz@gmail.com>
Reviewed-on: #10927
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
(cherry picked from commit 8770ffc848)
130 lines
4.2 KiB
Go
130 lines
4.2 KiB
Go
// Copyright 2017 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package issues
|
|
|
|
import (
|
|
"context"
|
|
|
|
"forgejo.org/models/db"
|
|
repo_model "forgejo.org/models/repo"
|
|
user_model "forgejo.org/models/user"
|
|
"forgejo.org/modules/timeutil"
|
|
)
|
|
|
|
// IssueWatch is connection request for receiving issue notification.
|
|
type IssueWatch struct {
|
|
ID int64 `xorm:"pk autoincr"`
|
|
UserID int64 `xorm:"UNIQUE(watch) NOT NULL"`
|
|
IssueID int64 `xorm:"UNIQUE(watch) NOT NULL"`
|
|
IsWatching bool `xorm:"NOT NULL"`
|
|
CreatedUnix timeutil.TimeStamp `xorm:"created NOT NULL"`
|
|
UpdatedUnix timeutil.TimeStamp `xorm:"updated NOT NULL"`
|
|
}
|
|
|
|
func init() {
|
|
db.RegisterModel(new(IssueWatch))
|
|
}
|
|
|
|
// IssueWatchList contains IssueWatch
|
|
type IssueWatchList []*IssueWatch
|
|
|
|
// CreateOrUpdateIssueWatch set watching for a user and issue
|
|
func CreateOrUpdateIssueWatch(ctx context.Context, userID, issueID int64, isWatching bool) error {
|
|
iw, exists, err := GetIssueWatch(ctx, userID, issueID)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
if !exists {
|
|
iw = &IssueWatch{
|
|
UserID: userID,
|
|
IssueID: issueID,
|
|
IsWatching: isWatching,
|
|
}
|
|
|
|
if _, err := db.GetEngine(ctx).Insert(iw); err != nil {
|
|
return err
|
|
}
|
|
} else {
|
|
iw.IsWatching = isWatching
|
|
|
|
if _, err := db.GetEngine(ctx).ID(iw.ID).Cols("is_watching", "updated_unix").Update(iw); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// GetIssueWatch returns all IssueWatch objects from db by user and issue
|
|
// the current Web-UI need iw object for watchers AND explicit non-watchers
|
|
func GetIssueWatch(ctx context.Context, userID, issueID int64) (iw *IssueWatch, exists bool, err error) {
|
|
iw = new(IssueWatch)
|
|
exists, err = db.GetEngine(ctx).
|
|
Where("user_id = ?", userID).
|
|
And("issue_id = ?", issueID).
|
|
Get(iw)
|
|
return iw, exists, err
|
|
}
|
|
|
|
// CheckIssueWatch check if a user is watching an issue
|
|
// it takes participants and repo watch into account
|
|
func CheckIssueWatch(ctx context.Context, user *user_model.User, issue *Issue) (bool, error) {
|
|
iw, exist, err := GetIssueWatch(ctx, user.ID, issue.ID)
|
|
if err != nil {
|
|
return false, err
|
|
}
|
|
if exist {
|
|
return iw.IsWatching, nil
|
|
}
|
|
return repo_model.GetWatchSelection(ctx, user.ID, issue.RepoID).Issues || IsUserParticipantsOfIssue(ctx, user, issue), nil
|
|
}
|
|
|
|
// GetIssueWatchersIDs returns IDs of subscribers or explicit unsubscribers to a given issue id
|
|
// but avoids joining with `user` for performance reasons
|
|
// User permissions must be verified elsewhere if required
|
|
func GetIssueWatchersIDs(ctx context.Context, issueID int64, watching bool) ([]int64, error) {
|
|
ids := make([]int64, 0, 64)
|
|
return ids, db.GetEngine(ctx).Table("issue_watch").
|
|
Where("issue_id=?", issueID).
|
|
And("is_watching = ?", watching).
|
|
Select("user_id").
|
|
Find(&ids)
|
|
}
|
|
|
|
// GetIssueWatchers returns watchers/unwatchers of a given issue
|
|
func GetIssueWatchers(ctx context.Context, issueID int64, listOptions db.ListOptions) (IssueWatchList, error) {
|
|
sess := db.GetEngine(ctx).
|
|
Where("`issue_watch`.issue_id = ?", issueID).
|
|
And("`issue_watch`.is_watching = ?", true).
|
|
And("`user`.is_active = ?", true).
|
|
And("`user`.prohibit_login = ?", false).
|
|
Join("INNER", "`user`", "`user`.id = `issue_watch`.user_id")
|
|
|
|
if listOptions.Page > 0 {
|
|
sess = db.SetSessionPagination(sess, &listOptions)
|
|
watches := make([]*IssueWatch, 0, listOptions.PageSize)
|
|
return watches, sess.Find(&watches)
|
|
}
|
|
watches := make([]*IssueWatch, 0, 8)
|
|
return watches, sess.Find(&watches)
|
|
}
|
|
|
|
// CountIssueWatchers count watchers/unwatchers of a given issue
|
|
func CountIssueWatchers(ctx context.Context, issueID int64) (int64, error) {
|
|
return db.GetEngine(ctx).
|
|
Where("`issue_watch`.issue_id = ?", issueID).
|
|
And("`issue_watch`.is_watching = ?", true).
|
|
And("`user`.is_active = ?", true).
|
|
And("`user`.prohibit_login = ?", false).
|
|
Join("INNER", "`user`", "`user`.id = `issue_watch`.user_id").Count(new(IssueWatch))
|
|
}
|
|
|
|
// RemoveIssueWatchersByRepoID remove issue watchers by repoID
|
|
func RemoveIssueWatchersByRepoID(ctx context.Context, userID, repoID int64) error {
|
|
_, err := db.GetEngine(ctx).
|
|
Join("INNER", "issue", "`issue`.id = `issue_watch`.issue_id AND `issue`.repo_id = ?", repoID).
|
|
Where("`issue_watch`.user_id = ?", userID).
|
|
Delete(new(IssueWatch))
|
|
return err
|
|
}
|