-;; mixi.el --- API libraries for accessing to mixi
+;; mixi.el --- API libraries for accessing to mixi -*- coding: euc-jp -*-
-;; Copyright (C) 2005,2006 OHASHI Akira
+;; Copyright (C) 2005, 2006, 2007 OHASHI Akira
;; Author: OHASHI Akira <bg66@koka-in.org>
;; Keywords: hypermedia
;;
;; Utilities:
;;
-;; * mixi-remove-markup
+;; * mixi-remove-markup (half broken)
;; Examples:
;;
;; (buffer (get-buffer-create "*temp*"))
;; (format "%Y/%m/%d %H:%M"))
;; (pop-to-buffer buffer)
-;; (mapc (lambda (diary)
-;; (let ((subject (mixi-diary-title diary))
-;; (from (mixi-friend-nick (mixi-diary-owner diary)))
-;; (date (format-time-string format (mixi-diary-time diary)))
-;; (body (mixi-remove-markup (mixi-diary-content diary))))
-;; (insert "From: " from "\n"
-;; "Subject: " subject "\n"
-;; "Date: " date "\n\n"
-;; body "\n\n")))
-;; (mixi-get-new-diaries range))
+;; (let ((diaries (mixi-get-new-diaries range)))
+;; (while diaries
+;; (let* ((diary (car diaries))
+;; (subject (mixi-diary-title diary))
+;; (from (mixi-friend-nick (mixi-diary-owner diary)))
+;; (date (format-time-string format (mixi-diary-time diary)))
+;; (body (mixi-remove-markup (mixi-diary-content diary))))
+;; (insert "From: " from "\n"
+;; "Subject: " subject "\n"
+;; "Date: " date "\n\n"
+;; body "\n\n"))
+;; (setq diaries (cdr diaries))))
;; (set-buffer-modified-p nil)
;; (setq buffer-read-only t)
;; (goto-char (point-min)))
;; (buffer (get-buffer-create "*temp*"))
;; (format "%Y/%m/%d %H:%M"))
;; (pop-to-buffer buffer)
-;; (mapc (lambda (diary)
-;; (let ((subject (mixi-diary-title diary))
-;; (from (mixi-friend-nick (mixi-diary-owner diary)))
-;; (date (format-time-string format (mixi-diary-time diary)))
-;; (body (mixi-remove-markup (mixi-diary-content diary))))
-;; (insert "From: " from "\n"
-;; "Subject: " subject "\n"
-;; "Date: " date "\n\n"
-;; body "\n\n")
-;; (mapc (lambda (comment)
-;; (let ((from (mixi-friend-nick
-;; (mixi-comment-owner comment)))
-;; (subject (concat "Re: " subject))
-;; (date (format-time-string
-;; format (mixi-comment-time comment)))
-;; (body (mixi-remove-markup
-;; (mixi-comment-content comment))))
-;; (insert "From: " from "\n"
-;; "Subject: " subject "\n"
-;; "Date: " date "\n\n"
-;; body "\n\n")))
-;; (mixi-get-comments diary range))))
-;; (mixi-get-new-diaries range))
+;; (let ((diaries (mixi-get-new-diaries range)))
+;; (while diaries
+;; (let* ((diary (car diaries))
+;; (subject (mixi-diary-title diary))
+;; (from (mixi-friend-nick (mixi-diary-owner diary)))
+;; (date (format-time-string format (mixi-diary-time diary)))
+;; (body (mixi-remove-markup (mixi-diary-content diary))))
+;; (insert "From: " from "\n"
+;; "Subject: " subject "\n"
+;; "Date: " date "\n\n"
+;; body "\n\n")
+;; (let ((comments (mixi-get-comments diary range)))
+;; (while comments
+;; (let* ((comment (car comments))
+;; (from (mixi-friend-nick (mixi-comment-owner comment)))
+;; (subject (concat "Re: " subject))
+;; (date (format-time-string format
+;; (mixi-comment-time comment)))
+;; (body (mixi-remove-markup (mixi-comment-content comment))))
+;; (insert "From: " from "\n"
+;; "Subject: " subject "\n"
+;; "Date: " date "\n\n"
+;; body "\n\n"))
+;; (setq comments (cdr comments)))))
+;; (setq diaries (cdr diaries))))
;; (set-buffer-modified-p nil)
;; (setq buffer-read-only t)
;; (goto-char (point-min)))
(buffer (url-retrieve-synchronously url))
ret)
(unless (bufferp buffer)
- (error (mixi-message "Cannot retrieve")))
+ (error (mixi-message "Cannot retrieve: " url)))
(with-current-buffer buffer
(goto-char (point-min))
(while (looking-at "HTTP/[0-9]+\\.[0-9]+ [13][0-9][0-9]")
(delete-region (point) (re-search-forward "\r?\n\r?\n")))
(unless (looking-at "HTTP/[0-9]+\\.[0-9]+ 200")
- (error (mixi-message "Cannot retrieve")))
+ (error (mixi-message "Cannot retrieve: " url)))
(delete-region (point) (re-search-forward "\r?\n\r?\n"))
(setq ret (decode-coding-string (buffer-string) mixi-coding-system))
(kill-buffer buffer)
(let ((url (mixi-expand-url url)))
(with-temp-buffer
(if (not (string= (w3m-retrieve url nil nil post-data) "text/html"))
- (error (mixi-message "Cannot retrieve"))
+ (error (mixi-message "Cannot retrieve: " url))
(w3m-decode-buffer url)
(let ((ret (buffer-substring-no-properties (point-min) (point-max))))
(mixi-parse-buffer url ret post-data))))))
(while (looking-at "HTTP/[0-9]+\\.[0-9]+ [13][0-9][0-9]")
(delete-region (point) (re-search-forward "\r?\n\r?\n")))
(unless (looking-at "HTTP/[0-9]+\\.[0-9]+ 200")
- (error (mixi-message "Cannot retrieve")))
+ (error (mixi-message "Cannot retrieve: " url)))
(delete-region (point) (re-search-forward "\r?\n\r?\n"))
(setq ret (decode-coding-string (buffer-string) mixi-coding-system))
(mixi-parse-buffer url ret post-data))))
(mixi-curl-retrieve url nil (reverse form-data))))
(defconst mixi-my-id-regexp
- "<a href=\"add_diary\\.pl\\?id=\\([0-9]+\\)")
+ "<a href=\"show_profile\\.pl\\?id=\\([0-9]+\\)")
(defun mixi-login (&optional email password)
"Login to mixi."
(read-from-minibuffer (mixi-message "Login Email: "))))
(password (or password mixi-default-password
(read-passwd (mixi-message "Login Password: ")))))
- (let ((url "/login.pl"))
- (when mixi-login-use-ssl
- (setq url (concat "https://mixi.jp" url)))
+ (let ((url (mixi-expand-url "/login.pl")))
+ (when (and mixi-login-use-ssl (string-match "^http:" url))
+ (setq url (replace-match "https:" nil nil url)))
(let ((buffer (mixi-retrieve url
(concat "email=" email
"&password=" password
(defun mixi-logout ()
(mixi-retrieve "/logout.pl"))
+(defconst mixi-login-form "<form action=\"/login.pl\" method=\"post\">")
+
(defmacro with-mixi-retrieve (url &rest body)
`(with-current-buffer (get-buffer-create mixi-temp-buffer-name)
(when ,url
(erase-buffer)
(insert (mixi-retrieve ,url))
(goto-char (point-min))
- (when (search-forward
- "<form action=\"login.pl\" method=\"post\">" nil t)
+ (when (search-forward mixi-login-form nil t)
(mixi-login)
(erase-buffer)
(insert (mixi-retrieve ,url))))
(erase-buffer)
(insert (mixi-post-form ,url ,fields))
(goto-char (point-min))
- (when (search-forward
- "<form action=\"login.pl\" method=\"post\">" nil t)
+ (when (search-forward mixi-login-form nil t)
(mixi-login)
(erase-buffer)
(insert (mixi-post-form ,url ,fields))))
(buffer-string)))
;; stolen (and modified) from w3m.el
-;; FIXME: Hmm.
-(defun mixi-url-encode-and-quote-percent-string (string)
+(defconst mixi-entity-alist '(("gt" . ">")
+ ("lt" . "<")
+ ("amp" . "&"))
+ "Alist of html character entities and values.")
+
+;; stolen (and modified) from w3m.el
+(defun mixi-encode-specials-string (str)
+ "Encode special characters in the string STR."
+ (let ((pos 0)
+ (buf))
+ (while (string-match "[<>&]" str pos)
+ (setq buf
+ (cons ";"
+ (cons (car (rassoc (match-string 0 str) mixi-entity-alist))
+ (cons "&"
+ (cons (substring str pos (match-beginning 0))
+ buf))))
+ pos (match-end 0)))
+ (if buf
+ (apply 'concat (nreverse (cons (substring str pos) buf)))
+ str)))
+
+;; stolen (and modified) from w3m.el
+(defun mixi-url-encode-string (string)
(apply (function concat)
(mapcar
(lambda (char)
(cond
((eq char ?\n) ; newline
- "%%0D%%0A")
+ "%0D%0A")
((string-match "[-a-zA-Z0-9_:/.]" (char-to-string char)) ; xxx?
(char-to-string char)) ; printable
((char-equal char ?\x20) ; space
"+")
(t
- (format "%%%%%02x" char)))) ; escape
+ (format "%%%02x" char)))) ; escape
;; Coerce a string into a list of chars.
(append (encode-coding-string (or string "") mixi-coding-system)
nil))))
+(defun mixi-url-encode-and-quote-percent-string (string)
+ (let ((string (mixi-url-encode-string string))
+ (pos 0))
+ (while (string-match "%" string pos)
+ (setq string (replace-match "%%" nil nil string))
+ (setq pos (+ (match-end 0) 1)))
+ string))
+
;; Object.
(defconst mixi-object-prefix "mixi-")
(unless (file-directory-p cache-directory)
(make-directory cache-directory t))
(let ((caches (apropos-internal mixi-cache-regexp 'boundp)))
- (mapc (lambda (symbol)
- (with-temp-file (expand-file-name
- (substring (symbol-name symbol)
- (length mixi-object-prefix))
- cache-directory)
- (let ((coding-system-for-write mixi-coding-system)
- (cache (symbol-value symbol)))
- (insert "#s(hash-table size "
- (number-to-string (hash-table-count cache))
- " test equal data (\n")
- (maphash
- (lambda (key value)
- (let (print-level print-length)
- (insert (prin1-to-string key) " "
- (prin1-to-string value) "\n")))
- cache))
- (insert "))")))
- caches))))
+ (while caches
+ (with-temp-file (expand-file-name
+ (substring (symbol-name (car caches))
+ (length mixi-object-prefix))
+ cache-directory)
+ (let ((coding-system-for-write mixi-coding-system)
+ (cache (symbol-value (car caches))))
+ (insert "#s(hash-table size "
+ (number-to-string (hash-table-count cache))
+ " test equal data (\n")
+ (maphash
+ (lambda (key value)
+ (let (print-level print-length)
+ (insert (prin1-to-string key) " "
+ (prin1-to-string value) "\n")))
+ cache))
+ (insert "))"))
+ (setq caches (cdr caches))))))
;; stolen (and modified) from lsdb.el
(defun mixi-read-cache (&optional marker)
;; FIXME: Load friend and community first.
(let ((files (directory-files cache-directory t
mixi-cache-file-regexp)))
- (mapc (lambda (file)
- (let ((buffer (find-file-noselect file)))
- (unwind-protect
- (save-excursion
- (set-buffer buffer)
- (goto-char (point-min))
- (re-search-forward "^#s(")
- (goto-char (match-beginning 0))
- (mixi-read-cache (point-marker)))
- (kill-buffer buffer))))
- files)))))
+ (while files
+ (let ((buffer (find-file-noselect (car files))))
+ (unwind-protect
+ (save-excursion
+ (set-buffer buffer)
+ (goto-char (point-min))
+ (re-search-forward "^#s(")
+ (goto-char (match-beginning 0))
+ (mixi-read-cache (point-marker)))
+ (kill-buffer buffer)))
+ (setq files (cdr files)))))))
;; Friend object.
(defvar mixi-friend-cache (make-hash-table :test 'equal))
"Return a my object."
(unless mixi-me
(with-mixi-retrieve "/home.pl"
- (if (re-search-forward mixi-my-id-regexp)
+ (if (re-search-forward mixi-my-id-regexp nil t)
(setq mixi-me (mixi-make-friend (match-string 1)))
(signal 'error (list 'who-am-i)))))
mixi-me)
`(concat "/show_profile.pl?id=" (mixi-friend-id ,friend)))
(defconst mixi-friend-nick-regexp
- "<img \\(alt=\"\\*\" \\)?src=\"?http://img\\.mixi\\.jp/img/dot0\\.gif\"? width=\"?1\"? height=\"?5\"?\\( /\\)?><br\\( /\\)?>\r?
-\\(.*\\)¤µ¤ó([0-9]+)")
+ "<h3>\\(.*\\)¤µ¤ó([0-9]+)</h3>")
(defconst mixi-friend-name-regexp
- "̾\\( \\| \\)Á°</font></td>
-
-?<td width=\"?345\"?>\\(.+?\\)\\(</td>\\| <img\\)")
+ "<dt>̾Á°</dt>\n?<dd>\\(.+?\\)\\(<img\\|</dd>\\)")
(defconst mixi-friend-sex-regexp
- "À\\( \\| \\)ÊÌ</font></td>
-
-?<td width=\"?345\"?>\\([Ã˽÷]\\)À\\(</td>\\| <img\\)")
+ "<dt>ÀÊÌ</dt>\n?<dd>\\([Ã˽÷]\\)À\\(<img\\|</dd>\\)")
(defconst mixi-friend-address-regexp
- "¸½½»½ê</font></td>
-<td>\\(.+?\\)\\(</td>\\| <img\\)")
+ "<dt>¸½½»½ê</dt>\n?<dd>\\(.+?\\)\\(<img \\|</dd>\\)")
(defconst mixi-friend-age-regexp
- "ǯ\\( \\| \\)Îð</font></td>\n<td>\\([0-9]+\\)ºÐ\\(</td>\\| <img\\)")
+ "<dt>ǯÎð</dt>\n?<dd>\\([0-9]+\\)ºÐ\\( <img\\|</dd>\\)")
(defconst mixi-friend-birthday-regexp
- "ÃÂÀ¸Æü</font></td>\n<td>\\([0-9]+\\)·î\\([0-9]+\\)Æü\\(</td>\\| <img\\)")
+ "<dt>ÃÂÀ¸Æü</dt>\n?<dd>\\([0-9]+\\)·î\\([0-9]+\\)Æü\\(<img \\|</dd>\\)")
(defconst mixi-friend-blood-type-regexp
- "·ì±Õ·¿</font></td>\n<td>\\([ABO]B?\\)·¿\\(</td>\\| <img\\)")
+ "<dt>·ì±Õ·¿</dt>\n?<dd>\\([ABO]B?\\)·¿\\(<img \\|</dd>\\)")
(defconst mixi-friend-birthplace-regexp
- "½Ð¿ÈÃÏ</font>\n?</td>\n<td>\\(.+?\\)\\(</td>\\| <img\\)")
+ "<dt>½Ð¿ÈÃÏ</dt>\n?<dd>\\(.+?\\)\\(<img \\|</dd>\\)")
(defconst mixi-friend-hobby-regexp
- "¼ñ\\( \\| \\)Ì£</font></td>\n<td>\\(.+?\\)\\(</td>\\| <img\\)")
+ "<dt>¼ñÌ£</dt>\n?<dd>\\(.+?\\)\\(<img \\|</dd>\\)")
(defconst mixi-friend-job-regexp
- "¿¦\\( \\| \\)¶È</font></td>\n<td>\\(.+?\\)\\(</td>\\| <img\\)")
+ "<dt>¿¦¶È</dt>\n?<dd>\\(.+?\\)\\(<img \\|</dd>\\)")
(defconst mixi-friend-organization-regexp
- "½ê\\( \\| \\)°</font></td>\n<td[^>]*>\\(.+?\\)\\(</td>\\| <img\\)")
+ "<dt>½ê°</dt>\n?<dd>\\(.+?\\)\\(<img \\|</dd>\\)")
(defconst mixi-friend-profile-regexp
- "¼«¸Ê¾Ò²ð</font></td>
-<td class=\"?h120\"?>\\(.+\\)</td></tr>")
+ "<dt>¼«¸Ê¾Ò²ð</dt>\n?<dd class=\"userInput\">\\(.+?\\)</dd>")
(defun mixi-realize-friend (friend)
"Realize a FRIEND."
(with-mixi-retrieve (mixi-friend-page friend)
(let ((case-fold-search t))
(if (re-search-forward mixi-friend-nick-regexp nil t)
- (mixi-friend-set-nick friend (match-string 4))
+ (mixi-friend-set-nick friend (match-string 1))
(mixi-realization-error 'cannot-find-nick friend))
(when (re-search-forward mixi-friend-name-regexp nil t)
- (mixi-friend-set-name friend (match-string 2)))
+ (mixi-friend-set-name friend (match-string 1)))
(when (re-search-forward mixi-friend-sex-regexp nil t)
- (mixi-friend-set-sex friend (if (string= (match-string 2) "ÃË")
+ (mixi-friend-set-sex friend (if (string= (match-string 1) "ÃË")
'male 'female)))
(when (re-search-forward mixi-friend-address-regexp nil t)
(mixi-friend-set-address friend (match-string 1)))
(when (re-search-forward mixi-friend-age-regexp nil t)
- (mixi-friend-set-age friend (string-to-number (match-string 2))))
+ (mixi-friend-set-age friend (string-to-number (match-string 1))))
(when (re-search-forward mixi-friend-birthday-regexp nil t)
(mixi-friend-set-birthday
friend (list (string-to-number (match-string 1))
(when (re-search-forward mixi-friend-birthplace-regexp nil t)
(mixi-friend-set-birthplace friend (match-string 1)))
(when (re-search-forward mixi-friend-hobby-regexp nil t)
- (mixi-friend-set-hobby friend (split-string (match-string 2) ", ")))
+ (mixi-friend-set-hobby friend (split-string (match-string 1) ", ")))
(when (re-search-forward mixi-friend-job-regexp nil t)
- (mixi-friend-set-job friend (match-string 2)))
+ (mixi-friend-set-job friend (match-string 1)))
(when (re-search-forward mixi-friend-organization-regexp nil t)
- (mixi-friend-set-organization friend (match-string 2)))
+ (mixi-friend-set-organization friend (match-string 1)))
(when (re-search-forward mixi-friend-profile-regexp nil t)
(mixi-friend-set-profile friend (match-string 1)))))
(mixi-object-touch friend)))
(aref (cdr friend) 12))
(defun mixi-friend-profile (friend)
- "Return the pforile of FRIEND."
+ "Return the profile of FRIEND."
(unless (mixi-friend-p friend)
(signal 'wrong-type-argument (list 'mixi-friend-p friend)))
(mixi-realize-friend friend)
(when ,friend (concat "&id=" (mixi-friend-id ,friend)))))
(defconst mixi-friend-list-id-regexp
- "<a href=show_friend\\.pl\\?id=\\([0-9]+\\)")
+ "<a href=\"?show_friend\\.pl\\?id=\\([0-9]+\\)\"?")
(defconst mixi-friend-list-nick-regexp
- "<td valign=middle>\\(.+\\)¤µ¤ó([0-9]+)<br />")
+ "<span>\\(.+\\)¤µ¤ó([0-9]+)</span>")
;;;###autoload
(defun mixi-get-friends (&rest friend-or-range)
(defmacro mixi-favorite-list-page ()
`(concat "/list_bookmark.pl?page=%d"))
-(defconst mixi-favorite-list-id-regexp
- "<td ALIGN=center BGCOLOR=#FDF9F2 width=330><a href=\"show_friend\\.pl\\?id=\\([0-9]+\\)\">")
-(defconst mixi-favorite-list-nick-regexp
- "<td BGCOLOR=#FDF9F2><font COLOR=#996600>̾ Á°</font></td>
-<td COLSPAN=2 BGCOLOR=#FFFFFF>\\(.+\\)</td></tr>")
+(defconst mixi-favorite-list-regexp
+ "<td bgcolor=\"#FDF9F2\"><font color=\"#996600\">̾Á°</font></td>
+<td colspan=\"2\" bgcolor=\"#FFFFFF\"><a href=\"show_friend\\.pl\\?id=\\([0-9]+\\)\">\\(.*\\)</a></td>")
;;;###autoload
(defun mixi-get-favorites (&optional range)
"Get favorites."
- (let ((ids (mixi-get-matched-items (mixi-favorite-list-page)
- mixi-favorite-list-id-regexp
- range))
- (nicks (mixi-get-matched-items (mixi-favorite-list-page)
- mixi-favorite-list-nick-regexp
+ (let ((items (mixi-get-matched-items (mixi-favorite-list-page)
+ mixi-favorite-list-regexp
range)))
- (let ((index 0)
- ret)
- (while (< index (length ids))
- (setq ret (cons (mixi-make-friend (nth 0 (nth index ids))
- (nth 0 (nth index nicks))) ret))
- (incf index))
- (reverse ret))))
+ (mapcar (lambda (item)
+ (mixi-make-friend (nth 0 item) (nth 1 item)))
+ items)))
;; Log object.
(defun mixi-make-log (friend time)
`(concat "/show_log.pl"))
(defconst mixi-log-list-regexp
- "\\([0-9]+\\)ǯ\\([0-9]+\\)·î\\([0-9]+\\)Æü \\([0-9]+\\):\\([0-9]+\\) <a href=\"show_friend\\.pl\\?id=\\([0-9]+\\)\">\\(.*\\)</a></li>")
+ "\\([0-9]+\\)ǯ\\([0-9]+\\)·î\\([0-9]+\\)Æü \\([0-9]+\\):\\([0-9]+\\) <a href=\"show_friend\\.pl\\?id=\\([0-9]+\\)\">\\(.*?\\)</a>")
;;;###autoload
(defun mixi-get-logs (&optional range)
"&owner_id=" (mixi-friend-id (mixi-diary-owner ,diary))))
(defconst mixi-diary-closed-regexp
- "<td>ͧ¿Í\\(¤Îͧ¿Í\\)?¤Þ¤Ç¸ø³«¤Î¤¿¤áÆɤळ¤È¤¬½ÐÍè¤Þ¤»¤ó¡£</td></tr>")
+ "<td>ͧ¿Í\\(¤Îͧ¿Í\\)?¤Þ¤Ç¸ø³«¤Î¤¿¤áÆɤळ¤È¤¬½ÐÍè¤Þ¤»¤ó¡£</td>")
(defconst mixi-diary-owner-nick-regexp
- "<td WIDTH=490 background=http://img\\.mixi\\.jp/img/bg_w\\.gif><b><font COLOR=#605048>\\(.+?\\)\\(¤µ¤ó\\)?¤ÎÆüµ</font></b></td>")
-(defconst mixi-diary-time-regexp
- "<td \\(align\\|ALIGN\\)=\"?center\"? \\(rowspan\\|ROWSPAN\\)=\"?[23]\"? \\(nowrap=\"nowrap\"\\|NOWRAP\\) \\(width\\|WIDTH\\)=\"?95\"? bgcolor=\"?#FFD8B0\"?>\\([0-9]+\\)ǯ\\([0-9]+\\)·î\\([0-9]+\\)Æü\\(<br />\\|<br>\\)\\([0-9]+\\):\\([0-9]+\\)</td>")
+ "<div class=\"diaryTitle\\(Friend\\)? clearfix\">
+<h2>\\(.+?\\)\\(¤µ¤ó\\)?¤ÎÆüµ</h2>")
(defconst mixi-diary-title-regexp
- "<td \\(bgcolor\\|BGCOLOR\\)=\"?#FFF4E0\"? width=\"?430\"?> \\([^<]+\\)</td>")
+ "<div class=\"listDiaryTitle\">
+<dl class=\"clearfix\">
+<dt>\\([^<\n]+\\)\\(<span>\\)?")
+(defconst mixi-diary-time-regexp
+ "<dd>\\([0-9]+\\)ǯ\\([0-9]+\\)·î\\([0-9]+\\)Æü\\([0-9]+\\):\\([0-9]+\\)</dd>")
(defconst mixi-diary-content-regexp
- "<td \\(class\\|CLASS\\)=\"?h12\"?>\\(.*\\)</td>")
+ "<div class=\"txtconfirmArea\">
+\\(\\(.\\|\r?\n\\)*?\\)
+<!--/viewDiaryBox--></div>")
(defun mixi-realize-diary (diary &optional page)
"Realize a DIARY."
;; FIXME: Check a expiration of cache?
(unless (mixi-object-realized-p diary)
(with-mixi-retrieve (or page (mixi-diary-page diary))
- (unless (re-search-forward mixi-diary-closed-regexp nil t)
- (if (re-search-forward mixi-diary-owner-nick-regexp nil t)
- (mixi-friend-set-nick (mixi-diary-owner diary) (match-string 1))
- (mixi-realization-error 'cannot-find-owner-nick diary))
- (if (re-search-forward mixi-diary-time-regexp nil t)
- (mixi-diary-set-time
- diary (encode-time 0 (string-to-number (match-string 10))
- (string-to-number (match-string 9))
- (string-to-number (match-string 7))
- (string-to-number (match-string 6))
- (string-to-number (match-string 5))))
- (mixi-realization-error 'cannot-find-time diary))
- (if (re-search-forward mixi-diary-title-regexp nil t)
- (mixi-diary-set-title diary (match-string 2))
- (mixi-realization-error 'cannot-find-title diary))
- (if (re-search-forward mixi-diary-content-regexp nil t)
- (mixi-diary-set-content diary (match-string 2))
- (mixi-realization-error 'cannot-find-content diary))))
+ (let ((case-fold-search t))
+ (unless (re-search-forward mixi-diary-closed-regexp nil t)
+ (if (re-search-forward mixi-diary-owner-nick-regexp nil t)
+ (mixi-friend-set-nick (mixi-diary-owner diary)
+ (match-string 2))
+ (mixi-realization-error 'cannot-find-owner-nick diary))
+ (if (re-search-forward mixi-diary-title-regexp nil t)
+ (mixi-diary-set-title diary (match-string 1))
+ (mixi-realization-error 'cannot-find-title diary))
+ (if (re-search-forward mixi-diary-time-regexp nil t)
+ (mixi-diary-set-time
+ diary (encode-time 0 (string-to-number (match-string 5))
+ (string-to-number (match-string 4))
+ (string-to-number (match-string 3))
+ (string-to-number (match-string 2))
+ (string-to-number (match-string 1))))
+ (mixi-realization-error 'cannot-find-time diary))
+ (if (re-search-forward mixi-diary-content-regexp nil t)
+ (mixi-diary-set-content diary (match-string 1))
+ (mixi-realization-error 'cannot-find-content diary)))))
(mixi-object-touch diary)))
(defun mixi-diary-owner (diary)
(when ,friend (concat "&id=" (mixi-friend-id ,friend)))))
(defconst mixi-diary-list-regexp
- "<tr VALIGN=top>
-<td ALIGN=center ROWSPAN=3 NOWRAP bgcolor=#F2DDB7><font COLOR=#996600>\\([0-9]+\\)·î\\([0-9]+\\)Æü<br>\\([0-9]+\\):\\([0-9]+\\)</font>\\(<br><input type=\"checkbox\" name=\"diary_id\" value=\"[0-9]+\">\\|\\)</td>
-<td bgcolor=\"#FFF4E0\"> <a href=\"view_diary\\.pl\\?id=\\([0-9]+\\)&owner_id=[0-9]+\">\\(.*\\)</a></td>")
+ "<dt>\\(<input name=\"diary_id\" type=\"checkbox\" value=\"[0-9]+\" />\\|\\)<a href=\"view_diary\\.pl\\?id=\\([0-9]+\\)&owner_id=[0-9]+\">\\(.*\\)</a>\\(<span><a href=\"edit_diary\\.pl\\?id=[0-9]+\">ÊÔ½¸¤¹¤ë</a></span>\\|\\)</dt>
+<dd>\\([0-9]+\\)ǯ\\([0-9]+\\)·î\\([0-9]+\\)Æü\n?\\([0-9]+\\):\\([0-9]+\\)</dd>
+</dl>")
;;;###autoload
(defun mixi-get-diaries (&rest friend-or-range)
(signal 'wrong-type-argument (list 'mixi-friend-p friend)))
(let ((items (mixi-get-matched-items (mixi-diary-list-page friend)
mixi-diary-list-regexp
- range))
- (year (nth 5 (decode-time (current-time))))
- (month (nth 4 (decode-time (current-time)))))
+ range)))
(mapcar (lambda (item)
- (let ((month-of-item (string-to-number (nth 0 item))))
- (when (> month-of-item month)
- (decf year))
- (setq month month-of-item)
- (mixi-make-diary friend (nth 5 item) nil
- (encode-time
- 0 (string-to-number (nth 3 item))
- (string-to-number (nth 2 item))
- (string-to-number (nth 1 item))
- month year)
- (nth 6 item))))
+ (mixi-make-diary friend (nth 1 item) nil
+ (encode-time
+ 0 (string-to-number (nth 8 item))
+ (string-to-number (nth 7 item))
+ (string-to-number (nth 6 item))
+ (string-to-number (nth 5 item))
+ (string-to-number (nth 4 item)))
+ (nth 2 item)))
items))))
(defmacro mixi-new-diary-list-page ()
`(concat "/new_friend_diary.pl?page=%d"))
(defconst mixi-new-diary-list-regexp
- "<td WIDTH=180><img src=http://img\\.mixi\\.jp/img/pen\\.gif ALIGN=left WIDTH=14 HEIGHT=16>\\([0-9]+\\)ǯ\\([0-9]+\\)·î\\([0-9]+\\)Æü \\([0-9]+\\):\\([0-9]+\\)</td>
-<td WIDTH=450><a class=\"new_link\" href=view_diary\\.pl\\?id=\\([0-9]+\\)&owner_id=\\([0-9]+\\)>\\(.+\\)</a> (\\(.*\\)) ")
+ "<dt>\\([0-9]+\\)ǯ\\([0-9]+\\)·î\\([0-9]+\\)Æü \\([0-9]+\\):\\([0-9]+\\)</dt>
+<dd><a href=\"view_diary\\.pl\\?id=\\([0-9]+\\)&owner_id=\\([0-9]+\\)\">\\(.+\\)</a> (\\(.*\\))<div ")
;;;###autoload
(defun mixi-get-new-diaries (&optional range)
<tr>
<td BGCOLOR=#FDF9F2><font COLOR=#996600>ËÜ Ê¸</font></td>
-<td COLSPAN=2 BGCOLOR=#FFFFFF>\\(.*\\)</td></tr>
+<td COLSPAN=2 BGCOLOR=#FFFFFF width=\"380\">\\(.*\\)</td></tr>
<tr>
`(concat "/add_diary.pl"))
(defconst mixi-post-key-regexp
- "<input type=\"?hidden\"? name=\"?post_key\"? value=\"\\([a-z0-9]+\\)\">")
+ "<input type=\"?hidden\"? name=\"?post_key\"? +value=\"\\([a-z0-9]+\\)\"")
(defconst mixi-post-succeed-regexp
"<b>\\(ºîÀ®\\|½ñ¤¹þ¤ß\\)¤¬´°Î»¤·¤Þ¤·¤¿¡£È¿±Ç¤Ë»þ´Ö¤¬¤«¤«¤ë¤³¤È¤¬¤¢¤ê¤Þ¤¹¤Î¤Ç¡¢É½¼¨¤µ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¤Ï¾¯¡¹¤ªÂÔ¤Á¤¯¤À¤µ¤¤¡£</b>")
(defconst mixi-community-nodata-regexp
"^¥Ç¡¼¥¿¤¬¤¢¤ê¤Þ¤»¤ó")
(defconst mixi-community-name-regexp
- "<td WIDTH=345>\\(.*\\)</td></tr>")
+ "<div class=\"pageTitle communityTitle002\">
+<h2>\\(.*\\)</h2>")
(defconst mixi-community-birthday-regexp
- "<td BGCOLOR=#F2DDB7 WIDTH=80><font COLOR=#996600>³«ÀßÆü</font></td>\r
-<td WIDTH=345>\\([0-9]+\\)ǯ\\([0-9]+\\)·î\\([0-9]+\\)Æü")
+ "<dt>³«ÀßÆü</dt>
+<dd>\\([0-9]+\\)ǯ\\([0-9]+\\)·î\\([0-9]+\\)Æü<br />")
;; FIXME: Care when the owner has seceded.
(defconst mixi-community-owner-regexp
- "<td BGCOLOR=#F2DDB7 WIDTH=80><font COLOR=#996600>´ÉÍý¿Í</font></td>\r
-<td WIDTH=345>\r
-<table style=\"width: 100%;\"><tr><td>\r
+ "<dt>´ÉÍý¿Í</dt>
+<dd>
<a href=\"\\(home\\.pl\\|show_friend\\.pl\\?id=\\([0-9]+\\)\\)\">\\(.*\\)</a>")
(defconst mixi-community-category-regexp
- "<td BGCOLOR=#F2DDB7 WIDTH=80><font COLOR=#996600>¥«¥Æ¥´¥ê</font></td>\r
-<td WIDTH=345>\\([^<]+\\)</td>")
+ "<dt>¥«¥Æ¥´¥ê</dt>
+<dd>\\(.+\\)</dd>")
(defconst mixi-community-members-regexp
- "<td BGCOLOR=#F2DDB7 WIDTH=80><font COLOR=#996600>¥á¥ó¥Ð¡¼¿ô</font></td>\r
-<td WIDTH=345>\\([0-9]+\\)¿Í</td></tr>")
+ "<dt>¥á¥ó¥Ð¡¼¿ô</dt>
+<dd>\\([0-9]+\\)¿Í</dd>")
(defconst mixi-community-open-level-regexp
- "<td BGCOLOR=#F2DDB7 WIDTH=80><font COLOR=#996600>»²²Ã¾ò·ï¤È<br>¸ø³«¥ì¥Ù¥ë</font></td>\r
-<td WIDTH=345>\\(.+\\)</td></tr>")
+ "<dt>»²²Ã¾ò·ï¤È<br />¸ø³«¥ì¥Ù¥ë</dt>
+<dd>\\(.+\\)</dd>")
(defconst mixi-community-authority-regexp
- "<td BGCOLOR=#F2DDB7 WIDTH=80><font COLOR=#996600>¥È¥Ô¥Ã¥¯ºîÀ®¤Î¸¢¸Â</font></td>\r
-<td WIDTH=345>\\(.+\\)</td></tr>")
+ "<dt>¥È¥Ô¥Ã¥¯¤Î<br />ºîÀ®¸¢¸Â</dt>
+<dd>
+\\(.+\\)
+
+
+</dd>")
(defconst mixi-community-description-regexp
- "<td CLASS=h120 WIDTH=345>\\(.+\\)</td>")
+ "<div id=\"communityIntro\">
+<p>\\(.+\\)</p>")
(defun mixi-realize-community (community)
"Realize a COMMUNITY."
;; FIXME: Check a expiration of cache?
(unless (mixi-object-realized-p community)
(with-mixi-retrieve (mixi-community-page community)
- (if (re-search-forward mixi-community-nodata-regexp nil t)
- ;; FIXME: Set all members?
- (mixi-community-set-name community "¥Ç¡¼¥¿¤¬¤¢¤ê¤Þ¤»¤ó")
- (if (re-search-forward mixi-community-name-regexp nil t)
- (mixi-community-set-name community (match-string 1))
- (mixi-realization-error 'cannot-find-name community))
- (if (re-search-forward mixi-community-birthday-regexp nil t)
- (mixi-community-set-birthday
- community (encode-time 0 0 0 (string-to-number (match-string 3))
- (string-to-number (match-string 2))
- (string-to-number (match-string 1))))
- (mixi-realization-error 'cannot-find-birthday community))
- (if (re-search-forward mixi-community-owner-regexp nil t)
- (if (string= (match-string 1) "home.pl")
- (mixi-community-set-owner community (mixi-make-me))
- (mixi-community-set-owner community
- (mixi-make-friend (match-string 2)
- (match-string 3))))
- (mixi-realization-error 'cannot-find-owner community))
- (if (re-search-forward mixi-community-category-regexp nil t)
- (mixi-community-set-category community (match-string 1))
- (mixi-realization-error 'cannot-find-category community))
- (if (re-search-forward mixi-community-members-regexp nil t)
- (mixi-community-set-members community
- (string-to-number (match-string 1)))
- (mixi-realization-error 'cannot-find-members community))
- (if (re-search-forward mixi-community-open-level-regexp nil t)
- (mixi-community-set-open-level community (match-string 1))
- (mixi-realization-error 'cannot-find-open-level community))
- (if (re-search-forward mixi-community-authority-regexp nil t)
- (mixi-community-set-authority community (match-string 1))
- (mixi-realization-error 'cannot-find-authority community))
- (if (re-search-forward mixi-community-description-regexp nil t)
- (mixi-community-set-description community (match-string 1))
- (mixi-realization-error 'cannot-find-description community))))
+ (let ((case-fold-search t))
+ (if (re-search-forward mixi-community-nodata-regexp nil t)
+ ;; FIXME: Set all members?
+ (mixi-community-set-name community "¥Ç¡¼¥¿¤¬¤¢¤ê¤Þ¤»¤ó")
+ (if (re-search-forward mixi-community-name-regexp nil t)
+ (mixi-community-set-name community (match-string 1))
+ (mixi-realization-error 'cannot-find-name community))
+ (if (re-search-forward mixi-community-birthday-regexp nil t)
+ (mixi-community-set-birthday
+ community (encode-time 0 0 0
+ (string-to-number (match-string 3))
+ (string-to-number (match-string 2))
+ (string-to-number (match-string 1))))
+ (mixi-realization-error 'cannot-find-birthday community))
+ (if (re-search-forward mixi-community-owner-regexp nil t)
+ (if (string= (match-string 1) "home.pl")
+ (mixi-community-set-owner community (mixi-make-me))
+ (mixi-community-set-owner community (mixi-make-friend
+ (match-string 2)
+ (match-string 3))))
+ (mixi-realization-error 'cannot-find-owner community))
+ (if (re-search-forward mixi-community-category-regexp nil t)
+ (mixi-community-set-category community (match-string 1))
+ (mixi-realization-error 'cannot-find-category community))
+ (if (re-search-forward mixi-community-members-regexp nil t)
+ (mixi-community-set-members community
+ (string-to-number (match-string 1)))
+ (mixi-realization-error 'cannot-find-members community))
+ (if (re-search-forward mixi-community-open-level-regexp nil t)
+ (mixi-community-set-open-level community (match-string 1))
+ (mixi-realization-error 'cannot-find-open-level community))
+ (if (re-search-forward mixi-community-authority-regexp nil t)
+ (mixi-community-set-authority community (match-string 1))
+ (mixi-realization-error 'cannot-find-authority community))
+ (if (re-search-forward mixi-community-description-regexp nil t)
+ (mixi-community-set-description community (match-string 1))
+ (mixi-realization-error 'cannot-find-description community)))))
(mixi-object-touch community)))
(defun mixi-community-id (community)
(when ,friend (concat "&id=" (mixi-friend-id ,friend)))))
(defconst mixi-community-list-id-regexp
- "<a href=view_community\\.pl\\?id=\\([0-9]+\\)")
+ "<a href=\"?view_community\\.pl\\?id=\\([0-9]+\\)\"?")
(defconst mixi-community-list-name-regexp
- "<td valign=middle>\\(.+\\)([0-9]+)</td>")
+ "<span>\\(.+\\)([0-9]+)</span>")
;;;###autoload
(defun mixi-get-communities (&rest friend-or-range)
"&category_id=0"))
(defconst mixi-search-community-list-regexp
- "<td WIDTH=90 VALIGN=top ROWSPAN=4 ALIGN=center background=http://img\\.mixi\\.jp/img/bg_line\\.gif><a href=\"view_community\\.pl\\?id=\\([0-9]+\\)\"><img SRC=\"http://img-c[0-9]+\\.mixi\\.jp/photo/comm/[^.]+\\.jpg\" VSPACE=3 border=0></a></td>
-<td NOWRAP WIDTH=90 BGCOLOR=#FDF9F2><font COLOR=#996600>¥³¥ß¥å¥Ë¥Æ¥£Ì¾</font></td>
-<td COLSPAN=2 WIDTH=370 BGCOLOR=#FFFFFF>\\([^<]+\\)</td></tr>")
+ "<dt class=\"communityTitle\"><a href=\"view_community\\.pl\\?id=\\([0-9]+\\)\">\\(.+\\) ([0-9]+)</a>")
;; FIXME: Support category.
;;;###autoload
"&comm_id=" (mixi-community-id (mixi-topic-community ,topic))))
(defconst mixi-topic-community-regexp
- "<td width=\"595\" background=\"http://img\\.mixi\\.jp/img/bg_w\\.gif\"><b>\\[\\(.+\\)\\] ¥È¥Ô¥Ã¥¯</b></td>")
-(defconst mixi-topic-time-regexp
- "<td rowspan=\"3\" width=\"110\" bgcolor=\"#ffd8b0\" align=\"center\" valign=\"top\" nowrap>\\([0-9]+\\)ǯ\\([0-9]+\\)·î\\([0-9]+\\)Æü<br>\\([0-9]+\\):\\([0-9]+\\)</td>")
+ "<div class=\"pageTitle communityTitle002\">
+<h2>\\(.+\\) ¥È¥Ô¥Ã¥¯</h2>")
(defconst mixi-topic-title-regexp
- "<td bgcolor=\"#fff4e0\"> \\([^<]+\\)</td>")
+ "<span class=\"title\">\\([^<]+\\)</span>")
+(defconst mixi-topic-time-regexp
+ "<span class=\"date\">\\([0-9]+\\)ǯ\\([0-9]+\\)·î\\([0-9]+\\)Æü \\([0-9]+\\):\\([0-9]+\\)</span>")
(defconst mixi-topic-owner-regexp
- "<td bgcolor=\"#fdf9f2\"> <font color=\"#dfb479\"></font> <a href=\"show_friend\\.pl\\?id=\\([0-9]+\\)\">\\(.*?\\)\\(¤µ¤ó\\)?</a>")
+ "<dt><a href=\"show_friend\\.pl\\?id=\\([0-9]+\\)\">\\(.*?\\)\\(¤µ¤ó\\)?</a>")
(defconst mixi-topic-content-regexp
- "<table width=\"500\" border=\"0\" cellspacing=\"0\" cellpadding=\"5\"><tr><td class=\"h120\"><table><tr>\\(<td width=\"130\" height=\"140\" align=\"center\" valign=\"middle\"><a href=\"javascript:void(0)\" onClick=\"MM_openBrWindow('show_bbs_picture\\.pl\\?id=[0-9]+&comm_id=[0-9]+&number=[0-9]+','pict','width=680,height=660,toolbar=no,scrollbars=yes,left=5,top=5')\"><img src=\"http://ic[0-9]+\\.mixi\\.jp/[^.]+\\.jpg\" border=\"0\"></a></td>\n\\)*</tr></table>\\(.+\\)</td></tr></table>")
+ "<dd>\\(\\(.\\|\r?\n\\)*?\\)</dd>")
(defun mixi-realize-topic (topic &optional page)
"Realize a TOPIC."
(mixi-community-set-name (mixi-topic-community topic)
(match-string 1))
(mixi-realization-error 'cannot-find-community topic))
+ (if (re-search-forward mixi-topic-title-regexp nil t)
+ (mixi-topic-set-title topic (match-string 1))
+ (mixi-realization-error 'cannot-find-title topic))
(if (re-search-forward mixi-topic-time-regexp nil t)
(mixi-topic-set-time
topic (encode-time 0 (string-to-number (match-string 5))
(string-to-number (match-string 2))
(string-to-number (match-string 1))))
(mixi-realization-error 'cannot-find-time topic))
- (if (re-search-forward mixi-topic-title-regexp nil t)
- (mixi-topic-set-title topic (match-string 1))
- (mixi-realization-error 'cannot-find-title topic))
(if (re-search-forward mixi-topic-owner-regexp nil t)
(mixi-topic-set-owner topic (mixi-make-friend (match-string 1)
(match-string 2)))
(mixi-realization-error 'cannot-find-owner topic))
(if (re-search-forward mixi-topic-content-regexp nil t)
- (mixi-topic-set-content topic (match-string 2))
+ (mixi-topic-set-content topic (match-string 1))
(mixi-realization-error 'cannot-find-content topic)))
(mixi-object-touch topic)))
"&comm_id=" (mixi-community-id (mixi-event-community ,event))))
(defconst mixi-event-community-regexp
- "<td WIDTH=595 background=http://img\\.mixi\\.jp/img/bg_w\\.gif><b>\\[\\(.+\\)\\] ¥¤¥Ù¥ó¥È</b></td>")
-(defconst mixi-event-time-regexp
- "<td ROWSPAN=11 \\(BGCOLOR\\|bgcolor\\)=#FFD8B0 \\(ALIGN\\|align\\)=center \\(VALIGN\\|Valign\\)=top WIDTH=110>
-?\\([0-9]+\\)ǯ\\([0-9]+\\)·î\\([0-9]+\\)Æü<br>
-?\\([0-9]+\\):\\([0-9]+\\)</td>")
+ "<div class=\"pageTitle communityTitle002\">
+<h2>\\(.+\\) ¥¤¥Ù¥ó¥È</h2>")
(defconst mixi-event-title-regexp
- "<td bgcolor=#FFF4E0\\( width=410\\)?> \\([^<]+\\)</td>")
-(defconst mixi-event-owner-regexp
- "<td \\(BGCOLOR\\|bgcolor\\)=#FDF9F2> <a href=\"show_friend\\.pl\\?id=\\([0-9]+\\)\">\\(.*\\)</a>")
-(defconst mixi-event-owner-seceded-regexp
- "<td \\(BGCOLOR\\|bgcolor\\)=#FDF9F2> \\((mixi Âà²ñºÑ)\\)")
+ "<span class=\"title\">\\([^<]+\\)</span>")
+(defconst mixi-event-time-regexp
+ "<span class=\"date\">\\([0-9]+\\)ǯ\\([0-9]+\\)·î\\([0-9]+\\)Æü \\([0-9]+\\):\\([0-9]+\\)</span>")
(defconst mixi-event-date-regexp
- "<td \\(BGCOLOR\\|bgcolor\\)=#\\(FFFFFF\\|ffffff\\) \\(ALIGN\\|align\\)=center NOWRAP>³«ºÅÆü»þ</td>
-<td \\(BGCOLOR\\|bgcolor\\)=#\\(FFFFFF\\|ffffff\\)>
- \\(.+\\)
-</td>")
+ "<dt>³«ºÅÆü»þ</dt>
+<dd>\\(.+\\)</dd>")
(defconst mixi-event-place-regexp
- "<td \\(BGCOLOR\\|bgcolor\\)=#\\(FFFFFF\\|ffffff\\) \\(ALIGN\\|align\\)=center NOWRAP>³«ºÅ¾ì½ê</td>
-<td \\(BGCOLOR\\|bgcolor\\)=#\\(FFFFFF\\|ffffff\\)>
- \\(.+\\)
-</td>")
+ "<dt>³«ºÅ¾ì½ê</dt>
+<dd>\\(.+\\)</dd>")
+(defconst mixi-event-owner-regexp
+ "<dt><a href=\"show_friend\\.pl\\?id=\\([0-9]+\\)\">\\(.*\\)</a></dt>")
+(defconst mixi-event-owner-seceded-regexp
+ "<dt>\\((mixi Âà²ñºÑ)\\)</dt>")
(defconst mixi-event-detail-regexp
- "<td \\(BGCOLOR\\|bgcolor\\)=#\\(FFFFFF\\|ffffff\\) \\(ALIGN\\|align\\)=center NOWRAP>¾ÜºÙ</td>
-<td \\(BGCOLOR\\|bgcolor\\)=#\\(FFFFFF\\|ffffff\\)><table BORDER=0 CELLSPACING=0 CELLPADDING=5><tr><td CLASS=h120>\\(.+\\)</td></tr></table></td>")
+ "<dd>\\(\\(.\\|\r?\n\\)*?\\)</dd>
+</dl>")
(defconst mixi-event-limit-regexp
- "<td \\(BGCOLOR\\|bgcolor\\)=\"?#\\(FFFFFF\\|ffffff\\)\"? \\(ALIGN\\|align\\)=\"?center\"? NOWRAP>Ê罸´ü¸Â</td>
-?<td \\(BGCOLOR\\|bgcolor\\)=#\\(FFFFFF\\|ffffff\\)> \\([0-9]+\\)ǯ\\([0-9]+\\)·î\\([0-9]+\\)Æü</td>")
+ "<dt>Ê罸´ü¸Â</dt>
+<dd>\\(.+\\)</dd>")
(defconst mixi-event-members-regexp
- "<td \\(BGCOLOR\\|bgcolor\\)=#\\(FFFFFF\\|ffffff\\) \\(ALIGN\\|align\\)=center NOWRAP>»²²Ã¼Ô</td>
-<td \\(BGCOLOR\\|bgcolor\\)=#\\(FFFFFF\\|ffffff\\)>
-
-?
-?<table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH=100%>
-<tr>
-
-?<td> \\(.+\\)</td>")
+ "<dt>»²²Ã¼Ô</dt>
+<dd>\\(.+\\)</dd>")
(defun mixi-realize-event (event &optional page)
"Realize a EVENT."
;; FIXME: Check a expiration of cache?
(unless (mixi-object-realized-p event)
(with-mixi-retrieve (or page (mixi-event-page event))
- (if (re-search-forward mixi-event-community-regexp nil t)
- (mixi-community-set-name (mixi-event-community event)
- (match-string 1))
- (mixi-realization-error 'cannot-find-community event))
- (if (re-search-forward mixi-event-time-regexp nil t)
- (mixi-event-set-time
- event (encode-time 0 (string-to-number (match-string 8))
- (string-to-number (match-string 7))
- (string-to-number (match-string 6))
- (string-to-number (match-string 5))
- (string-to-number (match-string 4))))
- (mixi-realization-error 'cannot-find-time event))
- (if (re-search-forward mixi-event-title-regexp nil t)
- (mixi-event-set-title event (match-string 2))
- (mixi-realization-error 'cannot-find-title event))
- (if (re-search-forward mixi-event-owner-regexp nil t)
- (mixi-event-set-owner event (mixi-make-friend (match-string 2)
- (match-string 3)))
- (if (re-search-forward mixi-event-owner-seceded-regexp nil t)
- (mixi-event-set-owner event
- (mixi-make-friend nil (match-string 2)))
- (mixi-realization-error 'cannot-find-owner event)))
- (if (re-search-forward mixi-event-date-regexp nil t)
- (mixi-event-set-date event (match-string 6))
- (mixi-realization-error 'cannot-find-date event))
- (if (re-search-forward mixi-event-place-regexp nil t)
- (mixi-event-set-place event (match-string 6))
- (mixi-realization-error 'cannot-find-place event))
- (if (re-search-forward mixi-event-detail-regexp nil t)
- (mixi-event-set-detail event (match-string 6))
- (mixi-realization-error 'cannot-find-detail event))
- (when (re-search-forward mixi-event-limit-regexp nil t)
- (mixi-event-set-limit
- event (encode-time 0 0 0 (string-to-number (match-string 8))
- (string-to-number (match-string 7))
- (string-to-number (match-string 6)))))
- (if (re-search-forward mixi-event-members-regexp nil t)
- (mixi-event-set-members event (match-string 6))
- (mixi-realization-error 'cannot-find-members event)))
+ (let ((case-fold-search t))
+ (if (re-search-forward mixi-event-community-regexp nil t)
+ (mixi-community-set-name (mixi-event-community event)
+ (match-string 1))
+ (mixi-realization-error 'cannot-find-community event))
+ (if (re-search-forward mixi-event-title-regexp nil t)
+ (mixi-event-set-title event (match-string 1))
+ (mixi-realization-error 'cannot-find-title event))
+ (if (re-search-forward mixi-event-time-regexp nil t)
+ (mixi-event-set-time
+ event (encode-time 0 (string-to-number (match-string 5))
+ (string-to-number (match-string 4))
+ (string-to-number (match-string 3))
+ (string-to-number (match-string 2))
+ (string-to-number (match-string 1))))
+ (mixi-realization-error 'cannot-find-time event))
+ (if (re-search-forward mixi-event-date-regexp nil t)
+ (mixi-event-set-date event (match-string 1))
+ (mixi-realization-error 'cannot-find-date event))
+ (if (re-search-forward mixi-event-place-regexp nil t)
+ (mixi-event-set-place event (match-string 1))
+ (mixi-realization-error 'cannot-find-place event))
+ (if (re-search-forward mixi-event-owner-regexp nil t)
+ (mixi-event-set-owner event (mixi-make-friend (match-string 1)
+ (match-string 2)))
+ (if (re-search-forward mixi-event-owner-seceded-regexp nil t)
+ (mixi-event-set-owner event
+ (mixi-make-friend nil (match-string 1)))
+ (mixi-realization-error 'cannot-find-owner event)))
+ (if (re-search-forward mixi-event-detail-regexp nil t)
+ (mixi-event-set-detail event (match-string 1))
+ (mixi-realization-error 'cannot-find-detail event))
+ (if (re-search-forward mixi-event-limit-regexp nil t)
+ (mixi-event-set-limit event (match-string 1))
+ (mixi-realization-error 'cannot-find-limit event))
+ (if (re-search-forward mixi-event-members-regexp nil t)
+ (mixi-event-set-members event (match-string 1))
+ (mixi-realization-error 'cannot-find-members event))))
(mixi-object-touch event)))
(defun mixi-event-community (event)
"&id=" (mixi-community-id ,community)))
(defconst mixi-bbs-list-regexp
- "<a href=view_\\(bbs\\|event\\)\\.pl\\?id=\\([0-9]+\\)")
+ "<a href=\"?view_\\(bbs\\|event\\)\\.pl\\?id=\\([0-9]+\\)")
;;;###autoload
(defun mixi-get-bbses (community &optional range)
`(concat "/new_bbs.pl?page=%d"))
(defconst mixi-new-bbs-list-regexp
- "<a href=\"view_\\(bbs\\|event\\)\\.pl\\?id=\\([0-9]+\\)&comment_count=\\([0-9]+\\)&comm_id=\\([0-9]+\\)\" class=\"new_link\">")
+ "<dd><a href=\"view_\\(bbs\\|event\\)\\.pl\\?id=\\([0-9]+\\)&comment_count=\\([0-9]+\\)&comm_id=\\([0-9]+\\)\">")
;;;###autoload
(defun mixi-get-new-bbses (&optional range)
"&community_id=0&category_id=0"))
(defconst mixi-search-bbs-list-regexp
- "<a href=\"view_\\(bbs\\|event\\)\\.pl\\?id=\\([0-9]+\\)&comm_id=\\([0-9]+\\)\"><img src=http://img\\.mixi\\.jp/img/shbtn\\.gif ALT=¾ÜºÙ¤ò¸«¤ë BORDER=0 WIDTH=104 HEIGHT=19></a>")
+ "<a href=\"view_\\(bbs\\|event\\)\\.pl\\?id=\\([0-9]+\\)&comm_id=\\([0-9]+\\)\" class=\"title\">")
;; FIXME: Support community and category.
;;;###autoload
;; FIXME: Split regexp to time, owner(id and nick) and contents.
(defconst mixi-diary-comment-list-regexp
-"<td rowspan=\"2\" align=\"center\" width=\"95\" bgcolor=\"#f2ddb7\" nowrap>
-\\([0-9]+\\)ǯ\\([0-9]+\\)·î\\([0-9]+\\)Æü<br>\\([0-9]+\\):\\([0-9]+\\)\\(<br>
-<input type=checkbox name=comment_id value=\".+\">
-\\|\\)
-</td>
-<td ALIGN=center BGCOLOR=#FDF9F2 WIDTH=430>
-<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\" width=\"410\">
-<tr>
-\\(<td>\\)
-<a href=\"show_friend\\.pl\\?id=\\([0-9]+\\)\">\\(.*\\)</a>
+ "<span class=\"commentTitleName\">\\(<input type=\"checkbox\" name=\"comment_id\" value=\".+\" />
+\\|\\)<a href=\"show_friend\\.pl\\?id=\\([0-9]+\\)\">\\(.*\\)</a>
+\\(
+| <a href=\"delete_comment\\.pl\\?diary_id=[0-9]+&owner_id=[0-9]+&comment_id=.+&type=comment\">¼«Ê¬¤Î¥³¥á¥ó¥È¤òºï½ü¤¹¤ë</a>
+\\|\\)</span>
+
+<span class=\"commentTitleDate\">\\([0-9]+\\)ǯ\\([0-9]+\\)·î\\([0-9]+\\)Æü \\([0-9]+\\):\\([0-9]+\\)</span>
+
+
+?
+</dt>
+
+
+
+
+
+
+
-\\(<font color=\"#f2ddb7\">|</font> <a href=[^>]+>ºï½ü</a>
-\\|\\)</td>
-</tr>
-</table>
-</td>
-</tr>
-<!-- [^ ]+ : start -->
-<tr>
-<td bgcolor=\"#ffffff\">
-<table BORDER=0 CELLSPACING=0 CELLPADDING=[35] WIDTH=410>
-<tr>
-<td CLASS=h12>
-\\(.+\\)
-</td></tr></table>")
+
+
+
+?
+<dd>
+\\(\\(.\\|\r?\n\\)*?\\)
+</dd>
+</dl>
+</div>")
(defun mixi-topic-comment-list-page (topic)
(concat "/view_bbs.pl?page=all"
;; FIXME: Split regexp to time, owner(id and nick) and contents.
(defconst mixi-topic-comment-list-regexp
- "<tr valign=\"top\">
-<td rowspan=\"2\" width=\"110\" bgcolor=\"#f2ddb7\" align=\"center\" nowrap>
-\\([0-9]+\\)ǯ\\([0-9]+\\)·î\\([0-9]+\\)Æü<br>
-\\([0-9]+\\):\\([0-9]+\\)<br>
-\\(<input type=\"checkbox\" name=\"comment_id\" value=\".+\">
-\\|\\)</td>
-<td bgcolor=\"#fdf9f2\"> <font color=\"#f8a448\">
-<b>[^<]+</b>:</font>
-\\(
-\\|\\) *<a href=\"show_friend\\.pl\\?id=\\([0-9]+\\)\">\\(.*\\)</a>
-
-?\\(
-
-\\|<font color=\"#f2ddb7\">| </font><a href=\"delete_bbs_comment\\.pl\\?id=[0-9]+&comm_id=[0-9]+&comment_id=[0-9]+\">ºï½ü</a>
-\\|\\)</td>
-</tr>
-<tr>
-<td bgcolor=\"#ffffff\" align=\"center\">
-<table border=\"0\" cellspacing=\"0\" cellpadding=\"5\" width=\"500\">
-<tr>
-<td class=\"h120\">
-
-\\(.+\\)
-</td>
-</tr>
-</table>
-</td>
-</tr>")
+ "<span class=\"date\">\\([0-9]+\\)ǯ\\([0-9]+\\)·î\\([0-9]+\\)Æü \\([0-9]+\\):\\([0-9]+\\)</span></dt>
+<dd>
+<dl class=\"commentContent01\">
+<dt><a href=\"show_friend\\.pl\\?id=\\([0-9]+\\)\">\\(.*\\)</a></dt>
+<dd>
+\\(\\(.\\|\r?\n\\)*?\\)
+</dd>")
(defun mixi-event-comment-list-page (event)
(concat "/view_event.pl?page=all"
;; FIXME: Split regexp to time, owner(id and nick) and contents.
(defconst mixi-event-comment-list-regexp
- "<tr>
-<td ROWSPAN=2 ALIGN=center BGCOLOR=#F2DDB7 WIDTH=110>
-\\([0-9]+\\)ǯ\\([0-9]+\\)·î\\([0-9]+\\)Æü<br>
-\\([0-9]+\\):\\([0-9]+\\)<br>
-\\(</td>\\)
-\\(<td BGCOLOR=#FDF9F2>\\)
-<font COLOR=#F8A448><b>[^<]+</b> :</font>
-<a HREF=\"show_friend\\.pl\\?id=\\([0-9]+\\)\">\\(.*\\)</a>
-
-\\(<font COLOR=#F2DDB7>|</font>
-<a href=\"delete_bbs_comment\\.pl\\?id=[0-9]+&comm_id=[0-9]+&comment_id=[0-9]+&type=event\">ºï½ü</a>
-
-\\|\\)</td>
-</tr>
-<tr>
-<td ALIGN=center BGCOLOR=#FFFFFF>
-<table BORDER=0 CELLSPACING=0 CELLPADDING=5 WIDTH=500>
-<tr><td CLASS=h120>\\(.+\\)</td></tr>
-</table>
-</td>
-</tr>")
+ "<span class=\"date\">\\([0-9]+\\)ǯ\\([0-9]+\\)·î\\([0-9]+\\)Æü \\([0-9]+\\):\\([0-9]+\\)</span></dt>
+<dd>
+<dl class=\"commentContent01\">
+<dt><a href=\"show_friend\\.pl\\?id=\\([0-9]+\\)\">\\(.*\\)</a></dt>
+<dd>
+\\(\\(.\\|\r?\n\\)*?\\)
+</dd>")
;;;###autoload
(defun mixi-get-comments (parent &optional range)
(setq page nil))
(let ((items (mixi-get-matched-items page regexp range t)))
(mapcar (lambda (item)
- (mixi-make-comment parent (mixi-make-friend
- (nth 7 item) (nth 8 item))
- (encode-time
- 0
- (string-to-number (nth 4 item))
- (string-to-number (nth 3 item))
- (string-to-number (nth 2 item))
- (string-to-number (nth 1 item))
- (string-to-number (nth 0 item)))
- (nth 10 item)))
+ (let (owner-id owner-nick year month day hour minute content)
+ (if (eq (mixi-object-class parent) 'mixi-diary)
+ (progn
+ (setq owner-id (nth 1 item))
+ (setq owner-nick (nth 2 item))
+ (setq year (nth 4 item))
+ (setq month (nth 5 item))
+ (setq day (nth 6 item))
+ (setq hour (nth 7 item))
+ (setq minute (nth 8 item))
+ (setq content (nth 9 item)))
+ (setq owner-id (nth 5 item))
+ (setq owner-nick (nth 6 item))
+ (setq year (nth 0 item))
+ (setq month (nth 1 item))
+ (setq day (nth 2 item))
+ (setq hour (nth 3 item))
+ (setq minute (nth 4 item))
+ (setq content (nth 7 item)))
+ (mixi-make-comment parent (mixi-make-friend owner-id
+ owner-nick)
+ (encode-time
+ 0
+ (string-to-number minute)
+ (string-to-number hour)
+ (string-to-number day)
+ (string-to-number month)
+ (string-to-number year))
+ content)))
items))))
(defmacro mixi-new-comment-list-page ()
`(concat "/new_comment.pl?page=%d"))
(defconst mixi-new-comment-list-regexp
- "<a href=\"view_diary\\.pl\\?id=\\([0-9]+\\)&owner_id=\\([0-9]+\\)&comment_count=\\([0-9]+\\)\" class=\"new_link\">")
+ "<a href=\"view_diary\\.pl\\?id=\\([0-9]+\\)&owner_id=\\([0-9]+\\)&comment_count=\\([0-9]+\\)\">")
;;;###autoload
(defun mixi-get-new-comments (&optional range)
(defconst mixi-message-title-regexp
"<font COLOR=#996600>·ï\\(¡¡\\| \\)̾</font> : \\(.*\\)\n?</td>")
(defconst mixi-message-content-regexp
- "<tr><td CLASS=h120>\\(.*\\)</td></tr>")
+ "<tr><td CLASS=h120 width=\"500\">\\(.*\\)</td></tr>")
(defun mixi-realize-message (message)
"Realize a MESSAGE."
`(concat "http://news.mixi.jp/view_news.pl?id=" (mixi-news-id ,news)
"&media_id=" (mixi-news-media-id ,news)))
-
(defconst mixi-news-finished-regexp
- "<td ALIGN=center background=http://img\\.mixi\\.jp/img/bg_line\\.gif> ¿½¤·Ìõ¤´¤¶¤¤¤Þ¤»¤ó¤¬¡¢¤³¤Î¥Ë¥å¡¼¥¹¤Ï·ÇºÜ½ªÎ»¤·¤Þ¤·¤¿¡£</td>")
+ "¿½¤·Ìõ¤´¤¶¤¤¤Þ¤»¤ó¤¬¡¢¤³¤Î¥Ë¥å¡¼¥¹¤Ï·ÇºÜ¤¬½ªÎ»¤·¤¿¤«¡¢URL¤¬´Ö°ã¤Ã¤Æ¤¤¤¤¤ë¤¿¤á¤´Í÷¤¤¤¿¤À¤±¤Þ¤»¤ó¡£</td>")
(defconst mixi-news-title-regexp
- "<td HEIGHT=\"46\" STYLE=\"font-weight: bold;font-size: 14px;\" CLASS=\"h130\">\\(.+\\)\\(\r
+ "<td HEIGHT=\"46\" STYLE=\"font-weight: bold;font-size: 14px;\" CLASS=\"h130\">\\(.+\\)\\(
\\)?</td>")
(defconst mixi-news-media-time-regexp
"<td COLSPAN=\"2\" ALIGN=\"right\">(\\(.+\\) - \\([0-9]+\\)·î\\([0-9]+\\)Æü \\([0-9]+\\):\\([0-9]+\\))</td></tr>")
projects / elisp / mixi.git / blobdiff