From patchwork Sat Jul 10 09:10:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bert Peters X-Patchwork-Id: 1941 Return-Path: Delivered-To: patchwork@archlinux.org Received: from mail.archlinux.org [95.216.189.61] by patchwork.archlinux.org with IMAP (fetchmail-6.4.19) for (single-drop); Sat, 10 Jul 2021 09:10:57 +0000 (UTC) Received: from mail.archlinux.org by mail.archlinux.org with LMTP id 6J5TGyFk6WAi4AAAK+/4rw (envelope-from ) for ; Sat, 10 Jul 2021 09:10:57 +0000 Received: from lists.archlinux.org (lists.archlinux.org [95.217.236.249]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.archlinux.org (Postfix) with ESMTPS id 81E2D6FC909; Sat, 10 Jul 2021 09:10:56 +0000 (UTC) Received: from lists.archlinux.org (localhost [IPv6:::1]) by lists.archlinux.org (Postfix) with ESMTP id 0FC6022D6AB; Sat, 10 Jul 2021 09:10:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lists.archlinux.org; s=dkim-rsa; t=1625908256; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=/e6eKuGMMXjPu2O5CN4FCxIyyl5LazoK9su/Kgn/6lY=; b=miMWahE8ccLhDJxZ9YmGq+Q7WFJnTHgEj3TIqODLS9MXQiKo2Ph0ZT5AjzQ7/wX9AoiBfR 9u5+PJIh5A1jMK6mZjQEHdTy6BmIDCl8eQA1UuarYEn9uBSfwoMEkKDhquuQucckMrcLQh M+Llhs/S4LhdeWeY4CU0QhNDjJOJ+JvJXHE1kIQKXZyefjGGfMRwyjjdux4fuDQ9qqvFPp 6oERbzEKrXHPHHgK5SHoqtdACdFeB3dPf0mJk3+h/F/BCaERVEgQaW+AMCLpquBNfVu55Z zqSBNII/UpzXCPZsfpNyJwqmnU1ddfhFDuvkL/H0RP3ZoK5UMhy2mzQ41VB16OZDPQzh0B 7nHraqqX4nZ5Dd0BAe4/hjiSO1OQUvVocVfdKn3iHQP9JSKIiDnjzEHT+4jxs2OdUmyZq6 d/ioZTH9jltuHmA6HIgpHXMLge86uOVmWOsS0FteOH44HHkQjL9Otgr8BRHyoNRgKCXnFZ f7w9JQQpEK3AwbQwj4Cn0FrFXytdhm668zOQQY1DAy1FG7O11900LUL9qDDa8UVR2pp8f9 NRYf3dOBXf8drUKwVkYiREnFYyrz6QuwrYCh0DrNNnqVETX/RxZrG/3AqJoT6YTyN9iGfI fMo0uWRRpvDdcOIzySJCGXUbGboDp+62okHjIbvnpgkAHcqfqShMI= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=lists.archlinux.org; s=dkim-ed25519; t=1625908256; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=/e6eKuGMMXjPu2O5CN4FCxIyyl5LazoK9su/Kgn/6lY=; b=OXjqz6d5VhBWbFQMmt67FVMUIp86mrajfL8Bjch0BUQLbZ10gyEYMg8IJXxgGioUhHukTw Sb7H6BpK8FgL3ZAA== X-Original-To: aur-dev@lists.archlinux.org Delivered-To: aur-dev@lists.archlinux.org Received: from charon.bertptrs.nl (charon.bertptrs.nl [37.97.134.152]) by lists.archlinux.org (Postfix) with ESMTPS id ECFA322D6A3 for ; Sat, 10 Jul 2021 09:10:52 +0000 (UTC) Received: from [192.168.1.18] (143-174-166-62.ftth.glasoperator.nl [62.166.174.143]) by charon.bertptrs.nl (Postfix) with ESMTPSA id 1EC79E0A2D for ; Sat, 10 Jul 2021 11:10:51 +0200 (CEST) Message-ID: Subject: [PATCH] Send request notifications to co-maintainers To: aur-dev@lists.archlinux.org Date: Sat, 10 Jul 2021 11:10:50 +0200 User-Agent: Evolution 3.40.2 MIME-Version: 1.0 X-Spam-Status: No, score=-1.2 required=5.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on charon.bertptrs.nl X-BeenThere: aur-dev@lists.archlinux.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: "Arch User Repository \(AUR\) Development" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Bert Peters via aur-dev From: Bert Peters Reply-To: "Arch User Repository \(AUR\) Development" Cc: Bert Peters Errors-To: aur-dev-bounces@lists.archlinux.org Sender: "aur-dev" Authentication-Results: mail.archlinux.org; dkim=pass header.d=lists.archlinux.org header.s=dkim-rsa header.b=miMWahE8; dkim=pass header.d=lists.archlinux.org header.s=dkim-ed25519 header.b=OXjqz6d5; dmarc=pass (policy=none) header.from=archlinux.org; spf=pass (mail.archlinux.org: domain of aur-dev-bounces@lists.archlinux.org designates 95.217.236.249 as permitted sender) smtp.mailfrom=aur-dev-bounces@lists.archlinux.org X-Rspamd-Queue-Id: 81E2D6FC909 X-Spamd-Result: default: False [-5.91 / 15.00]; HAS_REPLYTO(0.00)[aur-dev@lists.archlinux.org]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:95.217.236.249:c]; REPLYTO_ADDR_EQ_FROM(0.00)[]; RCVD_DKIM_ARC_DNSWL_MED(-0.50)[]; RCVD_COUNT_THREE(0.00)[4]; DKIM_TRACE(0.00)[lists.archlinux.org:+]; MIME_BASE64_TEXT(0.10)[]; RCPT_COUNT_TWO(0.00)[2]; RCVD_IN_DNSWL_MED(-0.20)[95.217.236.249:from]; MAILLIST(-0.20)[mailman]; SIGNED_PGP(-2.00)[]; DMARC_POLICY_ALLOW(-0.50)[archlinux.org,none]; FORGED_RECIPIENTS_MAILLIST(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:24940, ipnet:95.217.0.0/16, country:DE]; FROM_NEQ_ENVFROM(0.00)[aur-dev@lists.archlinux.org,aur-dev-bounces@lists.archlinux.org]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[lists.archlinux.org:s=dkim-rsa,lists.archlinux.org:s=dkim-ed25519]; FROM_HAS_DN(0.00)[]; DWL_DNSWL_MED(-2.00)[archlinux.org:dkim]; TAGGED_RCPT(0.00)[aur-dev]; PREVIOUSLY_DELIVERED(0.00)[aur-dev@lists.archlinux.org]; MIME_GOOD(-0.20)[multipart/signed,text/plain]; HAS_LIST_UNSUB(-0.01)[]; NEURAL_HAM(-0.00)[-1.000]; FORGED_SENDER_MAILLIST(0.00)[] X-Rspamd-Server: mail.archlinux.org This is in addition to the current recipients. Co-maintainers should also be made aware when their package has pending requests. ---  aurweb/scripts/notify.py | 6 ++++++  1 file changed, 6 insertions(+) +                           'OR Users.ID = PackageComaintainers.UsersID ' +                             'WHERE PackageRequests.ID = ? AND ' +                             'Users.Suspended = 0', [reqid])          self._to = aurweb.config.get('options', 'aur_request_ml') @@ -492,9 +495,12 @@ class RequestCloseNotification(Notification):          cur = conn.execute('SELECT DISTINCT Users.Email FROM PackageRequests ' +                             'INNER JOIN PackageBases ' +                             'ON PackageBases.ID = PackageRequests.PackageBaseID ' + +                           'INNER JOIN PackageComaintainers ' + +                           'ON PackageComaintainers.PackageBaseID = PackageRequests.PackageBaseID ' +                             'INNER JOIN Users ' +                             'ON Users.ID = PackageRequests.UsersID ' +                             'OR Users.ID = PackageBases.MaintainerUID ' + +                           'OR Users.ID = PackageComaintainers.UsersID ' +                             'WHERE PackageRequests.ID = ? AND ' +                             'Users.Suspended = 0', [reqid])          self._to = aurweb.config.get('options', 'aur_request_ml') diff --git a/aurweb/scripts/notify.py b/aurweb/scripts/notify.py index 7f8e7168..e815e4c3 100755 --- a/aurweb/scripts/notify.py +++ b/aurweb/scripts/notify.py @@ -435,9 +435,12 @@ class RequestOpenNotification(Notification):          cur = conn.execute('SELECT DISTINCT Users.Email FROM PackageRequests ' +                             'INNER JOIN PackageBases ' +                             'ON PackageBases.ID = PackageRequests.PackageBaseID ' + +                           'INNER JOIN PackageComaintainers ' + +                           'ON PackageComaintainers.PackageBaseID = PackageRequests.PackageBaseID ' +                             'INNER JOIN Users ' +                             'ON Users.ID = PackageRequests.UsersID ' +                             'OR Users.ID = PackageBases.MaintainerUID ' +