external/aurweb
0
0
Fork 0
mirror of https://gitlab.archlinux.org/archlinux/aurweb.git synced 2025-02-03 10:43:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Exclude suspended Users from being notified

Browse source 
The existing notify.py script was grabbing entries regardless
of user suspension. This has been modified to only send notifications
to unsuspended users.

This change was written as a solution to
https://bugs.archlinux.org/task/65554.

Signed-off-by: Kevin Morris <kevr.gtalk@gmail.com>
Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>
This commit is contained in:
Kevin Morris 2020-07-15 11:45:54 -07:00 • committed by Lukas Fleischer
parent 7c0e5d5315
commit df3ebfa9e2
1 changed files with 18 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
aurweb/scripts/notify.py
View file

@ -124,7 +124,7 @@ class ResetKeyNotification(Notification):
def __init__(self, conn, uid): def __init__(self, conn, uid):
cur = conn.execute('SELECT UserName, Email, BackupEmail, ' + cur = conn.execute('SELECT UserName, Email, BackupEmail, ' +
'LangPreference, ResetKey ' + 'LangPreference, ResetKey ' +
'FROM Users WHERE ID = ?', [uid]) 'FROM Users WHERE ID = ? AND Suspended = 0', [uid])
self._username, self._to, self._backup, self._lang, self._resetkey = cur.fetchone() self._username, self._to, self._backup, self._lang, self._resetkey = cur.fetchone()
super().__init__() super().__init__()
@ -171,7 +171,8 @@ class CommentNotification(Notification):
'ON PackageNotifications.UserID = Users.ID WHERE ' + 'ON PackageNotifications.UserID = Users.ID WHERE ' +
'Users.CommentNotify = 1 AND ' + 'Users.CommentNotify = 1 AND ' +
'PackageNotifications.UserID != ? AND ' + 'PackageNotifications.UserID != ? AND ' +
'PackageNotifications.PackageBaseID = ?', 'PackageNotifications.PackageBaseID = ? AND ' +
'Users.Suspended = 0',
[uid, pkgbase_id]) [uid, pkgbase_id])
self._recipients = cur.fetchall() self._recipients = cur.fetchall()
cur = conn.execute('SELECT Comments FROM PackageComments WHERE ID = ?', cur = conn.execute('SELECT Comments FROM PackageComments WHERE ID = ?',
@ -218,7 +219,8 @@ class UpdateNotification(Notification):
'ON PackageNotifications.UserID = Users.ID WHERE ' + 'ON PackageNotifications.UserID = Users.ID WHERE ' +
'Users.UpdateNotify = 1 AND ' + 'Users.UpdateNotify = 1 AND ' +
'PackageNotifications.UserID != ? AND ' + 'PackageNotifications.UserID != ? AND ' +
'PackageNotifications.PackageBaseID = ?', 'PackageNotifications.PackageBaseID = ? AND ' +
'Users.Suspended = 0',
[uid, pkgbase_id]) [uid, pkgbase_id])
self._recipients = cur.fetchall() self._recipients = cur.fetchall()
super().__init__() super().__init__()
@ -264,7 +266,8 @@ class FlagNotification(Notification):
'INNER JOIN PackageBases ' + 'INNER JOIN PackageBases ' +
'ON PackageBases.MaintainerUID = Users.ID OR ' + 'ON PackageBases.MaintainerUID = Users.ID OR ' +
'PackageBases.ID = PackageComaintainers.PackageBaseID ' + 'PackageBases.ID = PackageComaintainers.PackageBaseID ' +
'WHERE PackageBases.ID = ?', [pkgbase_id]) 'WHERE PackageBases.ID = ? AND ' +
'Users.Suspended = 0', [pkgbase_id])
self._recipients = cur.fetchall() self._recipients = cur.fetchall()
cur = conn.execute('SELECT FlaggerComment FROM PackageBases WHERE ' + cur = conn.execute('SELECT FlaggerComment FROM PackageBases WHERE ' +
'ID = ?', [pkgbase_id]) 'ID = ?', [pkgbase_id])
@ -302,7 +305,8 @@ class OwnershipEventNotification(Notification):
'ON PackageNotifications.UserID = Users.ID WHERE ' + 'ON PackageNotifications.UserID = Users.ID WHERE ' +
'Users.OwnershipNotify = 1 AND ' + 'Users.OwnershipNotify = 1 AND ' +
'PackageNotifications.UserID != ? AND ' + 'PackageNotifications.UserID != ? AND ' +
'PackageNotifications.PackageBaseID = ?', 'PackageNotifications.PackageBaseID = ? AND ' +
'Users.Suspended = 0',
[uid, pkgbase_id]) [uid, pkgbase_id])
self._recipients = cur.fetchall() self._recipients = cur.fetchall()
cur = conn.execute('SELECT FlaggerComment FROM PackageBases WHERE ' + cur = conn.execute('SELECT FlaggerComment FROM PackageBases WHERE ' +
@ -341,7 +345,7 @@ class ComaintainershipEventNotification(Notification):
def __init__(self, conn, uid, pkgbase_id): def __init__(self, conn, uid, pkgbase_id):
self._pkgbase = pkgbase_from_id(conn, pkgbase_id) self._pkgbase = pkgbase_from_id(conn, pkgbase_id)
cur = conn.execute('SELECT Email, LangPreference FROM Users ' + cur = conn.execute('SELECT Email, LangPreference FROM Users ' +
'WHERE ID = ?', [uid]) 'WHERE ID = ? AND Suspended = 0', [uid])
self._to, self._lang = cur.fetchone() self._to, self._lang = cur.fetchone()
super().__init__() super().__init__()
@ -384,7 +388,8 @@ class DeleteNotification(Notification):
'INNER JOIN PackageNotifications ' + 'INNER JOIN PackageNotifications ' +
'ON PackageNotifications.UserID = Users.ID WHERE ' + 'ON PackageNotifications.UserID = Users.ID WHERE ' +
'PackageNotifications.UserID != ? AND ' + 'PackageNotifications.UserID != ? AND ' +
'PackageNotifications.PackageBaseID = ?', 'PackageNotifications.PackageBaseID = ? AND ' +
'Users.Suspended = 0',
[uid, old_pkgbase_id]) [uid, old_pkgbase_id])
self._recipients = cur.fetchall() self._recipients = cur.fetchall()
super().__init__() super().__init__()
@ -431,7 +436,8 @@ class RequestOpenNotification(Notification):
'INNER JOIN Users ' + 'INNER JOIN Users ' +
'ON Users.ID = PackageRequests.UsersID ' + 'ON Users.ID = PackageRequests.UsersID ' +
'OR Users.ID = PackageBases.MaintainerUID ' + 'OR Users.ID = PackageBases.MaintainerUID ' +
'WHERE PackageRequests.ID = ?', [reqid]) 'WHERE PackageRequests.ID = ? AND ' +
'Users.Suspended = 0', [reqid])
self._to = aurweb.config.get('options', 'aur_request_ml') self._to = aurweb.config.get('options', 'aur_request_ml')
self._cc = [row[0] for row in cur.fetchall()] self._cc = [row[0] for row in cur.fetchall()]
cur = conn.execute('SELECT Comments FROM PackageRequests WHERE ID = ?', cur = conn.execute('SELECT Comments FROM PackageRequests WHERE ID = ?',
@ -485,7 +491,8 @@ class RequestCloseNotification(Notification):
'INNER JOIN Users ' + 'INNER JOIN Users ' +
'ON Users.ID = PackageRequests.UsersID ' + 'ON Users.ID = PackageRequests.UsersID ' +
'OR Users.ID = PackageBases.MaintainerUID ' + 'OR Users.ID = PackageBases.MaintainerUID ' +
'WHERE PackageRequests.ID = ?', [reqid]) 'WHERE PackageRequests.ID = ? AND ' +
'Users.Suspended = 0', [reqid])
self._to = aurweb.config.get('options', 'aur_request_ml') self._to = aurweb.config.get('options', 'aur_request_ml')
self._cc = [row[0] for row in cur.fetchall()] self._cc = [row[0] for row in cur.fetchall()]
cur = conn.execute('SELECT PackageRequests.ClosureComment, ' + cur = conn.execute('SELECT PackageRequests.ClosureComment, ' +
@ -541,7 +548,8 @@ class TUVoteReminderNotification(Notification):
cur = conn.execute('SELECT Email, LangPreference FROM Users ' + cur = conn.execute('SELECT Email, LangPreference FROM Users ' +
'WHERE AccountTypeID IN (2, 4) AND ID NOT IN ' + 'WHERE AccountTypeID IN (2, 4) AND ID NOT IN ' +
'(SELECT UserID FROM TU_Votes ' + '(SELECT UserID FROM TU_Votes ' +
'WHERE TU_Votes.VoteID = ?)', [vote_id]) 'WHERE TU_Votes.VoteID = ?) AND ' +
'Users.Suspended = 0', [vote_id])
self._recipients = cur.fetchall() self._recipients = cur.fetchall()
super().__init__() super().__init__()