February 2016 - Aur-dev - lists.archlinux.org

[aur-dev] [PATCH] Send notifications when changing ownership
by Lukas Fleischer 21 Feb '16

21 Feb '16

Add a new option that makes it possible to subscribe to package ownership changes (adoption/disownment). Fixes FS#15412. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- scripts/notify.py | 44 ++++++++++++++++++++++++++++++++++++++ upgrading/4.3.0.txt | 5 +++++ web/lib/acctfuncs.inc.php | 7 ++++-- web/lib/pkgbasefuncs.inc.php | 8 ++++++- web/template/account_edit_form.php | 4 ++++ 5 files changed, 65 insertions(+), 3 deletions(-) create mode 100644 upgrading/4.3.0.txt diff --git a/scripts/notify.py b/scripts/notify.py index 25102a2..5e5f377 100755 --- a/scripts/notify.py +++ b/scripts/notify.py @@ -115,6 +115,16 @@ def get_update_recipients(cur, pkgbase_id, uid): return [row[0] for row in cur.fetchall()] +def get_ownership_recipients(cur, pkgbase_id, uid): + cur.execute('SELECT DISTINCT Users.Email FROM Users ' + + 'INNER JOIN PackageNotifications ' + + 'ON PackageNotifications.UserID = Users.ID WHERE ' + + 'Users.OwnershipNotify = 1 AND ' + + 'PackageNotifications.UserID != %s AND ' + + 'PackageNotifications.PackageBaseID = %s', [uid, pkgbase_id]) + return [row[0] for row in cur.fetchall()] + + def get_request_recipients(cur, reqid): cur.execute('SELECT DISTINCT Users.Email FROM PackageRequests ' + 'INNER JOIN PackageBases ' + @@ -243,6 +253,38 @@ def flag(cur, uid, pkgbase_id): send_notification(to, subject, body, refs) +def adopt(cur, pkgbase_id, uid): + user = username_from_id(cur, uid) + pkgbase = pkgbase_from_id(cur, pkgbase_id) + to = get_ownership_recipients(cur, pkgbase_id, uid) + + user_uri = aur_location + '/account/' + user + '/' + pkgbase_uri = aur_location + '/pkgbase/' + pkgbase + '/' + + subject = 'AUR Ownership Notification for %s' % (pkgbase) + body = 'The package %s [1] was adopted by %s [2].' % (pkgbase, user) + refs = '[1] ' + pkgbase_uri + '\n' + refs += '[2] ' + user_uri + + send_notification(to, subject, body, refs) + + +def disown(cur, pkgbase_id, uid): + user = username_from_id(cur, uid) + pkgbase = pkgbase_from_id(cur, pkgbase_id) + to = get_ownership_recipients(cur, pkgbase_id, uid) + + user_uri = aur_location + '/account/' + user + '/' + pkgbase_uri = aur_location + '/pkgbase/' + pkgbase + '/' + + subject = 'AUR Ownership Notification for %s' % (pkgbase) + body = 'The package %s [1] was disowned by %s [2].' % (pkgbase, user) + refs = '[1] ' + pkgbase_uri + '\n' + refs += '[2] ' + user_uri + + send_notification(to, subject, body, refs) + + def comaintainer_add(cur, pkgbase_id, uid): pkgbase = pkgbase_from_id(cur, pkgbase_id) to = [get_user_email(cur, uid)] @@ -364,6 +406,8 @@ if __name__ == '__main__': 'comment': comment, 'update': update, 'flag': flag, + 'adopt': adopt, + 'disown': disown, 'comaintainer-add': comaintainer_add, 'comaintainer-remove': comaintainer_remove, 'delete': delete, diff --git a/upgrading/4.3.0.txt b/upgrading/4.3.0.txt new file mode 100644 index 0000000..0d3a9b7 --- /dev/null +++ b/upgrading/4.3.0.txt @@ -0,0 +1,5 @@ +1. Add a column to store ownership notification settings: + +---- +ALTER TABLE Users ADD COLUMN OwnershipNotify TINYINT(1) NOT NULL DEFAULT 1; +---- diff --git a/web/lib/acctfuncs.inc.php b/web/lib/acctfuncs.inc.php index b39420f..be0981f 100644 --- a/web/lib/acctfuncs.inc.php +++ b/web/lib/acctfuncs.inc.php @@ -58,13 +58,14 @@ function html_format_pgp_fingerprint($fingerprint) { * @param string $J The inactivity status of the displayed user * @param string $CN Whether to notify of new comments * @param string $UN Whether to notify of package updates + * @param string $ON Whether to notify of ownership changes * @param string $UID The user ID of the displayed user * @param string $N The username as present in the database * * @return void */ function display_account_form($A,$U="",$T="",$S="",$E="",$H="",$P="",$C="",$R="", - $L="",$I="",$K="",$PK="",$J="",$CN="",$UN="",$UID=0,$N="") { + $L="",$I="",$K="",$PK="",$J="",$CN="",$UN="",$ON="",$UID=0,$N="") { global $SUPPORTED_LANGS; include("account_edit_form.php"); @@ -92,13 +93,14 @@ function display_account_form($A,$U="",$T="",$S="",$E="",$H="",$P="",$C="",$R="" * @param string $J The inactivity status of the user * @param string $CN Whether to notify of new comments * @param string $UN Whether to notify of package updates + * @param string $ON Whether to notify of ownership changes * @param string $UID The user ID of the modified account * @param string $N The username as present in the database * * @return array Boolean indicating success and message to be printed */ function process_account_form($TYPE,$A,$U="",$T="",$S="",$E="",$H="",$P="",$C="", - $R="",$L="",$I="",$K="",$PK="",$J="",$CN="",$UN="",$UID=0,$N="") { + $R="",$L="",$I="",$K="",$PK="",$J="",$CN="",$UN="",$ON="",$UID=0,$N="") { global $SUPPORTED_LANGS; $error = ''; @@ -347,6 +349,7 @@ function process_account_form($TYPE,$A,$U="",$T="",$S="",$E="",$H="",$P="",$C="" $q.= ", InactivityTS = " . $inactivity_ts; $q.= ", CommentNotify = " . ($CN ? "1" : "0"); $q.= ", UpdateNotify = " . ($UN ? "1" : "0"); + $q.= ", OwnershipNotify = " . ($ON ? "1" : "0"); $q.= " WHERE ID = ".intval($UID); $result = $dbh->exec($q); diff --git a/web/lib/pkgbasefuncs.inc.php b/web/lib/pkgbasefuncs.inc.php index 1691bff..5d10cce 100644 --- a/web/lib/pkgbasefuncs.inc.php +++ b/web/lib/pkgbasefuncs.inc.php @@ -661,6 +661,9 @@ function pkgbase_adopt ($base_ids, $action=true, $via) { $q.= "SET MaintainerUID = $uid "; $q.= "WHERE ID IN (" . implode(",", $base_ids) . ") "; $dbh->exec($q); + + /* Add the new maintainer to the notification list. */ + pkgbase_notify($base_ids); } else { /* Update the co-maintainer list when disowning a package. */ if (has_credential(CRED_PKGBASE_DISOWN)) { @@ -692,8 +695,11 @@ function pkgbase_adopt ($base_ids, $action=true, $via) { } } + foreach ($base_ids as $base_id) { + notify(array($action ? 'adopt' : 'disown', $base_id, $uid)); + } + if ($action) { - pkgbase_notify($base_ids); return array(true, __("The selected packages have been adopted.")); } else { return array(true, __("The selected packages have been disowned.")); diff --git a/web/template/account_edit_form.php b/web/template/account_edit_form.php index b9affd6..b4f0192 100644 --- a/web/template/account_edit_form.php +++ b/web/template/account_edit_form.php @@ -143,6 +143,10 @@ <label for="id_updatenotify"><?= __("Notify of package updates") ?>:</label> <input type="checkbox" name="UN" id="id_updatenotify" <?= $UN ? 'checked="checked"' : '' ?> /> </p> + <p> + <label for="id_ownershipnotify"><?= __("Notify of ownership changes") ?>:</label> + <input type="checkbox" name="ON" id="id_ownershipnotify" <?= $ON ? 'checked="checked"' : '' ?> /> + </p> </fieldset> <fieldset> -- 2.7.1

