October 2018 - Aur-dev - lists.archlinux.org

[PATCH] feat(rpc): return "providers" packages when querying by `name` or `name-desc`
by morganamilo 18 Feb '19

18 Feb '19

From: actionless <actionless.loveless(a)gmail.com> --- doc/rpc.txt | 4 ++-- web/lib/aurjson.class.php | 16 +++++++++++++++- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/doc/rpc.txt b/doc/rpc.txt index f353ff0..83cdae3 100644 --- a/doc/rpc.txt +++ b/doc/rpc.txt @@ -8,8 +8,8 @@ Package searches can be performed by issuing HTTP GET requests of the form +/rpc/?v=5&type=search&by=_field_&arg=_keywords_+ where _keywords_ is the search argument and _field_ is one of the following values: -* `name` (search by package name only) -* `name-desc` (search by package name and description) +* `name` (search by package name or packages which provide that name) +* `name-desc` (the same as `name` and search by description) * `maintainer` (search by package maintainer) The _by_ parameter can be skipped and defaults to `name-desc`. diff --git a/web/lib/aurjson.class.php b/web/lib/aurjson.class.php index 9eeaafd..6e580a9 100644 --- a/web/lib/aurjson.class.php +++ b/web/lib/aurjson.class.php @@ -392,12 +392,26 @@ class AurJSON { if (strlen($keyword_string) < 2) { return $this->json_error('Query arg too small.'); } + + //packages which provide the package we are looking for: + $providers = pkg_providers(addcslashes($keyword_string, '%_')); + $provided_names = array(); + foreach ($providers as $provider) { + if ($provider[0] != 0) { // if package is not from repo + $name = $this->dbh->quote($provider[1]); + array_push($provided_names, $name); + } + } + $provided_query = "(" . join(", ", $provided_names) . ")"; + $keyword_string = $this->dbh->quote("%" . addcslashes($keyword_string, '%_') . "%"); if ($search_by === 'name') { - $where_condition = "(Packages.Name LIKE $keyword_string)"; + $where_condition = "(Packages.Name LIKE $keyword_string OR "; + $where_condition .= "Packages.Name IN $provided_query )"; } else if ($search_by === 'name-desc') { $where_condition = "(Packages.Name LIKE $keyword_string OR "; + $where_condition .= "Packages.Name IN $provided_query OR "; $where_condition .= "Description LIKE $keyword_string)"; } } else if ($search_by === 'maintainer') { -- 2.16.2

6 25

[aur-dev][PATCH] Fix notifications emails going to the right people, part #2
by Eli Schwartz 26 Oct '18

26 Oct '18

Notifications are still going to the wrong people. We tried to fix this in commit b702e5c0e7f13103fc764b7e5613f78f3e7acd30, but only fixed it for the python callers. There's another caller in the php code, which needs to use the right order of arguments as well. Fixes FS#60602 Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- The division between the python and php code is, well, sort of awkward, who knew? And I guess the php callers would be the more common cause here, so... Anyway, hopefully this actually fixes things for the common case. web/lib/pkgbasefuncs.inc.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/web/lib/pkgbasefuncs.inc.php b/web/lib/pkgbasefuncs.inc.php index b39bca5..1df21a2 100644 --- a/web/lib/pkgbasefuncs.inc.php +++ b/web/lib/pkgbasefuncs.inc.php @@ -733,7 +733,7 @@ function pkgbase_adopt ($base_ids, $action=true, $via) { } foreach ($base_ids as $base_id) { - notify(array($action ? 'adopt' : 'disown', $base_id, $uid)); + notify(array($action ? 'adopt' : 'disown', $uid, $base_id)); } if ($action) { @@ -1204,7 +1204,7 @@ function pkgbase_set_comaintainers($base_id, $users, $override=false) { foreach ($uids_new as $uid) { if (in_array($uid, $uids_add)) { $q = sprintf("INSERT INTO PackageComaintainers (PackageBaseID, UsersID, Priority) VALUES (%d, %d, %d)", $base_id, $uid, $i); - notify(array('comaintainer-add', $base_id, $uid)); + notify(array('comaintainer-add', $uid, $base_id)); } else { $q = sprintf("UPDATE PackageComaintainers SET Priority = %d WHERE PackageBaseID = %d AND UsersID = %d", $i, $base_id, $uid); } @@ -1216,7 +1216,7 @@ function pkgbase_set_comaintainers($base_id, $users, $override=false) { foreach ($uids_rem as $uid) { $q = sprintf("DELETE FROM PackageComaintainers WHERE PackageBaseID = %d AND UsersID = %d", $base_id, $uid); $dbh->exec($q); - notify(array('comaintainer-remove', $base_id, $uid)); + notify(array('comaintainer-remove', $uid, $base_id)); } return array(true, __("The package base co-maintainers have been updated.")); -- 2.19.1

1 1

Search by provides in RPC interface
by Guillaume Benoit 26 Oct '18

26 Oct '18

Hi, knowing you already added the possibility to search by depends, optdepends, makedepends and checkdepends in the AUR RPC interface, could you think about also add the possibility to search by provides: https://aur.archlinux.org/rpc/?v=5&type=search&by=provides&arg=<keyword> It could be very useful for AUR helpers to solve AUR dependencies this way. If you point me to the relevant code, I can try to provide a patch. Regards, Guillaume.

4 4

[PATCH] pkg_comments.php: Make comment timestamps link to the comment
by Vladimir Panteleev 23 Oct '18

23 Oct '18

As of today, there is no easy way to obtain a link to a specific comment on a package page. Many implementations of forums and comment systems today seem to follow a convention where a comment's timestamp is an unobtrusive link to the comment itself. Some examples are: - phpBB (e.g. bbs.archlinux.org) - GitHub - Disqus - Discourse This patch adopts this convention as well, by making the comment timestamp an unobtrusive link to the comment itself. --- web/html/css/aurweb.css | 2 +- web/template/pkg_comments.php | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/web/html/css/aurweb.css b/web/html/css/aurweb.css index 593c9ae..d587dc6 100644 --- a/web/html/css/aurweb.css +++ b/web/html/css/aurweb.css @@ -122,7 +122,7 @@ top: 4px; } -.flagged a { +.flagged a, a.date { color: inherit; } diff --git a/web/template/pkg_comments.php b/web/template/pkg_comments.php index 3001a34..3bcf1a3 100644 --- a/web/template/pkg_comments.php +++ b/web/template/pkg_comments.php @@ -53,17 +53,19 @@ if ($comment_section == "package") { $pkgbase_name = $row["PackageBaseName"]; } + $anchor = (isset($pinned) ? "pinned-" : "comment-") . $row['ID']; $date_fmtd = date('Y-m-d H:i', $row['CommentTS']); + $date_link = '<a href="#' . $anchor . '" class="date">' . $date_fmtd . '</a>'; if ($comment_section == "package") { if ($row['UserName']) { $user_fmtd = html_format_username($row['UserName']); - $heading = __('%s commented on %s', $user_fmtd, $date_fmtd); + $heading = __('%s commented on %s', $user_fmtd, $date_link); } else { - $heading = __('Anonymous comment on %s', $date_fmtd); + $heading = __('Anonymous comment on %s', $date_link); } } elseif ($comment_section == "account") { $pkg_uri = '<a href=' . htmlspecialchars(get_pkg_uri($row['PackageBaseName']), ENT_QUOTES) . '>' . htmlspecialchars($row['PackageBaseName']) . '</a></td>'; - $heading = __('Commented on package %s on %s', $pkg_uri, $date_fmtd); + $heading = __('Commented on package %s on %s', $pkg_uri, $date_link); } $is_deleted = $row['DelTS']; @@ -97,7 +99,7 @@ if ($comment_section == "package") { $comment_classes .= " comment-deleted"; } ?> - <h4 id="<?= isset($pinned) ? "pinned-" : "comment-" ?><?= $row['ID'] ?>" class="<?= $comment_classes ?>"> + <h4 id="<?= $anchor ?>" class="<?= $comment_classes ?>"> <?= $heading ?> <?php if ($is_deleted && has_credential(CRED_COMMENT_UNDELETE)): ?> <form class="undelete-comment-form" method="post" action="<?= htmlspecialchars(get_pkgbase_uri($pkgbase_name), ENT_QUOTES); ?>"> @@ -152,7 +154,7 @@ if ($comment_section == "package") { </form> <?php endif; ?> </h4> - <div id="<?= isset($pinned) ? "pinned-" : "comment-" ?><?= $row['ID'] ?>-content" class="article-content<?php if ($is_deleted): ?> comment-deleted<?php endif; ?>"> + <div id="<?= $anchor ?>-content" class="article-content<?php if ($is_deleted): ?> comment-deleted<?php endif; ?>"> <div> <?php if (!empty($row['RenderedComment'])): ?> <?= $row['RenderedComment'] ?> -- 2.19.0

3 7

[PATCH v2] Add "Enable notifications" checkbox in "Add Comment" form
by Vladimir Panteleev 16 Oct '18

16 Oct '18

Currently, it is a little to easy to forget to enable notifications for a package after leaving a comment, thus never being notified of a reply. Even though the "Enable notifications" link is on the same page, it is not part of the flow for posting a new comment, and so, easy to miss. Most web forums and comment systems include a checkbox to enable notifications when posting for the first time in a thread. This patch implements this in aurweb, as well. --- Following Eli's comment, this version only allows enabling notifications - the checkbox is simply not displayed when they are already enabled. The corresponding server-side code is also simplified. web/html/css/aurweb.css | 5 +++++ web/html/pkgbase.php | 3 +++ web/template/pkg_comment_form.php | 6 ++++++ 3 files changed, 14 insertions(+) diff --git a/web/html/css/aurweb.css b/web/html/css/aurweb.css index 593c9ae..ef37bf5 100644 --- a/web/html/css/aurweb.css +++ b/web/html/css/aurweb.css @@ -104,6 +104,11 @@ top: 1px; } +.comment-enable-notifications { + display: inline-block; + margin-left: 1em; +} + .rss-icon, .delete-comment, .undelete-comment, .edit-comment, .pin-comment { -webkit-filter: grayscale(100%); filter: grayscale(100%); diff --git a/web/html/pkgbase.php b/web/html/pkgbase.php index 46ad77e..b716644 100644 --- a/web/html/pkgbase.php +++ b/web/html/pkgbase.php @@ -120,6 +120,9 @@ if (check_token()) { } elseif (current_action("do_AddComment")) { $uid = uid_from_sid($_COOKIE["AURSID"]); list($ret, $output) = pkgbase_add_comment($base_id, $uid, $_REQUEST['comment']); + if ($ret && isset($_REQUEST['enable_notifications'])) { + list($ret, $output) = pkgbase_notify(array($base_id)); + } $fragment = '#news'; } elseif (current_action("do_EditComment")) { list($ret, $output) = pkgbase_edit_comment($_REQUEST['comment']); diff --git a/web/template/pkg_comment_form.php b/web/template/pkg_comment_form.php index c450c4b..3feee8f 100644 --- a/web/template/pkg_comment_form.php +++ b/web/template/pkg_comment_form.php @@ -13,6 +13,12 @@ </p> <p> <input type="submit" value="<?= (isset($comment_id)) ? __("Save") : __("Add Comment") ?>" /> + <?php if (!isset($comment_id) && !pkgbase_user_notify($uid, $base_id)): ?> + <span class="comment-enable-notifications"> + <input type="checkbox" name="enable_notifications" id="id_enable_notifications" /> + <label for="id_enable_notifications"><?= __("Enable notifications") ?></label> + </span> + <?php endif; ?> </p> </fieldset> </form> -- 2.19.0

1 0

[PATCH] Add "Enable notifications" checkbox in "Add Comment" form
by Vladimir Panteleev 16 Oct '18

16 Oct '18

Currently, it is a little to easy to forget to enable notifications for a package after leaving a comment, thus never being notified of a reply. Even though the "Enable notifications" link is on the same page, it is not part of the flow for posting a new comment, and so, easy to miss. Most web forums and comment systems include a checkbox to enable notifications when posting for the first time in a thread. This patch implements this in aurweb, as well. --- web/html/css/aurweb.css | 5 +++++ web/html/pkgbase.php | 4 ++++ web/template/pkg_comment_form.php | 6 ++++++ 3 files changed, 15 insertions(+) diff --git a/web/html/css/aurweb.css b/web/html/css/aurweb.css index 593c9ae..ef37bf5 100644 --- a/web/html/css/aurweb.css +++ b/web/html/css/aurweb.css @@ -104,6 +104,11 @@ top: 1px; } +.comment-enable-notifications { + display: inline-block; + margin-left: 1em; +} + .rss-icon, .delete-comment, .undelete-comment, .edit-comment, .pin-comment { -webkit-filter: grayscale(100%); filter: grayscale(100%); diff --git a/web/html/pkgbase.php b/web/html/pkgbase.php index 46ad77e..0fec858 100644 --- a/web/html/pkgbase.php +++ b/web/html/pkgbase.php @@ -120,6 +120,10 @@ if (check_token()) { } elseif (current_action("do_AddComment")) { $uid = uid_from_sid($_COOKIE["AURSID"]); list($ret, $output) = pkgbase_add_comment($base_id, $uid, $_REQUEST['comment']); + $enable_notifications = isset($_REQUEST['enable_notifications']); + if ($ret && $enable_notifications != pkgbase_user_notify($uid, $base_id)) { + list($ret, $output) = pkgbase_notify(array($base_id), $enable_notifications); + } $fragment = '#news'; } elseif (current_action("do_EditComment")) { list($ret, $output) = pkgbase_edit_comment($_REQUEST['comment']); diff --git a/web/template/pkg_comment_form.php b/web/template/pkg_comment_form.php index c450c4b..41c0e1c 100644 --- a/web/template/pkg_comment_form.php +++ b/web/template/pkg_comment_form.php @@ -13,6 +13,12 @@ </p> <p> <input type="submit" value="<?= (isset($comment_id)) ? __("Save") : __("Add Comment") ?>" /> + <?php if (!isset($comment_id)): ?> + <span class="comment-enable-notifications"> + <input type="checkbox" name="enable_notifications" id="id_enable_notifications" <?= pkgbase_user_notify($uid, $base_id) ? "checked" : "" ?> /> + <label for="id_enable_notifications"><?= __("Enable notifications") ?></label> + </span> + <?php endif; ?> </p> </fieldset> </form> -- 2.19.0

2 1

[PATCH 0/2] Mention users' relationship to packages in comment notifications
by Vladimir Panteleev 16 Oct '18

16 Oct '18

Generally, it's useful to distinguish actionable vs. non-actionable notifications. When receiving a comment notification on a package a user maintains, it can be easy to miss it in a flood of comment notifications for packages the user merely follows. To this end, this patch series adds code to mention the user's relationship to the package when sending a comment notification email. Comments: - I'm not too happy about how intrusive the changes in the first refactoring comment are. Using a Python dictionary instead of introducing a new class would have allowed to avoid declaring the new classes, but that's not where the bulk of changes is. Much of the diff is cluttered from rewrapping to fit within 80 columns. Open to suggestions. - We could also do this for other notification types, but the comment notification is by far the most common one, so I've implemented this only for comment notifications for now. Should we decide otherwise, it is doable without introducing or updating translatable strings. - I'm not including .pot changes, as I've been told this is not being done simultaneously with changes that affect it; though, I've checked the diff after `make update-pot` and it looks okay to me. Vladimir Panteleev (2): notify.py: Encapsulate individual message recipient into a new class notify.py: Mention users' relationship to packages in comment notifications aurweb/scripts/notify.py | 216 ++++++++++++++++++++++++++------------- test/t2500-notify.sh | 150 +++++++++++++++++++++++++++ 2 files changed, 293 insertions(+), 73 deletions(-) -- 2.19.0

1 2

[aur-dev][PATCH] notify: add X-AUR-Reason header to allow conveniently filtering emails
by Eli Schwartz 05 Oct '18

05 Oct '18

Because filtering by matching the sender && regular expressions on the subject is awkward. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- In order to remain generic enough to allow the notify script to be imported from and used elsewhere, we cannot just use sys.argv[1] as the reason. aurweb/scripts/notify.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/aurweb/scripts/notify.py b/aurweb/scripts/notify.py index 44eec84..d975086 100755 --- a/aurweb/scripts/notify.py +++ b/aurweb/scripts/notify.py @@ -63,6 +63,9 @@ class Notification: sendmail = aurweb.config.get('notifications', 'sendmail') sender = aurweb.config.get('notifications', 'sender') reply_to = aurweb.config.get('notifications', 'reply-to') + reason = self.__class__.__name__ + if reason.endswith('Notification'): + reason = reason[:-len('Notification')] for recipient in self.get_recipients(): to, lang = recipient @@ -72,6 +75,7 @@ class Notification: msg['From'] = sender msg['Reply-to'] = reply_to msg['To'] = to + msg['X-AUR-Reason'] = reason for key, value in self.get_headers().items(): msg[key] = value -- 2.19.0

1 0