* mixi.el (mixi-make-object-from-url): Support friend object.
[elisp/mixi.git] / sb-mixi.el
index 0c5f318..a346df2 100644 (file)
     ("new-comments" . mixi-get-new-comments)
     ("new-bbses" . mixi-get-new-bbses)
     ("messages" . mixi-get-messages)
+    ("messages.sent" .
+     (lambda (range)
+       (mixi-get-messages 'outbox range)))
+    ("logs" . mixi-get-logs)
     ("my-diaries" . "/home.pl")
+    ("mixi-el" . "/view_community.pl?id=1596390")
     ("news.newest.domestic" .
      (lambda (range)
        (mixi-get-news 'domestic 'newest range)))
@@ -139,27 +144,33 @@ of mixi object."
 
 (defun shimbun-mixi-make-subject (shimbun object)
   (let ((class (mixi-object-class 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)))))
+    (cond ((eq class 'mixi-comment)
+          (concat "Re: " (shimbun-mixi-make-subject
+                          shimbun (mixi-comment-parent object))))
+         ((eq class 'mixi-log)
+          (mixi-friend-nick (mixi-log-friend object)))
+         (t
+          (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 ((class (mixi-object-class object)))
     (if (eq class 'mixi-news)
        (mixi-news-media object)
-      (let ((owner (mixi-object-owner object)))
+      (let ((owner (if (eq class 'mixi-log)
+                      (mixi-log-friend object)
+                    (mixi-object-owner object))))
        (mixi-friend-nick owner)))))
 
 (defun shimbun-mixi-make-date (object)
@@ -174,19 +185,21 @@ of mixi object."
 
 (defun shimbun-mixi-make-message-id (object)
   (let ((class (mixi-object-class object)))
-    (concat "<"
-           (format-time-string "%Y%m%d%H%M" (mixi-object-time object)) "."
-           (if (eq class 'mixi-comment)
-               (concat (mixi-friend-id (mixi-comment-owner object)) "@"
-                       (mixi-object-id (mixi-comment-parent object)) "."
-                       (mixi-friend-id (mixi-object-owner
-                                        (mixi-comment-parent object))) ".")
-             (concat (mixi-object-id object) "@"
-                     (if (eq class 'mixi-news)
-                         (mixi-news-media-id object)
-                       (mixi-object-id (mixi-object-owner object))) "."))
-           (mixi-object-name object) ".mixi.jp"
-           ">")))
+    (concat
+     (format-time-string "<%Y%m%d%H%M" (mixi-object-time object)) "."
+     (cond ((eq class 'mixi-comment)
+           (concat (mixi-friend-id (mixi-comment-owner object)) "@"
+                   (mixi-object-id (mixi-comment-parent object)) "."
+                   (mixi-friend-id (mixi-object-owner
+                                    (mixi-comment-parent object))) "."))
+          ((eq class 'mixi-log)
+           (concat (mixi-friend-id (mixi-log-friend object)) "@"))
+          (t
+           (concat (mixi-object-id object) "@"
+                   (if (eq class 'mixi-news)
+                       (mixi-news-media-id object)
+                     (mixi-object-id (mixi-object-owner object))) ".")))
+     (mixi-object-name object) ".mixi.jp>")))
 
 (defun shimbun-mixi-make-xref (object)
   (let ((class (mixi-object-class object)))
@@ -202,7 +215,11 @@ of mixi object."
          ((eq class 'mixi-message)
           (mixi-expand-url (mixi-message-page object)))
          ((eq class 'mixi-news)
-          (mixi-news-page object)))))
+          (mixi-news-page object))
+         ((eq class 'mixi-log)
+          (mixi-expand-url (mixi-friend-page (mixi-log-friend object))))
+         ((eq class 'mixi-friend)
+          (mixi-expand-url (mixi-friend-page object))))))
 
 (defun shimbun-mixi-make-body (object)
   (let ((class (mixi-object-class object)))
@@ -211,16 +228,57 @@ of mixi object."
             (setq limit (if limit
                             (format-time-string "%Yǯ%m·î%dÆü" limit)
                           "»ØÄê¤Ê¤·"))
-            (concat "<dl><dt>³«ºÅÆü»þ¡§</dt>"
-                    "<dd>" (mixi-event-date object) "</dd>"
+            (concat "<dl>"
+                    "<dt>³«ºÅÆü»þ¡§</dt>"
+                    "<dd>" (mixi-event-date object) "</dd>\n"
                     "<dt>³«ºÅ¾ì½ê¡§</dt>"
-                    "<dd>" (mixi-event-place object) "</dd>"
+                    "<dd>" (mixi-event-place object) "</dd>\n"
                     "<dt>¾ÜºÙ¡§</dt>"
-                    "<dd>" (mixi-event-detail object) "</dd>"
+                    "<dd>" (mixi-event-detail object) "</dd>\n"
                     "<dt>Ê罸´ü¸Â¡§</dt>"
-                    "<dd>" limit "</dd>"
+                    "<dd>" limit "</dd>\n"
                     "<dt>»²²Ã¼Ô¡§</dt>"
-                    "<dd>" (mixi-event-members object) "</dd></dl>")))
+                    "<dd>" (mixi-event-members object) "</dd>\n"
+                    "</dl>")))
+         ((eq class 'mixi-friend)
+          (if (mixi-object-realized-p object)
+              (let ((sex (if (eq (mixi-friend-sex object) 'male) "ÃË" "½÷"))
+                    (age (number-to-string (mixi-friend-age object)))
+                    (birthday
+                     (concat (mapconcat (lambda (number)
+                                          (number-to-string number))
+                                        (mixi-friend-birthday object) "·î")
+                             "Æü"))
+                    (blood-type (symbol-name
+                                 (mixi-friend-blood-type object)))
+                    (hobby (mapconcat 'identity
+                                      (mixi-friend-hobby object) ", ")))
+                (concat "<dl>"
+                        "<dt>̾Á°¡§</dt>"
+                        "<dd>" (mixi-friend-name object) "</dd>\n"
+                        "<dt>À­ÊÌ¡§</dt>"
+                        "<dd>" sex "À­</dd>\n"
+                        "<dt>¸½½»½ê¡§</dt>"
+                        "<dd>" (mixi-friend-address object) "</dd>\n"
+                        "<dt>ǯÎð¡§</dt>"
+                        "<dd>" age "ºÐ</dd>\n"
+                        "<dt>ÃÂÀ¸Æü¡§</dt>"
+                        "<dd>" birthday "</dd>\n"
+                        "<dt>·ì±Õ·¿¡§</dt>"
+                        "<dd>" blood-type "·¿</dd>\n"
+                        "<dt>½Ð¿ÈÃÏ¡§</dt>"
+                        "<dd>" (mixi-friend-birthplace object) "</dd>\n"
+                        "<dt>¼ñÌ£¡§</dt>"
+                        "<dd>" hobby "</dd>\n"
+                        "<dt>¿¦¶È¡§</dt>"
+                        "<dd>" (mixi-friend-job object) "</dd>\n"
+                        "<dt>½ê°¡§</dt>"
+                        "<dd>" (mixi-friend-organization object) "</dd>\n"
+                        "<dt>¼«¸Ê¾Ò²ð¡§</dt>"
+                        "<dd>" (mixi-friend-profile object) "</dd>\n"
+                        "</dl>"))
+            (concat "<a href=\"" (shimbun-mixi-make-xref object)
+                    "\">¥×¥í¥Õ¥£¡¼¥ë¤òɽ¼¨¤¹¤ë</a>")))
          (t (mixi-object-content object)))))
 
 (defun shimbun-mixi-make-reply-to (object)
@@ -255,36 +313,35 @@ of mixi object."
       (catch 'stop
        (mapc (lambda (object)
                (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 shimbun object)
-                     (shimbun-mixi-make-from object)
-                     (shimbun-mixi-make-date object)
-                     id
-                     (if (eq class 'mixi-comment)
-                         (shimbun-mixi-make-message-id
-                          (mixi-comment-parent object))
-                       "")
-                     0 0
-                     (shimbun-mixi-make-xref object))
-                    headers)
-                   (when (or (eq class 'mixi-diary)
-                             (mixi-bbs-p object))
+                 (let ((class (mixi-object-class object)))
+                   (when (mixi-parent-p object)
                      (let ((comments (mixi-get-comments object range)))
                        (mapc (lambda (header)
                                (push header headers))
                              (shimbun-mixi-get-headers shimbun
                                                        comments))))
-                   (when (eq class 'mixi-comment)
-                     (puthash id (mixi-comment-content object)
-                              (shimbun-mixi-comment-cache-internal
-                               shimbun))))))
+                   (let ((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 shimbun object)
+                       (shimbun-mixi-make-from object)
+                       (shimbun-mixi-make-date object)
+                       id
+                       (if (eq class 'mixi-comment)
+                           (shimbun-mixi-make-message-id
+                            (mixi-comment-parent object))
+                         "")
+                       0 0
+                       (shimbun-mixi-make-xref object))
+                      headers)
+                     (when (eq class 'mixi-comment)
+                       (puthash id (mixi-comment-content object)
+                                (shimbun-mixi-comment-cache-internal
+                                 shimbun)))))))
              objects))
       headers)))
 
@@ -301,8 +358,7 @@ of mixi object."
                 (setq objects (mixi-get-diaries object range)))
                ((eq class 'mixi-community)
                 (setq objects (mixi-get-bbses object range)))
-               ((or (eq class 'mixi-diary)
-                    (mixi-bbs-p object))
+               ((mixi-parent-p object)
                 (setq objects (mixi-get-comments object range)))
                (t (error (concat (symbol-name class)
                                  " is not supported yet.")))))