X-Git-Url: https://cgit.sxemacs.org/?p=riece;a=blobdiff_plain;f=lisp%2Friece-300.el;h=499a98f3cf4078fbcac86d82ddb6a07828944d3a;hp=77ed5cb91e234be47d62b15f2700e9c0601fe97b;hb=005a2a7642c9f43d699922799801124a77d56f5d;hpb=440c3c0605c1419ee3a43cdd2febfdc68302b480 diff --git a/lisp/riece-300.el b/lisp/riece-300.el index 77ed5cb..499a98f 100644 --- a/lisp/riece-300.el +++ b/lisp/riece-300.el @@ -24,8 +24,6 @@ ;;; Code: -(eval-when-compile (require 'riece-inlines)) - (require 'riece-misc) (require 'riece-commands) @@ -46,55 +44,72 @@ "\\)\\(\\*\\)?=\\([-+]\\)\\([^ ]+\\)") (car replies)) (let ((user (match-string 1 (car replies))) - (away (eq (match-string 3 (car replies)) ?-))) + (away (eq (match-string 3 (car replies)) ?-)) + (user-at-host (match-string 4 (car replies))) + (operator (not (null (match-beginning 2))))) + (riece-user-toggle-away user away) + (riece-user-toggle-operator user operator) (riece-insert-info (list riece-dialogue-buffer riece-others-buffer) (concat (riece-concat-server-name (format "%s is (%s) [%s, %s]" - user - (riece-strip-user-at-host - (match-string 4 (car replies))) - (if (match-beginning 2) + (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"))) - "\n")) - (riece-user-set-away (riece-get-user user) away))) - (setq replies (cdr replies))))) + "\n")))) + (setq replies (cdr replies))) + (riece-update-status-indicators) + (force-mode-line-update t))) (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: " (substring string 1))) + (riece-concat-server-name + (concat "Online: " + (mapconcat + (lambda (user) + (riece-format-identity + (riece-make-identity user riece-server-name) + t)) + (split-string (substring string 1) " ") + ""))) "\n"))) (defun riece-handle-301-message (prefix number name string) - (when (string-match - (concat "^\\(" riece-user-regexp "\\) :") - string) - (let ((user (match-string 1 string))) - (riece-user-set-away (riece-get-user user) t) - (riece-insert-info - (list riece-dialogue-buffer riece-others-buffer) - (concat - (riece-concat-server-name - (format "%s is away: %s" - user - (substring string (match-end 0)))) - "\n"))))) + (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-insert-info + (list riece-dialogue-buffer riece-others-buffer) + (concat + (riece-concat-server-name + (format "%s is away: %s" + (riece-format-identity + (riece-make-identity user riece-server-name) + t) + message)) + "\n")))) + (riece-update-status-indicators) + (force-mode-line-update t)) (defun riece-handle-305-message (prefix number name string) - (riece-user-set-away (riece-get-user riece-real-nickname) nil) - (setq riece-away-indicator "-") + (riece-user-toggle-away riece-real-nickname nil) + (riece-update-status-indicators) (force-mode-line-update t)) (defun riece-handle-306-message (prefix number name string) - (riece-user-set-away (riece-get-user riece-real-nickname) t) - (setq riece-away-indicator "A") + (riece-user-toggle-away riece-real-nickname t) + (riece-update-status-indicators) (force-mode-line-update t)) (defun riece-handle-311-message (prefix number name string) @@ -102,16 +117,21 @@ (concat "^\\(" riece-user-regexp "\\) \\([^ ]+\\) \\([^ ]+\\) \\* :") string) - (riece-insert-info - (list riece-dialogue-buffer riece-others-buffer) - (concat - (riece-concat-server-name - (format "%s is %s (%s@%s)" - (match-string 1 string) - (substring string (match-end 0)) - (match-string 2 string) - (match-string 3 string))) - "\n")))) + (let ((user (match-string 1 string)) + (name (substring string (match-end 0))) + (user-at-host (concat (match-string 2 string) "@" + (match-string 3 string)))) + (riece-insert-info + (list riece-dialogue-buffer riece-others-buffer) + (concat + (riece-concat-server-name + (format "%s is %s (%s)" + (riece-format-identity + (riece-make-identity user riece-server-name) + t) + name + user-at-host)) + "\n"))))) (defun riece-handle-312-message (prefix number name string) (if (string-match @@ -128,25 +148,33 @@ (defun riece-handle-313-message (prefix number name string) (if (string-match (concat "^" riece-user-regexp) string) - (riece-insert-info - (list riece-dialogue-buffer riece-others-buffer) - (concat - (riece-concat-server-name - (concat (match-string 0 string) " is an IRC operator")) - "\n")))) + (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 + (riece-make-identity user riece-server-name) + t) + " is an IRC operator")) + "\n"))))) (defun riece-handle-317-message (prefix number name string) (if (string-match (concat "^\\(" riece-user-regexp "\\) \\([0-9]+\\) :") string) - (riece-insert-info - (list riece-dialogue-buffer riece-others-buffer) - (concat - (riece-concat-server-name - (format "%s is %s seconds idle" - (match-string 1 string) - (match-string 2 string))) - "\n")))) + (let ((user (match-string 1 string)) + (idle (match-string 2 string))) + (riece-insert-info + (list riece-dialogue-buffer riece-others-buffer) + (concat + (riece-concat-server-name + (format "%s is %s seconds idle" + (riece-format-identity + (riece-make-identity user riece-server-name) + t) + idle)) + "\n"))))) (defun riece-handle-351-message (prefix number name string) (if (string-match "\\([^ ]+\\.[^ ]+\\) \\([^ ]+\\) :" string) @@ -189,9 +217,10 @@ (let* ((channel (match-string 1 string)) (visible (match-string 2 string)) (topic (substring string (match-end 0)))) - (let ((buffer (cdr (riece-identity-assoc-no-server - (riece-make-identity channel) - riece-channel-buffer-alist)))) + (riece-channel-set-topic (riece-get-channel channel) topic) + (let* ((channel-identity (riece-make-identity channel + riece-server-name)) + (buffer (riece-channel-buffer-name channel-identity))) (riece-insert-info buffer (concat visible " users, topic: " topic "\n")) (riece-insert-info @@ -201,7 +230,8 @@ riece-dialogue-buffer) (concat (riece-concat-server-name - (format "%s users on %s, topic: %s" visible channel topic)) + (format "%s users on %s, topic: %s" visible + (riece-format-identity channel-identity t) topic)) "\n")))))) (defun riece-handle-324-message (prefix number name string) @@ -214,9 +244,9 @@ (while modes (riece-channel-toggle-mode channel (car modes) (eq toggle ?+)) (setq modes (cdr modes))) - (let ((buffer (cdr (riece-identity-assoc-no-server - (riece-make-identity channel) - riece-channel-buffer-alist)))) + (let* ((channel-identity (riece-make-identity channel + riece-server-name)) + (buffer (riece-channel-buffer-name channel-identity))) (riece-insert-info buffer (concat "Mode: " mode-string "\n")) (riece-insert-info (if (and riece-channel-buffer-mode @@ -225,16 +255,19 @@ riece-dialogue-buffer) (concat (riece-concat-server-name - (format "Mode for %s: %s" channel mode-string)) - "\n")))))) + (format "Mode for %s: %s" + (riece-format-identity channel-identity t) + mode-string)) + "\n"))) + (riece-update-channel-indicator) + (force-mode-line-update t)))) (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))) - (buffer (cdr (riece-identity-assoc-no-server - (riece-make-identity channel) - riece-channel-buffer-alist)))) + (channel-identity (riece-make-identity channel riece-server-name)) + (buffer (riece-channel-buffer-name channel-identity))) (if remove (riece-channel-set-topic (riece-get-channel channel) nil) (riece-channel-set-topic (riece-get-channel channel) message) @@ -246,23 +279,24 @@ riece-dialogue-buffer) (concat (riece-concat-server-name - (format "Topic for %s: %s" channel message)) + (format "Topic for %s: %s" + (riece-format-identity channel-identity t) + message)) "\n")) (riece-update-channel-indicator))))) (defun riece-handle-331-message (prefix number name string) - (riece-handle-set-topic prefix name name string t)) + (riece-handle-set-topic prefix number name string t)) (defun riece-handle-332-message (prefix number name string) - (riece-handle-set-topic prefix name name string nil)) + (riece-handle-set-topic prefix number name string nil)) (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))) - (buffer (cdr (riece-identity-assoc-no-server - (riece-make-identity channel) - riece-channel-buffer-alist)))) + (channel-identity (riece-make-identity channel riece-server-name)) + (buffer (riece-channel-buffer-name channel-identity))) (riece-insert-info buffer (concat "Inviting " user "\n")) (riece-insert-info (if (and riece-channel-buffer-mode @@ -271,7 +305,8 @@ riece-dialogue-buffer) (concat (riece-concat-server-name - (format "Inviting %s to %s" user channel)) + (format "Inviting %s to %s" user + (riece-format-identity channel-identity t))) "\n"))))) (defun riece-handle-352-message (prefix number name string) @@ -282,34 +317,35 @@ (server (match-string 4 string)) (nick (match-string 5 string)) (away (equal (match-string 6 string) "G")) - (operator (match-string 7 string)) + (operator (not (null (match-beginning 7)))) (flag (match-string 8 string)) (hops (match-string 9 string)) (name (substring string (match-end 0))) - (buffer (cdr (riece-identity-assoc-no-server - (riece-make-identity channel) - riece-channel-buffer-alist)))) + (buffer (riece-channel-buffer-name + (riece-make-identity channel riece-server-name))) + (info (format "%10s = %s (%s) [%s, %s, %s hops, on %s]" + (concat + (if (memq flag '(?@ ?+)) + (char-to-string flag) + " ") + (riece-format-identity + (riece-make-identity nick riece-server-name) + t)) + name + (riece-strip-user-at-host + (concat user "@" host)) + (if operator + "operator" + "not operator") + (if away + "away" + "not away") + hops + server))) (riece-naming-assert-join nick channel) - (riece-user-set-away (riece-get-user user) away) - (riece-insert-info - buffer - (format "%10s = %s (%s) [%s, %s, %s hops, on %s]\n" - (concat - (if (memq flag '(?@ ?+)) - (char-to-string flag) - " ") - nick) - name - (riece-strip-user-at-host - (concat user "@" host)) - (if operator - "operator" - "not operator") - (if away - "away" - "not away") - hops - server)) + (riece-user-toggle-away user away) + (riece-user-toggle-operator user operator) + (riece-insert-info buffer (concat info "\n")) (riece-insert-info (if (and riece-channel-buffer-mode (not (eq buffer riece-channel-buffer))) @@ -317,24 +353,12 @@ riece-dialogue-buffer) (concat (riece-concat-server-name - (format "%s %10s = %s (%s) [%s, %s, %s hops, on %s]\n" - channel - (concat - (if (memq flag '(?@ ?+)) - (char-to-string flag) - " ") - nick) - name - (riece-strip-user-at-host - (concat user "@" host)) - (if operator - "operator" - "not operator") - (if away - "away" - "not away") - hops - server)) + (concat + (riece-format-identity + (riece-make-identity channel riece-server-name) + t) + " " + info)) "\n")) (riece-redisplay-buffers))))