X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=sb-mixi.el;h=22c9e4c28100da17801ccf7b7d0c0919f1a4dd6f;hb=783277891be5b997142c5e7a72ba547a641cf6ef;hp=a346df2823a1dd7add49711a51911125defa1aa7;hpb=dc9d1f707c9eef0154a63ff4107fbd1f21aa3e9a;p=elisp%2Fmixi.git
diff --git a/sb-mixi.el b/sb-mixi.el
index a346df2..22c9e4c 100644
--- a/sb-mixi.el
+++ b/sb-mixi.el
@@ -30,13 +30,14 @@
;;; Code:
(require 'mixi)
+(require 'mixi-utils)
(require 'shimbun)
(eval-and-compile
(luna-define-class shimbun-mixi (shimbun) (comment-cache))
(luna-define-internal-accessors 'shimbun-mixi))
-(defcustom shimbun-mixi-group-alist
+(defconst shimbun-mixi-default-group-alist
'(("new-diaries" . mixi-get-new-diaries)
("new-comments" . mixi-get-new-comments)
("new-bbses" . mixi-get-new-bbses)
@@ -95,6 +96,9 @@
("news.pickup.it" .
(lambda (range)
(mixi-get-news 'IT 'pickup range))))
+ "An alist of mixi shimbun group default definition.")
+
+(defcustom shimbun-mixi-group-alist nil
"*An alist of mixi shimbun group definition.
Each element looks like (NAME . URL) or (NAME . FUNCTION).
NAME is a shimbun group name.
@@ -111,6 +115,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.
@@ -124,7 +129,9 @@ of mixi object."
h.d+'g\\I{D>Ocy?Rc4uYUyOZj2%2Kl>,x-!MCSsyi3!L}psrrC1jlF,O?Ui>qf)X;sBz`/}\\066X%$
siG'|4K!2?==|oBE'5GGH\\#z[muyQ")))
-(defvar shimbun-mixi-reply-to nil)
+(defun shimbun-mixi-group-alist ()
+ (append shimbun-mixi-default-group-alist
+ shimbun-mixi-group-alist))
(luna-define-method initialize-instance :after ((shimbun shimbun-mixi)
&rest init-args)
@@ -137,247 +144,74 @@ of mixi object."
(mixi-logout))
(luna-define-method shimbun-groups ((shimbun shimbun-mixi))
- (mapcar 'car shimbun-mixi-group-alist))
+ (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)))
- (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 (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))
- (cts (current-time-string time))
- (day-of-week (substring cts 0 3))
- (month (substring cts 4 7)))
- (concat day-of-week ", "
- (format-time-string "%d" time) " "
- month " "
- (format-time-string "%Y %H:%M:%S %z" time))))
-
-(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)) "."
- (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)))
- (cond ((eq class 'mixi-diary)
- (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"))
- ((eq class 'mixi-message)
- (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)))
- (cond ((eq class 'mixi-event)
- (let ((limit (mixi-event-limit object)))
- (setq limit (if limit
- (format-time-string "%Yǯ%m·î%dÆü" limit)
- "»ØÄê¤Ê¤·"))
- (concat "
"
- "- ³«ºÅÆü»þ¡§
"
- "- " (mixi-event-date object) "
\n"
- "- ³«ºÅ¾ì½ê¡§
"
- "- " (mixi-event-place object) "
\n"
- "- ¾ÜºÙ¡§
"
- "- " (mixi-event-detail object) "
\n"
- "- Ê罸´ü¸Â¡§
"
- "- " limit "
\n"
- "- »²²Ã¼Ô¡§
"
- "- " (mixi-event-members object) "
\n"
- "
")))
- ((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 ""
- "- ̾Á°¡§
"
- "- " (mixi-friend-name object) "
\n"
- "- ÀÊÌ¡§
"
- "- " sex "À
\n"
- "- ¸½½»½ê¡§
"
- "- " (mixi-friend-address object) "
\n"
- "- ǯÎð¡§
"
- "- " age "ºÐ
\n"
- "- ÃÂÀ¸Æü¡§
"
- "- " birthday "
\n"
- "- ·ì±Õ·¿¡§
"
- "- " blood-type "·¿
\n"
- "- ½Ð¿ÈÃÏ¡§
"
- "- " (mixi-friend-birthplace object) "
\n"
- "- ¼ñÌ£¡§
"
- "- " hobby "
\n"
- "- ¿¦¶È¡§
"
- "- " (mixi-friend-job object) "
\n"
- "- ½ê°¡§
"
- "- " (mixi-friend-organization object) "
\n"
- "- ¼«¸Ê¾Ò²ð¡§
"
- "- " (mixi-friend-profile object) "
\n"
- "
"))
- (concat "¥×¥í¥Õ¥£¡¼¥ë¤òɽ¼¨¤¹¤ë")))
- (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))))))))
+ mixi-reply-to)
(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)))
- (when (mixi-parent-p object)
- (let ((comments (mixi-get-comments object range)))
- (mapc (lambda (header)
- (push header headers))
- (shimbun-mixi-get-headers shimbun
- comments))))
- (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)))
+ (let (headers)
+ (catch 'stop
+ (while objects
+ (let ((object (car objects)))
+ (when (mixi-parent-p object)
+ (let* ((comments (mixi-get-comments object range))
+ (comment-headers (shimbun-mixi-get-headers shimbun
+ comments)))
+ (while comment-headers
+ (push (car comment-headers) headers)
+ (setq comment-headers (cdr comment-headers)))))
+ (let ((class (mixi-object-class object))
+ (id (mixi-make-message-id object)))
+ (when (and (eq class 'mixi-comment)
+ (shimbun-search-id shimbun id))
+ (throw 'stop nil))
+ (push
+ (shimbun-create-header
+ 0
+ (mixi-make-title object (string-match
+ "^new-"
+ (shimbun-current-group-internal
+ shimbun)))
+ (mixi-make-author object)
+ (mixi-make-date object)
+ id
+ (if (eq class 'mixi-comment)
+ (mixi-make-message-id (mixi-comment-parent object))
+ "")
+ 0 0
+ (mixi-make-url object))
+ headers)
+ (when (eq class 'mixi-comment)
+ (puthash id (mixi-comment-content object)
+ (shimbun-mixi-comment-cache-internal shimbun)))))
+ (setq objects (cdr objects))))
+ headers))
(luna-define-method shimbun-get-headers ((shimbun shimbun-mixi)
&optional range)
(let ((url-or-function (cdr (assoc (shimbun-current-group-internal shimbun)
- shimbun-mixi-group-alist)))
- (range (when (integerp range) (* range shimbun-mixi-page-articles)))
- objects)
- (if (stringp url-or-function)
- (let* ((object (mixi-make-object-from-url url-or-function))
- (class (mixi-object-class object)))
- (cond ((eq class 'mixi-friend)
- (setq objects (mixi-get-diaries object range)))
- ((eq class 'mixi-community)
- (setq objects (mixi-get-bbses object range)))
- ((mixi-parent-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))))
+ (shimbun-mixi-group-alist))))
+ (range (when (integerp range) (* range shimbun-mixi-page-articles))))
+ (shimbun-sort-headers
+ (shimbun-mixi-get-headers shimbun
+ (mixi-make-objects url-or-function range)
+ range))))
(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))))
+ (let* ((parent (mixi-make-object-from-url url))
+ (comments (mixi-get-comments parent)))
+ (while comments
+ (let ((id (mixi-make-message-id (car comments)))
+ (content (mixi-comment-content (car comments))))
+ (puthash id content cache)
+ (when (string= id message-id)
+ (setq article content)))
+ (setq comments (cdr comments)))))
article))
(luna-define-method shimbun-article ((shimbun shimbun-mixi)
@@ -391,8 +225,8 @@ of mixi object."
(article (if (string-match "#comment$" url)
(shimbun-mixi-comment-article
url shimbun header)
- (shimbun-mixi-make-body object))))
- (shimbun-mixi-make-reply-to object)
+ (mixi-make-content object))))
+ (mixi-make-reply-to object)
(when (stringp article)
(insert article)))
(shimbun-message shimbun "shimbun: Make contents...")