From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Ferdinand Pieper Newsgroups: gmane.emacs.bugs Subject: bug#72831: [PATCH] gnus-icalendar: Allow comments in event replies Date: Wed, 28 Aug 2024 18:35:55 +0200 Message-ID: <878qwgtxjo.fsf@pie.tf> References: <875xrml22f.fsf@pie.tf> <868qwgj4fh.fsf@gnu.org> <87wmk0vk0p.fsf@gmail.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="18562"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Cc: Eli Zaretskii , Andrew G Cohen , Alexandre Duret-Lutz , 72831@debbugs.gnu.org To: Robert Pluim Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Wed Aug 28 18:41:28 2024 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1sjLjb-0004bG-Sg for geb-bug-gnu-emacs@m.gmane-mx.org; Wed, 28 Aug 2024 18:41:28 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sjLjJ-0007ep-Jj; Wed, 28 Aug 2024 12:41:09 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sjLjH-0007eR-SW for bug-gnu-emacs@gnu.org; Wed, 28 Aug 2024 12:41:07 -0400 Original-Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sjLjH-0005uI-K1 for bug-gnu-emacs@gnu.org; Wed, 28 Aug 2024 12:41:07 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:References:In-Reply-To:From:To:Subject; bh=8bXjRsjDqa7ToJ0N94amujZB5tk/gQ35O6GOnr+ji7c=; b=JL3LWO1OSgyqZa1wB12doNRR2CuiG75muzm05fhmO7k6/r3RR4wNCGv8ncDF8PpXZcMgFr5CPrECGtzRfrUYLlmCkUy8o6GxlP03fM/Il78KJoRPdvGeK9vi910rBQz97xuntHIKjcssO/8Mj6ccDLr6XzJenMkHTxqArmKgXk1+DGrPll3qRjj0FDJCCgCC/G/zk8QjWRbEtASZe9+ZjWo2Wdxb/MbCgr6m1lBPAlWSZxmvNn1iRG744s/itzCGsgTGS8JpYj0qGuCKxOZUWoIMq+Mnf23EQ7WyX2vrFLlK5Fopkh97f01EXukBYpZG2V9xBZ2p7EneEng+40WfhA==; Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sjLk9-0001Xh-PF for bug-gnu-emacs@gnu.org; Wed, 28 Aug 2024 12:42:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Ferdinand Pieper Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 28 Aug 2024 16:42:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72831 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 72831-submit@debbugs.gnu.org id=B72831.17248632915885 (code B ref 72831); Wed, 28 Aug 2024 16:42:01 +0000 Original-Received: (at 72831) by debbugs.gnu.org; 28 Aug 2024 16:41:31 +0000 Original-Received: from localhost ([127.0.0.1]:49646 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sjLje-0001Wq-N9 for submit@debbugs.gnu.org; Wed, 28 Aug 2024 12:41:31 -0400 Original-Received: from pie.tf ([5.45.99.52]:38254) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sjLfQ-0001Pm-Ku for 72831@debbugs.gnu.org; Wed, 28 Aug 2024 12:37:09 -0400 Original-Received: from i577b13c1.versanet.de ([87.123.19.193] helo=localhost) by pie.tf with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1sjLeL-00020S-Oc; Wed, 28 Aug 2024 16:36:01 +0000 In-Reply-To: <87wmk0vk0p.fsf@gmail.com> (Robert Pluim's message of "Wed, 28 Aug 2024 15:45:10 +0200") X-Mailman-Approved-At: Wed, 28 Aug 2024 12:41:29 -0400 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:290871 Archived-At: --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Thanks for the review. Robert Pluim writes: > Now that you have the bug number, please put (Bug#72831) somewhere in > the commit message. Updated in the patch attached.=20 > I think a change this size requires copyright assigment, which I don=CA= =BCt > know if you=CA=BCve done. Copyright assignment is done. I wrote some prior contributions to org-mode. > I think that if you=CA=BCre making the same comment for the three functio= ns > you can put all three in one set of (), separated by commas. Updated. > >> @@ -319,6 +319,10 @@ gnus-icalendar-event--build-reply-event-body > >> (if (string-match "^[^:]+:" line) > >> (replace-match (format "\\&%s: " summary-status) t nil line) > >> line)) > >> + (update-comment > >> + (line) > >> + (if comment (format "COMMENT:%s" comment) > >> + line)) > >> (update-dtstamp () > >> (format-time-string "DTSTAMP:%Y%m%dT%H%M%SZ" nil t)) > >> (attendee-matches-identity > >> @@ -341,6 +345,7 @@ gnus-icalendar-event--build-reply-event-body > >> (cond > >> ((string=3D key "ATTENDEE") (update-attendee-status line)) > >> ((string=3D key "SUMMARY") (update-summary line)) > >> + ((string=3D key "COMMENT") (update-comment line)) > >> ((string=3D key "DTSTAMP") (update-dtstamp)) > >> ((member key '("ORGANIZER" "DTSTART" "DTEND" > >> "LOCATION" "DURATION" "SEQUENCE" > >> @@ -363,12 +368,17 @@ gnus-icalendar-event--build-reply-event-body > >> attendee-status user-full-name user-mail-address) > >> reply-event-lines)) > >>=20 > >> + ;; add comment line if not existing > >> + (when (and comment (not (gnus-icalendar-find-if (lambda (x) > >> (string-match "^COMMENT" x)) > >> + reply-event-lines))) > >> + (push (format "COMMENT:%s" comment) reply-event-lines)) > >> + > > So if the event was sent with a COMMENT the receiver can=CA=BCt add their > own? That doesn=CA=BCt match my conception of 'reply with comment'. I=CA= =BCm > hazy on what=CA=BCs exactly allowed in ical, can you have more than one > COMMENT line? Or we could combine the comments? If it already exists it is replaced by the prior > >> ((string=3D key "COMMENT") (update-comment line)) Just if it does not exist the `(string=3D key "COMMENT")` never matches and= we have to add the field. > >> -(defun gnus-icalendar-event-reply-from-buffer (buf status identit= ies) > >> +(defun gnus-icalendar-event-reply-from-buffer (buf status > >> identities &optional comment) > >> "Build a calendar event reply for request contained in BUF. > >> The reply will have STATUS (`accepted', `tentative' or `declined'= ). > >> The reply will be composed for attendees matching any entry > > Could you describe the COMMENT arg in the docstring? Updated. > >> @@ -1009,25 +1019,37 @@ gnus-icalendar-save-event > >> (when data > >> (gnus-icalendar-save-part data)))) > >>=20 > >> -(defun gnus-icalendar-reply-accept () > >> - "Accept invitation in the current article." > >> +(defun gnus-icalendar-reply-accept (&optional comment-p) > >> + "Accept invitation in the current article. > >> + > >> +With a prefix `\\[universal-argument]' prompt for a comment to in= clude > >> +in the reply." > > I think we tend to word this as > > "Optional argument COMMENT-P (interactively the prefix argument) means > prompt for a comment to include in the reply." Updated using `\\[universal-argument]'. Or does that not matter here and ju= st "prefix argument" would be fine? > Ideally you=CA=BCd add test cases for this to > "test/lisp/gnus/gnus-icalendar-tests.el". But that=CA=BCs not mandatory. I looked into it and will add a few tests for accepting/declining events wi= th and without comments. I will followup on this in a couple days. It might also make sense to extend the parsing of events to recognize comme= nts (and potentially display them inside emacs. I also missed to update the interactive argument for `gnus-icalendar-reply-= accept` and `gnus-icalendar-reply-tentative`, which is now fixed in the upd= ated patch. Best, --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-Allow-comments-to-organizer-in-event-replies-bug-728.patch >From 35dab0bb7131cf64873298cbe9a418f82d2a2508 Mon Sep 17 00:00:00 2001 From: fpi Date: Wed, 28 Aug 2024 18:33:20 +0200 Subject: [PATCH] Allow comments to organizer in event replies (bug#72831) * lisp/gnus/gnus-icalendar.el (gnus-icalendar-event--build-reply-event-body): Add optional COMMENT argument to be inserted into the reply. (gnus-icalendar-event-reply-from-buffer): Add COMMENT argument to be passed through to gnus-icalendar-event--build-reply-event-body (gnus-icalendar-reply-accept, gnus-icalendar-reply-tentative, gnus-icalendar-reply-decline): If interactively called with a prefix argument ask user for a COMMENT to add to the reply. --- lisp/gnus/gnus-icalendar.el | 61 ++++++++++++++++++++++++++----------- 1 file changed, 43 insertions(+), 18 deletions(-) diff --git a/lisp/gnus/gnus-icalendar.el b/lisp/gnus/gnus-icalendar.el index af7284b88e8..85f1aa09a56 100644 --- a/lisp/gnus/gnus-icalendar.el +++ b/lisp/gnus/gnus-icalendar.el @@ -309,7 +309,7 @@ gnus-icalendar-event-from-buffer ;;; gnus-icalendar-event-reply ;;; -(defun gnus-icalendar-event--build-reply-event-body (ical-request status identities) +(defun gnus-icalendar-event--build-reply-event-body (ical-request status identities &optional comment) (let ((summary-status (capitalize (symbol-name status))) (attendee-status (upcase (symbol-name status))) reply-event-lines) @@ -319,6 +319,10 @@ gnus-icalendar-event--build-reply-event-body (if (string-match "^[^:]+:" line) (replace-match (format "\\&%s: " summary-status) t nil line) line)) + (update-comment + (line) + (if comment (format "COMMENT:%s" comment) + line)) (update-dtstamp () (format-time-string "DTSTAMP:%Y%m%dT%H%M%SZ" nil t)) (attendee-matches-identity @@ -341,6 +345,7 @@ gnus-icalendar-event--build-reply-event-body (cond ((string= key "ATTENDEE") (update-attendee-status line)) ((string= key "SUMMARY") (update-summary line)) + ((string= key "COMMENT") (update-comment line)) ((string= key "DTSTAMP") (update-dtstamp)) ((member key '("ORGANIZER" "DTSTART" "DTEND" "LOCATION" "DURATION" "SEQUENCE" @@ -363,16 +368,24 @@ gnus-icalendar-event--build-reply-event-body attendee-status user-full-name user-mail-address) reply-event-lines)) + ;; add comment line if not existing + (when (and comment (not (gnus-icalendar-find-if (lambda (x) (string-match "^COMMENT" x)) + reply-event-lines))) + (push (format "COMMENT:%s" comment) reply-event-lines)) + (mapconcat #'identity `("BEGIN:VEVENT" ,@(nreverse reply-event-lines) "END:VEVENT") "\n")))) -(defun gnus-icalendar-event-reply-from-buffer (buf status identities) +(defun gnus-icalendar-event-reply-from-buffer (buf status identities &optional comment) "Build a calendar event reply for request contained in BUF. The reply will have STATUS (`accepted', `tentative' or `declined'). The reply will be composed for attendees matching any entry -on the IDENTITIES list." +on the IDENTITIES list. +Optional argument COMMENT will be placed in the comment field of the +reply. +" (cl-labels ((extract-block (blockname) @@ -396,7 +409,7 @@ gnus-icalendar-event-reply-from-buffer "PRODID:Gnus" "VERSION:2.0" zone - (gnus-icalendar-event--build-reply-event-body event status identities) + (gnus-icalendar-event--build-reply-event-body event status identities comment) "END:VCALENDAR"))) (mapconcat #'identity (delq nil contents) "\n")))))) @@ -878,13 +891,13 @@ gnus-icalendar-send-buffer-by-mail (insert "Subject: " subject) (message-send-and-exit)))) -(defun gnus-icalendar-reply (data) +(defun gnus-icalendar-reply (data &optional comment) (let* ((handle (car data)) (status (cadr data)) (event (caddr data)) (reply (gnus-icalendar-with-decoded-handle handle (gnus-icalendar-event-reply-from-buffer - (current-buffer) status (gnus-icalendar-identities)))) + (current-buffer) status (gnus-icalendar-identities) comment))) (organizer (gnus-icalendar-event:organizer event))) (when reply @@ -1009,25 +1022,37 @@ gnus-icalendar-save-event (when data (gnus-icalendar-save-part data)))) -(defun gnus-icalendar-reply-accept () - "Accept invitation in the current article." - (interactive nil gnus-article-mode gnus-summary-mode) +(defun gnus-icalendar-reply-accept (&optional comment-p) + "Accept invitation in the current article. + +Optional argument COMMENT-P (interactively the `\\[universal-argument]') +means prompt for a comment to include in the reply." + (interactive "P" gnus-article-mode gnus-summary-mode) (with-current-buffer gnus-article-buffer - (gnus-icalendar-reply (list gnus-icalendar-handle 'accepted gnus-icalendar-event)) + (gnus-icalendar-reply (list gnus-icalendar-handle 'accepted gnus-icalendar-event) + (when comment-p (read-string "Comment: "))) (setq-local gnus-icalendar-reply-status 'accepted))) -(defun gnus-icalendar-reply-tentative () - "Send tentative response to invitation in the current article." - (interactive nil gnus-article-mode gnus-summary-mode) +(defun gnus-icalendar-reply-tentative (&optional comment-p) + "Send tentative response to invitation in the current article. + +Optional argument COMMENT-P (interactively the `\\[universal-argument]') +means prompt for a comment to include in the reply." + (interactive "P" gnus-article-mode gnus-summary-mode) (with-current-buffer gnus-article-buffer - (gnus-icalendar-reply (list gnus-icalendar-handle 'tentative gnus-icalendar-event)) + (gnus-icalendar-reply (list gnus-icalendar-handle 'tentative gnus-icalendar-event) + (when comment-p (read-string "Comment: "))) (setq-local gnus-icalendar-reply-status 'tentative))) -(defun gnus-icalendar-reply-decline () - "Decline invitation in the current article." - (interactive nil gnus-article-mode gnus-summary-mode) +(defun gnus-icalendar-reply-decline (&optional comment-p) + "Decline invitation in the current article. + +Optional argument COMMENT-P (interactively the `\\[universal-argument]') +means prompt for a comment to include in the reply." + (interactive "P" gnus-article-mode gnus-summary-mode) (with-current-buffer gnus-article-buffer - (gnus-icalendar-reply (list gnus-icalendar-handle 'declined gnus-icalendar-event)) + (gnus-icalendar-reply (list gnus-icalendar-handle 'declined gnus-icalendar-event) + (when comment-p (read-string "Comment: "))) (setq-local gnus-icalendar-reply-status 'declined))) (defun gnus-icalendar-event-export () -- 2.44.1 --=-=-=--