* sb-mixi.el (shimbun-mixi-message-id-suffix): Abolish.

(shimbun-mixi-make-message-id): Revert.

diff --git a/ChangeLog b/ChangeLog
index 6a91b78..262dd67 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2006-12-28  OHASHI Akira  <bg66@koka-in.org>
 
+       * sb-mixi.el (shimbun-mixi-message-id-suffix): Abolish.
+       (shimbun-mixi-make-message-id): Revert.
+
+2006-12-28  OHASHI Akira  <bg66@koka-in.org>
+
        * sb-mixi.el (shimbun-mixi-send-mail-wrapper): New function.
 
 2006-12-28  OHASHI Akira  <bg66@koka-in.org>

diff --git a/sb-mixi.el b/sb-mixi.el
index 6dbd745..027dee6 100644 (file)
--- a/sb-mixi.el
+++ b/sb-mixi.el
@@ -115,52 +115,19 @@ of mixi object."
            month " "
            (format-time-string "%Y %H:%M:%S %z" time))))
 
-(defconst shimbun-mixi-message-id-suffix "@mixi.jp")
-
 (defun shimbun-mixi-make-message-id (object)
-  "Make message-id for OBJECT.
-If OBJECT is comment, message-id is like follow:
-
-  <date$owner-id.owner-class$parent-id.parent-class$parent-owner-id.
-   parent-owner-class@mixi.jp>
-
-If OBJECT is diary or BBS or message:
-
-  <date$id.class$owner-id.owner-class@mixi.jp>
-
-If OBJECT is log:
-
-  <date$id.class@mixi.jp>
-
-The others:
-
-  <id.class@mixi.jp>"
   (let ((class (mixi-object-class object)))
     (concat "<"
-           (unless (or (eq class 'mixi-friend) (eq class 'mixi-community))
-             (format-time-string "%Y%m%d%H%M." (mixi-object-time object)))
-           (mapconcat (lambda (object)
-                        (concat (mixi-object-id object)
-                                "." (mixi-object-name object)))
-                      (cond ((eq class 'mixi-comment)
-                             (let ((parent (mixi-comment-parent object)))
-                               (list (mixi-comment-owner object)
-                                     parent
-                                     (if (eq (mixi-object-class parent)
-                                             'mixi-diary)
-                                         (mixi-object-owner parent)
-                                       (mixi-bbs-community parent)))))
-                            ((or (eq class 'mixi-diary)
-                                 (eq class 'mixi-message))
-                             (list object (mixi-object-owner object)))
-                            ((mixi-bbs-p object)
-                             (list object (mixi-bbs-community object)))
-                            ((eq class 'mixi-log)
-                             (list (mixi-log-friend object)))
-                            (t
-                             (list object)))
-                      "$")
-           shimbun-mixi-message-id-suffix ">")))
+           (format-time-string "%Y%m%d%H%M" (mixi-object-time object)) "."
+           (if (eq class 'mixi-comment)
+               (concat (mixi-friend-id (mixi-comment-owner object)) "@"
+                       (mixi-object-id (mixi-comment-parent object)) "."
+                       (mixi-friend-id (mixi-object-owner
+                                        (mixi-comment-parent object))) ".")
+             (concat (mixi-object-id object) "@"
+                     (mixi-object-id (mixi-object-owner object)) "."))
+           (mixi-object-name object) ".mixi.jp"
+           ">")))
 
 (defun shimbun-mixi-make-xref (object)
   (let ((class (mixi-object-class object)))