X-Git-Url: http://cgit.sxemacs.org/?p=riece;a=blobdiff_plain;f=lisp%2Friece-300.el;h=62e2f6441a23d4f5fa21e91775cf6ea49448eece;hp=dd33c6ddac525d2e0ccf0d82ac5d5c1161725f33;hb=218d1f3a9ab6ab368fb9de131a15b9e79af16ea0;hpb=c93b87a80b0cc2e0c77bb0955380bd3284c254e8 diff --git a/lisp/riece-300.el b/lisp/riece-300.el index dd33c6d..62e2f64 100644 --- a/lisp/riece-300.el +++ b/lisp/riece-300.el @@ -1,4 +1,4 @@ -;;; riece-300.el --- handlers for 300 replies +;;; riece-300.el --- handlers for 300 replies -*- lexical-binding: t -*- ;; Copyright (C) 1998-2003 Daiki Ueno ;; Author: Daiki Ueno @@ -19,12 +19,15 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Code: (require 'riece-misc) +(require 'riece-naming) +(require 'riece-signal) +(require 'riece-display) (eval-when-compile (autoload 'riece-default-handle-numeric-reply "riece-handle")) @@ -32,7 +35,7 @@ (riece-default-handle-numeric-reply riece-info-prefix prefix number name string)) -(defun riece-handle-302-message (prefix number name string) +(defun riece-handle-302-message (_prefix _number _name string) "RPL_USERHOST \":*1 *( \" \" )\"" (let ((replies (split-string (if (eq (aref string 0) ?:) (substring string 1) @@ -40,8 +43,7 @@ " "))) (while replies (if (string-match - (concat "^\\(" riece-user-regexp - "\\)\\(\\*\\)?=\\([-+]\\)\\([^ ]+\\)") + (concat "^\\([^ ]+\\)\\(\\*\\)?=\\([-+]\\)\\([^ ]+\\)") (car replies)) (let ((user (match-string 1 (car replies))) (operator (not (null (match-beginning 2)))) @@ -66,7 +68,7 @@ (riece-concat-server-name (riece-concat-user-status status - (format "%s is (%s)" + (format (riece-mcat "%s is (%s)") (riece-format-identity (riece-make-identity user riece-server-name) t) @@ -74,12 +76,12 @@ "\n")))) (setq replies (cdr replies))))) -(defun riece-handle-303-message (prefix number name string) +(defun riece-handle-303-message (_prefix _number _name string) (riece-insert-info (list riece-dialogue-buffer riece-others-buffer) (concat (riece-concat-server-name - (concat "Online: " + (concat (riece-mcat "Online: ") (mapconcat (lambda (user) (riece-format-identity @@ -92,8 +94,8 @@ ""))) "\n"))) -(defun riece-handle-301-message (prefix number name string) - (if (string-match (concat "^\\(" riece-user-regexp "\\) :?") string) +(defun riece-handle-301-message (_prefix _number _name string) + (if (string-match (concat "^\\([^ ]+\\) :?") string) (let ((user (match-string 1 string)) (message (substring string (match-end 0)))) (riece-user-toggle-away user t) @@ -104,31 +106,30 @@ (list riece-dialogue-buffer riece-others-buffer) (concat (riece-concat-server-name - (format "%s is away: %s" + (format (riece-mcat "%s is away: %s") (riece-format-identity (riece-make-identity user riece-server-name) t) message)) "\n"))))) -(defun riece-handle-305-message (prefix number name string) +(defun riece-handle-305-message (_prefix _number _name _string) (riece-user-toggle-away riece-real-nickname nil) (riece-emit-signal 'user-away-changed (riece-make-identity riece-real-nickname riece-server-name) nil)) -(defun riece-handle-306-message (prefix number name string) +(defun riece-handle-306-message (_prefix _number _name _string) (riece-user-toggle-away riece-real-nickname t) (riece-emit-signal 'user-away-changed (riece-make-identity riece-real-nickname riece-server-name) t)) -(defun riece-handle-311-message (prefix number name string) +(defun riece-handle-311-message (_prefix _number _name string) (if (string-match - (concat "^\\(" riece-user-regexp - "\\) \\([^ ]+\\) \\([^ ]+\\) \\* :?") + (concat "^\\([^ ]+\\) \\([^ ]+\\) \\([^ ]+\\) \\* :?") string) (let ((user (match-string 1 string)) (name (substring string (match-end 0))) @@ -138,7 +139,7 @@ (list riece-dialogue-buffer riece-others-buffer) (concat (riece-concat-server-name - (format "%s is %s (%s)" + (format (riece-mcat "%s is %s (%s)") (riece-format-identity (riece-make-identity user riece-server-name) t) @@ -146,51 +147,64 @@ user-at-host)) "\n"))))) -(defun riece-handle-312-message (prefix number name string) +(defun riece-handle-312-message (_prefix _number _name string) (if (string-match - (concat "^\\(" riece-user-regexp "\\) \\([^ ]+\\) :?") + (concat "^\\([^ ]+\\) \\([^ ]+\\) :?") string) (riece-insert-info (list riece-dialogue-buffer riece-others-buffer) (concat (riece-concat-server-name - (format "on via server %s: %s" + (format (riece-mcat "on via server %s: %s") (match-string 2 string) (substring string (match-end 0)))) "\n")))) -(defun riece-handle-313-message (prefix number name string) - (if (string-match (concat "^" riece-user-regexp) string) +(defun riece-handle-313-message (_prefix _number _name string) + (if (string-match "^[^ ]+" string) (let ((user (match-string 0 string))) (riece-insert-info (list riece-dialogue-buffer riece-others-buffer) (concat (riece-concat-server-name - (concat (riece-format-identity + (format "%s is an IRC operator" + (riece-format-identity (riece-make-identity user riece-server-name) - t) - " is an IRC operator")) + t))) "\n"))))) -(defun riece-handle-317-message (prefix number name string) +(defun riece-handle-317-message (_prefix _number _name string) (if (string-match - (concat "^\\(" riece-user-regexp "\\) \\([0-9]+\\) ") + (concat "^\\([^ ]+\\) \\([0-9]+\\) ") string) - (let ((user (match-string 1 string)) - (idle (match-string 2 string))) + (let* ((user (match-string 1 string)) + (seconds (string-to-number (match-string 2 string))) + (units (list (cons (/ seconds 60 60 24) (riece-mcat "days")) + (cons (mod (/ seconds 60 60) 24) + (riece-mcat "hours")) + (cons (mod (/ seconds 60) 60) (riece-mcat "minutes")) + (cons (mod seconds 60) (riece-mcat "seconds"))))) (riece-insert-info (list riece-dialogue-buffer riece-others-buffer) (concat (riece-concat-server-name - (format "%s is %s seconds idle" + (format (riece-mcat "%s is %s idle") (riece-format-identity (riece-make-identity user riece-server-name) t) - idle)) + (mapconcat #'identity + (delq nil + (mapcar + (lambda (unit) + (if (/= (car unit) 0) + (format "%d %s" + (car unit) (cdr unit)))) + units)) + " "))) "\n"))))) -(defun riece-handle-319-message (prefix number name string) - (if (string-match (concat "^\\(" riece-user-regexp "\\) :?") string) +(defun riece-handle-319-message (_prefix _number _name string) + (if (string-match (concat "^\\([^ ]+\\) :?") string) (let ((user (match-string 1 string)) (channels (mapconcat @@ -217,56 +231,60 @@ channels)) "\n"))))) -(defun riece-handle-351-message (prefix number name string) +(defun riece-handle-351-message (_prefix _number _name string) (if (string-match "\\([^ ]+\\.[^ ]+\\) \\([^ ]+\\) :?" string) (riece-insert-info (list riece-dialogue-buffer riece-others-buffer) (concat (riece-concat-server-name - (format "%s is running on %s: %s" + (format (riece-mcat "%s is running on %s: %s") (match-string 1 string) (match-string 2 string) (substring string (match-end 0)))) "\n")))) (defvar riece-353-message-alist nil) -(defun riece-handle-353-message (prefix number name string) +(defun riece-handle-353-message (_prefix _number _name string) "RPL_NAMREPLY \"[=\*@] :[[@|+] [[@|+] [...]]]\"." (make-local-variable 'riece-353-message-alist) (if (string-match "^[=\*@] *\\([^ ]+\\) +:?" string) (let* ((channel (match-string 1 string)) - (entry (assoc channel riece-353-message-alist))) + (entry (riece-identity-assoc channel riece-353-message-alist t))) (if entry (setcdr entry (concat (cdr entry) - (substring string (match-end 0)))) + (substring string (match-end 0)) " ")) (setq riece-353-message-alist - (cons (cons channel (substring string (match-end 0))) + (cons (cons channel + (concat (substring string (match-end 0)) " ")) riece-353-message-alist)))))) -(defun riece-handle-322-message (prefix number name string) - (if (string-match "^\\([^ ]+\\) \\([0-9]+\\) :?" string) - (let* ((channel (match-string 1 string)) - (visible (match-string 2 string)) - (topic (substring string (match-end 0)))) - (riece-channel-set-topic (riece-get-channel channel) topic) - (let* ((channel-identity (riece-make-identity channel - riece-server-name)) - (buffer (riece-channel-buffer channel-identity))) - (riece-insert-info buffer (concat visible " users, topic: " - topic "\n")) - (riece-insert-info - (if (and riece-channel-buffer-mode - (not (eq buffer riece-channel-buffer))) - (list riece-dialogue-buffer riece-others-buffer) - riece-dialogue-buffer) - (concat - (riece-concat-server-name - (format "%s: %s users, topic: %s" - (riece-format-identity channel-identity t) visible topic)) - "\n")))))) +(defun riece-handle-322-message (_prefix _number _name decoded) + (let* ((parameters (riece-split-parameters (riece-decoded-string decoded))) + (channel (car parameters)) + (visible (nth 1 parameters)) + (channel-identity (riece-make-identity channel riece-server-name)) + (buffer (riece-channel-buffer channel-identity)) + topic) + (setq parameters (riece-split-parameters + (riece-decoded-string-for-identity decoded + channel-identity)) + topic (nth 2 parameters)) + (riece-channel-set-topic (riece-get-channel channel) topic) + (riece-insert-info buffer (format (riece-mcat "%s users, topic: %s\n") + visible topic)) + (riece-insert-info + (if (and riece-channel-buffer-mode + (not (eq buffer riece-channel-buffer))) + (list riece-dialogue-buffer riece-others-buffer) + riece-dialogue-buffer) + (concat + (riece-concat-server-name + (format (riece-mcat "%s: %s users, topic: %s") + (riece-format-identity channel-identity t) visible topic)) + "\n")))) -(defun riece-handle-324-message (prefix number name string) +(defun riece-handle-324-message (_prefix _number _name string) (if (string-match "^\\([^ ]+\\) \\([^ ]+\\) " string) (let* ((channel (match-string 1 string)) (mode-string (match-string 2 string))) @@ -275,7 +293,8 @@ (let* ((channel-identity (riece-make-identity channel riece-server-name)) (buffer (riece-channel-buffer channel-identity))) - (riece-insert-info buffer (concat "Mode: " mode-string "\n")) + (riece-insert-info buffer (concat (riece-mcat "Mode: ") mode-string + "\n")) (riece-insert-info (if (and riece-channel-buffer-mode (not (eq buffer riece-channel-buffer))) @@ -283,36 +302,37 @@ riece-dialogue-buffer) (concat (riece-concat-server-name - (format "Mode for %s: %s" + (format (riece-mcat "Mode for %s: %s") (riece-format-identity channel-identity t) mode-string)) "\n")))))) -(defun riece-handle-set-topic (prefix number name string remove) - (if (string-match "^\\([^ ]+\\) :?" string) - (let* ((channel (match-string 1 string)) - (message (substring string (match-end 0))) - (channel-identity (riece-make-identity channel riece-server-name)) - (buffer (riece-channel-buffer channel-identity))) - (if remove - (riece-channel-set-topic (riece-get-channel channel) nil) - (riece-channel-set-topic (riece-get-channel channel) message) - (riece-insert-info buffer (concat "Topic: " message "\n")) - (riece-insert-info - (if (and riece-channel-buffer-mode - (not (eq buffer riece-channel-buffer))) - (list riece-dialogue-buffer riece-others-buffer) - riece-dialogue-buffer) - (concat - (riece-concat-server-name - (format "Topic for %s: %s" - (riece-format-identity channel-identity t) - message)) - "\n"))) - (riece-emit-signal 'channel-topic-changed - channel-identity - (unless remove - message))))) +(defun riece-handle-set-topic (_prefix _number _name decoded remove) + (let* ((parameters (riece-split-parameters (riece-decoded-string decoded))) + (channel (car parameters)) + topic + (channel-identity (riece-make-identity channel riece-server-name)) + (buffer (riece-channel-buffer channel-identity))) + (if remove + (riece-channel-set-topic (riece-get-channel channel) nil) + (setq parameters (riece-split-parameters + (riece-decoded-string-for-identity decoded + channel-identity)) + topic (nth 1 parameters)) + (riece-channel-set-topic (riece-get-channel channel) topic) + (riece-insert-info buffer (concat (riece-mcat "Topic: ") topic "\n")) + (riece-insert-info + (if (and riece-channel-buffer-mode + (not (eq buffer riece-channel-buffer))) + (list riece-dialogue-buffer riece-others-buffer) + riece-dialogue-buffer) + (concat + (riece-concat-server-name + (format (riece-mcat "Topic for %s: %s") + (riece-format-identity channel-identity t) + topic)) + "\n"))) + (riece-emit-signal 'channel-topic-changed channel-identity topic))) (defun riece-handle-331-message (prefix number name string) (riece-handle-set-topic prefix number name string t)) @@ -320,13 +340,13 @@ (defun riece-handle-332-message (prefix number name string) (riece-handle-set-topic prefix number name string nil)) -(defun riece-handle-341-message (prefix number name string) +(defun riece-handle-341-message (_prefix _number _name string) (if (string-match "^\\([^ ]+\\) " string) - (let* ((channel (match-string 1 string)) - (user (substring string (match-end 0))) + (let* ((channel (substring string (match-end 0))) + (user (match-string 1 string)) (channel-identity (riece-make-identity channel riece-server-name)) (buffer (riece-channel-buffer channel-identity))) - (riece-insert-info buffer (concat "Inviting " user "\n")) + (riece-insert-info buffer (format (riece-mcat "Inviting %s\n") user)) (riece-insert-info (if (and riece-channel-buffer-mode (not (eq buffer riece-channel-buffer))) @@ -334,11 +354,11 @@ riece-dialogue-buffer) (concat (riece-concat-server-name - (format "Inviting %s to %s" user + (format (riece-mcat "Inviting %s to %s") user (riece-format-identity channel-identity t))) "\n"))))) -(defun riece-handle-352-message (prefix number name string) +(defun riece-handle-352-message (_prefix _number _name string) (if (string-match "^\\([^ ]+\\) \\([^ ]+\\) \\([^ ]+\\) \\([^ ]+\\) \\([^ ]+\\) \\([HG]\\)\\(\\*\\)?\\([@+]\\)? :\\([0-9]+\\) " string) (let* ((channel (match-string 1 string)) (user (match-string 2 string)) @@ -403,25 +423,26 @@ info))) "\n"))))) -(defun riece-handle-315-message (prefix number name string)) -(defun riece-handle-318-message (prefix number name string)) -(defun riece-handle-323-message (prefix number name string)) +(defun riece-handle-315-message (_prefix _number _name _string)) +(defun riece-handle-318-message (_prefix _number _name _string)) +(defun riece-handle-323-message (_prefix _number _name _string)) -(defun riece-handle-366-message (prefix number name string) +(defun riece-handle-366-message (_prefix _number _name string) "RPL_ENDOFNAMES \" :End of NAMES list\"" (if (string-match "^\\([^ ]+\\) " string) (let* ((channel (match-string 1 string)) (channel-identity (riece-make-identity channel riece-server-name)) (buffer (riece-channel-buffer channel-identity)) - (entry (assoc channel riece-353-message-alist)) + (entry (riece-identity-assoc channel riece-353-message-alist t)) (string (cdr entry)) (start 0) users) (if entry - (setcdr entry nil)) + (setq riece-353-message-alist + (delq entry riece-353-message-alist))) (while (string-match - (concat "\\([@+]\\)?\\(" riece-user-regexp "\\) *") + (concat "\\([@+]\\)?\\([^ ]+\\) +") string start) (put-text-property (match-beginning 2) (match-end 2) 'riece-identity @@ -440,7 +461,8 @@ (riece-naming-assert-channel-users users channel) (riece-insert-info buffer - (concat (format "%d users: " (length users)) string "\n")) + (concat (format (riece-mcat "%d users: ") (length users)) string + "\n")) (riece-insert-info (if (and riece-channel-buffer-mode (not (eq buffer riece-channel-buffer))) @@ -448,7 +470,7 @@ riece-dialogue-buffer) (concat (riece-concat-server-name - (concat (format "%d users on %s: " + (concat (format (riece-mcat "%d users on %s: ") (length users) (riece-format-identity channel-identity t)) string))