X-Git-Url: http://cgit.sxemacs.org/?p=riece;a=blobdiff_plain;f=lisp%2Friece-300.el;h=f52881beb62a902f5e396ab24da9377a62be6572;hp=771a41663c98c3cdb1f86f9c2f1cc2e1f424dced;hb=8ccc6545c3dc171176fd4f04779116ccd4ed1e82;hpb=fe7ce5e9a344721b1ecdd4d9ec1adce5dc908a49 diff --git a/lisp/riece-300.el b/lisp/riece-300.el index 771a416..f52881b 100644 --- a/lisp/riece-300.el +++ b/lisp/riece-300.el @@ -45,21 +45,29 @@ (concat "^\\(" riece-user-regexp "\\)\\(\\*\\)?=\\([-+]\\)\\([^ ]+\\)") (car replies)) - (riece-insert-info - (list riece-dialogue-buffer riece-others-buffer) - (concat - (riece-concat-server-name - (format "%s is (%s) [%s, %s]" - (match-string 1 (car replies)) - (riece-strip-user-at-host (match-string 4 (car replies))) - (if (match-beginning 2) - "operator" - "not operator") - (if (eq (match-string 3 (car replies)) ?-) - "away" - "not away"))) - "\n"))) - (setq replies (cdr replies))))) + (let ((user (match-string 1 (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 user-at-host) + (if operator + "operator" + "not operator") + (if away + "away" + "not away"))) + "\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 @@ -69,17 +77,30 @@ "\n"))) (defun riece-handle-301-message (prefix number name string) - (if (string-match - (concat "^\\(" riece-user-regexp "\\) :") - string) + (when (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" - (match-string 1 string) - (substring string (match-end 0)))) - "\n")))) + (format "%s is away: %s" user message)) + "\n"))) + (riece-update-status-indicators) + (force-mode-line-update t))) + +(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)) + +(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)) (defun riece-handle-311-message (prefix number name string) (if (string-match @@ -132,8 +153,6 @@ (match-string 2 string))) "\n")))) -(defun riece-handle-318-message (prefix number name string)) - (defun riece-handle-351-message (prefix number name string) (if (string-match "\\([^ ]+\\.[^ ]+\\) \\([^ ]+\\) :" string) (riece-insert-info @@ -146,8 +165,6 @@ (substring string (match-end 0)))) "\n")))) -(defun riece-handle-315-message (prefix number name string)) - (defun riece-handle-353-message (prefix number name string) "RPL_NAMREPLY \" :[[@|+] [[@|+] [...]]]\"." (if (string-match "^[=\*@] *\\([^ ]+\\) +:" string) @@ -172,18 +189,37 @@ (setq users (cdr users))) (riece-redisplay-buffers)))) -(defun riece-handle-366-message (prefix number name string)) +(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)))) + (let ((buffer (cdr (riece-identity-assoc + (riece-make-identity channel) + riece-channel-buffer-alist)))) + (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 users on %s, topic: %s" visible channel topic)) + "\n")))))) (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 (pop modes))) + (toggle (car modes))) + (setq modes (cdr modes)) (while modes (riece-channel-toggle-mode channel (car modes) (eq toggle ?+)) (setq modes (cdr modes))) - (let ((buffer (cdr (riece-identity-assoc-no-server + (let ((buffer (cdr (riece-identity-assoc (riece-make-identity channel) riece-channel-buffer-alist)))) (riece-insert-info buffer (concat "Mode: " mode-string "\n")) @@ -195,13 +231,15 @@ (concat (riece-concat-server-name (format "Mode for %s: %s" channel mode-string)) - "\n")))))) + "\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 + (buffer (cdr (riece-identity-assoc (riece-make-identity channel) riece-channel-buffer-alist)))) (if remove @@ -225,6 +263,94 @@ (defun riece-handle-332-message (prefix number name string) (riece-handle-set-topic prefix name 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 + (riece-make-identity channel) + riece-channel-buffer-alist)))) + (riece-insert-info buffer (concat "Inviting " user "\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 "Inviting %s to %s" user channel)) + "\n"))))) + +(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)) + (host (match-string 3 string)) + (server (match-string 4 string)) + (nick (match-string 5 string)) + (away (equal (match-string 6 string) "G")) + (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 + (riece-make-identity channel) + riece-channel-buffer-alist)))) + (riece-naming-assert-join nick channel) + (riece-user-toggle-away user away) + (riece-user-toggle-operator user operator) + (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-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 %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)) + "\n")) + (riece-redisplay-buffers)))) + +(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)) + (provide 'riece-300) ;;; riece-300.el ends here