* mixi.el (mixi-log-list-regexp): Follow the change of mixi.
[elisp/mixi.git] / sb-mixi.el
index 3f9a945..2d530dc 100644 (file)
   (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-bbses" . mixi-get-new-bbses)
-                                     ("messages" . mixi-get-messages)
-                                     ("my-diaries" . "/home.pl"))
+(defcustom shimbun-mixi-group-alist
+  '(("new-diaries" . mixi-get-new-diaries)
+    ("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)))
+    ("news.newest.politics" .
+     (lambda (range)
+       (mixi-get-news 'politics 'newest range)))
+    ("news.newest.economy" .
+     (lambda (range)
+       (mixi-get-news 'economy 'newest range)))
+    ("news.newest.area" .
+     (lambda (range)
+       (mixi-get-news 'area 'newest range)))
+    ("news.newest.abroad" .
+     (lambda (range)
+       (mixi-get-news 'abroad 'newest range)))
+    ("news.newest.sports" .
+     (lambda (range)
+       (mixi-get-news 'sports 'newest range)))
+    ("news.newest.entertainment" .
+     (lambda (range)
+       (mixi-get-news 'entertainment 'newest range)))
+    ("news.newest.it" .
+     (lambda (range)
+       (mixi-get-news 'IT 'newest range)))
+    ("news.pickup.domestic" .
+     (lambda (range)
+       (mixi-get-news 'domestic 'pickup range)))
+    ("news.pickup.politics" .
+     (lambda (range)
+       (mixi-get-news 'politics 'pickup range)))
+    ("news.pickup.economy" .
+     (lambda (range)
+       (mixi-get-news 'economy 'pickup range)))
+    ("news.pickup.area" .
+     (lambda (range)
+       (mixi-get-news 'area 'pickup range)))
+    ("news.pickup.abroad" .
+     (lambda (range)
+       (mixi-get-news 'abroad 'pickup range)))
+    ("news.pickup.sports" .
+     (lambda (range)
+       (mixi-get-news 'sports 'pickup range)))
+    ("news.pickup.entertainment" .
+     (lambda (range)
+       (mixi-get-news 'entertainment 'pickup range)))
+    ("news.pickup.it" .
+     (lambda (range)
+       (mixi-get-news 'IT 'pickup range))))
   "*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 BBSes.  When diary's
-or BBS's, get its comments.
+URL is the URL for mixi access point of the group.  If URL is friend's, get
+his/her diaries as article.  If community's, get its BBSes.  If 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
@@ -57,6 +111,7 @@ of mixi object."
                              (const :tag "New comments" mixi-get-new-comments)
                              (const :tag "New BBSes" mixi-get-new-bbses)
                              (const :tag "Messages" mixi-get-messages)
+                             (const :tag "Logs" mixi-get-logs)
                              (function :tag "Other function")))))
 
 ;; FIXME: Don't use this user option.
@@ -70,6 +125,8 @@ 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")))
 
