* sb-mixi.el (shimbun-get-headers): Use `mixi-bbs-p'.
[elisp/mixi.git] / sb-mixi.el
index 1e47c4b..2c56b98 100644 (file)
 
 ;;; Commentary:
 
+;; If you have bug reports and/or suggestions for improvement, please
+;; send them via <URL:http://mixi.jp/view_community.pl?id=1596390>.
+
 ;;; Code:
 
 (require 'mixi)
 (require 'shimbun)
 
-(luna-define-class shimbun-mixi (shimbun) ())
+(eval-and-compile
+  (luna-define-class shimbun-mixi (shimbun) (comment-cache))
+  (luna-define-internal-accessors 'shimbun-mixi))
 
 (defcustom shimbun-mixi-group-alist '(("new-diaries" . mixi-get-new-diaries)
                                      ("new-comments" . mixi-get-new-comments)
-                                     ("new-topics" . mixi-get-new-topics)
+                                     ("new-bbses" . mixi-get-new-bbses)
+                                     ("messages" . mixi-get-messages)
                                      ("my-diaries" . "/home.pl"))
   "*An alist of mixi shimbun group definition.
 Each element looks like (NAME . URL) or (NAME . FUNCTION).
 NAME is a shimbun group name.
 URL is the URL for mixi access point of the group.  When URL is friend's, get
-his/her diaries as article.  When community's, get its topics.  When diary's
-or topic's, get its comments.
-FUNCTION is the function for getting articles."
+his/her diaries as article.  When community's, get its BBSes.  When diary's
+or BBS's, get its comments.
+FUNCTION is the function which has one `range' argument and returns the list
+of mixi object."
   :group 'shimbun
   :type '(repeat (cons :fromat "%v"
                       (string :tag "Group name")
                       (radio (string :tag "URL")
                              (const :tag "New diaries" mixi-get-new-diaries)
                              (const :tag "New comments" mixi-get-new-comments)
-                             (const :tag "New topics" mixi-get-new-topics)
+                             (const :tag "New BBSes" mixi-get-new-bbses)
+                             (const :tag "Messages" mixi-get-messages)
                              (function :tag "Other function")))))
 
