object))
exp))
-(defun mixi-realize-object (object &optional page)
- "Realize a OBJECT."
- (unless (mixi-object-p object)
- (signal 'wrong-type-argument (list 'mixi-object-p object)))
- (let ((func (intern (concat mixi-object-prefix "realize-"
- (mixi-object-name object)))))
- (if page
- (funcall func object page)
- (funcall func object))))
-
(defun mixi-object-timestamp (object)
"Return the timestamp of OJBECT."
(unless (mixi-object-p object)
;; Diary object.
(defvar mixi-diary-cache (make-hash-table :test 'equal))
-(defun mixi-make-diary (owner id &optional time title content)
+(defun mixi-make-diary (owner id &optional comment-count time title content)
"Return a diary object."
(let ((owner (or owner (mixi-make-me))))
(mixi-make-cache (list (mixi-friend-id owner) id)
- (cons 'mixi-diary (vector nil owner id time title
- content))
+ (cons 'mixi-diary (vector nil owner id comment-count time
+ title content))
mixi-diary-cache)))
(defconst mixi-diary-url-regexp
- "/view_diary\\.pl\\?id=\\([0-9]+\\)&owner_id=\\([0-9]+\\)")
+ "/view_diary\\.pl\\?id=\\([0-9]+\\)&owner_id=\\([0-9]+\\)\\(&comment_count=\\([0-9]+\\)\\)?")
(defun mixi-make-diary-from-url (url)
"Return a diary object from URL."
(when (string-match mixi-diary-url-regexp url)
(let ((id (match-string 1 url))
- (owner-id (match-string 2 url)))
- (mixi-make-diary (mixi-make-friend owner-id) id))))
+ (owner-id (match-string 2 url))
+ (comment-count (match-string 4 url)))
+ (mixi-make-diary (mixi-make-friend owner-id) id comment-count))))
(defmacro mixi-diary-p (diary)
`(eq (mixi-object-class ,diary) 'mixi-diary))
(signal 'wrong-type-argument (list 'mixi-diary-p diary)))
(aref (cdr diary) 2))
+(defun mixi-diary-comment-count (diary)
+ "Return the comment-count of DIARY."
+ (unless (mixi-diary-p diary)
+ (signal 'wrong-type-argument (list 'mixi-diary-p diary)))
+ (aref (cdr diary) 3))
+
(defun mixi-diary-time (diary)
"Return the time of DIARY."
(unless (mixi-diary-p diary)
(signal 'wrong-type-argument (list 'mixi-diary-p diary)))
(unless (aref (cdr diary) 3)
(mixi-realize-diary diary))
- (aref (cdr diary) 3))
+ (aref (cdr diary) 4))
(defun mixi-diary-title (diary)
"Return the title of DIARY."
(signal 'wrong-type-argument (list 'mixi-diary-p diary)))
(unless (aref (cdr diary) 4)
(mixi-realize-diary diary))
- (aref (cdr diary) 4))
+ (aref (cdr diary) 5))
(defun mixi-diary-content (diary)
"Return the content of DIARY."
(unless (mixi-diary-p diary)
(signal 'wrong-type-argument (list 'mixi-diary-p diary)))
(mixi-realize-diary diary)
- (aref (cdr diary) 5))
+ (aref (cdr diary) 6))
+
+(defun mixi-diary-set-comment-count (diary comment-count)
+ "Set the comment-count of DIARY."
+ (unless (mixi-diary-p diary)
+ (signal 'wrong-type-argument (list 'mixi-diary-p diary)))
+ (aset (cdr diary) 3 comment-count))
(defun mixi-diary-set-time (diary time)
"Set the time of DIARY."
(unless (mixi-diary-p diary)
(signal 'wrong-type-argument (list 'mixi-diary-p diary)))
- (aset (cdr diary) 3 time))
+ (aset (cdr diary) 4 time))
(defun mixi-diary-set-title (diary title)
"Set the title of DIARY."
(unless (mixi-diary-p diary)
(signal 'wrong-type-argument (list 'mixi-diary-p diary)))
- (aset (cdr diary) 4 title))
+ (aset (cdr diary) 5 title))
(defun mixi-diary-set-content (diary content)
"Set the content of DIARY."
(unless (mixi-diary-p diary)
(signal 'wrong-type-argument (list 'mixi-diary-p diary)))
- (aset (cdr diary) 5 content))
+ (aset (cdr diary) 6 content))
(defmacro mixi-diary-list-page (&optional friend)
`(concat "/list_diary.pl?page=%d"
"<td WIDTH=345>\\(.*\\)</td></tr>")
(defconst mixi-community-birthday-regexp
"<td BGCOLOR=#F2DDB7 WIDTH=80><font COLOR=#996600>³«ÀßÆü</font></td>\r
-<td WIDTH=345>\\([0-9]+\\)ǯ\\([0-9]+\\)·î\\([0-9]+\\)Æü</td>")
+<td WIDTH=345>\\([0-9]+\\)ǯ\\([0-9]+\\)·î\\([0-9]+\\)Æü")
;; FIXME: Care when the owner has seceded.
(defconst mixi-community-owner-regexp
"<td BGCOLOR=#F2DDB7 WIDTH=80><font COLOR=#996600>´ÉÍý¿Í</font></td>\r
;; Topic object.
(defvar mixi-topic-cache (make-hash-table :test 'equal))
-(defun mixi-make-topic (community id &optional time title owner content)
+(defun mixi-make-topic (community id &optional comment-count time title owner
+ content)
"Return a topic object."
(mixi-make-cache (list (mixi-community-id community) id)
- (cons 'mixi-topic (vector nil community id time title owner
- content))
+ (cons 'mixi-topic (vector nil community id comment-count
+ time title owner content))
mixi-topic-cache))
(defconst mixi-topic-url-regexp
- "/view_bbs\\.pl\\?id=\\([0-9]+\\)\\(&comment_count=[0-9]+\\)?&comm_id=\\([0-9]+\\)")
+ "/view_bbs\\.pl\\?id=\\([0-9]+\\)\\(&comment_count=\\([0-9]+\\)\\)?&comm_id=\\([0-9]+\\)")
(defun mixi-make-topic-from-url (url)
"Return a topic object from URL."
(when (string-match mixi-topic-url-regexp url)
(let ((id (match-string 1 url))
- (community-id (match-string 3 url)))
- (mixi-make-topic (mixi-make-community community-id) id))))
+ (comment-count (match-string 3 url))
+ (community-id (match-string 4 url)))
+ (mixi-make-topic (mixi-make-community community-id) id comment-count))))
(defmacro mixi-topic-p (topic)
`(eq (mixi-object-class ,topic) 'mixi-topic))
(signal 'wrong-type-argument (list 'mixi-topic-p topic)))
(aref (cdr topic) 2))
+(defun mixi-topic-comment-count (topic)
+ "Return the comment-count of TOPIC."
+ (unless (mixi-topic-p topic)
+ (signal 'wrong-type-argument (list 'mixi-topic-p topic)))
+ (aref (cdr topic) 3))
+
(defun mixi-topic-time (topic)
"Return the time of TOPIC."
(unless (mixi-topic-p topic)
(signal 'wrong-type-argument (list 'mixi-topic-p topic)))
(mixi-realize-topic topic)
- (aref (cdr topic) 3))
+ (aref (cdr topic) 4))
(defun mixi-topic-title (topic)
"Return the title of TOPIC."
(unless (mixi-topic-p topic)
(signal 'wrong-type-argument (list 'mixi-topic-p topic)))
(mixi-realize-topic topic)
- (aref (cdr topic) 4))
+ (aref (cdr topic) 5))
(defun mixi-topic-owner (topic)
"Return the owner of TOPIC."
(unless (mixi-topic-p topic)
(signal 'wrong-type-argument (list 'mixi-topic-p topic)))
(mixi-realize-topic topic)
- (aref (cdr topic) 5))
+ (aref (cdr topic) 6))
(defun mixi-topic-content (topic)
"Return the content of TOPIC."
(unless (mixi-topic-p topic)
(signal 'wrong-type-argument (list 'mixi-topic-p topic)))
(mixi-realize-topic topic)
- (aref (cdr topic) 6))
+ (aref (cdr topic) 7))
+
+(defun mixi-topic-set-comment-count (topic comment-count)
+ "Set the comment-count of TOPIC."
+ (unless (mixi-topic-p topic)
+ (signal 'wrong-type-argument (list 'mixi-topic-p topic)))
+ (aset (cdr topic) 3 comment-count))
(defun mixi-topic-set-time (topic time)
"Set the time of TOPIC."
(unless (mixi-topic-p topic)
(signal 'wrong-type-argument (list 'mixi-topic-p topic)))
- (aset (cdr topic) 3 time))
+ (aset (cdr topic) 4 time))
(defun mixi-topic-set-title (topic title)
"Set the title of TOPIC."
(unless (mixi-topic-p topic)
(signal 'wrong-type-argument (list 'mixi-topic-p topic)))
- (aset (cdr topic) 4 title))
+ (aset (cdr topic) 5 title))
(defun mixi-topic-set-owner (topic owner)
"Set the owner of TOPIC."
(signal 'wrong-type-argument (list 'mixi-topic-p topic)))
(unless (mixi-friend-p owner)
(signal 'wrong-type-argument (list 'mixi-friend-p owner)))
- (aset (cdr topic) 5 owner))
+ (aset (cdr topic) 6 owner))
(defun mixi-topic-set-content (topic content)
"Set the content of TOPIC."
(unless (mixi-topic-p topic)
(signal 'wrong-type-argument (list 'mixi-topic-p topic)))
- (aset (cdr topic) 6 content))
+ (aset (cdr topic) 7 content))
(defmacro mixi-post-topic-page (community)
`(concat "/add_bbs.pl?id=" (mixi-community-id community)))
;; Event object.
(defvar mixi-event-cache (make-hash-table :test 'equal))
-(defun mixi-make-event (community id &optional time title owner date place
- detail limit members)
+(defun mixi-make-event (community id &optional comment-count time title owner
+ date place detail limit members)
"Return a event object."
(mixi-make-cache (list (mixi-community-id community) id)
- (cons 'mixi-event (vector nil community id time title owner
- date place detail limit members))
+ (cons 'mixi-event (vector nil community id comment-count
+ time title owner date place
+ detail limit members))
mixi-event-cache))
(defconst mixi-event-url-regexp
- "/view_event\\.pl\\?id=\\([0-9]+\\)\\(&comment_count=[0-9]+\\)?&comm_id=\\([0-9]+\\)")
+ "/view_event\\.pl\\?id=\\([0-9]+\\)\\(&comment_count=\\([0-9]+\\)\\)?&comm_id=\\([0-9]+\\)")
(defun mixi-make-event-from-url (url)
"Return a event object from URL."
(when (string-match mixi-event-url-regexp url)
(let ((id (match-string 1 url))
- (community-id (match-string 3 url)))
- (mixi-make-event (mixi-make-community community-id) id))))
+ (comment-count (match-string 3 url))
+ (community-id (match-string 4 url)))
+ (mixi-make-event (mixi-make-community community-id) id comment-count))))
(defmacro mixi-event-p (event)
`(eq (mixi-object-class ,event) 'mixi-event))
(signal 'wrong-type-argument (list 'mixi-event-p event)))
(aref (cdr event) 2))
+(defun mixi-event-comment-count (event)
+ "Return the comment-count of EVENT."
+ (unless (mixi-event-p event)
+ (signal 'wrong-type-argument (list 'mixi-event-p event)))
+ (aref (cdr event) 3))
+
(defun mixi-event-time (event)
"Return the time of EVENT."
(unless (mixi-event-p event)
(signal 'wrong-type-argument (list 'mixi-event-p event)))
(mixi-realize-event event)
- (aref (cdr event) 3))
+ (aref (cdr event) 4))
(defun mixi-event-title (event)
"Return the title of EVENT."
(unless (mixi-event-p event)
(signal 'wrong-type-argument (list 'mixi-event-p event)))
(mixi-realize-event event)
- (aref (cdr event) 4))
+ (aref (cdr event) 5))
(defun mixi-event-owner (event)
"Return the owner of EVENT."
(unless (mixi-event-p event)
(signal 'wrong-type-argument (list 'mixi-event-p event)))
(mixi-realize-event event)
- (aref (cdr event) 5))
+ (aref (cdr event) 6))
(defun mixi-event-date (event)
"Return the date of EVENT."
(unless (mixi-event-p event)
(signal 'wrong-type-argument (list 'mixi-event-p event)))
(mixi-realize-event event)
- (aref (cdr event) 6))
+ (aref (cdr event) 7))
(defun mixi-event-place (event)
"Return the place of EVENT."
(unless (mixi-event-p event)
(signal 'wrong-type-argument (list 'mixi-event-p event)))
(mixi-realize-event event)
- (aref (cdr event) 7))
+ (aref (cdr event) 8))
(defun mixi-event-detail (event)
"Return the detail of EVENT."
(unless (mixi-event-p event)
(signal 'wrong-type-argument (list 'mixi-event-p event)))
(mixi-realize-event event)
- (aref (cdr event) 8))
+ (aref (cdr event) 9))
(defun mixi-event-limit (event)
"Return the limit of EVENT."
(unless (mixi-event-p event)
(signal 'wrong-type-argument (list 'mixi-event-p event)))
(mixi-realize-event event)
- (aref (cdr event) 9))
+ (aref (cdr event) 10))
(defun mixi-event-members (event)
"Return the members of EVENT."
(unless (mixi-event-p event)
(signal 'wrong-type-argument (list 'mixi-event-p event)))
(mixi-realize-event event)
- (aref (cdr event) 10))
+ (aref (cdr event) 11))
+
+(defun mixi-event-set-comment-count (event comment-count)
+ "Set the comment-count of EVENT."
+ (unless (mixi-event-p event)
+ (signal 'wrong-type-argument (list 'mixi-event-p event)))
+ (aset (cdr event) 3 comment-count))
(defun mixi-event-set-time (event time)
"Set the time of EVENT."
(unless (mixi-event-p event)
(signal 'wrong-type-argument (list 'mixi-event-p event)))
- (aset (cdr event) 3 time))
+ (aset (cdr event) 4 time))
(defun mixi-event-set-title (event title)
"Set the title of EVENT."
(unless (mixi-event-p event)
(signal 'wrong-type-argument (list 'mixi-event-p event)))
- (aset (cdr event) 4 title))
+ (aset (cdr event) 5 title))
(defun mixi-event-set-owner (event owner)
"Set the owner of EVENT."
(signal 'wrong-type-argument (list 'mixi-event-p event)))
(unless (mixi-friend-p owner)
(signal 'wrong-type-argument (list 'mixi-friend-p owner)))
- (aset (cdr event) 5 owner))
+ (aset (cdr event) 6 owner))
(defun mixi-event-set-date (event date)
"Set the date of EVENT."
(unless (mixi-event-p event)
(signal 'wrong-type-argument (list 'mixi-event-p event)))
- (aset (cdr event) 6 date))
+ (aset (cdr event) 7 date))
(defun mixi-event-set-place (event place)
"Set the place of EVENT."
(unless (mixi-event-p event)
(signal 'wrong-type-argument (list 'mixi-event-p event)))
- (aset (cdr event) 7 place))
+ (aset (cdr event) 8 place))
(defun mixi-event-set-detail (event detail)
"Set the detail of EVENT."
(unless (mixi-event-p event)
(signal 'wrong-type-argument (list 'mixi-event-p event)))
- (aset (cdr event) 8 detail))
+ (aset (cdr event) 9 detail))
(defun mixi-event-set-limit (event limit)
"Set the limit of EVENT."
(unless (mixi-event-p event)
(signal 'wrong-type-argument (list 'mixi-event-p event)))
- (aset (cdr event) 9 limit))
+ (aset (cdr event) 10 limit))
(defun mixi-event-set-members (event members)
"Set the members of EVENT."
(unless (mixi-event-p event)
(signal 'wrong-type-argument (list 'mixi-event-p event)))
- (aset (cdr event) 10 members))
+ (aset (cdr event) 11 members))
-;; Bbs object.
+;; BBS object.
(defconst mixi-bbs-list '(mixi-topic mixi-event))
-(defmacro mixi-bbs-p (object)
- `(memq (mixi-object-class ,object) mixi-bbs-list))
+(defmacro mixi-bbs-p (bbs)
+ `(memq (mixi-object-class ,bbs) mixi-bbs-list))
-(defun mixi-bbs-community (object)
- "Return the community of OBJECT."
- (unless (mixi-bbs-p object)
- (signal 'wrong-type-argument (list 'mixi-bbs-p object)))
+(defun mixi-bbs-community (bbs)
+ "Return the community of BBS."
+ (unless (mixi-bbs-p bbs)
+ (signal 'wrong-type-argument (list 'mixi-bbs-p bbs)))
(let ((func (intern (concat mixi-object-prefix
- (mixi-object-name object) "-community"))))
- (funcall func object)))
+ (mixi-object-name bbs) "-community"))))
+ (funcall func bbs)))
+
+(defun mixi-bbs-comment-count (bbs)
+ "Return the comment-count of BBS."
+ (unless (mixi-bbs-p bbs)
+ (signal 'wrong-type-argument (list 'mixi-bbs-p bbs)))
+ (let ((func (intern (concat mixi-object-prefix
+ (mixi-object-name bbs) "-comment-count"))))
+ (funcall func bbs)))
+
+(defun mixi-bbs-set-comment-count (bbs count)
+ "Set the comment-count of BBS."
+ (unless (mixi-bbs-p bbs)
+ (signal 'wrong-type-argument (list 'mixi-bbs-p bbs)))
+ (let ((func (intern (concat mixi-object-prefix
+ (mixi-object-name bbs) "-set-comment-count"))))
+ (funcall func bbs count)))
(defalias 'mixi-bbs-id 'mixi-object-id)
(defalias 'mixi-bbs-time 'mixi-object-time)
`(concat "/new_bbs.pl?page=%d"))
(defconst mixi-new-bbs-list-regexp
- "<a href=\"view_\\(bbs\\|event\\)\\.pl\\?id=\\([0-9]+\\)&comment_count=[0-9]+&comm_id=\\([0-9]+\\)\" class=\"new_link\">")
+ "<a href=\"view_\\(bbs\\|event\\)\\.pl\\?id=\\([0-9]+\\)&comment_count=\\([0-9]+\\)&comm_id=\\([0-9]+\\)\" class=\"new_link\">")
(defun mixi-get-new-bbses (&optional range)
"Get new topics."
(let ((items (mixi-get-matched-items (mixi-new-bbs-list-page)
mixi-new-bbs-list-regexp
range)))
- (mapcar (lambda (item)
- (let ((name (nth 0 item)))
- (when (string= name "bbs")
- (setq name "topic"))
- (let ((func (intern (concat "mixi-make-" name))))
- (funcall func (mixi-make-community (nth 2 item))
- (nth 1 item)))))
- items)))
-
+ (delq nil
+ (mapcar (lambda (item)
+ (let ((name (nth 0 item)))
+ (when (string= name "bbs")
+ (setq name "topic"))
+ (let* ((func (intern (concat "mixi-make-" name)))
+ (bbs (funcall func
+ (mixi-make-community (nth 3 item))
+ (nth 1 item)))
+ (comment-count (mixi-bbs-comment-count bbs))
+ (count (string-to-number (nth 2 item))))
+ (when (or (null comment-count)
+ (< comment-count count))
+ (mixi-bbs-set-comment-count bbs count)
+ bbs))))
+ items))))
+
(defmacro mixi-search-bbs-list-page (keyword)
`(concat "/search_topic.pl?page=%d&type=top&submit=search"
"&keyword=" (mixi-url-encode-and-quote-percent-string ,keyword)
(nth 1 item)))))
items)))
+;; Parent object.
+(defmacro mixi-parent-p (object)
+ `(or (eq (mixi-object-class ,object) 'mixi-diary)
+ (mixi-bbs-p object)))
+
+(defun mixi-realize-parent (parent &optional page)
+ "Realize a PARENT."
+ (unless (mixi-parent-p parent)
+ (signal 'wrong-type-argument (list 'mixi-parent-p parent)))
+ (let ((func (intern (concat mixi-object-prefix "realize-"
+ (mixi-object-name parent)))))
+ (funcall func parent page)))
+
;; Comment object.
(defun mixi-make-comment (parent owner time content)
"Return a comment object."
(defun mixi-get-comments (parent &optional range)
"Get comments of PARENT."
- (unless (mixi-object-p parent)
- (signal 'wrong-type-argument (list 'mixi-object-p parent)))
+ (unless (mixi-parent-p parent)
+ (signal 'wrong-type-argument (list 'mixi-parent-p parent)))
(let* ((name (mixi-object-name parent))
(list-page (intern (concat mixi-object-prefix name
"-comment-list-page")))
"-comment-list-regexp"))))
(page (funcall list-page parent)))
(unless (mixi-object-realized-p parent)
- (mixi-realize-object parent page)
+ (mixi-realize-parent parent page)
(setq page nil))
(let ((items (mixi-get-matched-items page regexp range t)))
(mapcar (lambda (item)
`(concat "/new_comment.pl?page=%d"))
(defconst mixi-new-comment-list-regexp
- "<a href=\"view_diary\\.pl\\?id=\\([0-9]+\\)&owner_id=\\([0-9]+\\)&comment_count=[0-9]+\" class=\"new_link\">")
+ "<a href=\"view_diary\\.pl\\?id=\\([0-9]+\\)&owner_id=\\([0-9]+\\)&comment_count=\\([0-9]+\\)\" class=\"new_link\">")
(defun mixi-get-new-comments (&optional range)
"Get new comments."
(let ((items (mixi-get-matched-items (mixi-new-comment-list-page)
- mixi-new-comment-list-regexp
- range)))
- (mapcar (lambda (item)
- (mixi-make-diary (mixi-make-friend (nth 1 item)) (nth 0 item)))
- items)))
+ mixi-new-comment-list-regexp
+ range)))
+ (delq nil
+ (mapcar (lambda (item)
+ (let* ((diary (mixi-make-diary
+ (mixi-make-friend (nth 1 item))
+ (nth 0 item)))
+ (comment-count (mixi-diary-comment-count diary))
+ (count (string-to-number (nth 2 item))))
+ (when (or (null comment-count)
+ (< comment-count count))
+ (mixi-diary-set-comment-count diary count)
+ diary)))
+ items))))
(defun mixi-post-diary-comment-page (diary)
(concat "/add_comment.pl?&diary_id=" (mixi-diary-id diary)))
"&media_id=" (mixi-news-media-id ,news)))
(defconst mixi-news-title-regexp
- "<td HEIGHT=\"46\" STYLE=\"font-weight: bold;font-size: 14px;\" CLASS=\"h130\">\\(.+\\)</td>")
+ "<td HEIGHT=\"46\" STYLE=\"font-weight: bold;font-size: 14px;\" CLASS=\"h130\">\\(.+\\)\\(\r
+\\)?</td>")
(defconst mixi-news-media-time-regexp
"<td COLSPAN=\"2\" ALIGN=\"right\">(\\(.+\\) - \\([0-9]+\\)·î\\([0-9]+\\)Æü \\([0-9]+\\):\\([0-9]+\\))</td></tr>")
(defconst mixi-news-content-regexp
"<td CLASS=\"h150\">
\\(.+\\)
-
-?
+<br>
+\\(.*
+\\)?
\\(</td>\\|<br>\\)")
projects / elisp / mixi.git / blobdiff