Index: lang/elisp/twittering-mode/trunk/twittering-mode.el =================================================================== --- lang/elisp/twittering-mode/trunk/twittering-mode.el (revision 77) +++ lang/elisp/twittering-mode/trunk/twittering-mode.el (revision 80) @@ -11,4 +11,10 @@ ;; URL: http://lambdarepos.svnrepository.com/share/trac.cgi/browser/lang/elisp/twittering-mode +;; Modified by Alberto Garcia to add the following methods: +;; twittering-replies-timeline +;; twittering-public-timeline +;; twittering-user-timeline +;; twittering-current-timeline + ;; This file is free software; you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by @@ -59,5 +65,6 @@ (defvar twittering-mode-map (make-sparse-keymap)) -(defvar twittering-timer nil "Timer object for timeline refreshing will be stored here. DO NOT SET VALUE MANUALLY.") +(defvar twittering-timer nil "Timer object for timeline refreshing will be +stored here. DO NOT SET VALUE MANUALLY.") (defvar twittering-idle-time 20) @@ -68,4 +75,6 @@ (defvar twittering-password nil) + +(defvar twittering-last-timeline-retrieved nil) (defvar twittering-scroll-mode nil) @@ -102,6 +111,6 @@ (twittering-get-or-generate-buffer twittering-http-buffer)) -(defvar twittering-friends-timeline-data nil) -(defvar twittering-friends-timeline-last-update nil) +(defvar twittering-timeline-data nil) +(defvar twittering-timeline-last-update nil) (defvar twittering-username-face 'twittering-username-face) @@ -163,5 +172,7 @@ temporary-file-directory)) -(defvar twittering-icon-mode nil "You MUST NOT CHANGE this variable directory. You should change through function'twittering-icon-mode'") +(defvar twittering-icon-mode nil "You MUST NOT CHANGE this variable +directory. You should change through function'twittering-icon-mode'") + (make-variable-buffer-local 'twittering-icon-mode) (defun twittering-icon-mode (&optional arg) @@ -179,5 +190,5 @@ (make-directory twittering-tmp-dir)) t))))) - (twittering-render-friends-timeline)) + (twittering-render-timeline)) (defun twittering-scroll-mode (&optional arg) @@ -237,4 +248,7 @@ (let ((km twittering-mode-map)) (define-key km "\C-c\C-f" 'twittering-friends-timeline) + (define-key km "\C-c\C-r" 'twittering-replies-timeline) + (define-key km "\C-c\C-g" 'twittering-public-timeline) + (define-key km "\C-c\C-u" 'twittering-user-timeline) (define-key km "\C-c\C-s" 'twittering-update-status-interactive) (define-key km "\C-c\C-e" 'twittering-erase-old-statuses) @@ -243,4 +257,5 @@ (define-key km [mouse-1] 'twittering-click) (define-key km "\C-c\C-v" 'twittering-view-user-page) + (define-key km "g" 'twittering-current-timeline) ;; (define-key km "j" 'next-line) ;; (define-key km "k" 'previous-line) @@ -295,5 +310,6 @@ (body (cdr clause))) `(,(if (listp keylist) - `(or ,@(mapcar (lambda (key) `(string-equal ,str ,key)) keylist)) + `(or ,@(mapcar (lambda (key) `(string-equal ,str ,key)) + keylist)) 't) ,@body))) @@ -325,6 +341,5 @@ (run-hooks 'twittering-mode-hook) (font-lock-mode -1) - (twittering-start) - ) + (twittering-start)) ;;; @@ -369,6 +384,8 @@ (lambda (param-pair) (format "%s=%s" - (twittering-percent-encode (car param-pair)) - (twittering-percent-encode (cdr param-pair)))) + (twittering-percent-encode (car + param-pair)) + (twittering-percent-encode (cdr + param-pair)))) parameters "&"))) @@ -378,5 +395,6 @@ "Authorization: Basic " (base64-encode-string - (concat twittering-username ":" (twittering-get-password))) + (concat twittering-username ":" + (twittering-get-password))) nl "Accept: text/xml" @@ -417,5 +435,5 @@ (reverse (twittering-xmltree-to-status body))) - (twittering-render-friends-timeline) + (twittering-render-timeline) (message (if suc-msg suc-msg "Success: Get."))) (t (message status)))) @@ -423,5 +441,5 @@ ) -(defun twittering-render-friends-timeline () +(defun twittering-render-timeline () (with-current-buffer (twittering-buffer) (let ((point (point)) @@ -435,5 +453,5 @@ (save-excursion (beginning-of-line) (point)) (point)) (insert "\n")) - twittering-friends-timeline-data) + twittering-timeline-data) (if twittering-image-stack (clear-image-cache)) @@ -451,5 +469,6 @@ (icon-string "\n ")) (if (string-match "/\\([^/?]+\\)\\(?:\\?\\|$\\)" profile-image-url) - (let ((filename (match-string-no-properties 1 profile-image-url))) + (let ((filename (match-string-no-properties 1 + profile-image-url))) ;; download icons if does not exist (if (file-exists-p (concat twittering-tmp-dir @@ -474,5 +493,6 @@ (setq cursor 0) (setq result '()) - (while (setq found-at (string-match "%\\(C{\\([^}]+\\)}\\|[A-Za-z#@']\\)" format-str cursor)) + (while (setq found-at (string-match "%\\(C{\\([^}]+\\)}\\|[A-Za-z#@']\\)" + format-str cursor)) (setq c (string-to-char (match-string-no-properties 1 format-str))) (if (> found-at cursor) @@ -506,5 +526,6 @@ ((?c) ; %c - created_at (raw UTC string) (list-push (attr 'created-at) result)) - ((?C) ; %C{time-format-str} - created_at (formatted with time-format-str) + ((?C) ; %C{time-format-str} - created_at (formatted with + ; time-format-str) (list-push (twittering-local-strftime (or (match-string-no-properties 2 format-str) "%H:%M:%S") @@ -532,6 +553,8 @@ ((< secs 84600) (format "about %d hours ago" (/ (+ secs 1800) 3600))) - (t (format-time-string "%I:%M %p %B %d, %Y" created-at)))) - (setq url (twittering-get-status-url (attr 'user-screen-name) (attr 'id))) + (t (format-time-string "%I:%M %p %B %d, %Y" + created-at)))) + (setq url (twittering-get-status-url (attr 'user-screen-name) + (attr 'id))) ;; make status url clickable (add-text-properties @@ -569,7 +592,9 @@ "Send HTTP POST request to twitter.com -METHOD-CLASS must be one of Twitter API method classes(statuses, users or direct_messages). +METHOD-CLASS must be one of Twitter API method classes + (statuses, users or direct_messages). METHOD must be one of Twitter API method which belongs to METHOD-CLASS. -PARAMETERS is alist of URI parameters. ex) ((\"mode\" . \"view\") (\"page\" . \"6\")) => ?mode=view&page=6" +PARAMETERS is alist of URI parameters. + ex) ((\"mode\" . \"view\") (\"page\" . \"6\")) => ?mode=view&page=6" (if (null sentinel) (setq sentinel 'twittering-http-post-default-sentinel)) @@ -660,7 +685,7 @@ (defun twittering-get-response-body (&optional buffer) - "Exract HTTP response body from HTTP response, parse it as XML, and return a XML tree as list. -`buffer' may be a buffer or the name of an existing buffer. - If `buffer' is omitted, the value of `twittering-http-buffer' is used as `buffer'." + "Exract HTTP response body from HTTP response, parse it as XML, and return a +XML tree as list. `buffer' may be a buffer or the name of an existing buffer. If +`buffer' is omitted, the value of `twittering-http-buffer' is used as `buffer'." (if (stringp buffer) (setq buffer (get-buffer buffer))) (if (null buffer) (setq buffer (twittering-http-buffer))) @@ -675,8 +700,8 @@ (defun twittering-cache-status-datum (status-datum &optional data-var) - "Cache status datum into data-var(default twittering-friends-timeline-data) + "Cache status datum into data-var(default twittering-timeline-data) If STATUS-DATUM is already in DATA-VAR, return nil. If not, return t." (if (null data-var) - (setf data-var 'twittering-friends-timeline-data)) + (setf data-var 'twittering-timeline-data)) (let ((id (cdr (assq 'id status-datum)))) (if (or (null (symbol-value data-var)) @@ -687,5 +712,6 @@ (progn (if twittering-jojo-mode - (twittering-update-jojo (cdr (assq 'user-screen-name status-datum)) + (twittering-update-jojo (cdr (assq 'user-screen-name + status-datum)) (cdr (assq 'text status-datum)))) (set data-var (cons status-datum (symbol-value data-var))) @@ -788,5 +814,5 @@ ;; save last update time - (setq twittering-friends-timeline-last-update created-at) + (setq twittering-timeline-last-update created-at) (mapcar @@ -921,18 +947,21 @@ (setq twittering-timer nil)) -(defun twittering-friends-timeline () - (interactive) +(defun twittering-get-timeline (method) + (if (not (eq twittering-last-timeline-retrieved method)) + (setq twittering-timeline-last-update nil + twittering-timeline-data nil)) + (setq twittering-last-timeline-retrieved method) (let ((buf (get-buffer twittering-buffer))) (if (not buf) (twittering-stop) - (if (not twittering-friends-timeline-last-update) - (twittering-http-get "statuses" "friends_timeline") - (let* ((system-time-locale "C") - (since - (twittering-global-strftime - "%a, %d %b %Y %H:%M:%S GMT" - twittering-friends-timeline-last-update))) - (twittering-http-get "statuses" "friends_timeline" - `(("since" . ,since))))))) + (if (not twittering-timeline-last-update) + (twittering-http-get "statuses" method) + (let* ((system-time-locale "C") + (since + (twittering-global-strftime + "%a, %d %b %Y %H:%M:%S GMT" + twittering-timeline-last-update))) + (twittering-http-get "statuses" method + `(("since" . ,since))))))) (if twittering-icon-mode @@ -956,4 +985,26 @@ ))))))) +(defun twittering-friends-timeline () + (interactive) + (twittering-get-timeline "friends_timeline")) + +(defun twittering-replies-timeline () + (interactive) + (twittering-get-timeline "replies")) + +(defun twittering-public-timeline () + (interactive) + (twittering-get-timeline "public_timeline")) + +(defun twittering-user-timeline () + (interactive) + (twittering-get-timeline "user_timeline")) + +(defun twittering-current-timeline () + (interactive) + (if (not twittering-last-timeline-retrieved) + (setq twittering-last-timeline-retrieved "friends_timeline")) + (twittering-get-timeline twittering-last-timeline-retrieved)) + (defun twittering-update-status-interactive () (interactive) @@ -962,13 +1013,15 @@ (defun twittering-erase-old-statuses () (interactive) - (setq twittering-friends-timeline-data nil) - (if (not twittering-friends-timeline-last-update) - (twittering-http-get "statuses" "friends_timeline") + (setq twittering-timeline-data nil) + (if (not twittering-last-timeline-retrieved) + (setq twittering-last-timeline-retrieved "friends_timeline")) + (if (not twittering-timeline-last-update) + (twittering-http-get "statuses" twittering-last-timeline-retrieved) (let* ((system-time-locale "C") (since - (twittering-global-strftime - "%a, %d %b %Y %H:%M:%S GMT" - twittering-friends-timeline-last-update))) - (twittering-http-get "statuses" "friends_timeline" + (twittering-global-strftime + "%a, %d %b %Y %H:%M:%S GMT" + twittering-timeline-last-update))) + (twittering-http-get "statuses" twittering-last-timeline-retrieved `(("since" . ,since)))))) Index: lang/elisp/twittering-mode/trunk/ChangeLog =================================================================== --- lang/elisp/twittering-mode/trunk/ChangeLog (revision 78) +++ lang/elisp/twittering-mode/trunk/ChangeLog (revision 80) @@ -1,6 +1,32 @@ +2009-03-12 Tsuyoshi CHO + + * twittering-mode.el: Append new methods by Alberto Garcia + 's patch. + (twittering-get-timeline): Add new general method. Old name is + `twittering-friends-timeline'. + (twittering-friends-timeline): Renew use general method. + (twittering-replies-timeline): Add new. + (twittering-public-timeline): Ditto. + (twittering-user-timeline): Ditto. + (twittering-current-timeline): Ditto. + (twittering-last-timeline-retrieved): Add new variable. + (twittering-mode-map): Add new key binding. + (twittering-erase-old-statuses): Support multi method. + + (twittering-timer): Comment update. + (twittering-icon-mode): Ditto. + (twittering-http-post): Ditto. + (twittering-get-response-body): Ditto. + (twittering-cache-status-datum): Ditto and Fix renaming. + (twittering-timeline-data, twittering-timeline-last-update): Rename. + (twittering-render-timeline): Ditto. + (twittering-icon-mode): Fix renaming. + (twittering-http-get-default-sentinel): Ditto. + (twittering-format-status): Fix indentation. + 2009-03-09 Tsuyoshi CHO * twittering-mode.el (twittering-mode): Add keybind in Major mode - docstirng + docstirng by Alex Schröder 2008-08-03 Tsuyoshi CHO