+;; FIXME: Don't use this user option.
 (defcustom shimbun-mixi-page-articles 10
   "*How many articles are there in one page."
   :group 'shimbun
   :type 'integer)
 
+(defcustom shimbun-mixi-logout-p nil
+  "*If non-ni, logout from mixi when shimbun server was closed."
+  :group 'shimbun
+  :type 'boolean)
+
+(defvar shimbun-mixi-x-face-alist
+  '(("default" . "X-Face: CY;j#FoBnpK^37`-IoJvN!J^u;GciiPmMQ@T)~RP1]t8iv?v)/bVI:I\"F!JfWJvhM5{zY!=
+ h.d+'g\\I{D>Ocy?Rc4uYUyOZj2%2Kl>,x-!MCSsyi3!L}psrrC1jlF,O?Ui>qf)X;sBz`/}\\066X%$
+ siG'|4K!2?==|oB&#E'5GGH\\#z[muyQ")))
+
+(luna-define-method initialize-instance :after ((shimbun shimbun-mixi)
+                                               &rest init-args)
+  (shimbun-mixi-set-comment-cache-internal shimbun
+                                          (make-hash-table :test 'equal))
+  shimbun)
+
+(luna-define-method shimbun-close :after ((shimbun shimbun-mixi))
+  (shimbun-mixi-set-comment-cache-internal shimbun nil)
+  (when shimbun-mixi-logout-p
+    (mixi-logout)))
+
 (luna-define-method shimbun-groups ((shimbun shimbun-mixi))
   (mapcar 'car shimbun-mixi-group-alist))
 
-(defun shimbun-mixi-make-subject (object)
+(defun shimbun-mixi-make-subject (shimbun object)
   (let ((class (mixi-object-class object)))
     (if (eq class 'mixi-comment)
-       (concat "Re: " (mixi-object-title (mixi-comment-parent object)))
-      (mixi-object-title object))))
+        (concat "Re: " (shimbun-mixi-make-subject
+                       shimbun (mixi-comment-parent object)))
+      (let ((prefix (when (eq class 'mixi-event) "[¥¤¥Ù¥ó¥È]"))
+           (subject (mixi-object-title object))
+           (suffix (when (string-match
+                          "^new-" (shimbun-current-group-internal shimbun))
+                     (concat " ("
+                             (if (eq class 'mixi-diary)
+                                 (mixi-friend-nick
+                                  (mixi-diary-owner object))
+                               (mixi-community-name
+                                (mixi-bbs-community object)))
+                             ")"))))
+       (concat prefix subject suffix)))))
 
 (defun shimbun-mixi-make-from (object)
   (let ((owner (mixi-object-owner object)))
@@ -99,9 +141,32 @@ FUNCTION is the function for getting articles."
           (mixi-expand-url (mixi-diary-page object)))
          ((eq class 'mixi-topic)
           (mixi-expand-url (mixi-topic-page object)))
+         ((eq class 'mixi-event)
+          (mixi-expand-url (mixi-event-page object)))
          ((eq class 'mixi-comment)
           (concat (shimbun-mixi-make-xref (mixi-comment-parent object))
-                  "#comment")))))
+                  "#comment"))
+         ((eq class 'mixi-message)
+          (mixi-expand-url (mixi-message-page object))))))
+
+(defun shimbun-mixi-make-body (object)
+  (let ((class (mixi-object-class object)))
+    (cond ((eq class 'mixi-event)
+          (let ((limit (mixi-event-limit object)))
+            (setq limit (if limit
+                            (format-time-string "%Yǯ%m·î%dÆü" limit)
+                          "»ØÄê¤Ê¤·"))
+            (concat "<dl><dt>³«ºÅÆü»þ¡§</dt>"
+                    "<dd>" (mixi-event-date object) "</dd>"
+                    "<dt>³«ºÅ¾ì½ê¡§</dt>"
+                    "<dd>" (mixi-event-place object) "</dd>"
+                    "<dt>¾ÜºÙ¡§</dt>"
+                    "<dd>" (mixi-event-detail object) "</dd>"
+                    "<dt>Ê罸´ü¸Â¡§</dt>"
+                    "<dd>" limit "</dd>"
+                    "<dt>»²²Ã¼Ô¡§</dt>"
+                    "<dd>" (mixi-event-members object) "</dd></dl>")))
+         (t (mixi-object-content object)))))
 
 (defun shimbun-mixi-get-headers (shimbun objects &optional range)
   (when objects
@@ -111,13 +176,10 @@ FUNCTION is the function for getting articles."
                (when (mixi-object-p object)
                  (let ((class (mixi-object-class object))
                        (id (shimbun-mixi-make-message-id object)))
-                   (when (and (eq class 'mixi-comment)
-                              (shimbun-search-id shimbun id))
-                     (throw 'stop nil))
                    (push
                     (shimbun-create-header
                      0
-                     (shimbun-mixi-make-subject object)
+                     (shimbun-mixi-make-subject shimbun object)
                      (shimbun-mixi-make-from object)
                      (shimbun-mixi-make-date object)
                      id
@@ -129,12 +191,16 @@ FUNCTION is the function for getting articles."
                      (shimbun-mixi-make-xref object))
                     headers)
                    (when (or (eq class 'mixi-diary)
-                             (eq class 'mixi-topic))
+                             (mixi-bbs-p object))
                      (let ((comments (mixi-get-comments object range)))
                        (mapc (lambda (header)
                                (push header headers))
                              (shimbun-mixi-get-headers shimbun
-                                                       comments)))))))
+                                                       comments))))
+                   (when (eq class 'mixi-comment)
+                     (puthash id (mixi-comment-content object)
+                              (shimbun-mixi-comment-cache-internal
+                               shimbun))))))
              objects))
       headers)))
 
@@ -150,35 +216,29 @@ FUNCTION is the function for getting articles."
          (cond ((eq class 'mixi-friend)
                 (setq objects (mixi-get-diaries object range)))
                ((eq class 'mixi-community)
-                (setq objects (mixi-get-topics object range)))
-               ((or (eq class 'mixi-diary) (eq class 'mixi-topic))
+                (setq objects (mixi-get-bbses object range)))
+               ((or (eq class 'mixi-diary)
+                    (mixi-bbs-p object))
                 (setq objects (mixi-get-comments object range)))
                (t (error (concat (symbol-name class)
                                  " is not supported yet.")))))
-      (when (fboundp url-or-function)
-       (setq objects (funcall url-or-function range))))
+      (setq objects (funcall url-or-function range)))
     (shimbun-sort-headers (shimbun-mixi-get-headers shimbun objects range))))
 
-(defun shimbun-comment-article (url header)
-  (let ((parent (mixi-make-object-from-url url))
-       (date (shimbun-header-date header))
-       (from (shimbun-header-from header)))
-    (catch 'found
-      (mapc (lambda (comment)
-             (let ((nick (mixi-friend-nick (mixi-comment-owner comment)))
-                   (time (shimbun-mixi-make-date comment))
-                   nick2)
-               ;; FIXME: How tricky it is.
-               (when (string-match "\\(.+\\)¤µ¤ó$" nick)
-                 (setq nick2 (match-string 1 nick)))
-               (when (and
-                      (or (string= (shimbun-mime-encode-string nick) from)
-                          (string= (shimbun-mime-encode-string nick2) from))
-                      (string= time date))
-                 ;; FIXME: Concat parent's information?
-                 (throw 'found (mixi-comment-content comment)))))
-           ;; FIXME: Limit range?
-           (mixi-get-comments parent)))))
+(defun shimbun-mixi-comment-article (url shimbun header)
+  (let* ((message-id (shimbun-header-id header))
+        (cache (shimbun-mixi-comment-cache-internal shimbun))
+        (article (gethash message-id cache)))
+    (unless (stringp article)
+      (let ((parent (mixi-make-object-from-url url)))
+       (mapc (lambda (comment)
+               (let ((id (shimbun-mixi-make-message-id comment))
+                     (content (mixi-comment-content comment)))
+                 (puthash id content cache)
+                 (when (string= id message-id)
+                   (setq article content))))
+             (mixi-get-comments parent))))
+    article))
 
 (luna-define-method shimbun-article ((shimbun shimbun-mixi)
                                     header &optional outbuf)
@@ -188,9 +248,9 @@ FUNCTION is the function for getting articles."
        (or (with-temp-buffer
             (let* ((url (shimbun-article-url shimbun header))
                    (article (if (string-match "#comment$" url)
-                                (shimbun-comment-article url header)
-                              ;; FIXME: Concat community information?
-                              (mixi-object-content
+                                (shimbun-mixi-comment-article
+                                 url shimbun header)
+                              (shimbun-mixi-make-body
                                (mixi-make-object-from-url url)))))
               (when (stringp article)
                 (insert article)))