* nnmail.el (nnmail-cache-insert): make sure that the

[gnus] / lisp / spam-report.el

diff --git a/lisp/spam-report.el b/lisp/spam-report.el
index fafb891..cde38f8 100644 (file)
--- a/lisp/spam-report.el
+++ b/lisp/spam-report.el
@@ -31,13 +31,19 @@
 (require 'gnus)
 (require 'gnus-sum)
 
+(eval-and-compile
+  (autoload 'mm-url-insert "mm-url"))
+
 (defgroup spam-report nil
   "Spam reporting configuration.")
 
 (defcustom spam-report-gmane-regex nil
-  "String matching Gmane newsgroups if wanted, e.g. \"^nntp+.*:gmane.\"
-This is probably handled better with group/topic parameters."
-  :type 'regexp
+  "Regexp matching Gmane newsgroups, e.g. \"^nntp\\+.*:gmane\\.\"
+If you are using spam.el, consider setting gnus-spam-process-newsgroups 
+or the gnus-group-spam-exit-processor-report-gmane group/topic parameter 
+instead."
+  :type '(radio (const nil)
+               (regexp :format "%t: %v\n" :size 0 :value "^nntp\+.*:gmane\."))
   :group 'spam-report)
 
 (defcustom spam-report-gmane-spam-header 
@@ -51,6 +57,16 @@ This is probably handled better with group/topic parameters."
   :type 'boolean
   :group 'spam-report)
 
+(defcustom spam-report-url-ping-function
+  'spam-report-url-ping-plain
+  "Function to use for url ping spam reporting."
+  :type '(choice
+         (const :tag "Connect directly" 
+                spam-report-url-ping-plain)
+         (const :tag "Use the external program specified in `mm-url-program'" 
+                spam-report-url-ping-mm-url))
+  :group 'spam-report)
+
 (defun spam-report-gmane (article)
   "Report an article as spam through Gmane"
   (interactive "nEnter the article number: ")
@@ -62,7 +78,7 @@ This is probably handled better with group/topic parameters."
          (spam-report-url-ping "spam.gmane.org" 
                    (format "/%s:%d"
                            (gnus-group-real-name gnus-newsgroup-name)
-                           (gnus-summary-article-number)))
+                           article))
        (with-current-buffer nntp-server-buffer
          (gnus-request-head article gnus-newsgroup-name)
          (goto-char (point-min))
@@ -75,9 +91,13 @@ This is probably handled better with group/topic parameters."
            (gnus-message 10 "Could not find X-Report-Spam in article %d..."
                          article))))))
 
-
 (defun spam-report-url-ping (host report)
-  "Ping a host through HTTP, addressing a specific GET resource"
+  "Ping a host through HTTP, addressing a specific GET resource using
+the function specified by `spam-report-url-ping-function'."
+  (funcall spam-report-url-ping-function host report))
+
+(defun spam-report-url-ping-plain (host report)
+  "Ping a host through HTTP, addressing a specific GET resource."
   (let ((tcp-connection))
     (with-temp-buffer
       (or (setq tcp-connection
@@ -88,9 +108,18 @@ This is probably handled better with group/topic parameters."
                 80))
          (error "Could not open connection to %s" host))
       (set-marker (process-mark tcp-connection) (point-min))
-      (process-send-string tcp-connection
-                          (format "GET %s HTTP/1.1\nHost: %s\n\n"
-                                  report host)))))
+      (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)))))
+
+(defun spam-report-url-ping-mm-url (host report)
+  "Ping a host through HTTP, addressing a specific GET resource. Use
+the external program specified in `mm-url-program' to connect to
+server."
+  (with-temp-buffer
+    (let ((url (concat "http://" host "/" report)))
+      (mm-url-insert url t))))
 
 (provide 'spam-report)