* sb-mixi.el (shimbun-get-headers): Use `mixi-bbs-p'.

[elisp/mixi.git] / sb-mixi.el

diff --git a/sb-mixi.el b/sb-mixi.el
index c50fb52..2c56b98 100644 (file)
--- a/sb-mixi.el
+++ b/sb-mixi.el
@@ -65,13 +65,8 @@ of mixi object."
   :group 'shimbun
   :type 'integer)
 
-(defcustom shimbun-mixi-get-comment-p t
-  "*If non-nil, get diaries or BBSes together with its comments."
-  :group 'shimbun
-  :type 'boolean)
-
 (defcustom shimbun-mixi-logout-p nil
-  "*If non-ni, Logout from mixi when shimbun server was closed."
+  "*If non-ni, logout from mixi when shimbun server was closed."
   :group 'shimbun
   :type 'boolean)
 
@@ -80,29 +75,37 @@ of mixi object."
  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")))
 
-(defmacro shimbun-mixi-initialize-comment-cache (shimbun)
-  `(shimbun-mixi-set-comment-cache-internal ,shimbun
-                                           (make-hash-table :test 'equal)))
-
 (luna-define-method initialize-instance :after ((shimbun shimbun-mixi)
                                                &rest init-args)
-  (shimbun-mixi-initialize-comment-cache shimbun)
+  (shimbun-mixi-set-comment-cache-internal shimbun
+                                          (make-hash-table :test 'equal))
   shimbun)
 
 (luna-define-method shimbun-close :after ((shimbun shimbun-mixi))
-  (shimbun-mixi-initialize-comment-cache shimbun)
+  (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)))
-    (cond ((eq class 'mixi-comment)
-          (concat "Re: " (shimbun-mixi-make-subject
-                          (mixi-comment-parent object))))
-         (t (mixi-object-title object)))))
+    (if (eq class 'mixi-comment)
+        (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)))
@@ -147,7 +150,23 @@ of mixi object."
           (mixi-expand-url (mixi-message-page object))))))
 
 (defun shimbun-mixi-make-body (object)
-  (mixi-object-content 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
@@ -160,7 +179,7 @@ of mixi object."
                    (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
@@ -171,10 +190,8 @@ of mixi object."
                      0 0
                      (shimbun-mixi-make-xref object))
                     headers)
-                   (when (and shimbun-mixi-get-comment-p
-                              (or (eq class 'mixi-diary)
-                                  (eq class 'mixi-topic)
-                                  (eq class 'mixi-event)))
+                   (when (or (eq class 'mixi-diary)
+                             (mixi-bbs-p object))
                      (let ((comments (mixi-get-comments object range)))
                        (mapc (lambda (header)
                                (push header headers))
@@ -201,15 +218,14 @@ of mixi object."
                ((eq class 'mixi-community)
                 (setq objects (mixi-get-bbses object range)))
                ((or (eq class 'mixi-diary)
-                    (eq class 'mixi-topic)
-                    (eq class 'mixi-event))
+                    (mixi-bbs-p object))
                 (setq objects (mixi-get-comments object range)))
                (t (error (concat (symbol-name class)
                                  " is not supported yet.")))))
       (setq objects (funcall url-or-function range)))
     (shimbun-sort-headers (shimbun-mixi-get-headers shimbun objects range))))
 
-(defun shimbun-comment-article (url shimbun header)
+(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)))
@@ -217,7 +233,6 @@ of mixi object."
       (let ((parent (mixi-make-object-from-url url)))
        (mapc (lambda (comment)
                (let ((id (shimbun-mixi-make-message-id comment))
-                     ;; FIXME: Concat parent's information?
                      (content (mixi-comment-content comment)))
                  (puthash id content cache)
                  (when (string= id message-id)
@@ -233,8 +248,8 @@ of mixi object."
        (or (with-temp-buffer
             (let* ((url (shimbun-article-url shimbun header))
                    (article (if (string-match "#comment$" url)
-                                (shimbun-comment-article url shimbun header)
-                              ;; FIXME: Concat community information?
+                                (shimbun-mixi-comment-article
+                                 url shimbun header)
                               (shimbun-mixi-make-body
                                (mixi-make-object-from-url url)))))
               (when (stringp article)