1 0

[aur-dev] [PATCH] Unset $pinned unconditionally when displaying comments
by Mark Weiman 19 Feb '16

19 Feb '16

Signed-off-by: Mark Weiman <mark.weiman(a)markzz.com> --- web/lib/pkgbasefuncs.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/lib/pkgbasefuncs.inc.php b/web/lib/pkgbasefuncs.inc.php index c0e672a..1691bff 100644 --- a/web/lib/pkgbasefuncs.inc.php +++ b/web/lib/pkgbasefuncs.inc.php @@ -252,8 +252,8 @@ function pkgbase_display_details($base_id, $row, $SID="") { $pinned = pkgbase_comments($base_id, $limit_pinned, false, true); if (!empty($pinned)) { include('pkg_comments.php'); - unset($pinned); } + unset($pinned); $limit = isset($_GET['comments']) ? 0 : 10; $comments = pkgbase_comments($base_id, $limit, $include_deleted); -- 2.7.1

2 3

[aur-dev] [PATCH 1/3] notify: Reintroduce Message-ID again
by Lukas Fleischer 18 Feb '16

18 Feb '16

In commit 7b57e0e (Set Message-ID when sending package request emails, 2014-07-01), we changed the code responsible for sending notifications such that the value of the Message-ID header is set deterministically in the first email referring to a request. Unfortunately, this was forgotten when porting the notification routines to Python in 9746a65 (Port notification routines to Python, 2015-06-27) and later fixed by 092e00f (notify: Fix references in request notifications, 2015-10-10). However, when fixing another bug, the old behavior of not setting a Message-ID was restored by d87b138 (notify: Fix merging of header dicts, 2015-10-26). Revert that particular change once more and add a comment such that the line gets extra attention, should it be changed in the future. Fixes FS#48239. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- scripts/notify.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/notify.py b/scripts/notify.py index 56534ae..2dd8805 100755 --- a/scripts/notify.py +++ b/scripts/notify.py @@ -324,7 +324,8 @@ def request_open(cur, uid, reqid, reqtype, pkgbase_id, merge_into=None): refs = '[1] ' + user_uri + '\n' refs += '[2] ' + pkgbase_uri + '\n' thread_id = '<pkg-request-' + reqid + '@aur.archlinux.org>' - headers = headers_reply(thread_id) + # Use a deterministic Message-ID for the first email referencing a request. + headers = headers_msgid(thread_id) headers.update(headers_cc(cc)) send_notification(to, subject, body, refs, headers) -- 2.7.1

1 2

[aur-dev] aurweb 4.2.0 released
by Lukas Fleischer 15 Feb '16

15 Feb '16

Dear aurweb contributors and users, We are pleased to announce aurweb 4.2.0. The official aurweb setup [1] has already been upgraded. Even though this is only a minor release, the list of new features is longer than usual, which is mostly because we started working on various different requests that have been lying around for a long time. I divided the changes into four categories: * Package Handling: Providers from the official repositories are now recognized and broken dependencies are highlighted in the web interface (note that this particular feature already went live [1] a while ago, even though it was not part of any official release yet). As an alternative to using the web interface, it is possible to change package base keywords via SSH (check `ssh aur(a)aur.archlinux.org help` for details) and we switched to python-srcinfo for parsing package metadata (thanks to Johannes Löthberg for starting this project and for providing aurweb patches). * Notifications: Users are now notified when they are added to (resp. removed from) the co-maintainer list of a repository. You can optionally subscribe to package update notifications from the new notification settings area on the account edit page. * Comments: Package base comments can be pinned (thanks to Mark Weiman for implementing this) and Trusted Users as well as developers can undelete comments that were removed earlier (thanks to Marcel Korpel). * RPC: There was a complete overhaul of the RPC interface (now at v5). The documentation can be found at [2]. For a comprehensive list of changes, please consult the Git log [3]. As usual, bugs should be reported to the aurweb bug tracker [4]. [1] https://aur.archlinux.org/ [2] https://aur.archlinux.org/rpc/ [3] https://projects.archlinux.org/aurweb.git/log/?id=v4.2.0 [4] https://bugs.archlinux.org/index.php?project=2

2 1

[aur-dev] [PATCH] Add an example post-checkout hook
by Lukas Fleischer 11 Feb '16

11 Feb '16

Add a shell script that rebuild the documentation and install translations. Can be executed manually or used as a post-checkout hook in Git. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- upgrading/post-checkout | 4 ++++ 1 file changed, 4 insertions(+) create mode 100755 upgrading/post-checkout diff --git a/upgrading/post-checkout b/upgrading/post-checkout new file mode 100755 index 0000000..7ad41cf --- /dev/null +++ b/upgrading/post-checkout @@ -0,0 +1,4 @@ +#!/bin/sh + +( cd doc/ && make ) +( cd po/ && make && make install ) -- 2.7.1

1 0

[aur-dev] 4.2.0 string freeze
by Lukas Fleischer 10 Feb '16

10 Feb '16

Dear translators, Some of you might already have noticed that I updated the aur.pot resource on Transifex a couple of hours ago. It now contains the final message catalog for 4.2.0. The release is scheduled for this Monday, February 15th. Thank you, everybody, for your contributions! Regards, Lukas

1 0

[aur-dev] [PATCH] aurjson: Add package base keywords
by Lukas Fleischer 09 Feb '16

09 Feb '16

Expose package base keywords through the RPC interface (version 5). Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- web/lib/aurjson.class.php | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/web/lib/aurjson.class.php b/web/lib/aurjson.class.php index 51a7c64..7f9b5f2 100644 --- a/web/lib/aurjson.class.php +++ b/web/lib/aurjson.class.php @@ -175,10 +175,11 @@ class AurJSON { * Get extended package details (for info and multiinfo queries). * * @param $pkgid The ID of the package to retrieve details for. + * @param $base_id The ID of the package base to retrieve details for. * * @return array An array containing package details. */ - private function get_extended_fields($pkgid) { + private function get_extended_fields($pkgid, $base_id) { $query = "SELECT DependencyTypes.Name AS Type, " . "PackageDepends.DepName AS Name, " . "PackageDepends.DepCondition AS Cond " . @@ -224,6 +225,19 @@ class AurJSON { $data[$type][] = $row['Name'] . $row['Cond']; } + if ($this->version >= 5) { + $query = "SELECT Keyword FROM PackageKeywords " . + "WHERE PackageBaseID = " . intval($base_id) . " " . + "ORDER BY Keyword ASC"; + $result = $this->dbh->query($query); + + if (!$result) { + return null; + } + + $data['Keywords'] = $result->fetchAll(PDO::FETCH_COLUMN, 0); + } + return $data; } @@ -300,7 +314,7 @@ class AurJSON { } if ($this->version >= 2 && ($type == 'info' || $type == 'multiinfo')) { - $row = array_merge($row, $this->get_extended_fields($row['ID'])); + $row = array_merge($row, $this->get_extended_fields($row['ID'], $row['PackageBaseID'])); } if ($this->version < 3) { -- 2.7.1

1 0

[aur-dev] [PATCH] git-serve: Change syntax for setting keywords
by Lukas Fleischer 09 Feb '16

09 Feb '16

Instead of `config <pkgbase> keywords <keyword1> <keyword2>...`, the new syntax is `set-keywords <pkgbase> <keyword1> <keyword2>...`. The `config` keyword was rather general and it was not obvious that it could be used to change package base settings. Instead of replacing it with an even more verbose expression, remove that unnecessary level of indirection. Since we do not (and probably never will) support keywords anywhere else, the chance of name conflicts is small. Suggested-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- git-interface/git-serve.py | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/git-interface/git-serve.py b/git-interface/git-serve.py index ff389d2..35c6b3a 100755 --- a/git-interface/git-serve.py +++ b/git-interface/git-serve.py @@ -88,7 +88,7 @@ def create_pkgbase(pkgbase, user): db.close() -def pkgbase_config_keywords(pkgbase, keywords): +def pkgbase_set_keywords(pkgbase, keywords): pkgbase_id = pkgbase_from_name(pkgbase) if not pkgbase_id: die('{:s}: package base not found: {:s}'.format(action, pkgbase)) @@ -173,17 +173,10 @@ if action == 'git-upload-pack' or action == 'git-receive-pack': os.environ["GIT_NAMESPACE"] = pkgbase cmd = action + " '" + repo_path + "'" os.execl(git_shell_cmd, git_shell_cmd, '-c', cmd) -elif action == 'config': +elif action == 'set-keywords': if len(cmdargv) < 2: die_with_help("{:s}: missing repository name".format(action)) - if len(cmdargv) < 3: - die_with_help("{:s}: missing option name".format(action)) - pkgbase = cmdargv[1] - option = cmdargv[2] - - if option == 'keywords': - pkgbase_config_keywords(pkgbase, cmdargv[3:]) - + pkgbase_set_keywords(cmdargv[1], cmdargv[2:]) elif action == 'list-repos': if len(cmdargv) > 1: die_with_help("{:s}: too many arguments".format(action)) @@ -213,12 +206,12 @@ elif action == 'restore': os.execl(git_update_cmd, git_update_cmd, 'restore') elif action == 'help': die("Commands:\n" + - " config <name> <param>... Change package base settings.\n" + - " help Show this help message and exit.\n" + - " list-repos List all your repositories.\n" + - " restore <name> Restore a deleted package base.\n" + - " setup-repo <name> Create an empty repository.\n" + - " git-receive-pack Internal command used with Git.\n" + - " git-upload-pack Internal command used with Git.") + " help Show this help message and exit.\n" + + " list-repos List all your repositories.\n" + + " restore <name> Restore a deleted package base.\n" + + " set-keywords <name> [...] Change package base keywords.\n" + + " setup-repo <name> Create an empty repository.\n" + + " git-receive-pack Internal command used with Git.\n" + + " git-upload-pack Internal command used with Git.") else: die_with_help("invalid command: {:s}".format(action)) -- 2.7.1

1 0

[aur-dev] SSH interface for modifying package metadata
by Lukas Fleischer 07 Feb '16

07 Feb '16

Hi, aurweb 4.2.0 will be released soon and one of its new features is an SSH command to modify package metadata. Currently, only changing keywords is supported and the syntax (in master) looks as follows: $ ssh aur(a)aur.archlinux.org config <pkgbase> keywords [...] One of my concerns with that syntax is that "config" might be a bit too general. For example, we might want to add commands to change account settings later. Since it is not part of any public interface yet, this is the right (and only) time to decide on proper naming. Other suggestions: $ ssh aur(a)aur.archlinux.org modify <pkgbase> keywords [...] $ ssh aur(a)aur.archlinux.org set <pkgbase> keywords [...] $ ssh aur(a)aur.archlinux.org pkg-config <pkgbase> keywords [...] $ ssh aur(a)aur.archlinux.org pkg-modify <pkgbase> keywords [...] $ ssh aur(a)aur.archlinux.org pkg-set <pkgbase> keywords [...] $ ssh aur(a)aur.archlinux.org pkgbase-config <pkgbase> keywords [...] $ ssh aur(a)aur.archlinux.org pkgbase-modify <pkgbase> keywords [...] $ ssh aur(a)aur.archlinux.org pkgbase-set <pkgbase> keywords [...] $ ssh aur(a)aur.archlinux.org pkg <pkgbase> config keywords [...] $ ssh aur(a)aur.archlinux.org pkg <pkgbase> modify keywords [...] $ ssh aur(a)aur.archlinux.org pkg <pkgbase> set keywords [...] $ ssh aur(a)aur.archlinux.org pkg <pkgbase> set-keywords [...] $ ssh aur(a)aur.archlinux.org pkgbase <pkgbase> config keywords [...] $ ssh aur(a)aur.archlinux.org pkgbase <pkgbase> modify keywords [...] $ ssh aur(a)aur.archlinux.org pkgbase <pkgbase> set keywords [...] $ ssh aur(a)aur.archlinux.org pkgbase <pkgbase> set-keywords [...] The first two options also have the disadvantage that they are quite general. The options including "pkg" (but not "pkgbase") do not have that problem but they are a bit misleading since those operations are performed on package bases, not packages (and they require package base names, not package names). The options including "pkgbase" describe the semantics very well but they are quite complex and verbose. I would really like to hear about your opinions/preferences. Regards, Lukas

4 4

[aur-dev] [PATCH 1/3] Rename the CommentNotify table to PackageNotifications
by Lukas Fleischer 07 Feb '16

07 Feb '16

As a preparatory step to adding support for package notifications on events other than comments, rename the database table accordingly. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- git-interface/git-serve.py | 2 +- git-interface/git-update.py | 4 ++-- schema/aur-schema.sql | 6 +++--- scripts/notify.py | 8 ++++---- upgrading/4.2.0.txt | 6 ++++++ web/lib/acctfuncs.inc.php | 2 +- web/lib/pkgbasefuncs.inc.php | 14 +++++++------- web/lib/pkgfuncs.inc.php | 6 +++--- 8 files changed, 27 insertions(+), 21 deletions(-) diff --git a/git-interface/git-serve.py b/git-interface/git-serve.py index 8581590..ff389d2 100755 --- a/git-interface/git-serve.py +++ b/git-interface/git-serve.py @@ -81,7 +81,7 @@ def create_pkgbase(pkgbase, user): "UNIX_TIMESTAMP(), %s, %s)", [pkgbase, userid, userid]) pkgbase_id = cur.lastrowid - cur.execute("INSERT INTO CommentNotify (PackageBaseID, UserID) " + + cur.execute("INSERT INTO PackageNotifications (PackageBaseID, UserID) " + "VALUES (%s, %s)", [pkgbase_id, userid]) db.commit() diff --git a/git-interface/git-update.py b/git-interface/git-update.py index a4a8d8d..3b587b3 100755 --- a/git-interface/git-update.py +++ b/git-interface/git-update.py @@ -160,11 +160,11 @@ def save_metadata(metadata, db, cur, user): # Add user to notification list on adoption. if was_orphan: - cur.execute("SELECT COUNT(*) FROM CommentNotify WHERE " + + cur.execute("SELECT COUNT(*) FROM PackageNotifications WHERE " + "PackageBaseID = %s AND UserID = %s", [pkgbase_id, user_id]) if cur.fetchone()[0] == 0: - cur.execute("INSERT INTO CommentNotify (PackageBaseID, UserID) " + + cur.execute("INSERT INTO PackageNotifications (PackageBaseID, UserID) " + "VALUES (%s, %s)", [pkgbase_id, user_id]) db.commit() diff --git a/schema/aur-schema.sql b/schema/aur-schema.sql index 9645e13..543f025 100644 --- a/schema/aur-schema.sql +++ b/schema/aur-schema.sql @@ -284,15 +284,15 @@ CREATE TABLE PackageComaintainers ( FOREIGN KEY (PackageBaseID) REFERENCES PackageBases(ID) ON DELETE CASCADE ) ENGINE = InnoDB; --- Comment addition notifications +-- Package base notifications -- -CREATE TABLE CommentNotify ( +CREATE TABLE PackageNotifications ( PackageBaseID INTEGER UNSIGNED NOT NULL, UserID INTEGER UNSIGNED NOT NULL, FOREIGN KEY (PackageBaseID) REFERENCES PackageBases(ID) ON DELETE CASCADE, FOREIGN KEY (UserID) REFERENCES Users(ID) ON DELETE CASCADE ) ENGINE = InnoDB; -CREATE UNIQUE INDEX NotifyUserIDPkgID ON CommentNotify (UserID, PackageBaseID); +CREATE UNIQUE INDEX NotifyUserIDPkgID ON PackageNotifications (UserID, PackageBaseID); -- Package name blacklist -- diff --git a/scripts/notify.py b/scripts/notify.py index 7b10efb..08cdda8 100755 --- a/scripts/notify.py +++ b/scripts/notify.py @@ -88,10 +88,10 @@ def get_maintainer_email(cur, pkgbase_id): def get_recipients(cur, pkgbase_id, uid): cur.execute('SELECT DISTINCT Users.Email FROM Users ' + - 'INNER JOIN CommentNotify ' + - 'ON CommentNotify.UserID = Users.ID WHERE ' + - 'CommentNotify.UserID != %s AND ' + - 'CommentNotify.PackageBaseID = %s', [uid, pkgbase_id]) + 'INNER JOIN PackageNotifications ' + + 'ON PackageNotifications.UserID = Users.ID WHERE ' + + 'PackageNotifications.UserID != %s AND ' + + 'PackageNotifications.PackageBaseID = %s', [uid, pkgbase_id]) return [row[0] for row in cur.fetchall()] diff --git a/upgrading/4.2.0.txt b/upgrading/4.2.0.txt index c43c6e7..7d404b3 100644 --- a/upgrading/4.2.0.txt +++ b/upgrading/4.2.0.txt @@ -41,3 +41,9 @@ ALTER TABLE PackageRequests ADD COLUMN ClosureComment TEXT NOT NULL DEFAULT ''; ---- ALTER TABLE PackageBases MODIFY COLUMN FlaggerComment TEXT NOT NULL DEFAULT ''; ---- + +7. Rename the CommentNotify table to PackageNotifications: + +---- +ALTER TABLE CommentNotify RENAME TO PackageNotifications; +---- diff --git a/web/lib/acctfuncs.inc.php b/web/lib/acctfuncs.inc.php index 6fb2b40..0c6388a 100644 --- a/web/lib/acctfuncs.inc.php +++ b/web/lib/acctfuncs.inc.php @@ -897,7 +897,7 @@ function user_delete($id) { $fields_delete = array( array("Sessions", "UsersID"), array("PackageVotes", "UsersID"), - array("CommentNotify", "UsersID") + array("PackageNotifications", "UsersID") ); $fields_set_null = array( diff --git a/web/lib/pkgbasefuncs.inc.php b/web/lib/pkgbasefuncs.inc.php index 20f5bb4..c0e672a 100644 --- a/web/lib/pkgbasefuncs.inc.php +++ b/web/lib/pkgbasefuncs.inc.php @@ -542,15 +542,15 @@ function pkgbase_delete ($base_ids, $merge_base_id, $via, $grant=false) { $dbh->exec($q); /* Merge notifications */ - $q = "SELECT DISTINCT UserID FROM CommentNotify cn "; + $q = "SELECT DISTINCT UserID FROM PackageNotifications cn "; $q.= "WHERE PackageBaseID IN (" . implode(",", $base_ids) . ") "; - $q.= "AND NOT EXISTS (SELECT * FROM CommentNotify cn2 "; + $q.= "AND NOT EXISTS (SELECT * FROM PackageNotifications cn2 "; $q.= "WHERE cn2.PackageBaseID = " . intval($merge_base_id) . " "; $q.= "AND cn2.UserID = cn.UserID)"; $result = $dbh->query($q); while ($notify_uid = $result->fetch(PDO::FETCH_COLUMN, 0)) { - $q = "INSERT INTO CommentNotify (UserID, PackageBaseID) "; + $q = "INSERT INTO PackageNotifications (UserID, PackageBaseID) "; $q.= "VALUES (" . intval($notify_uid) . ", " . intval($merge_base_id) . ")"; $dbh->exec($q); } @@ -840,7 +840,7 @@ function pkgbase_user_voted($uid, $base_id) { function pkgbase_user_notify($uid, $base_id) { $dbh = DB::connect(); - $q = "SELECT * FROM CommentNotify WHERE UserID = " . $dbh->quote($uid); + $q = "SELECT * FROM PackageNotifications WHERE UserID = " . $dbh->quote($uid); $q.= " AND PackageBaseID = " . $dbh->quote($base_id); $result = $dbh->query($q); @@ -898,20 +898,20 @@ function pkgbase_notify ($base_ids, $action=true) { if ($action) { - $q = "SELECT COUNT(*) FROM CommentNotify WHERE "; + $q = "SELECT COUNT(*) FROM PackageNotifications WHERE "; $q .= "UserID = $uid AND PackageBaseID = $bid"; /* Notification already added. Don't add again. */ $result = $dbh->query($q); if ($result->fetchColumn() == 0) { - $q = "INSERT INTO CommentNotify (PackageBaseID, UserID) VALUES ($bid, $uid)"; + $q = "INSERT INTO PackageNotifications (PackageBaseID, UserID) VALUES ($bid, $uid)"; $dbh->exec($q); } $output .= $basename; } else { - $q = "DELETE FROM CommentNotify WHERE PackageBaseID = $bid "; + $q = "DELETE FROM PackageNotifications WHERE PackageBaseID = $bid "; $q .= "AND UserID = $uid"; $dbh->exec($q); diff --git a/web/lib/pkgfuncs.inc.php b/web/lib/pkgfuncs.inc.php index c2bbe38..0e152dd 100644 --- a/web/lib/pkgfuncs.inc.php +++ b/web/lib/pkgfuncs.inc.php @@ -716,7 +716,7 @@ function pkg_search_page($SID="") { /* Build the package search query. */ $q_select = "SELECT "; if ($SID) { - $q_select .= "CommentNotify.UserID AS Notify, + $q_select .= "PackageNotifications.UserID AS Notify, PackageVotes.UsersID AS Voted, "; } $q_select .= "Users.Username AS Maintainer, @@ -731,8 +731,8 @@ function pkg_search_page($SID="") { /* This is not needed for the total row count query. */ $q_from_extra = "LEFT JOIN PackageVotes ON (PackageBases.ID = PackageVotes.PackageBaseID AND PackageVotes.UsersID = $myuid) - LEFT JOIN CommentNotify - ON (PackageBases.ID = CommentNotify.PackageBaseID AND CommentNotify.UserID = $myuid) "; + LEFT JOIN PackageNotifications + ON (PackageBases.ID = PackageNotifications.PackageBaseID AND PackageNotifications.UserID = $myuid) "; } else { $q_from_extra = ""; } -- 2.7.0

1 2