"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
;; report: "/gmane.some.group:123456"
(funcall spam-report-url-ping-function host report))
+(defcustom spam-report-user-mail-address
+ (and (stringp user-mail-address)
+ (gnus-replace-in-string user-mail-address "@" "<at>"))
+ "Mail address of this user used for spam reports to Gmane.
+This is initialized based on `user-mail-address'."
+ :type '(choice string
+ (const :tag "Don't expose address" nil))
+ :version "23.0" ;; No Gnus
+ :group 'spam-report)
+
+(defvar spam-report-user-agent
+ (if spam-report-user-mail-address
+ (format "%s (%s) %s" "spam-report.el"
+ spam-report-user-mail-address
+ (gnus-extended-version))
+ (format "%s %s" "spam-report.el"
+ (gnus-extended-version))))
+
(defun spam-report-url-ping-plain (host report)
"Ping a host through HTTP, addressing a specific GET resource."
(let ((tcp-connection))
(set-marker (process-mark tcp-connection) (point-min))
(process-send-string
tcp-connection
- (format "GET %s HTTP/1.1\nUser-Agent: %s (spam-report.el)\nHost: %s\n\n"
- report (gnus-emacs-version) host)))))
+ (format "GET %s HTTP/1.1\nUser-Agent: %s\nHost: %s\n\n"
+ report spam-report-user-agent host)))))
;;;###autoload
(defun spam-report-process-queue (&optional file keep)
projects / elisp / gnus.git- / blobdiff