* mixi.el (mixi-message-owner-regexp): Fix regexp.

(mixi-message-title-regexp): Ditto.
(mixi-message-time-regexp): Ditto.
(mixi-message-realize): Follow the change above.

diff --git a/ChangeLog b/ChangeLog
index bc51870..235644a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2006-11-22  OHASHI Akira  <bg66@koka-in.org>
 
+       * mixi.el (mixi-message-owner-regexp): Fix regexp.
+       (mixi-message-title-regexp): Ditto.
+       (mixi-message-time-regexp): Ditto.
+       (mixi-message-realize): Follow the change above.
+
+2006-11-22  OHASHI Akira  <bg66@koka-in.org>
+
        * mixi.el (mixi-log-list-regexp): Fix regexp.
 
 2006-11-22  OHASHI Akira  <bg66@koka-in.org>

diff --git a/mixi.el b/mixi.el
index 69dfacf..f2d9e05 100644 (file)
--- a/mixi.el
+++ b/mixi.el
@@ -1621,12 +1621,11 @@ Increase this value when unexpected error frequently occurs."
           "&box=" (mixi-message-box ,message)))
 
 (defconst mixi-message-owner-regexp
-  "<font COLOR=#996600>º¹½Ð¿Í</font>&nbsp;:&nbsp;<a HREF=\"show_friend\\.pl\\?id=\\([0-9]+\\)\">\\(.*\\)</a>")
+  "<font COLOR=#996600>\\(º¹½Ð¿Í\\|°¸&nbsp;Àè\\)</font>&nbsp;:&nbsp;<a HREF=\"show_friend\\.pl\\?id=\\([0-9]+\\)\">\\(.*\\)\\(</a>\\|</td>\\)")
 (defconst mixi-message-title-regexp
-  "<font COLOR=#996600>·ï¡¡Ì¾</font>&nbsp;:&nbsp;\\(.+\\)
-</td>")
+"<font COLOR=#996600>·ï\\(¡¡\\|&nbsp;\\)̾</font>&nbsp;:&nbsp;\\(.+\\)\n?</td>")
 (defconst mixi-message-time-regexp
-  "<font COLOR=#996600>Æü¡¡ÉÕ</font>&nbsp;:&nbsp;\\([0-9]+\\)ǯ\\([0-9]+\\)·î\\([0-9]+\\)Æü \\([0-9]+\\)»þ\\([0-9]+\\)ʬ&nbsp;&nbsp;")
+"<font COLOR=#996600>Æü\\(¡¡\\|&nbsp;\\)ÉÕ</font>&nbsp;:&nbsp;\\([0-9]+\\)ǯ\\([0-9]+\\)·î\\([0-9]+\\)Æü \\([0-9]+\\)»þ\\([0-9]+\\)ʬ&nbsp;&nbsp;")
 (defconst mixi-message-content-regexp
   "<tr><td CLASS=h120>\\(.+\\)</td></tr>")
 
@@ -1636,19 +1635,19 @@ Increase this value when unexpected error frequently occurs."
     (with-mixi-retrieve (mixi-message-page message)
       (if (string-match mixi-message-owner-regexp buffer)
          (mixi-message-set-owner message
-                                 (mixi-make-friend (match-string 1 buffer)
-                                                   (match-string 2 buffer)))
+                                 (mixi-make-friend (match-string 2 buffer)
+                                                   (match-string 3 buffer)))
        (signal 'error (list 'cannot-find-owner message)))
       (if (string-match mixi-message-title-regexp buffer)
-         (mixi-message-set-title message (match-string 1 buffer))
+         (mixi-message-set-title message (match-string 2 buffer))
        (signal 'error (list 'cannot-find-title message)))
       (if (string-match mixi-message-time-regexp buffer)
          (mixi-message-set-time
-          message (encode-time 0 (string-to-number (match-string 5 buffer))
+          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))
-                               (string-to-number (match-string 1 buffer))))
+                               (string-to-number (match-string 2 buffer))))
        (signal 'error (list 'cannot-find-time message)))
       (if (string-match mixi-message-content-regexp buffer)
          (mixi-message-set-content message (match-string 1 buffer))