diff options
| author | David Schneiderbauer <daviian@users.noreply.github.com> | 2017-09-16 02:18:25 +0200 |
|---|---|---|
| committer | Lunny Xiao <xiaolunwen@gmail.com> | 2017-09-16 08:18:25 +0800 |
| commit | d766d0c4e064bf7f66098123f39d15c2dc67e415 (patch) | |
| tree | 274eebecadd724502dd5c82e95f2f6f4cc4d6d34 /models/issue_watch.go | |
| parent | b496e3e1cc70829e5a6f78f3dff28277993f8406 (diff) | |
| download | gitea-d766d0c4e064bf7f66098123f39d15c2dc67e415.tar.gz gitea-d766d0c4e064bf7f66098123f39d15c2dc67e415.zip | |
Prevent sending emails and notifications to inactive users (#2384)
* Filter inactive users before sending emails or creating browser notifications
Signed-off-by: David Schneiderbauer <dschneiderbauer@gmail.com>
* fix formatting issues
Signed-off-by: David Schneiderbauer <dschneiderbauer@gmail.com>
* included requested changes
Signed-off-by: David Schneiderbauer <dschneiderbauer@gmail.com>
* optimized database queries
* rebasing new master and add tablenames for clarification in xorm queries
* remove escaped quotationmarks using backticks
Signed-off-by: David Schneiderbauer <dschneiderbauer@gmail.com>
Diffstat (limited to 'models/issue_watch.go')
| -rw-r--r-- | models/issue_watch.go | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/models/issue_watch.go b/models/issue_watch.go index 37511787e5..994ae5a97f 100644 --- a/models/issue_watch.go +++ b/models/issue_watch.go @@ -90,7 +90,10 @@ func GetIssueWatchers(issueID int64) ([]*IssueWatch, error) { func getIssueWatchers(e Engine, issueID int64) (watches []*IssueWatch, err error) { err = e. - Where("issue_id = ?", issueID). + Where("`issue_watch`.issue_id = ?", issueID). + And("`user`.is_active = ?", true). + And("`user`.prohibit_login = ?", false). + Join("INNER", "user", "`user`.id = `issue_watch`.user_id"). Find(&watches) return } |