+(defvar shimbun-mixi-reply-to nil)
+
 (luna-define-method initialize-instance :after ((shimbun shimbun-mixi)
                                                &rest init-args)
   (shimbun-mixi-set-comment-cache-internal shimbun
@@ -83,27 +140,39 @@ of mixi object."
 (luna-define-method shimbun-groups ((shimbun shimbun-mixi))
   (mapcar 'car shimbun-mixi-group-alist))
 
+(luna-define-method shimbun-reply-to ((shimbun shimbun-mixi))
+  shimbun-mixi-reply-to)
+
 (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 ((owner (mixi-object-owner object)))
-    (mixi-friend-nick owner)))
+  (let ((class (mixi-object-class object)))
+    (if (eq class 'mixi-news)
+       (mixi-news-media 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)
   (let* ((time (mixi-object-time object))
@@ -115,52 +184,23 @@ of mixi object."
            month " "
            (format-time-string "%Y %H:%M:%S %z" time))))
 
-(defconst shimbun-mixi-message-id-suffix "@mixi.jp")
-
 (defun shimbun-mixi-make-message-id (object)
-  "Make message-id for OBJECT.
-If OBJECT is comment, message-id is like follow:
-
-  <date$owner-id.owner-class$parent-id.parent-class$parent-owner-id.
-   parent-owner-class@mixi.jp>
-
-If OBJECT is diary or BBS or message:
-
-  <date$id.class$owner-id.owner-class@mixi.jp>
-
-If OBJECT is log:
-
-  <date$id.class@mixi.jp>
-
-The others:
-
-  <id.class@mixi.jp>"
   (let ((class (mixi-object-class object)))
-    (concat "<"
-           (unless (or (eq class 'mixi-friend) (eq class 'mixi-community))
-             (format-time-string "%Y%m%d%H%M." (mixi-object-time object)))
-           (mapconcat (lambda (object)
-                        (concat (mixi-object-id object)
-                                "." (mixi-object-name object)))
-                      (cond ((eq class 'mixi-comment)
-                             (let ((parent (mixi-comment-parent object)))
-                               (list (mixi-comment-owner object)
-                                     parent
-                                     (if (eq (mixi-object-class parent)
-                                             'mixi-diary)
-                                         (mixi-object-owner parent)
-                                       (mixi-bbs-community parent)))))
-                            ((or (eq class 'mixi-diary)
-                                 (eq class 'mixi-message))
-                             (list object (mixi-object-owner object)))
-                            ((mixi-bbs-p object)
-                             (list object (mixi-bbs-community object)))
-                            ((eq class 'mixi-log)
-                             (list (mixi-log-friend object)))
-                            (t
-                             (list object)))
-                      "$")
-           shimbun-mixi-message-id-suffix ">")))
+    (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)))
@@ -174,7 +214,13 @@ The others:
           (concat (shimbun-mixi-make-xref (mixi-comment-parent object))
                   "#comment"))
          ((eq class 'mixi-message)
-          (mixi-expand-url (mixi-message-page object))))))
+          (mixi-expand-url (mixi-message-page object)))
+         ((eq class 'mixi-news)
+          (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)))
@@ -183,51 +229,120 @@ The others:
             (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)
+  (setq shimbun-mixi-reply-to "mixi;")
+  (let ((class (mixi-object-class object)))
+    (setq shimbun-mixi-reply-to
+         (concat
+          (cond ((eq class 'mixi-diary)
+                 (concat shimbun-mixi-reply-to "comment;diary;"
+                         (mixi-friend-id (mixi-diary-owner object)) ";"
+                         (mixi-diary-id object)))
+                ((mixi-bbs-p object)
+                 (concat shimbun-mixi-reply-to "comment;"
+                         (mixi-object-name object) ";"
+                         (mixi-community-id (mixi-bbs-community object)) ";"
+                         (mixi-bbs-id object)))
+                ((eq class 'mixi-community)
+                 (concat shimbun-mixi-reply-to "topic;"
+                         (mixi-community-id object)))
+                ((or (eq class 'mixi-news) (eq object (mixi-make-me)))
+                 (concat shimbun-mixi-reply-to "diary"))
+                ((eq class 'mixi-message)
+                 (concat shimbun-mixi-reply-to "message;"
+                         (mixi-friend-id (mixi-message-owner object))))
+                ((or (eq class 'mixi-friend) (eq class 'mixi-log))
+                 (concat shimbun-mixi-reply-to "message;"
+                         (mixi-friend-id object))))))))
+
 (defun shimbun-mixi-get-headers (shimbun objects &optional range)
   (when objects
     (let (headers)
       (catch 'stop
        (mapc (lambda (object)
                (when (mixi-object-p object)
-                 (let ((class (mixi-object-class object))
-                       (id (shimbun-mixi-make-message-id object)))
-                   (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)))
 
@@ -244,8 +359,7 @@ The others:
                 (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.")))))
@@ -274,11 +388,12 @@ The others:
       (w3m-insert-string
        (or (with-temp-buffer
             (let* ((url (shimbun-article-url shimbun header))
+                   (object (mixi-make-object-from-url url))
                    (article (if (string-match "#comment$" url)
                                 (shimbun-mixi-comment-article
                                  url shimbun header)
-                              (shimbun-mixi-make-body
-                               (mixi-make-object-from-url url)))))
+                              (shimbun-mixi-make-body object))))
+              (shimbun-mixi-make-reply-to object)
               (when (stringp article)
                 (insert article)))
             (shimbun-message shimbun "shimbun: Make contents...")
@@ -287,31 +402,32 @@ The others:
               (shimbun-message shimbun "shimbun: Make contents...done")))
           "")))))
 
-(defun shimbun-mixi-make-object-from-message-id (message-id)
-  (when (string-match (concat "^<\\(.+\\)"
-                             (regexp-quote shimbun-mixi-message-id-suffix)
-                             ">$") message-id)
-    (let ((parts (reverse (split-string (match-string 1 message-id) "\\$")))
-         object parent comment)
-      (catch 'stop
-       (mapc (lambda (part)
-               (if (string-match "\\([a-z0-9]+\\)\\.\\([a-z]+\\)$" part)
-                   (let ((id (match-string 1 part))
-                         (func (intern (concat
-                                        mixi-object-prefix
-                                        "make-" (match-string 2 part)))))
-                     (cond ((null object)
-                            (setq object (funcall func id)))
-                           ((null parent)
-                            (setq parent (funcall func object id)))
-                           ((null comment)
-                            (setq comment
-                                  (mixi-make-comment parent
-                                                     (mixi-make-friend id)
-                                                     nil "dummy")))))
-                 (throw 'stop nil)))
-             parts))
-      (or comment parent object))))
+(defconst shimbun-mixi-to-regexp
+  "^mixi;\\([a-z]+\\);?\\([a-z0-9]+\\)?;?\\([0-9]+\\)?;?\\([0-9]+\\)?")
+
+(defun shimbun-mixi-send-mail (to title content)
+  (when (string-match shimbun-mixi-to-regexp to)
+    (let ((method (match-string 1 to)))
+      (cond ((string= method "comment")
+            (let ((parent (match-string 2 to))
+                  (owner-id (match-string 3 to))
+                  (id (match-string 4 to)))
+              (if (string= parent "diary")
+                  (mixi-post-comment
+                   (mixi-make-diary (mixi-make-friend owner-id) id) content)
+                (let ((func (intern
+                             (concat mixi-object-prefix "make-" parent))))
+                  (mixi-post-comment
+                   (funcall func (mixi-make-community owner-id) id)
+                   content)))))
+           ((string= method "topic")
+            (mixi-post-topic (mixi-make-community (match-string 2 to))
+                             title content))
+           ((string= method "diary")
+            (mixi-post-diary title content))
+           ((string= method "message")
+            (mixi-post-message (mixi-make-friend (match-string 2 to))
+                               title content))))))
 
 (provide 'sb-mixi)