X-Git-Url: https://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Friece-300.el;h=d82f698410eb041618235e99ae5d3ef880a87572;hb=3b810c1c90fc6a707a23b4579452e5d5fd5747f5;hp=a44fa17ad71bb6f8c73df32a032b6378760c1c1a;hpb=58493f60ccd09128dfc78e6f88e980fc62907c6d;p=riece diff --git a/lisp/riece-300.el b/lisp/riece-300.el index a44fa17..d82f698 100644 --- a/lisp/riece-300.el +++ b/lisp/riece-300.el @@ -26,47 +26,53 @@ (require 'riece-misc) -(require 'riece-filter) ;riece-default-handle-message - (eval-when-compile - (autoload 'riece-default-handle-numeric-reply "riece-filter")) + (autoload 'riece-default-handle-numeric-reply "riece-handle")) (defun riece-handle-default-300-message (prefix number name string) (riece-default-handle-numeric-reply riece-info-prefix prefix number name string)) (defun riece-handle-302-message (prefix number name string) "RPL_USERHOST \":*1 *( \" \" )\"" - (let ((replies (split-string (substring string 1) " "))) + (let ((replies (split-string (if (eq (aref string 0) ?:) + (substring string 1) + string) + " "))) (while replies (if (string-match (concat "^\\(" riece-user-regexp "\\)\\(\\*\\)?=\\([-+]\\)\\([^ ]+\\)") (car replies)) (let ((user (match-string 1 (car replies))) + (operator (not (null (match-beginning 2)))) (away (eq (match-string 3 (car replies)) ?-)) (user-at-host (match-string 4 (car replies))) - (operator (not (null (match-beginning 2))))) + status) + (if away + (setq status (cons "away" status))) + (if operator + (setq status (cons "operator" status))) (riece-user-toggle-away user away) + (riece-emit-signal 'user-away-changed + (riece-make-identity user riece-server-name) + away) (riece-user-toggle-operator user operator) + (riece-emit-signal 'user-operator-changed + (riece-make-identity user riece-server-name) + operator) (riece-insert-info (list riece-dialogue-buffer riece-others-buffer) (concat (riece-concat-server-name - (format "%s is (%s) [%s, %s]" - (riece-format-identity - (riece-make-identity user riece-server-name) - t) - (riece-strip-user-at-host user-at-host) - (if operator - "operator" - "not operator") - (if away - "away" - "not away"))) + (riece-concat-user-status + status + (format "%s is (%s)" + (riece-format-identity + (riece-make-identity user riece-server-name) + t) + (riece-strip-user-at-host user-at-host)))) "\n")))) - (setq replies (cdr replies))) - (riece-update-status-indicators) - (force-mode-line-update t))) + (setq replies (cdr replies))))) (defun riece-handle-303-message (prefix number name string) (riece-insert-info @@ -79,15 +85,21 @@ (riece-format-identity (riece-make-identity user riece-server-name) t)) - (split-string (substring string 1) " ") + (split-string (if (eq (aref string 0) ?:) + (substring string 1) + string) + " ") ""))) "\n"))) (defun riece-handle-301-message (prefix number name string) - (if (string-match (concat "^\\(" riece-user-regexp "\\) :") string) + (if (string-match (concat "^\\(" riece-user-regexp "\\) :?") string) (let ((user (match-string 1 string)) (message (substring string (match-end 0)))) (riece-user-toggle-away user t) + (riece-emit-signal 'user-away-changed + (riece-make-identity user riece-server-name) + t) (riece-insert-info (list riece-dialogue-buffer riece-others-buffer) (concat @@ -97,24 +109,26 @@ (riece-make-identity user riece-server-name) t) message)) - "\n")))) - (riece-update-status-indicators) - (force-mode-line-update t)) + "\n"))))) (defun riece-handle-305-message (prefix number name string) (riece-user-toggle-away riece-real-nickname nil) - (riece-update-status-indicators) - (force-mode-line-update t)) + (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) (riece-user-toggle-away riece-real-nickname t) - (riece-update-status-indicators) - (force-mode-line-update 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) (if (string-match (concat "^\\(" riece-user-regexp - "\\) \\([^ ]+\\) \\([^ ]+\\) \\* :") + "\\) \\([^ ]+\\) \\([^ ]+\\) \\* :?") string) (let ((user (match-string 1 string)) (name (substring string (match-end 0))) @@ -134,14 +148,14 @@ (defun riece-handle-312-message (prefix number name string) (if (string-match - (concat "^\\(" riece-user-regexp "\\) \\([^ ]+\\) :") + (concat "^\\(" riece-user-regexp "\\) \\([^ ]+\\) :?") string) (riece-insert-info (list riece-dialogue-buffer riece-others-buffer) (concat (riece-concat-server-name (format "on via server %s: %s" - riece-real-server-name + (match-string 2 string) (substring string (match-end 0)))) "\n")))) @@ -160,23 +174,35 @@ (defun riece-handle-317-message (prefix number name string) (if (string-match - (concat "^\\(" riece-user-regexp "\\) \\([0-9]+\\) [^:]*:seconds") + (concat "^\\(" riece-user-regexp "\\) \\([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) "days") + (cons (mod (/ seconds 60 60) 24) "hours") + (cons (mod (/ seconds 60) 60) "minutes") + (cons (mod seconds 60) "seconds")))) (riece-insert-info (list riece-dialogue-buffer riece-others-buffer) (concat (riece-concat-server-name - (format "%s is %s seconds idle" + (format "%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) + (if (string-match (concat "^\\(" riece-user-regexp "\\) :?") string) (let ((user (match-string 1 string)) (channels (mapconcat @@ -204,7 +230,7 @@ "\n"))))) (defun riece-handle-351-message (prefix number name string) - (if (string-match "\\([^ ]+\\.[^ ]+\\) \\([^ ]+\\) :" string) + (if (string-match "\\([^ ]+\\.[^ ]+\\) \\([^ ]+\\) :?" string) (riece-insert-info (list riece-dialogue-buffer riece-others-buffer) (concat @@ -215,32 +241,23 @@ (substring string (match-end 0)))) "\n")))) +(defvar riece-353-message-alist nil) (defun riece-handle-353-message (prefix number name string) - "RPL_NAMREPLY \" :[[@|+] [[@|+] [...]]]\"." - (if (string-match "^[=\*@] *\\([^ ]+\\) +:" string) - (let ((channel (match-string 1 string)) - users) - (setq string (substring string (match-end 0))) - (if (string-match " *$" string) - (setq string (substring string 0 (match-beginning 0)))) - (setq users (split-string string)) - (while users - (if (eq (aref (car users) 0) ?@) - (progn - (riece-naming-assert-join (substring (car users) 1) channel) - (riece-channel-toggle-operator - channel (substring (car users) 1) t)) - (if (eq (aref (car users) 0) ?+) - (progn - (riece-naming-assert-join (substring (car users) 1) channel) - (riece-channel-toggle-speaker - channel (substring (car users) 1) t)) - (riece-naming-assert-join (car users) channel))) - (setq users (cdr users))) - (riece-redisplay-buffers)))) + "RPL_NAMREPLY \"[=\*@] :[[@|+] [[@|+] [...]]]\"." + (make-local-variable 'riece-353-message-alist) + (if (string-match "^[=\*@] *\\([^ ]+\\) +:?" string) + (let* ((channel (match-string 1 string)) + (entry (riece-identity-assoc channel riece-353-message-alist t))) + (if entry + (setcdr entry + (concat (cdr entry) + (substring string (match-end 0)))) + (setq riece-353-message-alist + (cons (cons channel (substring string (match-end 0))) + riece-353-message-alist)))))) (defun riece-handle-322-message (prefix number name string) - (if (string-match "^\\([^ ]+\\) \\([0-9]+\\) :" string) + (if (string-match "^\\([^ ]+\\) \\([0-9]+\\) :?" string) (let* ((channel (match-string 1 string)) (visible (match-string 2 string)) (topic (substring string (match-end 0)))) @@ -264,13 +281,9 @@ (defun riece-handle-324-message (prefix number name string) (if (string-match "^\\([^ ]+\\) \\([^ ]+\\) " string) (let* ((channel (match-string 1 string)) - (mode-string (substring string (match-beginning 2))) - (modes (string-to-list (match-string 2 string))) - (toggle (car modes))) - (setq modes (cdr modes)) - (while modes - (riece-channel-toggle-mode channel (car modes) (eq toggle ?+)) - (setq modes (cdr modes))) + (mode-string (match-string 2 string))) + (riece-naming-assert-channel-modes channel + (riece-parse-modes mode-string)) (let* ((channel-identity (riece-make-identity channel riece-server-name)) (buffer (riece-channel-buffer channel-identity))) @@ -285,12 +298,10 @@ (format "Mode for %s: %s" (riece-format-identity channel-identity t) mode-string)) - "\n"))) - (riece-update-channel-indicator) - (force-mode-line-update t)))) + "\n")))))) (defun riece-handle-set-topic (prefix number name string remove) - (if (string-match "^\\([^ ]+\\) :" string) + (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)) @@ -298,19 +309,22 @@ (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-update-channel-indicator))))) + (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-331-message (prefix number name string) (riece-handle-set-topic prefix number name string t)) @@ -350,7 +364,7 @@ (name (substring string (match-end 0))) (buffer (riece-channel-buffer (riece-make-identity channel riece-server-name))) - (info (format "%10s = %s (%s) [%s, %s, %s hops, on %s]" + (info (format "%10s = %s (%s)" (concat (if (memq flag '(?@ ?+)) (char-to-string flag) @@ -360,19 +374,30 @@ t)) name (riece-strip-user-at-host - (concat user "@" host)) - (if operator - "operator" - "not operator") - (if away - "away" - "not away") - hops - server))) + (concat user "@" host)))) + status) + (if operator + (setq status (cons "operator" status))) + (if away + (setq status (cons "away" status))) + (unless (equal hops "0") + (setq status (cons (concat "on " server) + (cons (concat hops " hops") + status)))) + (if status + (setq status (nreverse status))) (riece-naming-assert-join nick channel) (riece-user-toggle-away user away) + (riece-emit-signal 'user-away-changed + (riece-make-identity user riece-server-name) + away) (riece-user-toggle-operator user operator) - (riece-insert-info buffer (concat info "\n")) + (riece-emit-signal 'user-operator-changed + (riece-make-identity user riece-server-name) + operator) + (riece-insert-info buffer (concat (riece-concat-user-status + status info) + "\n")) (riece-insert-info (if (and riece-channel-buffer-mode (not (eq buffer riece-channel-buffer))) @@ -380,19 +405,67 @@ riece-dialogue-buffer) (concat (riece-concat-server-name - (concat - (riece-format-identity - (riece-make-identity channel riece-server-name) - t) - " " - info)) - "\n")) - (riece-redisplay-buffers)))) + (riece-concat-user-status + status + (concat + (riece-format-identity + (riece-make-identity channel riece-server-name) + t) + " " + 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-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 (riece-identity-assoc channel riece-353-message-alist t)) + (string (cdr entry)) + (start 0) + users) + (if entry + (setq riece-353-message-alist + (delq entry riece-353-message-alist))) + (while (string-match + (concat "\\([@+]\\)?\\(" riece-user-regexp "\\) *") + string start) + (put-text-property (match-beginning 2) (match-end 2) + 'riece-identity + (riece-make-identity (match-string 2 string) + riece-server-name) + string) + (setq start (match-end 0) + users (cons (if (match-beginning 1) + (if (eq (aref string (match-beginning 1)) ?@) + (list (match-string 2 string) ?o) + (if (eq (aref string (match-beginning 1)) ?+) + (list (match-string 2 string) ?v))) + (list (match-string 2 string))) + users))) + (setq users (nreverse users)) + (riece-naming-assert-channel-users users channel) + (riece-insert-info + buffer + (concat (format "%d users: " (length users)) string "\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 + (concat (format "%d users on %s: " + (length users) + (riece-format-identity channel-identity t)) + string)) + "\n"))))) (provide 'riece-300)