From cbef98e52c3e3c90db2b3482bb36b553aaa9c16a Mon Sep 17 00:00:00 2001 From: yamaoka Date: Thu, 22 Sep 2005 12:53:03 +0000 Subject: [PATCH] Synch to No Gnus 200509221216. --- lisp/ChangeLog | 12 +++++++ lisp/spam-report.el | 92 +++++++++++++++++++++++++++------------------------ lisp/spam.el | 4 ++- 3 files changed, 64 insertions(+), 44 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 55a4fbe..c46d039 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,15 @@ +2005-09-22 Reiner Steib + + * spam-report.el (spam-report-gmane-ham): Renamed from + `spam-report-gmane-unspam'. + (spam-report-gmane-internal): Renamed from `spam-report-gmane'. + Simplify use of UNSPAM argument. Fetch "X-Report-Unspam" header. + + * spam.el (spam-report-gmane-spam, spam-report-gmane-ham): + Autoload. + (spam-report-gmane-unregister-routine): Renamed + `spam-report-gmane-unspam' to `spam-report-gmane-ham'. + 2005-09-21 Teodor Zlatanov * spam.el (spam-use-gmane, spam-report-gmane-register-routine) diff --git a/lisp/spam-report.el b/lisp/spam-report.el index e5f342e..4b37394 100644 --- a/lisp/spam-report.el +++ b/lisp/spam-report.el @@ -115,61 +115,67 @@ Reports is as ham when HAM is set." "Report an article as ham by resending via email." (spam-report-resend articles t)) -(defun spam-report-gmane-unspam (&rest articles) - "Report ARTICLES as not-spam (unregister) through Gmane." +(defun spam-report-gmane-ham (&rest articles) + "Report ARTICLES as ham (unregister) through Gmane." (interactive (gnus-summary-work-articles current-prefix-arg)) (dolist (article articles) - (spam-report-gmane t article))) + (spam-report-gmane-internal t article))) (defun spam-report-gmane-spam (&rest articles) "Report ARTICLES as spam through Gmane." (interactive (gnus-summary-work-articles current-prefix-arg)) (dolist (article articles) - (spam-report-gmane nil article))) + (spam-report-gmane-internal nil article))) -(defun spam-report-gmane (unspam article) +;; `spam-report-gmane' was an interactive entry point, so we should provide an +;; alias. +(defalias 'spam-report-gmane 'spam-report-gmane-spam) + +(defun spam-report-gmane-internal (unspam article) "Report ARTICLE as spam or not-spam through Gmane, depending on UNSPAM." (when (and gnus-newsgroup-name (or (null spam-report-gmane-regex) (string-match spam-report-gmane-regex gnus-newsgroup-name))) - (gnus-message 6 "Reporting spam article %d to spam.gmane.org..." article) - (if spam-report-gmane-use-article-number - (spam-report-url-ping - (if unspam "unspam.gmane.org" "spam.gmane.org") - (format "/%s:%d" - (gnus-group-real-name gnus-newsgroup-name) - article)) - (with-current-buffer nntp-server-buffer - (gnus-request-head article gnus-newsgroup-name) - (let ((case-fold-search t) - field host report url) - ;; First check for X-Report-Spam because it's more specific to - ;; spam reporting than Archived-At. OTOH, all new articles on - ;; Gmane don't have X-Report-Spam anymore (unless Lars changes his - ;; mind :-)). - ;; - ;; There might be more than one Archived-At header so we need to - ;; find (and transform) the one related to Gmane. - (setq field (or (gnus-fetch-field "X-Report-Spam") - (gnus-fetch-field "Archived-At"))) - (setq host (progn - (string-match - (concat "http://\\([a-z]+\\.gmane\\.org\\)" - "\\(/[^:/]+[:/][0-9]+\\)") - field) - (match-string 1 field))) - (setq report (match-string 2 field)) - (when (string-equal "permalink.gmane.org" host) - (setq host (if unspam "unspam.gmane.org" "spam.gmane.org")) - (setq report (gnus-replace-in-string - report "/\\([0-9]+\\)$" ":\\1"))) - (setq url (format "http://%s%s" host report)) - (if (not (and host report url)) - (gnus-message - 3 "Could not find a spam report header in article %d..." - article) - (gnus-message 7 "Reporting %s through URL %s..." (if unspam "unspam" "spam") url) - (spam-report-url-ping host report))))))) + (let ((rpt-host (if unspam "unspam.gmane.org" "spam.gmane.org"))) + (gnus-message 6 "Reporting article %d to %s..." article rpt-host) + (if spam-report-gmane-use-article-number + (spam-report-url-ping + rpt-host + (format "/%s:%d" + (gnus-group-real-name gnus-newsgroup-name) + article)) + (with-current-buffer nntp-server-buffer + (gnus-request-head article gnus-newsgroup-name) + (let ((case-fold-search t) + field host report url) + ;; First check for X-Report-Spam because it's more specific to + ;; spam reporting than Archived-At. OTOH, all new articles on + ;; Gmane don't have X-Report-Spam anymore (unless Lars changes his + ;; mind :-)). + ;; + ;; There might be more than one Archived-At header so we need to + ;; find (and transform) the one related to Gmane. + (setq field (or (gnus-fetch-field "X-Report-Spam") + (gnus-fetch-field "X-Report-Unspam") + (gnus-fetch-field "Archived-At"))) + (setq host (progn + (string-match + (concat "http://\\([a-z]+\\.gmane\\.org\\)" + "\\(/[^:/]+[:/][0-9]+\\)") + field) + (match-string 1 field))) + (setq report (match-string 2 field)) + (when (string-equal "permalink.gmane.org" host) + (setq host rpt-host) + (setq report (gnus-replace-in-string + report "/\\([0-9]+\\)$" ":\\1"))) + (setq url (format "http://%s%s" host report)) + (if (not (and host report url)) + (gnus-message + 3 "Could not find a spam report header in article %d..." + article) + (gnus-message 7 "Reporting article through URL %s..." url) + (spam-report-url-ping host report)))))))) (defun spam-report-url-ping (host report) "Ping a host through HTTP, addressing a specific GET resource using diff --git a/lisp/spam.el b/lisp/spam.el index 27ca9d7..467bc85 100644 --- a/lisp/spam.el +++ b/lisp/spam.el @@ -60,6 +60,8 @@ ;; autoload spam-report (eval-and-compile (autoload 'spam-report-gmane "spam-report") + (autoload 'spam-report-gmane-spam "spam-report") + (autoload 'spam-report-gmane-ham "spam-report") (autoload 'spam-report-resend "spam-report")) ;; autoload gnus-registry @@ -2439,7 +2441,7 @@ REMOVE not nil, remove the ADDRESSES." (defun spam-report-gmane-unregister-routine (articles) (when articles - (apply 'spam-report-gmane-unspam articles))) + (apply 'spam-report-gmane-ham articles))) (defun spam-report-resend-register-ham-routine (articles) (spam-report-resend-register-routine articles t)) -- 1.7.10.4