X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=mixi.el;h=171c070173cdb45cbbed9c880f8ee679c05dd705;hb=ac17113829f33b0afa7bb9976df17190ef7fe040;hp=bf82c9ae182585f0c34879b62430bb8151b96936;hpb=dc5810970e2ef1656afd3f207c4cc8e1573f4413;p=elisp%2Fmixi.git diff --git a/mixi.el b/mixi.el index bf82c9a..171c070 100644 --- a/mixi.el +++ b/mixi.el @@ -1,6 +1,6 @@ ;; mixi.el --- API libraries for accessing to mixi -*- coding: euc-jp -*- -;; Copyright (C) 2005, 2006, 2007, 2008 OHASHI Akira +;; Copyright (C) 2005, 2006, 2007, 2008, 2009 OHASHI Akira ;; Author: OHASHI Akira ;; Keywords: hypermedia @@ -29,6 +29,7 @@ ;; * mixi-get-friends ;; * mixi-get-favorites ;; * mixi-get-logs +;; * mixi-get-self-logs ;; * mixi-get-recommended-friends (indies) ;; * mixi-get-diaries ;; * mixi-get-new-diaries @@ -138,7 +139,7 @@ (autoload 'w3m-retrieve "w3m") (autoload 'url-retrieve-synchronously "url")) -(defconst mixi-revision "$Revision: 1.200 $") +(defconst mixi-revision "$Revision: 1.205 $") (defgroup mixi nil "API library for accessing to mixi." @@ -221,6 +222,11 @@ Increase this value when unexpected error frequently occurs." :type 'number :group 'mixi) +(defcustom mixi-replace-tab-and-space-to-nbsp t + "*If non-nil, replace tab and space to   for keeping formatted." + :type 'boolean + :group 'mixi) + (defcustom mixi-cache-expires nil "*Seconds for expiration of a cached object." :type '(radio (integer :tag "Expired seconds") @@ -565,6 +571,18 @@ Increase this value when unexpected error frequently occurs." (setq pos (+ (match-end 0) 1))) string)) +(defun mixi-replace-tab-and-space-to-nbsp (string) + (when mixi-replace-tab-and-space-to-nbsp + (let ((pos 0)) + (while (or (string-match "\t" string pos) + (string-match " " string pos)) + (if (string= (match-string 0 string) "\t") + (setq string (replace-match (make-string tab-width ?\ ) + nil nil string)) + (setq string (replace-match " " nil nil string)) + (setq pos (+ (match-end 0) 1)))) + string))) + ;; Object. (defconst mixi-object-prefix "mixi-") @@ -1136,28 +1154,42 @@ Increase this value when unexpected error frequently occurs." (signal 'wrong-type-argument (list 'mixi-log-p log))) (aref (cdr log) 1)) -(defmacro mixi-log-list-page () - `(concat "/show_log.pl")) +(defconst mixi-log-list-page "/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]+\\)\\(.*?\\)") -;;;###autoload -(defun mixi-get-logs (&optional range) - "Get logs." - (let ((items (mixi-get-matched-items (mixi-log-list-page) +(defun mixi-get-logs-internal (list-page &optional range) + (let ((items (mixi-get-matched-items list-page mixi-log-list-regexp - range))) + range)) + (year (nth 5 (decode-time (current-time)))) + (month (nth 4 (decode-time (current-time))))) (mapcar (lambda (item) - (mixi-make-log (mixi-make-friend (nth 5 item) (nth 6 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))))) + (let ((month-of-item (string-to-number (nth 0 item)))) + (when (> month-of-item month) + (decf year)) + (setq month month-of-item) + (mixi-make-log (mixi-make-friend (nth 4 item) (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)))) items))) +;;;###autoload +(defun mixi-get-logs (&optional range) + "Get logs." + (mixi-get-logs-internal mixi-log-list-page range)) + +(defconst mixi-log-self-list-page "/show_self_log.pl") + +;;;###autoload +(defun mixi-get-self-logs (&optional range) + "Get self logs." + (mixi-get-logs-internal mixi-log-self-list-page range)) + ;; Recommended friend. (defmacro mixi-recommended-friend-list-page () `(concat "http://indies.mixi.jp/recommend.pl")) @@ -1210,7 +1242,7 @@ Increase this value when unexpected error frequently occurs."

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

") (defconst mixi-diary-title-regexp "
-
+
\\([^<\n]+\\)\\(\\)?") (defconst mixi-diary-time-regexp "
\\([0-9]+\\)ǯ\\([0-9]+\\)·î\\([0-9]+\\)Æü\\([0-9]+\\):\\([0-9]+\\)
") @@ -1455,7 +1487,8 @@ Increase this value when unexpected error frequently occurs." (setq fields `(("post_key" . ,post-key) ("id" . ,(mixi-friend-id (mixi-make-me))) ("diary_title" . ,title) - ("diary_body" . ,content) + ("diary_body" . ,(mixi-replace-tab-and-space-to-nbsp + content)) ("submit" . "confirm"))) (with-mixi-post-form (mixi-post-diary-page) fields (unless (re-search-forward mixi-post-succeed-regexp nil t) @@ -1920,7 +1953,8 @@ Increase this value when unexpected error frequently occurs." (mixi-post-error 'cannot-find-key community))) (setq fields `(("post_key" . ,post-key) ("bbs_title" . ,title) - ("bbs_body" . ,content) + ("bbs_body" . ,(mixi-replace-tab-and-space-to-nbsp + content)) ("submit" . "confirm"))) (with-mixi-post-form (mixi-post-topic-page community) fields (unless (re-search-forward mixi-post-succeed-regexp nil t) @@ -2519,10 +2553,12 @@ Increase this value when unexpected error frequently occurs." (setq fields `(("post_key" . ,post-key) ("owner_id" . ,(mixi-friend-id (mixi-diary-owner parent))) - ("comment_body" . ,content) + ("comment_body" . ,(mixi-replace-tab-and-space-to-nbsp + content)) ("submit" . "confirm"))) (setq fields `(("post_key" . ,post-key) - ("comment" . ,content) + ("comment" . ,(mixi-replace-tab-and-space-to-nbsp + content)) ("submit" . "confirm")))) (with-mixi-post-form (funcall page parent) fields (unless (re-search-forward mixi-post-succeed-regexp nil t) @@ -2574,8 +2610,7 @@ Increase this value when unexpected error frequently occurs."
\\([0-9]+\\)ǯ\\([0-9]+\\)·î\\([0-9]+\\)Æü \\([0-9]+\\)»þ\\([0-9]+\\)ʬ
") (defconst mixi-message-owner-regexp "
º¹½Ð¿Í
-
\\( -\\(.*\\)\\|mixi
\\)") +
\\(\\(.*\\)\\|mixi
\\)") (defconst mixi-message-content-regexp "
\\(\\(.\\|\r?\n\\)*?\\)
") @@ -2674,7 +2709,7 @@ Increase this value when unexpected error frequently occurs." (when ,box (concat "&box=" ,box)))) (defconst mixi-message-list-regexp - "") + "