From: bg66 <bg66>
Date: Sat, 13 Jan 2007 22:51:14 +0000 (+0000)
Subject: * sb-mixi.el (shimbun-mixi-group-alist): Add news groups.
X-Git-Tag: mixi-el-1_0_0~108
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ec9085454877685f546245481c100df7a9c13933;p=elisp%2Fmixi.git

* sb-mixi.el (shimbun-mixi-group-alist): Add news groups.
(shimbun-mixi-make-from): Fix for news.
(shimbun-mixi-make-message-id): Ditto.
(shimbun-mixi-make-xref): Ditto.
(shimbun-mixi-make-reply-to): Ditto.
---

diff --git a/ChangeLog b/ChangeLog
index cc4743c..e84e389 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2007-01-14  OHASHI Akira  <bg66@koka-in.org>
 
+	* sb-mixi.el (shimbun-mixi-group-alist): Add news groups.
+	(shimbun-mixi-make-from): Fix for news.
+	(shimbun-mixi-make-message-id): Ditto.
+	(shimbun-mixi-make-xref): Ditto.
+	(shimbun-mixi-make-reply-to): Ditto.
+
+2007-01-14  OHASHI Akira  <bg66@koka-in.org>
+
 	* mixi.el (mixi-expand-url): Fix for news.
 	(mixi-news-cache): New variable.
 	(mixi-make-news): New function.
@@ -8,7 +16,6 @@
 	(mixi-news-p): New macro.
 	(mixi-news-page): Ditto.
 	(mixi-news-title-regexp): New regexp.
-	(mixi-news-media-regexp): Ditto.
 	(mixi-news-media-time-regexp): Ditto.
 	(mixi-news-content-regexp): Ditto.
 	(mixi-realize-news): New function.
diff --git a/sb-mixi.el b/sb-mixi.el
index 60b7bf7..8050e15 100644
--- a/sb-mixi.el
+++ b/sb-mixi.el
@@ -40,7 +40,31 @@
 				      ("new-comments" . mixi-get-new-comments)
 				      ("new-bbses" . mixi-get-new-bbses)
 				      ("messages" . mixi-get-messages)
-				      ("my-diaries" . "/home.pl"))
+				      ("my-diaries" . "/home.pl")
+				      ("news.domestic" .
+				       (lambda (range)
+					 (mixi-get-news 'domestic range)))
+				      ("news.politics" .
+				       (lambda (range)
+					 (mixi-get-news 'politics range)))
+				      ("news.economy" .
+				       (lambda (range)
+					 (mixi-get-news 'economy range)))
+				      ("news.area" .
+				       (lambda (range)
+					 (mixi-get-news 'area range)))
+				      ("news.abroad" .
+				       (lambda (range)
+					 (mixi-get-news 'abroad range)))
+				      ("news.sports" .
+				       (lambda (range)
+					 (mixi-get-news 'sports range)))
+				      ("news.entertainment" .
+				       (lambda (range)
+					 (mixi-get-news 'entertainment range)))
+				      ("news.IT" .
+				       (lambda (range)
+					 (mixi-get-news 'IT range))))
   "*An alist of mixi shimbun group definition.
 Each element looks like (NAME . URL) or (NAME . FUNCTION).
 NAME is a shimbun group name.
@@ -107,8 +131,10 @@ of mixi object."
 	(concat prefix subject suffix)))))
 
 (defun shimbun-mixi-make-from (object)
-  (let ((owner (mixi-object-owner object)))
-    (mixi-friend-nick owner)))
+  (if (eq class 'mixi-news)
+      (mixi-news-media object)
+    (let ((owner (mixi-object-owner object)))
+      (mixi-friend-nick owner))))
 
 (defun shimbun-mixi-make-date (object)
   (let* ((time (mixi-object-time object))
@@ -130,7 +156,9 @@ of mixi object."
 			(mixi-friend-id (mixi-object-owner
 					 (mixi-comment-parent object))) ".")
 	      (concat (mixi-object-id object) "@"
-		      (mixi-object-id (mixi-object-owner object)) "."))
+		      (if (eq class 'mixi-news)
+			  (mixi-news-media-id object)
+			(mixi-object-id (mixi-object-owner object))) "."))
 	    (mixi-object-name object) ".mixi.jp"
 	    ">")))
 
@@ -146,7 +174,9 @@ of mixi object."
 	   (concat (shimbun-mixi-make-xref (mixi-comment-parent object))
 		   "#comment"))
 	  ((eq class 'mixi-message)
-	   (mixi-expand-url (mixi-message-page object))))))
+	   (mixi-expand-url (mixi-message-page object)))
+	  ((eq class 'mixi-news)
+	   (mixi-news-page object)))))
 
 (defun shimbun-mixi-make-body (object)
   (let ((class (mixi-object-class object)))
@@ -184,7 +214,7 @@ of mixi object."
 		 ((eq class 'mixi-community)
 		  (concat shimbun-mixi-reply-to "topic;"
 			  (mixi-community-id object)))
-		 ((eq object (mixi-make-me))
+		 ((or (eq class 'mixi-news) (eq object (mixi-make-me)))
 		  (concat shimbun-mixi-reply-to "diary"))
 		 ((eq class 'mixi-message)
 		  (concat shimbun-mixi-reply-to "message;"