X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=mixi.el;h=cb8b2ed0abdae2707c3b6155491ca3e6dbdc5797;hb=29738be226ea8350c050b5d21cf52e68a47b5968;hp=6db106a1e048624a949cc9237bfa3294b86fe4bd;hpb=07c80be49c0074993d19f20098059e545bd560e2;p=elisp%2Fmixi.git diff --git a/mixi.el b/mixi.el index 6db106a..cb8b2ed 100644 --- a/mixi.el +++ b/mixi.el @@ -1,6 +1,6 @@ -;; 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 ;; Keywords: hypermedia @@ -18,9 +18,9 @@ ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License -;; along with this program; if not, you can either send email to this -;; program's maintainer or write to: The Free Software Foundation, -;; Inc.; 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +;; along with GNU Emacs; see the file COPYING. If not, write to the +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: @@ -39,8 +39,9 @@ ;; * 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 ;; ;; APIs for posting: @@ -52,7 +53,7 @@ ;; ;; Utilities: ;; -;; * mixi-remove-markup +;; * mixi-remove-markup (half broken) ;; Examples: ;; @@ -62,16 +63,18 @@ ;; (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))) @@ -83,29 +86,31 @@ ;; (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))) @@ -131,6 +136,8 @@ (autoload 'w3m-retrieve "w3m") (autoload 'url-retrieve-synchronously "url")) +(defconst mixi-revision "$Revision: 1.174 $") + (defgroup mixi nil "API library for accessing to mixi." :group 'hypermedia) @@ -320,13 +327,13 @@ Increase this value when unexpected error frequently occurs." (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) @@ -342,7 +349,7 @@ Increase this value when unexpected error frequently occurs." (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)))))) @@ -383,7 +390,7 @@ Increase this value when unexpected error frequently occurs." (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)))) @@ -400,7 +407,7 @@ Increase this value when unexpected error frequently occurs." (mixi-curl-retrieve url nil (reverse form-data)))) (defconst mixi-my-id-regexp - "") + (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 - "
" nil t) + (when (search-forward mixi-login-form nil t) (mixi-login) (erase-buffer) (insert (mixi-retrieve ,url)))) @@ -451,8 +459,7 @@ Increase this value when unexpected error frequently occurs." (erase-buffer) (insert (mixi-post-form ,url ,fields)) (goto-char (point-min)) - (when (search-forward - "" nil t) + (when (search-forward mixi-login-form nil t) (mixi-login) (erase-buffer) (insert (mixi-post-form ,url ,fields)))) @@ -509,24 +516,54 @@ Increase this value when unexpected error frequently occurs." (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-") @@ -687,24 +724,24 @@ Increase this value when unexpected error frequently occurs." (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) @@ -740,17 +777,17 @@ Increase this value when unexpected error frequently occurs." ;; 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)) @@ -768,7 +805,7 @@ Increase this value when unexpected error frequently occurs." "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) @@ -791,36 +828,29 @@ Increase this value when unexpected error frequently occurs." `(concat "/show_profile.pl?id=" (mixi-friend-id ,friend))) (defconst mixi-friend-nick-regexp - " ? -\\(.*\\)¤µ¤ó([0-9]+)") + "

\\(.*\\)¤µ¤ó([0-9]+)

