-;; mixi.el --- API library 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
;;; Commentary:
-;; API for getting contents:
+;; APIs for getting contents:
;;
;; * mixi-get-friends
;; * mixi-get-favorites
;; * mixi-search-bbses
;; * mixi-get-comments
;; * mixi-get-new-comments
+;; * mixi-get-new-bbs-comments
;; * mixi-get-messages
-;; * mixi-get-introductions
+;; * mixi-get-introductions (broken)
+;; * mixi-get-news
;;
-;; API for posting:
+;; APIs for posting:
;;
;; * mixi-post-diary
;; * mixi-post-topic
;;
;; Utilities:
;;
-;; * mixi-remove-markup
+;; * mixi-remove-markup (half broken)
-;; Example:
+;; Examples:
;;
;; Display newest 3 diaries like a mail format.
;;
;; (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)))
(eval-when-compile (require 'cl))
+;; Functions and variables which should be defined in the other module
+;; at run-time.
+(eval-when-compile
+ (defvar w3m-use-cookies)
+ (defvar url-request-method)
+ (defvar url-request-data)
+ (defvar url-request-extra-headers)
+ (defvar url-show-status)
+ (autoload 'w3m-decode-buffer "w3m")
+ (autoload 'w3m-retrieve "w3m")
+ (autoload 'url-retrieve-synchronously "url"))
+
+(defconst mixi-revision "$Revision: 1.173 $")
+
(defgroup mixi nil
"API library for accessing to mixi."
:group 'hypermedia)
(symbol :tag "The other backend"))
:group 'mixi)
+(defcustom mixi-login-use-ssl nil
+ "*If non-ni, login using SSL."
+ :type 'boolean
+ :group 'mixi)
+
(defcustom mixi-default-email nil
"*Default E-mail address that is used to login automatically."
:type '(radio (string :tag "E-mail address")
:type 'boolean
:group 'mixi)
+(defvar mixi-temp-buffer-name " *mixi temp*")
(defvar mixi-me nil)
;; Utilities.
'error-conditions '(mixi-post-error error))
(defmacro mixi-realization-error (type object)
- `(let ((data (if (and (boundp 'buffer) debug-on-error)
- (list ,type ,object buffer)
+ `(let ((data (if debug-on-error
+ (list ,type ,object (buffer-string))
(list ,type ,object))))
(signal 'mixi-realization-error data)))
(defmacro mixi-post-error (type &optional object)
- `(let ((data (when (and (boundp 'buffer) debug-on-error)
- (list buffer))))
+ `(let ((data (when debug-on-error (list (buffer-string)))))
(if ,object
(setq data (cons ,type (cons ,object data)))
(setq data (cons ,type data)))
,url
(concat mixi-url ,url)))
-;; FIXME: Support file, checkbox and so on.
+;; FIXME: Support files.
(defun mixi-make-form-data (fields)
"Make form data and return (CONTENT-TYPE . FORM-DATA)."
(let* ((boundary (apply 'format "--_%d_%d_%d" (current-time)))
(url-request-data post-data)
(url-request-extra-headers extra-headers)
(url (mixi-expand-url url))
+ url-show-status
(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))))))
(let ((form-data (mixi-make-form-data fields)))
(mixi-w3m-retrieve url form-data)))
-(defun mixi-curl-retrieve (url &optional post-data)
+(defun mixi-curl-retrieve (url &optional post-data form-data)
"Retrieve the URL and return gotten strings."
(with-temp-buffer
(if (fboundp 'set-buffer-multibyte)
(apply #'start-process "curl" (current-buffer)
mixi-curl-program
(append (if post-data '("-d" "@-"))
+ form-data
(list "-i" "-L" "-s"
"-b" mixi-curl-cookie-file
"-c" mixi-curl-cookie-file
(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))))
+(defun mixi-curl-post-form (url fields)
+ (let (form-data)
+ (mapcar (lambda (field)
+ (push "-F" form-data)
+ (push (concat (car field) "="
+ (encode-coding-string (cdr field)
+ mixi-coding-system))
+ form-data))
+ fields)
+ (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 ((buffer (mixi-retrieve "/login.pl"
- (concat "email=" email
- "&password=" password
- "&next_url=/home.pl"
- "&sticky=on"))))
- (unless (string-match "url=/check\\.pl\\?n=" buffer)
- (error (mixi-message "Cannot login")))
- (setq buffer (mixi-retrieve "/check.pl?n=home.pl"))
- (if (string-match mixi-my-id-regexp buffer)
- (setq mixi-me (mixi-make-friend (match-string 1 buffer)))
- (error (mixi-message "Cannot login"))))))
+ (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
+ "&next_url=/home.pl"
+ "&sticky=on"))))
+ (unless (string-match "url=/check\\.pl\\?n=" buffer)
+ (error (mixi-message "Cannot login")))
+ (setq buffer (mixi-retrieve "/check.pl?n=home.pl"))
+ (if (string-match mixi-my-id-regexp buffer)
+ (setq mixi-me (mixi-make-friend (match-string 1 buffer)))
+ (error (mixi-message "Cannot login")))))))
(defun mixi-logout ()
(mixi-retrieve "/logout.pl"))
+(defconst mixi-login-form "<form action=\"/login.pl\" method=\"post\">")
+
(defmacro with-mixi-retrieve (url &rest body)
- `(let (buffer)
+ `(with-current-buffer (get-buffer-create mixi-temp-buffer-name)
(when ,url
- (setq buffer (mixi-retrieve ,url))
- (when (string-match "<form action=\"login\\.pl\" method=\"post\">"
- buffer)
+ (erase-buffer)
+ (insert (mixi-retrieve ,url))
+ (goto-char (point-min))
+ (when (search-forward mixi-login-form nil t)
(mixi-login)
- (setq buffer (mixi-retrieve ,url))))
+ (erase-buffer)
+ (insert (mixi-retrieve ,url))))
+ (goto-char (point-min))
,@body))
(put 'with-mixi-retrieve 'lisp-indent-function 'defun)
-(put 'with-mixi-retrieve 'edebug-form-spec '(form body))
+(put 'with-mixi-retrieve 'edebug-form-spec '(body))
(defmacro with-mixi-post-form (url fields &rest body)
- `(let (buffer)
+ `(with-current-buffer (get-buffer-create mixi-temp-buffer-name)
(when ,url
- (setq buffer (mixi-post-form ,url ,fields))
- (when (string-match "<form action=\"login\\.pl\" method=\"post\">"
- buffer)
+ (erase-buffer)
+ (insert (mixi-post-form ,url ,fields))
+ (goto-char (point-min))
+ (when (search-forward mixi-login-form nil t)
(mixi-login)
- (setq buffer (mixi-post-form ,url ,fields))))
+ (erase-buffer)
+ (insert (mixi-post-form ,url ,fields))))
+ (goto-char (point-min))
,@body))
(put 'with-mixi-post-form 'lisp-indent-function 'defun)
-(put 'with-mixi-post-form 'edebug-form-spec '(form body))
+(put 'with-mixi-post-form 'edebug-form-spec '(body))
-(defun mixi-get-matched-items (url regexp &optional range)
+(defun mixi-get-matched-items (url regexp &optional range reverse)
"Get matched items to REGEXP in URL."
(let ((page 1)
ids)
(catch 'end
(while (or (null range) (< (length ids) range))
- (with-mixi-retrieve (format url page)
- (let ((pos 0)
+ (with-mixi-retrieve (when url (format url page))
+ (let ((func (if reverse (progn
+ (goto-char (point-max))
+ 're-search-backward)
+ 're-search-forward))
found)
- (while (and (string-match regexp buffer pos)
+ (while (and (funcall func regexp nil t)
(or (null range) (< (length ids) range)))
(let ((num 1)
list)
- (while (match-string num buffer)
- (setq list (cons (match-string num buffer) list))
+ (while (match-string num)
+ (setq list (cons (match-string num) list))
(incf num))
(when (not (member (reverse list) ids))
(setq found t)
- (setq ids (cons (reverse list) ids)))
- (setq pos (match-end (1- num)))))
+ (setq ids (cons (reverse list) ids)))))
(when (not found)
(throw 'end ids))))
(incf page)))
(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-")
"Return a mixi object from URL."
(if (string-match mixi-object-url-regexp url)
(let ((name (match-string 2 url)))
- (when (string= name "bbs")
- (setq name "topic"))
+ (cond ((string= name "bbs")
+ (setq name "topic"))
+ ((string= name "profile")
+ (setq name "friend")))
(let ((func (intern (concat mixi-object-prefix "make-" name
"-from-url"))))
(funcall func url)))
(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 (string-match mixi-my-id-regexp buffer)
- (setq mixi-me (mixi-make-friend (match-string 1 buffer)))
+ (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)
(defconst mixi-friend-url-regexp
- "/show_friend\\.pl\\?id=\\([0-9]+\\)")
+ "/show_\\(friend\\|profile\\)\\.pl\\?id=\\([0-9]+\\)")
(defun mixi-make-friend-from-url (url)
"Return a friend object from URL."
(if (string-match mixi-friend-url-regexp url)
- (let ((id (match-string 1 url)))
+ (let ((id (match-string 2 url)))
(mixi-make-friend id))
(when (string-match "/home\\.pl" url)
(mixi-make-me))))
`(eq (mixi-object-class ,friend) 'mixi-friend))
(defmacro mixi-friend-page (friend)
- `(concat "/show_friend.pl?id=" (mixi-friend-id ,friend)))
+ `(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
- "<td BGCOLOR=#F2DDB7 WIDTH=80 NOWRAP><font COLOR=#996600>̾\\( \\| \\)Á°</font></td>
-
-?<td WIDTH=345>\\(.+?\\)\\(</td>\\|<img\\)")
+ "<dt>̾Á°</dt>\n?<dd>\\(.+?\\)\\(<img\\|</dd>\\)")
(defconst mixi-friend-sex-regexp
- "<td BGCOLOR=#F2DDB7\\( WIDTH=80 NOWRAP\\)?><font COLOR=#996600>À\\( \\| \\)ÊÌ</font></td>
-
-?<td WIDTH=345>\\([Ã˽÷]\\)À\\(</td>\\|<img\\)")
+ "<dt>ÀÊÌ</dt>\n?<dd>\\([Ã˽÷]\\)À\\(<img\\|</dd>\\)")
(defconst mixi-friend-address-regexp
- "<td BGCOLOR=#F2DDB7><font COLOR=#996600>¸½½»½ê</font></td>\n<td>\\(.+\\)\\(\n.+\n\\)?</td></tr>")
+ "<dt>¸½½»½ê</dt>\n?<dd>\\(.+?\\)\\(<img \\|</dd>\\)")
(defconst mixi-friend-age-regexp
- "<td BGCOLOR=#F2DDB7><font COLOR=#996600>ǯ\\( \\| \\)Îð</font></td>\n<td>\\([0-9]+\\)ºÐ\\(\n.+\n\\)?</td></tr>")
+ "<dt>ǯÎð</dt>\n?<dd>\\([0-9]+\\)ºÐ\\( <img\\|</dd>\\)")
(defconst mixi-friend-birthday-regexp
- "<td BGCOLOR=#F2DDB7><font COLOR=#996600>ÃÂÀ¸Æü</font></td>\n<td>\\([0-9]+\\)·î\\([0-9]+\\)Æü\\(\n.+\n\\)?</td></tr>")
+ "<dt>ÃÂÀ¸Æü</dt>\n?<dd>\\([0-9]+\\)·î\\([0-9]+\\)Æü\\(<img \\|</dd>\\)")
(defconst mixi-friend-blood-type-regexp
- "<td BGCOLOR=#F2DDB7><font COLOR=#996600>·ì±Õ·¿</font></td>\n<td>\\([ABO]B?\\)·¿\\(\n\n\\)?</td></tr>")
+ "<dt>·ì±Õ·¿</dt>\n?<dd>\\([ABO]B?\\)·¿\\(<img \\|</dd>\\)")
(defconst mixi-friend-birthplace-regexp
- "<td BGCOLOR=#F2DDB7><font COLOR=#996600>½Ð¿ÈÃÏ</font>\n?</td>\n<td>\\(.+\\)\\(\n.+\n\\)?</td></tr>")
+ "<dt>½Ð¿ÈÃÏ</dt>\n?<dd>\\(.+?\\)\\(<img \\|</dd>\\)")
(defconst mixi-friend-hobby-regexp
- "<td BGCOLOR=#F2DDB7><font COLOR=#996600>¼ñ\\( \\| \\)Ì£</font></td>\n<td>\\(.+?\\)\\(</td>\\|<img\\)")
+ "<dt>¼ñÌ£</dt>\n?<dd>\\(.+?\\)\\(<img \\|</dd>\\)")
(defconst mixi-friend-job-regexp
- "<td BGCOLOR=#F2DDB7><font COLOR=#996600>¿¦\\( \\| \\)¶È</font></td>\n<td>\\(.+\\)\\(\n.+\n\\)?</td></tr>")
+ "<dt>¿¦¶È</dt>\n?<dd>\\(.+?\\)\\(<img \\|</dd>\\)")
(defconst mixi-friend-organization-regexp
- "<td BGCOLOR=#F2DDB7><font COLOR=#996600>½ê\\( \\| \\)°</font></td>\n<td[^>]*>\\(.+\\)\\(\n.+\n\\)?</td></tr>")
+ "<dt>½ê°</dt>\n?<dd>\\(.+?\\)\\(<img \\|</dd>\\)")
(defconst mixi-friend-profile-regexp
- "<td BGCOLOR=#F2DDB7><font COLOR=#996600>¼«¸Ê¾Ò²ð</font></td>\n<td CLASS=h120>\\(.+\\)</td></tr>")
+ "<dt>¼«¸Ê¾Ò²ð</dt>\n?<dd class=\"userInput\">\\(.+?\\)</dd>")
(defun mixi-realize-friend (friend)
"Realize a FRIEND."
;; FIXME: Check a expiration of cache?
(unless (mixi-object-realized-p friend)
- (let (buf)
- (with-mixi-retrieve (mixi-friend-page friend)
- (setq buf buffer))
- (if (string-match mixi-friend-nick-regexp buf)
- (mixi-friend-set-nick friend (match-string 1 buf))
- (mixi-realization-error 'cannot-find-nick friend))
- ;; For getting my profile.
- (unless (string-match mixi-friend-name-regexp buf)
- (with-mixi-retrieve (concat "/show_profile.pl?id="
- (mixi-friend-id friend))
- (setq buf buffer)))
- (if (string-match mixi-friend-name-regexp buf)
- (mixi-friend-set-name friend (match-string 2 buf))
- (mixi-realization-error 'cannot-find-name friend))
- (if (string-match mixi-friend-sex-regexp buf)
- (mixi-friend-set-sex friend
- (if (string= (match-string 3 buf) "ÃË")
- 'male 'female))
- (mixi-realization-error 'cannot-find-sex friend))
- (when (string-match mixi-friend-address-regexp buf)
- (mixi-friend-set-address friend (match-string 1 buf)))
- (when (string-match mixi-friend-age-regexp buf)
- (mixi-friend-set-age
- friend (string-to-number (match-string 2 buf))))
- (when (string-match mixi-friend-birthday-regexp buf)
- (mixi-friend-set-birthday
- friend (list (string-to-number (match-string 1 buf))
- (string-to-number (match-string 2 buf)))))
- (when (string-match mixi-friend-blood-type-regexp buf)
- (mixi-friend-set-blood-type friend (intern (match-string 1 buf))))
- (when (string-match mixi-friend-birthplace-regexp buf)
- (mixi-friend-set-birthplace friend (match-string 1 buf)))
- (when (string-match mixi-friend-hobby-regexp buf)
- (mixi-friend-set-hobby
- friend (split-string (match-string 2 buf) ", ")))
- (when (string-match mixi-friend-job-regexp buf)
- (mixi-friend-set-job friend (match-string 2 buf)))
- (when (string-match mixi-friend-organization-regexp buf)
- (mixi-friend-set-organization friend (match-string 2 buf)))
- (when (string-match mixi-friend-profile-regexp buf)
- (mixi-friend-set-profile friend (match-string 1 buf))))
+ (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 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 1)))
+ (when (re-search-forward mixi-friend-sex-regexp nil t)
+ (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 1))))
+ (when (re-search-forward mixi-friend-birthday-regexp nil t)
+ (mixi-friend-set-birthday
+ friend (list (string-to-number (match-string 1))
+ (string-to-number (match-string 2)))))
+ (when (re-search-forward mixi-friend-blood-type-regexp nil t)
+ (mixi-friend-set-blood-type friend (intern (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 1) ", ")))
+ (when (re-search-forward mixi-friend-job-regexp nil t)
+ (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 1)))
+ (when (re-search-forward mixi-friend-profile-regexp nil t)
+ (mixi-friend-set-profile friend (match-string 1)))))
(mixi-object-touch friend)))
(defun mixi-friend-id (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)
"Get friends of FRIEND."
(when (> (length friend-or-range) 2)
(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)
"Get logs."
(let ((items (mixi-get-matched-items (mixi-log-list-page)
;; Diary object.
(defvar mixi-diary-cache (make-hash-table :test 'equal))
-(defun mixi-make-diary (owner id &optional time title content)
+(defun mixi-make-diary (owner id &optional comment-count time title content)
"Return a diary object."
(let ((owner (or owner (mixi-make-me))))
(mixi-make-cache (list (mixi-friend-id owner) id)
- (cons 'mixi-diary (vector nil owner id time title
- content))
+ (cons 'mixi-diary (vector nil owner id comment-count time
+ title content))
mixi-diary-cache)))
(defconst mixi-diary-url-regexp
- "/view_diary\\.pl\\?id=\\([0-9]+\\)&owner_id=\\([0-9]+\\)")
+ "/view_diary\\.pl\\?id=\\([0-9]+\\)&owner_id=\\([0-9]+\\)\\(&comment_count=\\([0-9]+\\)\\)?")
(defun mixi-make-diary-from-url (url)
"Return a diary object from URL."
(when (string-match mixi-diary-url-regexp url)
(let ((id (match-string 1 url))
- (owner-id (match-string 2 url)))
- (mixi-make-diary (mixi-make-friend owner-id) id))))
+ (owner-id (match-string 2 url))
+ (comment-count (match-string 4 url)))
+ (mixi-make-diary (mixi-make-friend owner-id) id comment-count))))
(defmacro mixi-diary-p (diary)
`(eq (mixi-object-class ,diary) 'mixi-diary))
"&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)
+(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 (mixi-diary-page diary)
- (unless (string-match mixi-diary-closed-regexp buffer)
- (if (string-match mixi-diary-owner-nick-regexp buffer)
- (mixi-friend-set-nick (mixi-diary-owner diary)
- (match-string 1 buffer))
- (mixi-realization-error 'cannot-find-owner-nick diary))
- (if (string-match mixi-diary-time-regexp buffer)
- (mixi-diary-set-time
- diary (encode-time 0 (string-to-number (match-string 10 buffer))
- (string-to-number (match-string 9 buffer))
- (string-to-number (match-string 7 buffer))
- (string-to-number (match-string 6 buffer))
- (string-to-number (match-string 5 buffer))))
- (mixi-realization-error 'cannot-find-time diary))
- (if (string-match mixi-diary-title-regexp buffer)
- (mixi-diary-set-title diary (match-string 2 buffer))
- (mixi-realization-error 'cannot-find-title diary))
- (if (string-match mixi-diary-content-regexp buffer)
- (mixi-diary-set-content diary (match-string 2 buffer))
- (mixi-realization-error 'cannot-find-content diary))))
+ (with-mixi-retrieve (or page (mixi-diary-page 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)
(signal 'wrong-type-argument (list 'mixi-diary-p diary)))
(aref (cdr diary) 2))
+(defun mixi-diary-comment-count (diary)
+ "Return the comment-count of DIARY."
+ (unless (mixi-diary-p diary)
+ (signal 'wrong-type-argument (list 'mixi-diary-p diary)))
+ (aref (cdr diary) 3))
+
(defun mixi-diary-time (diary)
"Return the time of DIARY."
(unless (mixi-diary-p diary)
(signal 'wrong-type-argument (list 'mixi-diary-p diary)))
(unless (aref (cdr diary) 3)
(mixi-realize-diary diary))
- (aref (cdr diary) 3))
+ (aref (cdr diary) 4))
(defun mixi-diary-title (diary)
"Return the title of DIARY."
(signal 'wrong-type-argument (list 'mixi-diary-p diary)))
(unless (aref (cdr diary) 4)
(mixi-realize-diary diary))
- (aref (cdr diary) 4))
+ (aref (cdr diary) 5))
(defun mixi-diary-content (diary)
"Return the content of DIARY."
(unless (mixi-diary-p diary)
(signal 'wrong-type-argument (list 'mixi-diary-p diary)))
(mixi-realize-diary diary)
- (aref (cdr diary) 5))
+ (aref (cdr diary) 6))
+
+(defun mixi-diary-set-comment-count (diary comment-count)
+ "Set the comment-count of DIARY."
+ (unless (mixi-diary-p diary)
+ (signal 'wrong-type-argument (list 'mixi-diary-p diary)))
+ (aset (cdr diary) 3 comment-count))
(defun mixi-diary-set-time (diary time)
"Set the time of DIARY."
(unless (mixi-diary-p diary)
(signal 'wrong-type-argument (list 'mixi-diary-p diary)))
- (aset (cdr diary) 3 time))
+ (aset (cdr diary) 4 time))
(defun mixi-diary-set-title (diary title)
"Set the title of DIARY."
(unless (mixi-diary-p diary)
(signal 'wrong-type-argument (list 'mixi-diary-p diary)))
- (aset (cdr diary) 4 title))
+ (aset (cdr diary) 5 title))
(defun mixi-diary-set-content (diary content)
"Set the content of DIARY."
(unless (mixi-diary-p diary)
(signal 'wrong-type-argument (list 'mixi-diary-p diary)))
- (aset (cdr diary) 5 content))
+ (aset (cdr diary) 6 content))
(defmacro mixi-diary-list-page (&optional friend)
`(concat "/list_diary.pl?page=%d"
(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>
-</tr>
-<tr>
-<td ALIGN=center BGCOLOR=#FFFFFF>
-<table BORDER=0 CELLSPACING=0 CELLPADDING=3 WIDTH=410>
-<tr>
-<td CLASS=h120>
-
-\\(.*\\)
-
-?<br>
-
-</td></tr>
-</table>
-</td></tr>")
+ "<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)
"Get diaries of FRIEND."
(when (> (length friend-or-range) 2)
(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)
- (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) (nth 7 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)
"Get new diaries."
(let ((items (mixi-get-matched-items (mixi-new-diary-list-page)
(mapcar (lambda (item)
(mixi-make-diary (mixi-make-friend (nth 6 item) (nth 8 item))
(nth 5 item)
+ nil
(encode-time
0 (string-to-number (nth 4 item))
(string-to-number (nth 3 item))
<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>
</table>
</td></tr></table>")
+;;;###autoload
(defun mixi-search-diaries (keyword &optional range)
(let ((items (mixi-get-matched-items (mixi-search-diary-list-page keyword)
mixi-search-diary-list-regexp
(setq month month-of-item)
(mixi-make-diary (mixi-make-friend (nth 8 item) (nth 0 item))
(nth 7 item)
+ nil
(encode-time
0 (string-to-number (nth 6 item))
(string-to-number (nth 5 item))
`(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>")
+ "<p\\(\\| class=\"messageAlert\"\\)>\\(ºîÀ®\\|½ñ¤¹þ¤ß\\)¤¬´°Î»¤·¤Þ¤·¤¿¡£È¿±Ç¤Ë»þ´Ö¤¬¤«¤«¤ë¤³¤È¤¬¤¢¤ê¤Þ¤¹¤Î¤Ç¡¢É½¼¨¤µ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¤Ï¾¯¡¹¤ªÂÔ¤Á¤¯¤À¤µ¤¤¡£</p>")
;; FIXME: Support photos.
+;;;###autoload
(defun mixi-post-diary (title content)
"Post a diary."
(unless (stringp title)
("submit" . "main")))
post-key)
(with-mixi-post-form (mixi-post-diary-page) fields
- (if (string-match mixi-post-key-regexp buffer)
- (setq post-key (match-string 1 buffer))
+ (if (re-search-forward mixi-post-key-regexp nil t)
+ (setq post-key (match-string 1))
(mixi-post-error 'cannot-find-key)))
(setq fields `(("post_key" . ,post-key)
("id" . ,(mixi-friend-id (mixi-make-me)))
("diary_body" . ,content)
("submit" . "confirm")))
(with-mixi-post-form (mixi-post-diary-page) fields
- (unless (string-match mixi-post-succeed-regexp buffer)
+ (unless (re-search-forward mixi-post-succeed-regexp nil t)
(mixi-post-error 'cannot-find-succeed)))))
;; Community object.
(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]+\\)Æü</td>")
+ "<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 (string-match mixi-community-nodata-regexp buffer)
- ;; FIXME: Set all members?
- (mixi-community-set-name community "¥Ç¡¼¥¿¤¬¤¢¤ê¤Þ¤»¤ó")
- (if (string-match mixi-community-name-regexp buffer)
- (mixi-community-set-name community (match-string 1 buffer))
- (mixi-realization-error 'cannot-find-name community))
- (if (string-match mixi-community-birthday-regexp buffer)
- (mixi-community-set-birthday
- community
- (encode-time 0 0 0 (string-to-number (match-string 3 buffer))
- (string-to-number (match-string 2 buffer))
- (string-to-number (match-string 1 buffer))))
- (mixi-realization-error 'cannot-find-birthday community))
- (if (string-match mixi-community-owner-regexp buffer)
- (if (string= (match-string 1 buffer) "home.pl")
- (mixi-community-set-owner community (mixi-make-me))
- (mixi-community-set-owner
- community (mixi-make-friend (match-string 2 buffer)
- (match-string 3 buffer))))
- (mixi-realization-error 'cannot-find-owner community))
- (if (string-match mixi-community-category-regexp buffer)
- (mixi-community-set-category community (match-string 1 buffer))
- (mixi-realization-error 'cannot-find-category community))
- (if (string-match mixi-community-members-regexp buffer)
- (mixi-community-set-members
- community (string-to-number (match-string 1 buffer)))
- (mixi-realization-error 'cannot-find-members community))
- (if (string-match mixi-community-open-level-regexp buffer)
- (mixi-community-set-open-level community (match-string 1 buffer))
- (mixi-realization-error 'cannot-find-open-level community))
- (if (string-match mixi-community-authority-regexp buffer)
- (mixi-community-set-authority community (match-string 1 buffer))
- (mixi-realization-error 'cannot-find-authority community))
- (if (string-match mixi-community-description-regexp buffer)
- (mixi-community-set-description community (match-string 1 buffer))
- (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)
"Get communities of FRIEND."
(when (> (length friend-or-range) 2)
"&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
(defun mixi-search-communities (keyword &optional range)
(let ((items (mixi-get-matched-items (mixi-search-community-list-page
keyword)
;; Topic object.
(defvar mixi-topic-cache (make-hash-table :test 'equal))
-(defun mixi-make-topic (community id &optional time title owner content)
+(defun mixi-make-topic (community id &optional comment-count time title owner
+ content)
"Return a topic object."
(mixi-make-cache (list (mixi-community-id community) id)
- (cons 'mixi-topic (vector nil community id time title owner
- content))
+ (cons 'mixi-topic (vector nil community id comment-count
+ time title owner content))
mixi-topic-cache))
(defconst mixi-topic-url-regexp
- "/view_bbs\\.pl\\?id=\\([0-9]+\\)\\(&comment_count=[0-9]+\\)?&comm_id=\\([0-9]+\\)")
+ "/view_bbs\\.pl\\?id=\\([0-9]+\\)\\(&comment_count=\\([0-9]+\\)\\)?&comm_id=\\([0-9]+\\)")
(defun mixi-make-topic-from-url (url)
"Return a topic object from URL."
(when (string-match mixi-topic-url-regexp url)
(let ((id (match-string 1 url))
- (community-id (match-string 3 url)))
- (mixi-make-topic (mixi-make-community community-id) id))))
+ (comment-count (match-string 3 url))
+ (community-id (match-string 4 url)))
+ (mixi-make-topic (mixi-make-community community-id) id comment-count))))
(defmacro mixi-topic-p (topic)
`(eq (mixi-object-class ,topic) 'mixi-topic))
"&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)
+(defun mixi-realize-topic (topic &optional page)
"Realize a TOPIC."
;; FIXME: Check a expiration of cache?
(unless (mixi-object-realized-p topic)
- (with-mixi-retrieve (mixi-topic-page topic)
- (if (string-match mixi-topic-community-regexp buffer)
+ (with-mixi-retrieve (or page (mixi-topic-page topic))
+ (if (re-search-forward mixi-topic-community-regexp nil t)
(mixi-community-set-name (mixi-topic-community topic)
- (match-string 1 buffer))
+ (match-string 1))
(mixi-realization-error 'cannot-find-community topic))
- (if (string-match mixi-topic-time-regexp buffer)
+ (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 buffer))
- (string-to-number (match-string 4 buffer))
- (string-to-number (match-string 3 buffer))
- (string-to-number (match-string 2 buffer))
- (string-to-number (match-string 1 buffer))))
+ topic (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 topic))
- (if (string-match mixi-topic-title-regexp buffer)
- (mixi-topic-set-title topic (match-string 1 buffer))
- (mixi-realization-error 'cannot-find-title topic))
- (if (string-match mixi-topic-owner-regexp buffer)
- (mixi-topic-set-owner topic
- (mixi-make-friend (match-string 1 buffer)
- (match-string 2 buffer)))
+ (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 (string-match mixi-topic-content-regexp buffer)
- (mixi-topic-set-content topic (match-string 2 buffer))
+ (if (re-search-forward mixi-topic-content-regexp nil t)
+ (mixi-topic-set-content topic (match-string 1))
(mixi-realization-error 'cannot-find-content topic)))
(mixi-object-touch topic)))
(signal 'wrong-type-argument (list 'mixi-topic-p topic)))
(aref (cdr topic) 2))
+(defun mixi-topic-comment-count (topic)
+ "Return the comment-count of TOPIC."
+ (unless (mixi-topic-p topic)
+ (signal 'wrong-type-argument (list 'mixi-topic-p topic)))
+ (aref (cdr topic) 3))
+
(defun mixi-topic-time (topic)
"Return the time of TOPIC."
(unless (mixi-topic-p topic)
(signal 'wrong-type-argument (list 'mixi-topic-p topic)))
(mixi-realize-topic topic)
- (aref (cdr topic) 3))
+ (aref (cdr topic) 4))
(defun mixi-topic-title (topic)
"Return the title of TOPIC."
(unless (mixi-topic-p topic)
(signal 'wrong-type-argument (list 'mixi-topic-p topic)))
(mixi-realize-topic topic)
- (aref (cdr topic) 4))
+ (aref (cdr topic) 5))
(defun mixi-topic-owner (topic)
"Return the owner of TOPIC."
(unless (mixi-topic-p topic)
(signal 'wrong-type-argument (list 'mixi-topic-p topic)))
(mixi-realize-topic topic)
- (aref (cdr topic) 5))
+ (aref (cdr topic) 6))
(defun mixi-topic-content (topic)
"Return the content of TOPIC."
(unless (mixi-topic-p topic)
(signal 'wrong-type-argument (list 'mixi-topic-p topic)))
(mixi-realize-topic topic)
- (aref (cdr topic) 6))
+ (aref (cdr topic) 7))
+
+(defun mixi-topic-set-comment-count (topic comment-count)
+ "Set the comment-count of TOPIC."
+ (unless (mixi-topic-p topic)
+ (signal 'wrong-type-argument (list 'mixi-topic-p topic)))
+ (aset (cdr topic) 3 comment-count))
(defun mixi-topic-set-time (topic time)
"Set the time of TOPIC."
(unless (mixi-topic-p topic)
(signal 'wrong-type-argument (list 'mixi-topic-p topic)))
- (aset (cdr topic) 3 time))
+ (aset (cdr topic) 4 time))
(defun mixi-topic-set-title (topic title)
"Set the title of TOPIC."
(unless (mixi-topic-p topic)
(signal 'wrong-type-argument (list 'mixi-topic-p topic)))
- (aset (cdr topic) 4 title))
+ (aset (cdr topic) 5 title))
(defun mixi-topic-set-owner (topic owner)
"Set the owner of TOPIC."
(signal 'wrong-type-argument (list 'mixi-topic-p topic)))
(unless (mixi-friend-p owner)
(signal 'wrong-type-argument (list 'mixi-friend-p owner)))
- (aset (cdr topic) 5 owner))
+ (aset (cdr topic) 6 owner))
(defun mixi-topic-set-content (topic content)
"Set the content of TOPIC."
(unless (mixi-topic-p topic)
(signal 'wrong-type-argument (list 'mixi-topic-p topic)))
- (aset (cdr topic) 6 content))
+ (aset (cdr topic) 7 content))
(defmacro mixi-post-topic-page (community)
`(concat "/add_bbs.pl?id=" (mixi-community-id community)))
;; FIXME: Support photos.
+;;;###autoload
(defun mixi-post-topic (community title content)
"Post a topic to COMMUNITY."
(unless (mixi-community-p community)
("submit" . "main")))
post-key)
(with-mixi-post-form (mixi-post-topic-page community) fields
- (if (string-match mixi-post-key-regexp buffer)
- (setq post-key (match-string 1 buffer))
+ (if (re-search-forward mixi-post-key-regexp nil t)
+ (setq post-key (match-string 1))
(mixi-post-error 'cannot-find-key community)))
(setq fields `(("post_key" . ,post-key)
("bbs_title" . ,title)
("bbs_body" . ,content)
("submit" . "confirm")))
(with-mixi-post-form (mixi-post-topic-page community) fields
- (unless (string-match mixi-post-succeed-regexp buffer)
+ (unless (re-search-forward mixi-post-succeed-regexp nil t)
(mixi-post-error 'cannot-find-succeed community)))))
;; Event object.
(defvar mixi-event-cache (make-hash-table :test 'equal))
-(defun mixi-make-event (community id &optional time title owner date place
- detail limit members)
+(defun mixi-make-event (community id &optional comment-count time title owner
+ date place detail limit members)
"Return a event object."
(mixi-make-cache (list (mixi-community-id community) id)
- (cons 'mixi-event (vector nil community id time title owner
- date place detail limit members))
+ (cons 'mixi-event (vector nil community id comment-count
+ time title owner date place
+ detail limit members))
mixi-event-cache))
(defconst mixi-event-url-regexp
- "/view_event\\.pl\\?id=\\([0-9]+\\)\\(&comment_count=[0-9]+\\)?&comm_id=\\([0-9]+\\)")
+ "/view_event\\.pl\\?id=\\([0-9]+\\)\\(&comment_count=\\([0-9]+\\)\\)?&comm_id=\\([0-9]+\\)")
(defun mixi-make-event-from-url (url)
"Return a event object from URL."
(when (string-match mixi-event-url-regexp url)
(let ((id (match-string 1 url))
- (community-id (match-string 3 url)))
- (mixi-make-event (mixi-make-community community-id) id))))
+ (comment-count (match-string 3 url))
+ (community-id (match-string 4 url)))
+ (mixi-make-event (mixi-make-community community-id) id comment-count))))
(defmacro mixi-event-p (event)
`(eq (mixi-object-class ,event) 'mixi-event))
"&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>\\((mixi Âà²ñºÑ)\\|<a href=\"show_friend\\.pl\\?id=\\([0-9]+\\)\">\\(.*\\)</a>\\)</dt>")
+(defconst mixi-event-owner-seceded-regexp
+ "(mixi Âà²ñºÑ)")
(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)
+(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 (mixi-event-page event)
- (if (string-match mixi-event-community-regexp buffer)
- (mixi-community-set-name (mixi-event-community event)
- (match-string 1 buffer))
- (mixi-realization-error 'cannot-find-community event))
- (if (string-match mixi-event-time-regexp buffer)
- (mixi-event-set-time
- event (encode-time 0 (string-to-number (match-string 8 buffer))
- (string-to-number (match-string 7 buffer))
- (string-to-number (match-string 6 buffer))
- (string-to-number (match-string 5 buffer))
- (string-to-number (match-string 4 buffer))))
- (mixi-realization-error 'cannot-find-time event))
- (if (string-match mixi-event-title-regexp buffer)
- (mixi-event-set-title event (match-string 2 buffer))
- (mixi-realization-error 'cannot-find-title event))
- (if (string-match mixi-event-owner-regexp buffer)
- (mixi-event-set-owner event
- (mixi-make-friend (match-string 2 buffer)
- (match-string 3 buffer)))
- (if (string-match mixi-event-owner-seceded-regexp buffer)
- (mixi-event-set-owner event
- (mixi-make-friend nil
- (match-string 2 buffer)))
- (mixi-realization-error 'cannot-find-owner event)))
- (if (string-match mixi-event-date-regexp buffer)
- (mixi-event-set-date event (match-string 6 buffer))
- (mixi-realization-error 'cannot-find-date event))
- (if (string-match mixi-event-place-regexp buffer)
- (mixi-event-set-place event (match-string 6 buffer))
- (mixi-realization-error 'cannot-find-place event))
- (if (string-match mixi-event-detail-regexp buffer)
- (mixi-event-set-detail event (match-string 6 buffer))
- (mixi-realization-error 'cannot-find-detail event))
- (when (string-match mixi-event-limit-regexp buffer)
- (mixi-event-set-limit
- event (encode-time 0 0 0 (string-to-number (match-string 8 buffer))
- (string-to-number (match-string 7 buffer))
- (string-to-number (match-string 6 buffer)))))
- (if (string-match mixi-event-members-regexp buffer)
- (mixi-event-set-members event (match-string 6 buffer))
- (mixi-realization-error 'cannot-find-members event)))
+ (with-mixi-retrieve (or page (mixi-event-page 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)
+ (let ((seceded-or-not (match-string 1))
+ (id (match-string 2))
+ (nick (match-string 3)))
+ (if (string= mixi-event-owner-seceded-regexp seceded-or-not)
+ (mixi-event-set-owner event
+ (mixi-make-friend nil seceded-or-not))
+ (mixi-event-set-owner event (mixi-make-friend id nick))))
+ (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)
(signal 'wrong-type-argument (list 'mixi-event-p event)))
(aref (cdr event) 2))
+(defun mixi-event-comment-count (event)
+ "Return the comment-count of EVENT."
+ (unless (mixi-event-p event)
+ (signal 'wrong-type-argument (list 'mixi-event-p event)))
+ (aref (cdr event) 3))
+
(defun mixi-event-time (event)
"Return the time of EVENT."
(unless (mixi-event-p event)
(signal 'wrong-type-argument (list 'mixi-event-p event)))
(mixi-realize-event event)
- (aref (cdr event) 3))
+ (aref (cdr event) 4))
(defun mixi-event-title (event)
"Return the title of EVENT."
(unless (mixi-event-p event)
(signal 'wrong-type-argument (list 'mixi-event-p event)))
(mixi-realize-event event)
- (aref (cdr event) 4))
+ (aref (cdr event) 5))
(defun mixi-event-owner (event)
"Return the owner of EVENT."
(unless (mixi-event-p event)
(signal 'wrong-type-argument (list 'mixi-event-p event)))
(mixi-realize-event event)
- (aref (cdr event) 5))
+ (aref (cdr event) 6))
(defun mixi-event-date (event)
"Return the date of EVENT."
(unless (mixi-event-p event)
(signal 'wrong-type-argument (list 'mixi-event-p event)))
(mixi-realize-event event)
- (aref (cdr event) 6))
+ (aref (cdr event) 7))
(defun mixi-event-place (event)
"Return the place of EVENT."
(unless (mixi-event-p event)
(signal 'wrong-type-argument (list 'mixi-event-p event)))
(mixi-realize-event event)
- (aref (cdr event) 7))
+ (aref (cdr event) 8))
(defun mixi-event-detail (event)
"Return the detail of EVENT."
(unless (mixi-event-p event)
(signal 'wrong-type-argument (list 'mixi-event-p event)))
(mixi-realize-event event)
- (aref (cdr event) 8))
+ (aref (cdr event) 9))
(defun mixi-event-limit (event)
"Return the limit of EVENT."
(unless (mixi-event-p event)
(signal 'wrong-type-argument (list 'mixi-event-p event)))
(mixi-realize-event event)
- (aref (cdr event) 9))
+ (aref (cdr event) 10))
(defun mixi-event-members (event)
"Return the members of EVENT."
(unless (mixi-event-p event)
(signal 'wrong-type-argument (list 'mixi-event-p event)))
(mixi-realize-event event)
- (aref (cdr event) 10))
+ (aref (cdr event) 11))
+
+(defun mixi-event-set-comment-count (event comment-count)
+ "Set the comment-count of EVENT."
+ (unless (mixi-event-p event)
+ (signal 'wrong-type-argument (list 'mixi-event-p event)))
+ (aset (cdr event) 3 comment-count))
(defun mixi-event-set-time (event time)
"Set the time of EVENT."
(unless (mixi-event-p event)
(signal 'wrong-type-argument (list 'mixi-event-p event)))
- (aset (cdr event) 3 time))
+ (aset (cdr event) 4 time))
(defun mixi-event-set-title (event title)
"Set the title of EVENT."
(unless (mixi-event-p event)
(signal 'wrong-type-argument (list 'mixi-event-p event)))
- (aset (cdr event) 4 title))
+ (aset (cdr event) 5 title))
(defun mixi-event-set-owner (event owner)
"Set the owner of EVENT."
(signal 'wrong-type-argument (list 'mixi-event-p event)))
(unless (mixi-friend-p owner)
(signal 'wrong-type-argument (list 'mixi-friend-p owner)))
- (aset (cdr event) 5 owner))
+ (aset (cdr event) 6 owner))
(defun mixi-event-set-date (event date)
"Set the date of EVENT."
(unless (mixi-event-p event)
(signal 'wrong-type-argument (list 'mixi-event-p event)))
- (aset (cdr event) 6 date))
+ (aset (cdr event) 7 date))
(defun mixi-event-set-place (event place)
"Set the place of EVENT."
(unless (mixi-event-p event)
(signal 'wrong-type-argument (list 'mixi-event-p event)))
- (aset (cdr event) 7 place))
+ (aset (cdr event) 8 place))
(defun mixi-event-set-detail (event detail)
"Set the detail of EVENT."
(unless (mixi-event-p event)
(signal 'wrong-type-argument (list 'mixi-event-p event)))
- (aset (cdr event) 8 detail))
+ (aset (cdr event) 9 detail))
(defun mixi-event-set-limit (event limit)
"Set the limit of EVENT."
(unless (mixi-event-p event)
(signal 'wrong-type-argument (list 'mixi-event-p event)))
- (aset (cdr event) 9 limit))
+ (aset (cdr event) 10 limit))
(defun mixi-event-set-members (event members)
"Set the members of EVENT."
(unless (mixi-event-p event)
(signal 'wrong-type-argument (list 'mixi-event-p event)))
- (aset (cdr event) 10 members))
+ (aset (cdr event) 11 members))
-;; Bbs object.
+;; BBS object.
(defconst mixi-bbs-list '(mixi-topic mixi-event))
-(defmacro mixi-bbs-p (object)
- `(when (memq (mixi-object-class ,object) mixi-bbs-list)
- t))
+(defmacro mixi-bbs-p (bbs)
+ `(memq (mixi-object-class ,bbs) mixi-bbs-list))
-(defun mixi-bbs-community (object)
- "Return the community of OBJECT."
- (unless (mixi-bbs-p object)
- (signal 'wrong-type-argument (list 'mixi-bbs-p object)))
+(defun mixi-bbs-community (bbs)
+ "Return the community of BBS."
+ (unless (mixi-bbs-p bbs)
+ (signal 'wrong-type-argument (list 'mixi-bbs-p bbs)))
(let ((func (intern (concat mixi-object-prefix
- (mixi-object-name object) "-community"))))
- (funcall func object)))
+ (mixi-object-name bbs) "-community"))))
+ (funcall func bbs)))
+
+(defun mixi-bbs-comment-count (bbs)
+ "Return the comment-count of BBS."
+ (unless (mixi-bbs-p bbs)
+ (signal 'wrong-type-argument (list 'mixi-bbs-p bbs)))
+ (let ((func (intern (concat mixi-object-prefix
+ (mixi-object-name bbs) "-comment-count"))))
+ (funcall func bbs)))
+
+(defun mixi-bbs-set-comment-count (bbs count)
+ "Set the comment-count of BBS."
+ (unless (mixi-bbs-p bbs)
+ (signal 'wrong-type-argument (list 'mixi-bbs-p bbs)))
+ (let ((func (intern (concat mixi-object-prefix
+ (mixi-object-name bbs) "-set-comment-count"))))
+ (funcall func bbs count)))
(defalias 'mixi-bbs-id 'mixi-object-id)
(defalias 'mixi-bbs-time 'mixi-object-time)
"&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)
"Get bbese of COMMUNITY."
(unless (mixi-community-p community)
`(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)
"Get new topics."
(let ((items (mixi-get-matched-items (mixi-new-bbs-list-page)
mixi-new-bbs-list-regexp
range)))
- (mapcar (lambda (item)
- (let ((name (nth 0 item)))
- (when (string= name "bbs")
- (setq name "topic"))
- (let ((func (intern (concat "mixi-make-" name))))
- (funcall func (mixi-make-community (nth 2 item))
- (nth 1 item)))))
- items)))
-
+ (delq nil
+ (mapcar (lambda (item)
+ (let ((name (nth 0 item)))
+ (when (string= name "bbs")
+ (setq name "topic"))
+ (let* ((func (intern (concat "mixi-make-" name)))
+ (bbs (funcall func
+ (mixi-make-community (nth 3 item))
+ (nth 1 item)))
+ (comment-count (mixi-bbs-comment-count bbs))
+ (count (string-to-number (nth 2 item))))
+ (when (or (null comment-count)
+ (< comment-count count))
+ (mixi-bbs-set-comment-count bbs count)
+ bbs))))
+ items))))
+
(defmacro mixi-search-bbs-list-page (keyword)
`(concat "/search_topic.pl?page=%d&type=top&submit=search"
"&keyword=" (mixi-url-encode-and-quote-percent-string ,keyword)
"&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
(defun mixi-search-bbses (keyword &optional range)
(let ((items (mixi-get-matched-items (mixi-search-bbs-list-page keyword)
mixi-search-bbs-list-regexp
(nth 1 item)))))
items)))
+;; Parent object.
+(defmacro mixi-parent-p (object)
+ `(or (eq (mixi-object-class ,object) 'mixi-diary)
+ (mixi-bbs-p ,object)))
+
+(defun mixi-realize-parent (parent &optional page)
+ "Realize a PARENT."
+ (unless (mixi-parent-p parent)
+ (signal 'wrong-type-argument (list 'mixi-parent-p parent)))
+ (let ((func (intern (concat mixi-object-prefix "realize-"
+ (mixi-object-name parent)))))
+ (funcall func parent page)))
+
;; Comment object.
(defun mixi-make-comment (parent owner time content)
"Return a comment object."
;; 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>
-\\(<font color=\"#f2ddb7\">|</font> <a href=[^>]+>ºï½ü</a>
+<span class=\"commentTitleDate\">\\([0-9]+\\)ǯ\\([0-9]+\\)·î\\([0-9]+\\)Æü \\([0-9]+\\):\\([0-9]+\\)</span>
+</dt>
-\\|\\)</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)
"Get comments of PARENT."
- (unless (mixi-object-p parent)
- (signal 'wrong-type-argument (list 'mixi-object-p parent)))
+ (unless (mixi-parent-p parent)
+ (signal 'wrong-type-argument (list 'mixi-parent-p parent)))
(let* ((name (mixi-object-name parent))
(list-page (intern (concat mixi-object-prefix name
"-comment-list-page")))
(regexp (eval (intern (concat mixi-object-prefix name
- "-comment-list-regexp")))))
- (let ((items (mixi-get-matched-items
- (funcall list-page parent) regexp)))
- (let (list)
- (catch 'stop
- (mapc (lambda (item)
- (when (and (numberp range)
- (>= (length list) range))
- (throw 'stop nil))
- (setq list (cons item list)))
- (reverse items)))
- (setq items (reverse list)))
+ "-comment-list-regexp"))))
+ (page (funcall list-page parent)))
+ (unless (mixi-object-realized-p parent)
+ (mixi-realize-parent parent page)
+ (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)
"Get new comments."
(let ((items (mixi-get-matched-items (mixi-new-comment-list-page)
mixi-new-comment-list-regexp
range)))
- (mapcar (lambda (item)
- (mixi-make-diary (mixi-make-friend (nth 1 item)) (nth 0 item)))
- items)))
+ (delq nil
+ (mapcar (lambda (item)
+ (let* ((diary (mixi-make-diary
+ (mixi-make-friend (nth 1 item))
+ (nth 0 item)))
+ (comment-count (mixi-diary-comment-count diary))
+ (count (string-to-number (nth 2 item))))
+ (when (or (null comment-count)
+ (< comment-count count))
+ (mixi-diary-set-comment-count diary count)
+ diary)))
+ items))))
+
+(defmacro mixi-new-bbs-comment-list-page ()
+ `(concat "/new_bbs_comment.pl?page=%d"))
+
+(defconst mixi-new-bbs-comment-list-regexp
+ "<a href=\"?view_\\(bbs\\|event\\)\\.pl\\?id=\\([0-9]+\\)&comment_count=\\([0-9]+\\)&comm_id=\\([0-9]+\\)\"?>")
+
+;;;###autoload
+(defun mixi-get-new-bbs-comments (&optional range)
+ "Get new BBS comments."
+ (let ((items (mixi-get-matched-items (mixi-new-bbs-comment-list-page)
+ mixi-new-bbs-comment-list-regexp
+ range)))
+ (delq nil
+ (mapcar (lambda (item)
+ (let ((name (nth 0 item)))
+ (when (string= name "bbs")
+ (setq name "topic"))
+ (let ((make-func (intern (concat "mixi-make-" name)))
+ (comment-count-func
+ (intern (concat "mixi-" name "-comment-count")))
+ (set-comment-count-func
+ (intern (concat "mixi-" name
+ "-set-comment-count"))))
+ (let* ((bbs (funcall make-func
+ (mixi-make-community (nth 3 item))
+ (nth 1 item)))
+ (comment-count (funcall comment-count-func bbs))
+ (count (string-to-number (nth 2 item))))
+ (when (or (null comment-count)
+ (< comment-count count))
+ (funcall set-comment-count-func bbs count)
+ bbs)))))
+ items))))
(defun mixi-post-diary-comment-page (diary)
(concat "/add_comment.pl?&diary_id=" (mixi-diary-id diary)))
"&comm_id=" (mixi-community-id (mixi-event-community event))))
;; FIXME: Support photos.
+;;;###autoload
(defun mixi-post-comment (parent content)
"Post a comment to PARENT."
(unless (mixi-object-p parent)
("comment_body" . ,content)))
(setq fields `(("comment" . ,content))))
(with-mixi-post-form (funcall page parent) fields
- (if (string-match mixi-post-key-regexp buffer)
- (setq post-key (match-string 1 buffer))
+ (if (re-search-forward mixi-post-key-regexp nil t)
+ (setq post-key (match-string 1))
(mixi-post-error 'cannot-find-key parent)))
(if (mixi-diary-p parent)
(setq fields
("comment" . ,content)
("submit" . "confirm"))))
(with-mixi-post-form (funcall page parent) fields
- (unless (string-match mixi-post-succeed-regexp buffer)
+ (unless (re-search-forward mixi-post-succeed-regexp nil t)
(mixi-post-error 'cannot-find-succeed parent)))))
;; Message object.
(defconst mixi-message-box-list '(inbox outbox savebox thrash)) ; thrash?
(defmacro mixi-message-box-p (box)
- `(when (memq ,box mixi-message-box-list)
- t))
+ `(memq ,box mixi-message-box-list))
(defun mixi-message-box-name (box)
"Return the name of BOX."
(defconst mixi-message-owner-regexp
"<font COLOR=#996600>\\(º¹½Ð¿Í\\|°¸ Àè\\)</font> : <a HREF=\"show_friend\\.pl\\?id=\\([0-9]+\\)\">\\(.*\\)\\(</a>\\|</td>\\)")
-(defconst mixi-message-title-regexp
-"<font COLOR=#996600>·ï\\(¡¡\\| \\)̾</font> : \\(.+\\)\n?</td>")
(defconst mixi-message-time-regexp
"<font COLOR=#996600>Æü\\(¡¡\\| \\)ÉÕ</font> : \\([0-9]+\\)ǯ\\([0-9]+\\)·î\\([0-9]+\\)Æü \\([0-9]+\\)»þ\\([0-9]+\\)ʬ ")
+(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."
(unless (mixi-object-realized-p message)
(with-mixi-retrieve (mixi-message-page message)
- (if (string-match mixi-message-owner-regexp buffer)
+ (if (re-search-forward mixi-message-owner-regexp nil t)
(mixi-message-set-owner message
- (mixi-make-friend (match-string 2 buffer)
- (match-string 3 buffer)))
+ (mixi-make-friend (match-string 2)
+ (match-string 3)))
(mixi-realization-error 'cannot-find-owner message))
- (if (string-match mixi-message-title-regexp buffer)
- (mixi-message-set-title message (match-string 2 buffer))
- (mixi-realization-error 'cannot-find-title message))
- (if (string-match mixi-message-time-regexp buffer)
+ (if (re-search-forward mixi-message-time-regexp nil t)
(mixi-message-set-time
- message (encode-time 0 (string-to-number (match-string 6 buffer))
- (string-to-number (match-string 5 buffer))
- (string-to-number (match-string 4 buffer))
- (string-to-number (match-string 3 buffer))
- (string-to-number (match-string 2 buffer))))
+ message (encode-time 0 (string-to-number (match-string 6))
+ (string-to-number (match-string 5))
+ (string-to-number (match-string 4))
+ (string-to-number (match-string 3))
+ (string-to-number (match-string 2))))
(mixi-realization-error 'cannot-find-time message))
- (if (string-match mixi-message-content-regexp buffer)
- (mixi-message-set-content message (match-string 1 buffer))
+ (if (re-search-forward mixi-message-title-regexp nil t)
+ (mixi-message-set-title message (match-string 2))
+ (mixi-realization-error 'cannot-find-title message))
+ (if (re-search-forward mixi-message-content-regexp nil t)
+ (mixi-message-set-content message (match-string 1))
(mixi-realization-error 'cannot-find-content message)))
(mixi-object-touch message)))
(defconst mixi-message-list-regexp
"<td><a HREF=\"view_message\\.pl\\?id=\\(.+\\)&box=\\(.+\\)\">")
+;;;###autoload
(defun mixi-get-messages (&rest box-or-range)
"Get messages of BOX."
(when (> (length box-or-range) 2)
(defconst mixi-post-message-succeed-regexp
"<b>Á÷¿®´°Î»</b>¤·¤Þ¤·¤¿¡£")
+;;;###autoload
(defun mixi-post-message (friend title content)
"Post a message to FRIEND."
(unless (mixi-friend-p friend)
("submit" . "main")))
post-key)
(with-mixi-post-form (mixi-post-message-page friend) fields
- (if (string-match mixi-post-message-key-regexp buffer)
- (setq post-key (match-string 1 buffer))
+ (if (re-search-forward mixi-post-message-key-regexp nil t)
+ (setq post-key (match-string 1))
(mixi-post-error 'cannot-find-key friend)))
(setq fields `(("post_key" . ,post-key)
("subject" . ,title)
("yes" . "¡¡Á÷¡¡¿®¡¡")
("submit" . "confirm")))
(with-mixi-post-form (mixi-post-message-page friend) fields
- (unless (string-match mixi-post-message-succeed-regexp buffer)
+ (unless (re-search-forward mixi-post-message-succeed-regexp nil t)
(mixi-post-error 'cannot-find-succeed friend)))))
;; Introduction object.
</td>
</tr>")
+;;;###autoload
(defun mixi-get-introductions (&rest friend-or-range)
"Get introductions of FRIEND."
(when (> (length friend-or-range) 2)
;; News object.
(defvar mixi-news-cache (make-hash-table :test 'equal))
-(defun mixi-make-news (media-id id &optional time title content)
+(defun mixi-make-news (media-id id &optional media time title content)
"Return a news object."
(mixi-make-cache (list media-id id)
- (cons 'mixi-news (vector nil media-id id time title
+ (cons 'mixi-news (vector nil media-id id media time title
content))
mixi-news-cache))
`(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
+ "¿½¤·Ìõ¤´¤¶¤¤¤Þ¤»¤ó¤¬¡¢¤³¤Î¥Ë¥å¡¼¥¹¤Ï·ÇºÜ¤¬½ªÎ»¤·¤¿¤«¡¢URL¤¬´Ö°ã¤Ã¤Æ¤¤¤¤¤ë¤¿¤á¤´Í÷¤¤¤¿¤À¤±¤Þ¤»¤ó¡£</td>")
(defconst mixi-news-title-regexp
- "<td HEIGHT=\"46\" STYLE=\"font-weight: bold;font-size: 14px;\" CLASS=\"h130\">\\(.+\\)</td>")
-(defconst mixi-news-time-regexp
- "<td COLSPAN=\"2\" ALIGN=\"right\">(.+ - \\([0-9]+\\)·î\\([0-9]+\\)Æü \\([0-9]+\\):\\([0-9]+\\))</td></tr>")
+ "<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>")
(defconst mixi-news-content-regexp
"<td CLASS=\"h150\">
\\(.+\\)
+<br>
+\\(.*
+\\)?
-?
-
-\\(</td>\\|<br>\\)
-")
+\\(</td>\\|<br>\\)")
(defun mixi-realize-news (news)
"Realize a NEWS."
;; FIXME: Check a expiration of cache?
(unless (mixi-object-realized-p news)
(with-mixi-retrieve (mixi-news-page news)
- (if (string-match mixi-news-title-regexp buffer)
- (mixi-news-set-title news (match-string 1 buffer))
- (mixi-realization-error 'cannot-find-title news))
- (if (string-match mixi-news-time-regexp buffer)
- (let ((year (nth 5 (decode-time (current-time))))
- (month (nth 4 (decode-time (current-time))))
- (month-of-item (string-to-number (match-string 1 buffer))))
- (when (> month-of-item month)
- (decf year))
- (mixi-news-set-time
- news (encode-time 0 (string-to-number (match-string 4 buffer))
- (string-to-number (match-string 3 buffer))
- (string-to-number (match-string 2 buffer))
- month year)))
- (mixi-realization-error 'cannot-find-time news))
- (if (string-match mixi-news-content-regexp buffer)
- (mixi-news-set-content news (match-string 1 buffer))
- (mixi-realization-error 'cannot-find-content news)))
+ (if (re-search-forward mixi-news-finished-regexp nil t)
+ (mixi-news-set-content news (match-string 0))
+ (if (re-search-forward mixi-news-title-regexp nil t)
+ (mixi-news-set-title news (match-string 1))
+ (mixi-realization-error 'cannot-find-title news))
+ (if (re-search-forward mixi-news-media-time-regexp nil t)
+ (progn
+ (mixi-news-set-media news (match-string 1))
+ (let ((year (nth 5 (decode-time (current-time))))
+ (month (nth 4 (decode-time (current-time))))
+ (month-of-item (string-to-number (match-string 2))))
+ (when (> month-of-item month)
+ (decf year))
+ (mixi-news-set-time
+ news (encode-time 0 (string-to-number (match-string 5))
+ (string-to-number (match-string 4))
+ (string-to-number (match-string 3))
+ month year))))
+ (mixi-realization-error 'cannot-find-media-time news))
+ (if (re-search-forward mixi-news-content-regexp nil t)
+ (mixi-news-set-content news (match-string 1))
+ (mixi-realization-error 'cannot-find-content news))))
(mixi-object-touch news)))
(defun mixi-news-media-id (news)
(signal 'wrong-type-argument (list 'mixi-news-p news)))
(aref (cdr news) 2))
-(defun mixi-news-time (news)
- "Return the time of NEWS."
+(defun mixi-news-media (news)
+ "Return the media of NEWS."
(unless (mixi-news-p news)
(signal 'wrong-type-argument (list 'mixi-news-p news)))
(unless (aref (cdr news) 3)
(mixi-realize-news news))
(aref (cdr news) 3))
-(defun mixi-news-title (news)
- "Return the title of NEWS."
+(defun mixi-news-time (news)
+ "Return the time of NEWS."
(unless (mixi-news-p news)
(signal 'wrong-type-argument (list 'mixi-news-p news)))
(unless (aref (cdr news) 4)
(mixi-realize-news news))
(aref (cdr news) 4))
+(defun mixi-news-title (news)
+ "Return the title of NEWS."
+ (unless (mixi-news-p news)
+ (signal 'wrong-type-argument (list 'mixi-news-p news)))
+ (unless (aref (cdr news) 5)
+ (mixi-realize-news news))
+ (aref (cdr news) 5))
+
(defun mixi-news-content (news)
"Return the content of NEWS."
(unless (mixi-news-p news)
(signal 'wrong-type-argument (list 'mixi-news-p news)))
(mixi-realize-news news)
- (aref (cdr news) 5))
+ (aref (cdr news) 6))
+
+(defun mixi-news-set-media (news media)
+ "Set the media of NEWS."
+ (unless (mixi-news-p news)
+ (signal 'wrong-type-argument (list 'mixi-news-p news)))
+ (aset (cdr news) 3 media))
(defun mixi-news-set-time (news time)
"Set the time of NEWS."
(unless (mixi-news-p news)
(signal 'wrong-type-argument (list 'mixi-news-p news)))
- (aset (cdr news) 3 time))
+ (aset (cdr news) 4 time))
(defun mixi-news-set-title (news title)
"Set the title of NEWS."
(unless (mixi-news-p news)
(signal 'wrong-type-argument (list 'mixi-news-p news)))
- (aset (cdr news) 4 title))
+ (aset (cdr news) 5 title))
(defun mixi-news-set-content (news content)
"Set the content of NEWS."
(unless (mixi-news-p news)
(signal 'wrong-type-argument (list 'mixi-news-p news)))
- (aset (cdr news) 5 content))
+ (aset (cdr news) 6 content))
(defconst mixi-news-category-list '(domestic politics economy area abroad
sports entertainment IT))
(defmacro mixi-news-category-p (category)
- `(when (memq ,category mixi-news-category-list)
- t))
+ `(memq ,category mixi-news-category-list))
(defun mixi-news-category-id (category)
"Return the id of CATEGORY."
(1+ (- (length mixi-news-category-list)
(length (memq category mixi-news-category-list))))))
-(defmacro mixi-news-list-page (category)
- `(concat "http://news.mixi.jp/list_news_category.pl?page=%d&sort=1"
- (concat "&id=" (mixi-news-category-id category) "&type=bn")))
+(defconst mixi-news-sort-list '(newest pickup))
+
+(defmacro mixi-news-sort-p (sort)
+ `(memq ,sort mixi-news-sort-list))
+
+(defun mixi-news-sort-id (sort)
+ "Return the id of SORT."
+ (unless (mixi-news-sort-p sort)
+ (signal 'wrong-type-argument (list 'mixi-news-sort-p sort)))
+ (number-to-string
+ (- (length mixi-news-sort-list)
+ (length (memq sort mixi-news-sort-list)))))
+
+(defmacro mixi-news-list-page (category sort)
+ `(concat "http://news.mixi.jp/list_news_category.pl?page=%d"
+ "&sort=" (mixi-news-sort-id ,sort)
+ "&id=" (mixi-news-category-id ,category)
+ "&type=bn"))
(defconst mixi-news-list-regexp
"<tr bgcolor=\"\\(#FCF5EB\\|#FFFFFF\\)\">
\\(<IMG SRC=\"http://img\\.mixi\\.jp/img/news_camera3\\.gif\" WIDTH=\"11\" HEIGHT=\"12\">\\|\\)
</td>
-<td WIDTH=\"1%\" nowrap CLASS=\"f08\"><A HREF=\"list_news_media\\.pl\\?id=[0-9]+\">.+</A></td>
+<td WIDTH=\"1%\" nowrap CLASS=\"f08\"><A HREF=\"list_news_media\\.pl\\?id=[0-9]+\">\\(.+\\)</A></td>
<td WIDTH=\"1%\" nowrap CLASS=\"f08\">\\([0-9]+\\)·î\\([0-9]+\\)Æü \\([0-9]+\\):\\([0-9]+\\)</td></tr>")
-(defun mixi-get-news (category &optional range)
- "Get news of CATEGORY."
+;;;###autoload
+(defun mixi-get-news (category sort &optional range)
+ "Get news of CATEGORY and SORT."
(unless (mixi-news-category-p category)
(signal 'wrong-type-argument (list 'mixi-news-category-p category)))
- (let ((items (mixi-get-matched-items (mixi-news-list-page category)
- mixi-news-list-regexp
- range))
- (year (nth 5 (decode-time (current-time))))
- (month (nth 4 (decode-time (current-time)))))
- (mapcar (lambda (item)
- (let ((month-of-item (string-to-number (nth 5 item))))
- (when (> month-of-item month)
- (decf year))
- (setq month month-of-item)
- (mixi-make-news (nth 2 item) (nth 1 item)
- (encode-time
- 0 (string-to-number (nth 8 item))
- (string-to-number (nth 7 item))
- (string-to-number (nth 6 item))
- month year)
- (nth 3 item))))
- items)))
+ (unless (mixi-news-sort-p sort)
+ (signal 'wrong-type-argument (list 'mixi-news-sort-p sort)))
+ (let ((items (mixi-get-matched-items (mixi-news-list-page category sort)
+ mixi-news-list-regexp
+ range))
+ (year (nth 5 (decode-time (current-time))))
+ (month (nth 4 (decode-time (current-time)))))
+ (mapcar (lambda (item)
+ (let ((month-of-item (string-to-number (nth 6 item))))
+ (when (> month-of-item month)
+ (decf year))
+ (setq month month-of-item)
+ (mixi-make-news (nth 2 item) (nth 1 item) (nth 5 item)
+ (encode-time
+ 0 (string-to-number (nth 9 item))
+ (string-to-number (nth 8 item))
+ (string-to-number (nth 7 item))
+ month year)
+ (nth 3 item))))
+ items)))
(provide 'mixi)