* mixi.el (mixi-make-comment): Add the COUNT slot.

[elisp/mixi.git] / mixi-utils.el

diff --git a/mixi-utils.el b/mixi-utils.el
index 6c1b441..d2646d0 100644 (file)
--- a/mixi-utils.el
+++ b/mixi-utils.el
@@ -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:
 
@@ -78,14 +78,20 @@
                                   ")"))))
             (concat prefix subject suffix))))))
 
-(defun mixi-make-author (object)
+(defun mixi-make-author (object &optional add-comment-count)
   (with-mixi-class object
-    (if (eq class 'mixi-news)
-       (mixi-news-media object)
-      (let ((owner (if (eq class 'mixi-log)
-                      (mixi-log-friend object)
-                    (mixi-object-owner object))))
-       (mixi-friend-nick owner)))))
+    (cond ((eq class 'mixi-news)
+          (mixi-news-media object))
+         ((and add-comment-count
+               (eq class 'mixi-comment)
+               (mixi-bbs-p (mixi-comment-parent object)))
+          (concat (mixi-comment-count object) " "
+                  (mixi-friend-nick (mixi-comment-owner object))))
+         (t
+          (let ((owner (if (eq class 'mixi-log)
+                           (mixi-log-friend object)
+                         (mixi-object-owner object))))
+            (mixi-friend-nick owner))))))
 
 (defun mixi-make-date (object)
   (let* ((time (mixi-object-time object))
@@ -149,22 +155,18 @@
 (defun mixi-make-content (object)
   (with-mixi-class object
     (cond ((eq class 'mixi-event)
-          (let ((limit (mixi-event-limit object)))
-            (setq limit (if limit
-                            (format-time-string "%Yǯ%m·î%dÆü" limit)
-                          "»ØÄê¤Ê¤·"))
-            (concat "<dl>"
-                    "<dt>³«ºÅÆü»þ¡§</dt>"
-                    "<dd>" (mixi-event-date object) "</dd>\n"
-                    "<dt>³«ºÅ¾ì½ê¡§</dt>"
-                    "<dd>" (mixi-event-place object) "</dd>\n"
-                    "<dt>¾ÜºÙ¡§</dt>"
-                    "<dd>" (mixi-event-detail object) "</dd>\n"
-                    "<dt>Ê罸´ü¸Â¡§</dt>"
-                    "<dd>" limit "</dd>\n"
-                    "<dt>»²²Ã¼Ô¡§</dt>"
-                    "<dd>" (mixi-event-members object) "</dd>\n"
-                    "</dl>")))
+          (concat "<dl>"
+                  "<dt>³«ºÅÆü»þ¡§</dt>"
+                  "<dd>" (mixi-event-date object) "</dd>\n"
+                  "<dt>³«ºÅ¾ì½ê¡§</dt>"
+                  "<dd>" (mixi-event-place object) "</dd>\n"
+                  "<dt>¾ÜºÙ¡§</dt>"
+                  "<dd>" (mixi-event-detail object) "</dd>\n"
+                  "<dt>Ê罸´ü¸Â¡§</dt>"
+                  "<dd>" (mixi-event-limit object) "</dd>\n"
+                  "<dt>»²²Ã¼Ô¡§</dt>"
+                  "<dd>" (mixi-event-members object) "</dd>\n"
+                  "</dl>"))
          ((eq class 'mixi-friend)
           (if (mixi-object-realized-p object)
               (let ((sex (if (eq (mixi-friend-sex object) 'male) "ÃË" "½÷"))