mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2026-07-24 18:38:42 +00:00
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: https://codeberg.org/forgejo/forgejo/pulls/10927 Reviewed-by: Gusted <gusted@noreply.codeberg.org>
113 lines
4.6 KiB
Go
113 lines
4.6 KiB
Go
// Copyright 2025 The Forgejo Authors. All rights reserved.
|
|
// SPDX-License-Identifier: GPL-3.0-or-later
|
|
|
|
package forgejo_migrations
|
|
|
|
import (
|
|
"code.forgejo.org/xorm/xorm"
|
|
)
|
|
|
|
type WatchSource bool
|
|
|
|
const (
|
|
// WatchSourceExplicit means the user explicitly chose to watch certain things (or none or all) of this repo.
|
|
// It means that setting.Service.AutoWatchOnChanges doesn't have an effect on this user for this repo; they explicitly made their choice after all.
|
|
// This mode replaces the old WatchModeDont and WatchModeNormal states.
|
|
WatchSourceExplicit WatchSource = false
|
|
// WatchSourceAutomatic means the user didn't explicitly select whether to watch this repo or not.
|
|
// Instead, the user either doesn't watch the repo because they didn't ever click the watch/unwatch button.
|
|
// Or they do watch the repo but only because the user pushed to the repo and setting.Service.AutoWatchOnChanges is true.
|
|
// When there is no record in the db this is the same as WatchSourceAutomatic combined with all watch selections turned off (i.e., not watching anything).
|
|
// This used to be WatchModeNone.
|
|
// When in this mode the watch selection is never fully deselected.
|
|
// Otherwise there'd be some automatic method to unwatch a repo; which does not exist.
|
|
// This mode replaces the old WatchModeAuto and WatchModeNone states.
|
|
WatchSourceAutomatic WatchSource = true
|
|
|
|
// There may not be more modes than the above two.
|
|
// I intend this to be a single bit.
|
|
)
|
|
|
|
func init() {
|
|
registerMigration(&Migration{
|
|
Description: "Add granular watch settings to repos.",
|
|
Upgrade: addGranularWatchColumnsAndDropModeColumn,
|
|
})
|
|
}
|
|
|
|
func addGranularWatchColumnsAndDropModeColumn(x *xorm.Engine) error {
|
|
type Watch struct {
|
|
Source WatchSource `xorm:"BOOL DEFAULT TRUE"`
|
|
WatchSelectionIssues bool `xorm:"BOOL DEFAULT TRUE"`
|
|
WatchSelectionPullRequests bool `xorm:"BOOL DEFAULT TRUE"`
|
|
WatchSelectionReleases bool `xorm:"BOOL DEFAULT TRUE"`
|
|
}
|
|
|
|
_, err := x.SyncWithOptions(xorm.SyncOptions{IgnoreDropIndices: true}, new(Watch))
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
// copy of old code //
|
|
type WatchMode uint8
|
|
const (
|
|
// WatchModeNone don't watch
|
|
// This means there is no Watch record in the db.
|
|
// We never store this mode in the db and instead remove the record from the db.
|
|
// Furthermore, this means there is a WatchMode for all combinations of user and repo.
|
|
// We never go back to this state once we've been in a different state.
|
|
WatchModeNone WatchMode = iota // 0
|
|
// WatchModeNormal watch repository (from other sources)
|
|
// This means the user explicitly chose to watch the repo.
|
|
WatchModeNormal // 1
|
|
// WatchModeDont explicit don't auto-watch
|
|
// This means the user explicitly removed themselves as a watcher.
|
|
// Then the AutoWatchOnChanges feature doesn't make the user a watcher when they push to the repo.
|
|
WatchModeDont // 2
|
|
// WatchModeAuto watch repository (from AutoWatchOnChanges)
|
|
// This is used when the user pushed to the repo and setting.Service.AutoWatchOnChanges is true.
|
|
// That way we can differentiate people explicitly watching the repo and people only watching it because of the AutoWatchOnChanges feature.
|
|
WatchModeAuto // 3
|
|
)
|
|
// end copy of old code //
|
|
|
|
_, err = x.Exec("UPDATE `watch` SET source = ? WHERE mode IN (?, ?)", WatchSourceAutomatic, WatchModeNone, WatchModeAuto)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
_, err = x.Exec("UPDATE `watch` SET source = ? WHERE mode IN (?, ?)", WatchSourceExplicit, WatchModeNormal, WatchModeDont)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
_, err = x.Exec("UPDATE `watch` SET watch_selection_issues = ? WHERE mode = ? OR mode = ?", false, WatchModeNone, WatchModeDont)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
_, err = x.Exec("UPDATE `watch` SET watch_selection_pull_requests = ? WHERE mode = ? OR mode = ?", false, WatchModeNone, WatchModeDont)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
_, err = x.Exec("UPDATE `watch` SET watch_selection_releases = ? WHERE mode = ? OR mode = ?", false, WatchModeNone, WatchModeDont)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
_, err = x.Exec("UPDATE `watch` SET watch_selection_issues = ? WHERE mode = ? OR mode = ?", true, WatchModeNormal, WatchModeAuto)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
_, err = x.Exec("UPDATE `watch` SET watch_selection_pull_requests = ? WHERE mode = ? OR mode = ?", true, WatchModeNormal, WatchModeAuto)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
_, err = x.Exec("UPDATE `watch` SET watch_selection_releases = ? WHERE mode = ? OR mode = ?", true, WatchModeNormal, WatchModeAuto)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
_, err = x.Exec("ALTER TABLE watch DROP COLUMN `mode`")
|
|
if err != nil {
|
|
return err
|
|
}
|
|
return nil
|
|
}
|