Fix my last change.
[gnus] / lisp / nnslashdot.el
index 433e1ea..3762927 100644 (file)
@@ -1,5 +1,5 @@
 ;;; nnslashdot.el --- interfacing with Slashdot
-;; Copyright (C) 1999 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2000 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
 (require 'gnus)
 (require 'nnmail)
 (require 'mm-util)
-(require 'nnweb)
 (eval-when-compile
   (ignore-errors
-    (require 'w3)
-    (require 'url)
-    (require 'w3-forms)))
+    (require 'nnweb)))
 ;; Report failure to find w3 at load time if appropriate.
-(eval '(progn
-        (require 'w3)
-        (require 'url)
-        (require 'w3-forms)))
+(eval '(require 'nnweb))
 
 (nnoo-declare nnslashdot)
 
 (defvoo nnslashdot-active-url "http://slashdot.org/search.pl?section=&min=%d"
   "Where nnslashdot will fetch the active file from.")
 
-(defvoo nnslashdot-comments-url "http://slashdot.org/comments.pl?sid=%s&threshold=%d&commentsort=0&mode=flat&startat=%d"
+(defvoo nnslashdot-comments-url "http://slashdot.org/comments.pl?sid=%s&threshold=%d&commentsort=%d&mode=flat&startat=%d"
   "Where nnslashdot will fetch comments from.")
 
 (defvoo nnslashdot-article-url
     "http://slashdot.org/article.pl?sid=%s&mode=nocomment"
   "Where nnslashdot will fetch the article from.")
 
-(defvoo nnslashdot-threshold 0
+(defvoo nnslashdot-threshold -1
   "The article threshold.")
 
-(defvoo nnslashdot-group-number 30
-  "The number of groups to keep updated.")
+(defvoo nnslashdot-threaded t
+  "Whether the nnslashdot groups should be threaded or not.")
+
+(defvoo nnslashdot-group-number 0
+  "The number of non-fresh groups to keep updated.")
+
+(defvoo nnslashdot-login-name ""
+  "The login name to use when posting.")
+
+(defvoo nnslashdot-password ""
+  "The password to use when posting.")
 
 ;;; Internal variables
 
 
 (deffoo nnslashdot-retrieve-headers (articles &optional group server fetch-old)
   (nnslashdot-possibly-change-server group server)
+  (condition-case why
+      (unless gnus-nov-is-evil
+        (if nnslashdot-threaded
+            (nnslashdot-threaded-retrieve-headers articles group)
+          (nnslashdot-sane-retrieve-headers articles group)))
+    (search-failed (nnslashdot-lose why))))
+
+(deffoo nnslashdot-threaded-retrieve-headers (articles group)
   (let ((last (car (last articles)))
        (did nil)
        (start 1)
        (sid (caddr (assoc group nnslashdot-groups)))
-       headers article subject score from date lines parent point
-       startats s)
+       (first-comments t)
+       (startats '(1))
+       headers article subject score from date lines parent point s)
     (save-excursion
       (set-buffer nnslashdot-buffer)
-      (erase-buffer)
-      (when (= start 1)
-       (url-insert-file-contents (format nnslashdot-article-url sid))
-       (setq buffer-file-name nil)
-       (goto-char (point-min))
-       (search-forward "Posted by ")
-       (when (looking-at "<a[^>]+>\\([^<]+\\)")
-         (setq from (match-string 1)))
-       (search-forward " on ")
-       (setq date (nnslashdot-date-to-date
-                   (buffer-substring (point) (1- (search-forward "<")))))
-       (forward-line 2)
-       (setq lines (count-lines (point)
-                                (search-forward
-                                 "A href=http://slashdot.org/article.pl")))
-       (push
-        (cons
-         1
-         (make-full-mail-header
-          1 group from date (concat "<" sid "%1@slashdot>")
-          "" 0 lines nil nil))
-        headers)
-       (goto-char (point-max))
-       (while (re-search-backward "startat=\\([0-9]+\\)" nil t)
-         (setq s (match-string 1))
-         (unless (memq s startats)
-           (push s startats)))
-       (unless startats
-         (push 1 startats)))
-      (setq startats (sort startats '<))
-      (while (and (setq start (pop startats))
-                 (< start last))
-       (setq point (goto-char (point-max)))
-       (url-insert-file-contents
-        (format nnslashdot-comments-url sid nnslashdot-threshold start))
-       (setq buffer-file-name nil)
-       (goto-char point)
-       (while (re-search-forward
-               "<a name=\"\\([0-9]+\\)\"><b>\\([^<]+\\)</b>.*score:\\([^)]+\\))"
-               nil t)
-         (setq article (string-to-number (match-string 1))
-               subject (match-string 2)
-               score (match-string 3))
-         (when (string-match "^Re: *" subject)
-           (setq subject (concat "Re: " (substring subject (match-end 0)))))
-         (forward-line 1)
-         (if (looking-at "by <a[^>]+>\\([^<]+\\)</a>[ \t\n]*.*(\\([^)]+\\))")
-             (setq from (concat (match-string 1) " <" (match-string 2) ">"))
-           (looking-at "by \\(.+\\) on ")
-           (setq from (match-string 1)))
-         (goto-char (- (match-end 0) 5))
+      (let ((case-fold-search t))
+       (erase-buffer)
+       (when (= start 1)
+         (nnweb-insert (format nnslashdot-article-url
+                               (nnslashdot-sid-strip sid)) t)
+         (goto-char (point-min))
+         (search-forward "Posted by ")
+         (when (looking-at "<a[^>]+>\\([^<]+\\)")
+           (setq from (nnweb-decode-entities-string (match-string 1))))
          (search-forward " on ")
-         (setq date
-               (nnslashdot-date-to-date
-                (buffer-substring (point) (progn (end-of-line) (point)))))
-         (setq lines (/ (abs (- (search-forward "<td ")
-                                (search-forward "</td>")))
-                        70))
-         (forward-line 2)
-         (setq parent
-               (if (looking-at ".*cid=\\([0-9]+\\)")
-                   (match-string 1)
-                 nil))
-         (setq did t)
+         (setq date (nnslashdot-date-to-date
+                     (buffer-substring (point) (1- (search-forward "<")))))
+         (setq lines (/ (- (point)
+                           (progn (forward-line 1) (point)))
+                        60))
          (push
           (cons
-           (1+ article)
+           1
            (make-full-mail-header
-            (1+ article) subject
-            from date
-            (concat "<" sid "%"
-                    (number-to-string (1+ article)) 
-                    "@slashdot>")
-            (if parent
-                (concat "<" sid "%"
-                        (number-to-string (1+ (string-to-number parent)))
-                        "@slashdot>")
-              "")
-            0 (string-to-number score) nil nil))
-          headers))))
-    (setq nnslashdot-headers
-         (sort headers (lambda (s1 s2) (< (car s1) (car s2)))))
+            1 group from date
+            (concat "<" (nnslashdot-sid-strip sid) "%1@slashdot>")
+            "" 0 lines nil nil))
+          headers))
+       (while (and (setq start (pop startats))
+                   (< start last))
+         (setq point (goto-char (point-max)))
+         (nnweb-insert
+          (format nnslashdot-comments-url
+                  (nnslashdot-sid-strip sid)
+                  nnslashdot-threshold 0 start)
+          t)
+         (when first-comments
+           (setq first-comments nil)
+           (goto-char (point-max))
+           (while (re-search-backward "startat=\\([0-9]+\\)" nil t)
+             (setq s (string-to-number (match-string 1)))
+             (unless (memq s startats)
+               (push s startats)))
+           (setq startats (sort startats '<)))
+         (goto-char point)
+         (while (re-search-forward
+                 "<a name=\"\\([0-9]+\\)\"><\\(b\\|H4\\)>\\([^<]+\\)</\\(b\\|H4\\)>.*score:\\([^)]+\\))"
+                 nil t)
+           (setq article (string-to-number (match-string 1))
+                 subject (match-string 3)
+                 score (match-string 5))
+           (when (string-match "^Re: *" subject)
+             (setq subject (concat "Re: " (substring subject (match-end 0)))))
+            (setq subject (nnweb-decode-entities-string subject))
+           (forward-line 1)
+           (if (looking-at
+                "by <a[^>]+>\\([^<]+\\)</a>[ \t\n]*.*(\\([^)]+\\))")
+               (progn
+                 (goto-char (- (match-end 0) 5))
+                 (setq from (concat 
+                             (nnweb-decode-entities-string (match-string 1))
+                             " <" (match-string 2) ">")))
+             (setq from "")
+             (when (looking-at "by \\(.+\\) on ")
+               (goto-char (- (match-end 0) 5))
+               (setq from (nnweb-decode-entities-string (match-string 1)))))
+           (search-forward " on ")
+           (setq date
+                 (nnslashdot-date-to-date
+                  (buffer-substring (point) (progn (end-of-line) (point)))))
+           (setq lines (/ (abs (- (search-forward "<td ")
+                                  (search-forward "</td>")))
+                          70))
+           (forward-line 4)
+           (setq parent
+                 (if (looking-at ".*cid=\\([0-9]+\\)")
+                     (match-string 1)
+                   nil))
+           (setq did t)
+           (push
+            (cons
+             (1+ article)
+             (make-full-mail-header
+              (1+ article)
+              (concat subject " (" score ")")
+              from date
+              (concat "<" (nnslashdot-sid-strip sid) "%"
+                      (number-to-string (1+ article)) 
+                      "@slashdot>")
+              (if parent
+                  (concat "<" (nnslashdot-sid-strip sid) "%"
+                          (number-to-string (1+ (string-to-number parent)))
+                          "@slashdot>")
+                "")
+              0 lines nil nil))
+            headers)))))
+    (setq nnslashdot-headers (sort headers 'car-less-than-car))
     (save-excursion
       (set-buffer nntp-server-buffer)
       (erase-buffer)
-      (dolist (header nnslashdot-headers)
-       (nnheader-insert-nov (cdr header))))
+      (mm-with-unibyte-current-buffer
+       (dolist (header nnslashdot-headers)
+        (nnheader-insert-nov (cdr header)))))
     'nov))
 
-(deffoo nnslashdot-sane-retrieve-headers (articles &optional group
-                                                  server fetch-old)
-  (nnslashdot-possibly-change-server group server)
+(deffoo nnslashdot-sane-retrieve-headers (articles group)
   (let ((last (car (last articles)))
        (did nil)
-       (start (car articles))
+       (start (max (1- (car articles)) 1))
        (sid (caddr (assoc group nnslashdot-groups)))
        headers article subject score from date lines parent point)
     (save-excursion
       (set-buffer nnslashdot-buffer)
       (erase-buffer)
       (when (= start 1)
-       (url-insert-file-contents (format nnslashdot-article-url sid))
-       (setq buffer-file-name nil)
+       (nnweb-insert (format nnslashdot-article-url
+                             (nnslashdot-sid-strip sid)) t)
        (goto-char (point-min))
        (search-forward "Posted by ")
        (when (looking-at "<a[^>]+>\\([^<]+\\)")
-         (setq from (match-string 1)))
+         (setq from (nnweb-decode-entities-string (match-string 1))))
        (search-forward " on ")
        (setq date (nnslashdot-date-to-date
                    (buffer-substring (point) (1- (search-forward "<")))))
        (forward-line 2)
        (setq lines (count-lines (point)
-                                (search-forward
-                                 "A href=http://slashdot.org/article.pl")))
+                                (re-search-forward
+                                 "A href=\"\\(http://slashdot.org\\)?/article")))
        (push
         (cons
          1
          (make-full-mail-header
-          1 group from date (concat "<" sid "%1@slashdot>")
+          1 group from date (concat "<" (nnslashdot-sid-strip sid)
+                                    "%1@slashdot>")
           "" 0 lines nil nil))
         headers))
       (while (or (not article)
        (when article
          (setq start (1+ article)))
        (setq point (goto-char (point-max)))
-       (url-insert-file-contents
-        (format nnslashdot-comments-url sid nnslashdot-threshold start))
-       (setq buffer-file-name nil)
+       (nnweb-insert
+        (format nnslashdot-comments-url (nnslashdot-sid-strip sid)
+                nnslashdot-threshold 4 start)
+        t)
        (goto-char point)
        (while (re-search-forward
-               "<a name=\"\\([0-9]+\\)\"><b>\\([^<]+\\)</b>.*score\\([^)]+\\))"
+                 "<a name=\"\\([0-9]+\\)\"><\\(b\\|H4\\)>\\([^<]+\\)</\\(b\\|H4\\)>.*score:\\([^)]+\\))"
                nil t)
          (setq article (string-to-number (match-string 1))
-               subject (match-string 2)
-               score (match-string 3))
+               subject (match-string 3)
+               score (match-string 5))
+         (when (string-match "^Re: *" subject)
+           (setq subject (concat "Re: " (substring subject (match-end 0)))))
+          (setq subject (nnweb-decode-entities-string subject))
          (forward-line 1)
-         (if (looking-at "by <a[^>]+>\\([^<]+\\)</a>[ \t\n]*.*(\\([^)]+\\))")
-             (setq from (concat (match-string 1) " <" (match-string 2) ">"))
-           (looking-at "by \\(.+\\) on ")
-           (setq from (match-string 1)))
-         (goto-char (- (match-end 0) 5))
+         (if (looking-at
+              "by <a[^>]+>\\([^<]+\\)</a>[ \t\n]*.*(\\([^)]+\\))")
+             (progn
+               (goto-char (- (match-end 0) 5))
+               (setq from (concat 
+                           (nnweb-decode-entities-string (match-string 1))
+                           " <" (match-string 2) ">")))
+           (setq from "")
+           (when (looking-at "by \\(.+\\) on ")
+             (goto-char (- (match-end 0) 5))
+             (setq from (nnweb-decode-entities-string (match-string 1)))))
          (search-forward " on ")
          (setq date
                (nnslashdot-date-to-date
            (make-full-mail-header
             (1+ article) (concat subject " (" score ")")
             from date
-            (concat "<" sid "%"
+            (concat "<" (nnslashdot-sid-strip sid) "%"
                     (number-to-string (1+ article)) 
                     "@slashdot>")
             (if parent
-                (concat "<" sid "%"
+                (concat "<" (nnslashdot-sid-strip sid) "%"
                         (number-to-string (1+ (string-to-number parent)))
                         "@slashdot>")
               "")
     (save-excursion
       (set-buffer nntp-server-buffer)
       (erase-buffer)
-      (dolist (header nnslashdot-headers)
-       (nnheader-insert-nov (cdr header))))
+      (mm-with-unibyte-current-buffer
+       (dolist (header nnslashdot-headers)
+         (nnheader-insert-nov (cdr header)))))
     'nov))
 
 (deffoo nnslashdot-request-group (group &optional server dont-check)
 (deffoo nnslashdot-request-article (article &optional group server buffer)
   (nnslashdot-possibly-change-server group server)
   (let (contents)
-    (save-excursion
-      (set-buffer nnslashdot-buffer)
-      (goto-char (point-min))
-      (when (numberp article)
-       (if (= article 1)
-           (progn
-             (search-forward " on ")
-             (forward-line 1)
-             (setq contents
-                   (buffer-substring
-                    (point)
-                    (search-forward
-                                 "A href=http://slashdot.org/article.pl"))))
-         (search-forward (format "<a name=\"%d\">" (1- article)))
-         (setq contents
-               (buffer-substring
-                (re-search-forward "<td[^>]+>")
-                (search-forward "</td>"))))))
+    (condition-case why
+       (save-excursion
+         (set-buffer nnslashdot-buffer)
+         (let ((case-fold-search t))
+           (goto-char (point-min))
+           (when (and (stringp article)
+                      (string-match "%\\([0-9]+\\)@" article))
+             (setq article (string-to-number (match-string 1 article))))
+           (when (numberp article)
+             (if (= article 1)
+                 (progn
+                   (re-search-forward "Posted by *<[^>]+>[^>]*<[^>]+> *on ")
+                   (search-forward "<BR>")
+                   (setq contents
+                         (buffer-substring
+                          (point)
+                          (progn
+                            (re-search-forward
+                             "<p>.*A href=\"\\(http://slashdot.org\\)?/article")
+                            (match-beginning 0)))))
+               (search-forward (format "<a name=\"%d\">" (1- article)))
+               (setq contents
+                     (buffer-substring
+                      (re-search-forward "<td[^>]+>")
+                      (search-forward "</td>")))))))
+      (search-failed (nnslashdot-lose why)))
+
     (when contents
       (save-excursion
        (set-buffer (or buffer nntp-server-buffer))
        (erase-buffer)
-       (insert contents)
-       ;;(nnweb-remove-markup)
-       ;;(nnweb-decode-entities)
-       (goto-char (point-min))
-       (insert "Content-Type: text/html\nMIME-Version: 1.0\n")
-       (let ((header (cdr (assq article nnslashdot-headers))))
-         (nnheader-insert-header header))
-       (nnheader-report 'nnslashdot "Fetched article %s" article)
-       t))))
+       (mm-with-unibyte-current-buffer
+         (insert contents)
+         (goto-char (point-min))
+         (while (re-search-forward "\\(<br>\r?\\)+" nil t)
+           (replace-match "<p>" t t))
+         (goto-char (point-min))
+         (insert "Content-Type: text/html\nMIME-Version: 1.0\n")
+         (insert "Newsgroups: " (caddr (assoc group nnslashdot-groups))
+                 "\n")
+         (let ((header (cdr (assq article nnslashdot-headers))))
+           (nnheader-insert-header header))
+         (nnheader-report 'nnslashdot "Fetched article %s" article))
+       (cons group article)))))
 
 (deffoo nnslashdot-close-server (&optional server)
   (when (and (nnslashdot-server-opened server)
 
 (deffoo nnslashdot-request-list (&optional server)
   (nnslashdot-possibly-change-server nil server)
-  (let ((case-fold-search t)
-       (number 0)
+  (let ((number 0)
        sid elem description articles gname)
-    (while (> (- nnslashdot-group-number number) 0)
-      (with-temp-buffer
-       (url-insert-file-contents (format nnslashdot-active-url number))
-       (setq buffer-file-name nil)
-       (goto-char (point-min))
-       (while (re-search-forward
-               "article.pl\\?sid=\\([^&]+\\).*<b>\\([^<]+\\)</b>" nil t)
-         (setq sid (match-string 1)
-               description (match-string 2))
-         (forward-line 1)
-         (when (re-search-forward "<b>\\([0-9]+\\)</b>" nil t)
-           (setq articles (string-to-number (match-string 1))))
-         (setq gname (concat description " (" sid ")"))
-         (if (setq elem (assoc gname nnslashdot-groups))
-             (setcar (cdr elem) articles)
-           (push (list gname articles sid) nnslashdot-groups))))
-      (incf number 30))
+    (condition-case why
+        ;; First we do the Ultramode to get info on all the latest groups.
+       (progn 
+         (mm-with-unibyte-buffer
+           (nnweb-insert "http://slashdot.org/slashdot.xml" t)
+           (goto-char (point-min))
+           (while (search-forward "<story>" nil t)
+             (narrow-to-region (point) (search-forward "</story>"))
+             (goto-char (point-min))
+             (re-search-forward "<title>\\([^<]+\\)</title>")
+             (setq description
+                   (nnweb-decode-entities-string (match-string 1)))
+             (re-search-forward "<url>\\([^<]+\\)</url>")
+             (setq sid (match-string 1))
+             (string-match "/\\([0-9/]+\\)\\(.shtml\\|$\\)" sid)
+             (setq sid (concat "00/" (match-string 1 sid)))
+             (re-search-forward "<comments>\\([^<]+\\)</comments>")
+             (setq articles (string-to-number (match-string 1)))
+             (setq gname (concat description " (" sid ")"))
+             (if (setq elem (assoc gname nnslashdot-groups))
+                 (setcar (cdr elem) articles)
+               (push (list gname articles sid) nnslashdot-groups))
+             (goto-char (point-max))
+             (widen)))
+         ;; Then do the older groups.
+         (while (> (- nnslashdot-group-number number) 0)
+           (mm-with-unibyte-buffer
+             (let ((case-fold-search t))
+               (nnweb-insert (format nnslashdot-active-url number) t)
+               (goto-char (point-min))
+               (while (re-search-forward
+                       "article.pl\\?sid=\\([^&]+\\).*<b>\\([^<]+\\)</b>"
+                       nil t)
+                 (setq sid (match-string 1)
+                       description
+                       (nnweb-decode-entities-string (match-string 2)))
+                 (forward-line 1)
+                 (when (re-search-forward "<b>\\([0-9]+\\)</b>" nil t)
+                   (setq articles (string-to-number (match-string 1))))
+                 (setq gname (concat description " (" sid ")"))
+                 (if (setq elem (assoc gname nnslashdot-groups))
+                     (setcar (cdr elem) articles)
+                   (push (list gname articles sid) nnslashdot-groups)))))
+           (incf number 30)))
+      (search-failed (nnslashdot-lose why)))
     (nnslashdot-write-groups)
-    (save-excursion
-      (set-buffer nntp-server-buffer)
-      (erase-buffer)
-      (dolist (elem nnslashdot-groups)
-       (insert (prin1-to-string (car elem))
-               " " (number-to-string (cadr elem)) " 1 y\n")))
+    (nnslashdot-generate-active)
     t))
-
+  
 (deffoo nnslashdot-request-newgroups (date &optional server)
-  (nnslashdot-request-list server))
+  (nnslashdot-possibly-change-server nil server)
+  (nnslashdot-generate-active)
+  t)
 
-(deffoo nnslashdot-asynchronous-p ()
-  nil)
+(deffoo nnslashdot-request-post (&optional server)
+  (nnslashdot-possibly-change-server nil server)
+  (let ((sid (nnslashdot-sid-strip (message-fetch-field "newsgroups")))
+       (subject (message-fetch-field "subject"))
+       (references (car (last (split-string
+                               (message-fetch-field "references")))))
+       body quoted pid)
+    (string-match "%\\([0-9]+\\)@slashdot" references)
+    (setq pid (match-string 1 references))
+    (message-goto-body)
+    (narrow-to-region (point) (progn (message-goto-signature) (point)))
+    (goto-char (point-min))
+    (while (not (eobp))
+      (if (looking-at "> ")
+         (progn
+           (delete-region (point) (+ (point) 2))
+           (unless quoted
+             (insert "<blockquote>\n"))
+           (setq quoted t))
+       (when quoted
+         (insert "</blockquote>\n")
+         (setq quoted nil)))
+      (forward-line 1))
+    (goto-char (point-min))
+    (while (re-search-forward "^ *\n" nil t)
+      (replace-match "<p>\n"))
+    (widen)
+    (when (message-goto-signature)
+      (forward-line -1)
+      (insert "<p>\n")
+      (while (not (eobp))
+       (end-of-line)
+       (insert "<br>")
+       (forward-line 1)))
+    (message-goto-body)
+    (setq body (buffer-substring (point) (point-max)))
+    (erase-buffer)
+    (nnweb-fetch-form
+     "http://slashdot.org/comments.pl"
+     `(("sid" . ,sid)
+       ("pid" . ,pid)
+       ("rlogin" . "userlogin")
+       ("unickname" . ,nnslashdot-login-name)
+       ("upasswd" . ,nnslashdot-password)
+       ("postersubj" . ,subject)
+       ("op" . "Submit")
+       ("postercomment" . ,body)
+       ("posttype" . "html")))))
+
+(deffoo nnslashdot-request-delete-group (group &optional force server)
+  (nnslashdot-possibly-change-server group server)
+  (setq nnslashdot-groups (delq (assoc group nnslashdot-groups)
+                               nnslashdot-groups))
+  (nnslashdot-write-groups))
+
+(deffoo nnslashdot-request-close ()
+  (setq nnslashdot-headers nil
+       nnslashdot-groups nil))
 
 (nnoo-define-skeleton nnslashdot)
 
 (defun nnslashdot-read-groups ()
   (let ((file (expand-file-name "groups" nnslashdot-directory)))
     (when (file-exists-p file)
-      (with-temp-buffer
+      (mm-with-unibyte-buffer
        (insert-file-contents file)
        (goto-char (point-min))
        (setq nnslashdot-groups (read (current-buffer)))))))
            (nnheader-set-temp-buffer
             (format " *nnslashdot %s*" server))))))
 
-(defun nnslashdot-encode-www-form-urlencoded (pairs)
-  "Return PAIRS encoded for forms."
-  (mapconcat
-   (function
-    (lambda (data)
-      (concat (w3-form-encode-xwfu (car data)) "="
-             (w3-form-encode-xwfu (cdr data)))))
-   pairs "&"))
-
-(defun nnslashdot-fetch-form (url pairs)
-  (let ((url-request-data (nnslashdot-encode-www-form-urlencoded pairs))
-       (url-request-method "POST")
-       (url-request-extra-headers
-        '(("Content-type" . "application/x-www-form-urlencoded"))))
-    (url-insert-file-contents url)
-    (setq buffer-file-name nil))
-  t)
-
-(defun nnslashdot-decode-entities ()
-  (goto-char (point-min))
-  (while (re-search-forward "&\\([a-z]+\\);" nil t)
-    (replace-match (char-to-string (or (cdr (assq (intern (match-string 1))
-                                                 w3-html-entities))
-                                      ?#))
-                  t t)))
-
-(defun nnslashdot-remove-markup ()
-  (goto-char (point-min))
-  (while (search-forward "<!--" nil t)
-    (delete-region (match-beginning 0)
-                  (or (search-forward "-->" nil t)
-                      (point-max))))
-  (goto-char (point-min))
-  (while (re-search-forward "<[^>]+>" nil t)
-    (replace-match "" t t)))
-
 (defun nnslashdot-date-to-date (sdate)
-  (let ((elem (split-string sdate)))
-    (concat (substring (nth 0 elem) 0 3) " "
-           (substring (nth 1 elem) 0 3) " "
-           (substring (nth 2 elem) 0 2) " "
-           (substring (nth 3 elem) 1 6) " "
-           (format-time-string "%Y") " "
-           (nth 4 elem))))
+  (condition-case err
+      (let ((elem (delete "" (split-string sdate))))
+       (concat (substring (nth 0 elem) 0 3) " "
+               (substring (nth 1 elem) 0 3) " "
+               (substring (nth 2 elem) 0 2) " "
+               (substring (nth 3 elem) 1 6) " "
+               (format-time-string "%Y") " "
+               (nth 4 elem)))
+    (error "")))
+
+(defun nnslashdot-generate-active ()
+  (save-excursion
+    (set-buffer nntp-server-buffer)
+    (erase-buffer)
+    (dolist (elem nnslashdot-groups)
+      (insert (prin1-to-string (car elem))
+             " " (number-to-string (cadr elem)) " 1 y\n"))))
+
+(defun nnslashdot-lose (why)
+  (error "Slashdot HTML has changed; please get a new version of nnslashdot"))
+
+;(defun nnslashdot-sid-strip (sid)
+;  (if (string-match "^00/" sid)
+;      (substring sid (match-end 0))
+;    sid))
+
+(defalias 'nnslashdot-sid-strip 'identity)
 
 (provide 'nnslashdot)