") (defconst mixi-friend-name-regexp - "̾\\( \\| \\)Á° - -?\\(.+?\\)\\(\\| ̾Á°\n?
\\(.+?\\)\\(\\)") (defconst mixi-friend-sex-regexp - "À­\\( \\| \\)ÊÌ - -?\\([Ã˽÷]\\)À­\\(\\| À­ÊÌ\n?
\\([Ã˽÷]\\)À­\\(\\)") (defconst mixi-friend-address-regexp - "¸½½»½ê -\\(.+?\\)\\(\\| ¸½½»½ê\n?
\\(.+?\\)\\(\\)") (defconst mixi-friend-age-regexp - "ǯ\\( \\| \\)Îð\n\\([0-9]+\\)ºÐ\\(\\| ǯÎð\n?
\\([0-9]+\\)ºÐ\\( \\)") (defconst mixi-friend-birthday-regexp - "ÃÂÀ¸Æü\n\\([0-9]+\\)·î\\([0-9]+\\)Æü\\(\\| ÃÂÀ¸Æü\n?
\\([0-9]+\\)·î\\([0-9]+\\)Æü\\(\\)") (defconst mixi-friend-blood-type-regexp - "·ì±Õ·¿\n\\([ABO]B?\\)·¿\\(\\| ·ì±Õ·¿\n?
\\([ABO]B?\\)·¿\\(\\)") (defconst mixi-friend-birthplace-regexp - "½Ð¿ÈÃÏ\n?\n\\(.+?\\)\\(\\| ½Ð¿ÈÃÏ\n?
\\(.+?\\)\\(\\)") (defconst mixi-friend-hobby-regexp - "¼ñ\\( \\| \\)Ì£\n\\(.+?\\)\\(\\| ¼ñÌ£\n?
\\(.+?\\)\\(\\)") (defconst mixi-friend-job-regexp - "¿¦\\( \\| \\)¶È\n\\(.+?\\)\\(\\| ¿¦¶È\n?
\\(.+?\\)\\(\\)") (defconst mixi-friend-organization-regexp - "½ê\\( \\| \\)°\n]*>\\(.+?\\)\\(\\| ½ê°\n?
\\(.+?\\)\\(\\)") (defconst mixi-friend-profile-regexp - "¼«¸Ê¾Ò²ð -\\(.+\\)") + "
¼«¸Ê¾Ò²ð
\n?
\\(.+?\\)
") (defun mixi-realize-friend (friend) "Realize a FRIEND." @@ -829,17 +859,17 @@ Increase this value when unexpected error frequently occurs." (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)) @@ -849,11 +879,11 @@ Increase this value when unexpected error frequently occurs." (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))) @@ -943,7 +973,7 @@ Increase this value when unexpected error frequently occurs." (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) @@ -1026,10 +1056,11 @@ Increase this value when unexpected error frequently occurs." (when ,friend (concat "&id=" (mixi-friend-id ,friend))))) (defconst mixi-friend-list-id-regexp - "\\(.+\\)¤µ¤ó([0-9]+)
") + "\\(.+\\)¤µ¤ó([0-9]+)") +;;;###autoload (defun mixi-get-friends (&rest friend-or-range) "Get friends of FRIEND." (when (> (length friend-or-range) 2) @@ -1060,27 +1091,19 @@ Increase this value when unexpected error frequently occurs." (defmacro mixi-favorite-list-page () `(concat "/list_bookmark.pl?page=%d")) -(defconst mixi-favorite-list-id-regexp - "") -(defconst mixi-favorite-list-nick-regexp - "̾  Á° -\\(.+\\)") +(defconst mixi-favorite-list-regexp + "̾Á° +\\(.*\\)") +;;;###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) @@ -1106,8 +1129,9 @@ Increase this value when unexpected error frequently occurs." `(concat "/show_log.pl")) (defconst mixi-log-list-regexp - "\\([0-9]+\\)ǯ\\([0-9]+\\)·î\\([0-9]+\\)Æü \\([0-9]+\\):\\([0-9]+\\) \\(.*\\)") + "\\([0-9]+\\)ǯ\\([0-9]+\\)·î\\([0-9]+\\)Æü \\([0-9]+\\):\\([0-9]+\\) \\(.*?\\)") +;;;###autoload (defun mixi-get-logs (&optional range) "Get logs." (let ((items (mixi-get-matched-items (mixi-log-list-page) @@ -1152,39 +1176,46 @@ Increase this value when unexpected error frequently occurs." "&owner_id=" (mixi-friend-id (mixi-diary-owner ,diary)))) (defconst mixi-diary-closed-regexp - "ͧ¿Í\\(¤Îͧ¿Í\\)?¤Þ¤Ç¸ø³«¤Î¤¿¤áÆɤळ¤È¤¬½ÐÍè¤Þ¤»¤ó¡£") + "ͧ¿Í\\(¤Îͧ¿Í\\)?¤Þ¤Ç¸ø³«¤Î¤¿¤áÆɤळ¤È¤¬½ÐÍè¤Þ¤»¤ó¡£") (defconst mixi-diary-owner-nick-regexp - "\\(.+?\\)\\(¤µ¤ó\\)?¤ÎÆüµ­") -(defconst mixi-diary-time-regexp - "\\([0-9]+\\)ǯ\\([0-9]+\\)·î\\([0-9]+\\)Æü\\(
\\|
\\)\\([0-9]+\\):\\([0-9]+\\)") + "
+

\\(.+?\\)\\(¤µ¤ó\\)?¤ÎÆüµ­

") (defconst mixi-diary-title-regexp - " \\([^<]+\\)") + "
+
+
\\([^<\n]+\\)\\(\\)?") +(defconst mixi-diary-time-regexp + "
\\([0-9]+\\)ǯ\\([0-9]+\\)·î\\([0-9]+\\)Æü\\([0-9]+\\):\\([0-9]+\\)
") (defconst mixi-diary-content-regexp - "\\(.*\\)") + "
+\\(\\(.\\|\r?\n\\)*?\\) +
") (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) @@ -1257,10 +1288,11 @@ Increase this value when unexpected error frequently occurs." (when ,friend (concat "&id=" (mixi-friend-id ,friend))))) (defconst mixi-diary-list-regexp - " -\\([0-9]+\\)·î\\([0-9]+\\)Æü
\\([0-9]+\\):\\([0-9]+\\)\\(
\\|\\) - \\(.*\\)") + "
\\(\\|\\)\\(.*\\)\\(ÊÔ½¸¤¹¤ë\\|\\)
+
\\([0-9]+\\)ǯ\\([0-9]+\\)·î\\([0-9]+\\)Æü\n?\\([0-9]+\\):\\([0-9]+\\)
+
") +;;;###autoload (defun mixi-get-diaries (&rest friend-or-range) "Get diaries of FRIEND." (when (> (length friend-or-range) 2) @@ -1275,30 +1307,26 @@ Increase this value when unexpected error frequently occurs." (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 - "\\([0-9]+\\)ǯ\\([0-9]+\\)·î\\([0-9]+\\)Æü \\([0-9]+\\):\\([0-9]+\\) -\\(.+\\) (\\(.*\\)) ") + "
\\([0-9]+\\)ǯ\\([0-9]+\\)·î\\([0-9]+\\)Æü \\([0-9]+\\):\\([0-9]+\\)
+
\\(.+\\) (\\(.*\\))
ËÜ  Ê¸ -\\(.*\\) +\\(.*\\) @@ -1343,6 +1371,7 @@ Increase this value when unexpected error frequently occurs." ") +;;;###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 @@ -1370,11 +1399,12 @@ Increase this value when unexpected error frequently occurs." `(concat "/add_diary.pl")) (defconst mixi-post-key-regexp - "") + "\\(ºîÀ®\\|½ñ¤­¹þ¤ß\\)¤¬´°Î»¤·¤Þ¤·¤¿¡£È¿±Ç¤Ë»þ´Ö¤¬¤«¤«¤ë¤³¤È¤¬¤¢¤ê¤Þ¤¹¤Î¤Ç¡¢É½¼¨¤µ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¤Ï¾¯¡¹¤ªÂÔ¤Á¤¯¤À¤µ¤¤¡£") + "\\(ºîÀ®\\|½ñ¤­¹þ¤ß\\)¤¬´°Î»¤·¤Þ¤·¤¿¡£È¿±Ç¤Ë»þ´Ö¤¬¤«¤«¤ë¤³¤È¤¬¤¢¤ê¤Þ¤¹¤Î¤Ç¡¢É½¼¨¤µ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¤Ï¾¯¡¹¤ªÂÔ¤Á¤¯¤À¤µ¤¤¡£

") ;; FIXME: Support photos. +;;;###autoload (defun mixi-post-diary (title content) "Post a diary." (unless (stringp title) @@ -1429,71 +1459,78 @@ Increase this value when unexpected error frequently occurs." (defconst mixi-community-nodata-regexp "^¥Ç¡¼¥¿¤¬¤¢¤ê¤Þ¤»¤ó") (defconst mixi-community-name-regexp - "\\(.*\\)") + "
+

\\(.*\\)

") (defconst mixi-community-birthday-regexp - "³«ÀßÆü -\\([0-9]+\\)ǯ\\([0-9]+\\)·î\\([0-9]+\\)Æü") + "
³«ÀßÆü
+
\\([0-9]+\\)ǯ\\([0-9]+\\)·î\\([0-9]+\\)Æü
") ;; FIXME: Care when the owner has seceded. (defconst mixi-community-owner-regexp - "´ÉÍý¿Í - - -") + "
¥«¥Æ¥´¥ê
+
\\(.+\\)
") (defconst mixi-community-members-regexp - " -") + "
¥á¥ó¥Ð¡¼¿ô
+
\\([0-9]+\\)¿Í
") (defconst mixi-community-open-level-regexp - " -") + "
»²²Ã¾ò·ï¤È
¸ø³«¥ì¥Ù¥ë
+
\\(.+\\)
") (defconst mixi-community-authority-regexp - " -") + "
¥È¥Ô¥Ã¥¯¤Î
ºîÀ®¸¢¸Â
+
+\\(.+\\) + + +
") (defconst mixi-community-description-regexp - "") + "
+

\\(.+\\)

") (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) @@ -1614,10 +1651,11 @@ Increase this value when unexpected error frequently occurs." (when ,friend (concat "&id=" (mixi-friend-id ,friend))))) (defconst mixi-community-list-id-regexp - "\\(.+\\)([0-9]+)") + "\\(.+\\)([0-9]+)") +;;;###autoload (defun mixi-get-communities (&rest friend-or-range) "Get communities of FRIEND." (when (> (length friend-or-range) 2) @@ -1650,11 +1688,10 @@ Increase this value when unexpected error frequently occurs." "&category_id=0")) (defconst mixi-search-community-list-regexp - "
- -") + "
\\(.+\\) ([0-9]+)") ;; FIXME: Support category. +;;;###autoload (defun mixi-search-communities (keyword &optional range) (let ((items (mixi-get-matched-items (mixi-search-community-list-page keyword) @@ -1693,15 +1730,16 @@ Increase this value when unexpected error frequently occurs." "&comm_id=" (mixi-community-id (mixi-topic-community ,topic)))) (defconst mixi-topic-community-regexp - "
") -(defconst mixi-topic-time-regexp - "") + "
+

\\(.+\\) ¥È¥Ô¥Ã¥¯

") (defconst mixi-topic-title-regexp - "
") + "\\([^<]+\\)") +(defconst mixi-topic-time-regexp + "\\([0-9]+\\)ǯ\\([0-9]+\\)·î\\([0-9]+\\)Æü \\([0-9]+\\):\\([0-9]+\\)") (defconst mixi-topic-owner-regexp - "") -(defconst mixi-event-time-regexp - "") + "
+

\\(.+\\) ¥¤¥Ù¥ó¥È

") (defconst mixi-event-title-regexp - "
") -(defconst mixi-event-owner-regexp - " -") + "
³«ºÅÆü»þ
+
\\(.+\\)
") (defconst mixi-event-place-regexp - " -") + "
³«ºÅ¾ì½ê
+
\\(.+\\)
") +(defconst mixi-event-owner-regexp + "
\\((mixi Âà²ñºÑ)\\|\\(.*\\)\\)
") +(defconst mixi-event-owner-seceded-regexp + "(mixi Âà²ñºÑ)") (defconst mixi-event-detail-regexp - " -") + "
\\(\\(.\\|\r?\n\\)*?\\)
+") (defconst mixi-event-limit-regexp - " -?") + "
Ê罸´ü¸Â
+
\\(.+\\)
") (defconst mixi-event-members-regexp - " -
+ "
´ÉÍý¿Í
+
\\(.*\\)") (defconst mixi-community-category-regexp - "
¥«¥Æ¥´¥ê\\([^<]+\\)¥á¥ó¥Ð¡¼¿ô\\([0-9]+\\)¿Í
»²²Ã¾ò·ï¤È
¸ø³«¥ì¥Ù¥ë		\\(.+\\)
¥È¥Ô¥Ã¥¯ºîÀ®¤Î¸¢¸Â\\(.+\\)
\\(.+\\)¥³¥ß¥å¥Ë¥Æ¥£Ì¾\\([^<]+\\)
\\[\\(.+\\)\\] ¥È¥Ô¥Ã¥¯\\([0-9]+\\)ǯ\\([0-9]+\\)·î\\([0-9]+\\)Æü
\\([0-9]+\\):\\([0-9]+\\)		 \\([^<]+\\)  \\(.*?\\)\\(¤µ¤ó\\)?") + "
\\(.*?\\)\\(¤µ¤ó\\)?") (defconst mixi-topic-content-regexp - "
\\(\n\\)*
\\(.+\\)
") + "
\\(\\(.\\|\r?\n\\)*?\\)
") (defun mixi-realize-topic (topic &optional page) "Realize a TOPIC." @@ -1712,6 +1750,9 @@ Increase this value when unexpected error frequently occurs." (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)) @@ -1720,15 +1761,12 @@ Increase this value when unexpected error frequently occurs." (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))) @@ -1814,6 +1852,7 @@ Increase this value when unexpected error frequently occurs." `(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) @@ -1868,87 +1907,77 @@ Increase this value when unexpected error frequently occurs." "&comm_id=" (mixi-community-id (mixi-event-community ,event)))) (defconst mixi-event-community-regexp - "		\\[\\(.+\\)\\] ¥¤¥Ù¥ó¥È -?\\([0-9]+\\)ǯ\\([0-9]+\\)·î\\([0-9]+\\)Æü
-?\\([0-9]+\\):\\([0-9]+\\)		 \\([^<]+\\) \\(.*\\)") -(defconst mixi-event-owner-seceded-regexp - " \\((mixi Âà²ñºÑ)\\)") + "\\([^<]+\\)") +(defconst mixi-event-time-regexp + "\\([0-9]+\\)ǯ\\([0-9]+\\)·î\\([0-9]+\\)Æü \\([0-9]+\\):\\([0-9]+\\)") (defconst mixi-event-date-regexp - "³«ºÅÆü»þ - \\(.+\\) -³«ºÅ¾ì½ê - \\(.+\\) -¾ÜºÙ
\\(.+\\)
Ê罸´ü¸Â \\([0-9]+\\)ǯ\\([0-9]+\\)·î\\([0-9]+\\)Æü»²²Ã¼Ô - -? -? - - -?") + "
»²²Ã¼Ô
+
\\(.+\\)
") (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) + (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) @@ -2122,8 +2151,9 @@ Increase this value when unexpected error frequently occurs." "&id=" (mixi-community-id ,community))) (defconst mixi-bbs-list-regexp - "") + "
") +;;;###autoload (defun mixi-get-new-bbses (&optional range) "Get new topics." (let ((items (mixi-get-matched-items (mixi-new-bbs-list-page) @@ -2173,9 +2204,10 @@ Increase this value when unexpected error frequently occurs." "&community_id=0&category_id=0")) (defconst mixi-search-bbs-list-regexp - "¾ÜºÙ¤ò¸«¤ë") + "") ;; 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 @@ -2192,7 +2224,7 @@ Increase this value when unexpected error frequently occurs." ;; Parent object. (defmacro mixi-parent-p (object) `(or (eq (mixi-object-class ,object) 'mixi-diary) - (mixi-bbs-p object))) + (mixi-bbs-p ,object))) (defun mixi-realize-parent (parent &optional page) "Realize a PARENT." @@ -2241,32 +2273,22 @@ Increase this value when unexpected error frequently occurs." ;; FIXME: Split regexp to time, owner(id and nick) and contents. (defconst mixi-diary-comment-list-regexp -"
- - - - - - - - - - -") + "\\([0-9]+\\)ǯ\\([0-9]+\\)·î\\([0-9]+\\)Æü \\([0-9]+\\):\\([0-9]+\\) +
+
+
\\(.*\\)
+
+\\(\\(.\\|\r?\n\\)*?\\) +
") (defun mixi-event-comment-list-page (event) (concat "/view_event.pl?page=all" @@ -2311,28 +2312,15 @@ Increase this value when unexpected error frequently occurs." ;; FIXME: Split regexp to time, owner(id and nick) and contents. (defconst mixi-event-comment-list-regexp - "
-\\) -\\( - - - -") - + "\\([0-9]+\\)ǯ\\([0-9]+\\)·î\\([0-9]+\\)Æü \\([0-9]+\\):\\([0-9]+\\) +
+
+
\\(.*\\)
+
+\\(\\(.\\|\r?\n\\)*?\\) +
") + +;;;###autoload (defun mixi-get-comments (parent &optional range) "Get comments of PARENT." (unless (mixi-parent-p parent) @@ -2348,41 +2336,95 @@ Increase this value when unexpected error frequently occurs." (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 - "") + "") +;;;###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))) + mixi-new-comment-list-regexp + range))) (delq nil - (mapcar (lambda (item) - (let* ((diary (mixi-make-diary - (mixi-make-friend (nth 1 item)) + (mapcar (lambda (item) + (let* ((diary (mixi-make-diary + (mixi-make-friend (nth 1 item)) (nth 0 item))) - (comment-count (mixi-diary-comment-count diary)) + (comment-count (mixi-diary-comment-count diary)) (count (string-to-number (nth 2 item)))) - (when (or (null comment-count) - (< comment-count count)) + (when (or (null comment-count) + (< comment-count count)) (mixi-diary-set-comment-count diary count) - diary))) - items)))) + diary))) + items)))) + +(defmacro mixi-new-bbs-comment-list-page () + `(concat "/new_bbs_comment.pl?page=%d")) + +(defconst mixi-new-bbs-comment-list-regexp + "") + +;;;###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))) @@ -2396,6 +2438,7 @@ Increase this value when unexpected error frequently occurs." "&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) @@ -2472,7 +2515,7 @@ Increase this value when unexpected error frequently occurs." (defconst mixi-message-title-regexp "·ï\\(¡¡\\| \\)̾ : \\(.*\\)\n?") (defconst mixi-message-content-regexp - "
") + "") (defun mixi-realize-message (message) "Realize a MESSAGE." @@ -2570,6 +2613,7 @@ Increase this value when unexpected error frequently occurs." (defconst mixi-message-list-regexp "") +;;;###autoload (defun mixi-get-introductions (&rest friend-or-range) "Get introductions of FRIEND." (when (> (length friend-or-range) 2) @@ -2745,8 +2791,10 @@ Increase this value when unexpected error frequently occurs." `(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¤¬´Ö°ã¤Ã¤Æ¤¤¤¤¤ë¤¿¤á¤´Í÷¤¤¤¿¤À¤±¤Þ¤»¤ó¡£") (defconst mixi-news-title-regexp - "") (defconst mixi-news-media-time-regexp "") @@ -2765,26 +2813,28 @@ Increase this value when unexpected error frequently occurs." ;; FIXME: Check a expiration of cache? (unless (mixi-object-realized-p news) (with-mixi-retrieve (mixi-news-page news) - (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))) + (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) @@ -2897,6 +2947,7 @@ Increase this value when unexpected error frequently occurs." ") +;;;###autoload (defun mixi-get-news (category sort &optional range) "Get news of CATEGORY and SORT." (unless (mixi-news-category-p category)
 \\(.+\\) -\\([0-9]+\\)ǯ\\([0-9]+\\)·î\\([0-9]+\\)Æü
\\([0-9]+\\):\\([0-9]+\\)\\(
- -\\|\\) -		 - - -\\( - -
\\) -\\(.*\\) + "\\( +\\|\\)\\(.*\\) +\\( +| ¼«Ê¬¤Î¥³¥á¥ó¥È¤òºï½ü¤¹¤ë +\\|\\) -\\(| ]+>ºï½ü +\\([0-9]+\\)ǯ\\([0-9]+\\)·î\\([0-9]+\\)Æü \\([0-9]+\\):\\([0-9]+\\) + -\\|\\)
-
- - -
-\\(.+\\) -
") + ++ +
+\\(\\(.\\|\r?\n\\)*?\\) +
+ +") (defun mixi-topic-comment-list-page (topic) (concat "/view_bbs.pl?page=all" @@ -2275,34 +2297,13 @@ Increase this value when unexpected error frequently occurs." ;; FIXME: Split regexp to time, owner(id and nick) and contents. (defconst mixi-topic-comment-list-regexp - "
-\\([0-9]+\\)ǯ\\([0-9]+\\)·î\\([0-9]+\\)Æü
-\\([0-9]+\\):\\([0-9]+\\)
-\\( -\\|\\)		  -[^<]+:  -\\( -\\|\\) *\\(.*\\) - -?\\( - -\\|| ºï½ü -\\|\\)
- - - - -
- -\\(.+\\) -
-
-\\([0-9]+\\)ǯ\\([0-9]+\\)·î\\([0-9]+\\)Æü
-\\([0-9]+\\):\\([0-9]+\\)
-\\(		\\) -[^<]+ : -\\(.*\\) - -\\(| -ºï½ü - -\\|\\)
- - -
\\(.+\\)
-
\\(.*\\)
\\(.*\\)
") +;;;###autoload (defun mixi-get-messages (&rest box-or-range) "Get messages of BOX." (when (> (length box-or-range) 2) @@ -2599,6 +2643,7 @@ Increase this value when unexpected error frequently occurs." (defconst mixi-post-message-succeed-regexp "Á÷¿®´°Î»¤·¤Þ¤·¤¿¡£") +;;;###autoload (defun mixi-post-message (friend title content) "Post a message to FRIEND." (unless (mixi-friend-p friend) @@ -2695,6 +2740,7 @@ Increase this value when unexpected error frequently occurs."
\\(.+\\)\\( + "\\(.+\\)\\( \\)?(\\(.+\\) - \\([0-9]+\\)·î\\([0-9]+\\)Æü \\([0-9]+\\):\\([0-9]+\\))
\\(.+\\) \\([0-9]+\\)·î\\([0-9]+\\)Æü \\([0-9]+\\):\\([0-9]+\\)