X-Git-Url: https://cgit.sxemacs.org/?p=riece;a=blobdiff_plain;f=lisp%2Friece-handle.el;h=628d3563b5ee19be5bd22c52911420739c94b3ee;hp=0e35d5cf2fc537519819316750e9557e08f9a1eb;hb=705cc214cf5f7baec9df513df9ffe8ed70286303;hpb=9ada394901488b65006e6e17e19089942c6f0499 diff --git a/lisp/riece-handle.el b/lisp/riece-handle.el index 0e35d5c..628d356 100644 --- a/lisp/riece-handle.el +++ b/lisp/riece-handle.el @@ -28,7 +28,22 @@ (require 'riece-message) (require 'riece-channel) (require 'riece-naming) -(require 'riece-display) +(require 'riece-signal) +(require 'riece-mode) +(require 'riece-000) +(require 'riece-200) +(require 'riece-300) +(require 'riece-400) +(require 'riece-500) + +(defun riece-default-handle-numeric-reply + (client-prefix prefix number name string) + (riece-insert + (list riece-dialogue-buffer riece-others-buffer) + (concat client-prefix + (riece-concat-server-name + (mapconcat #'identity (riece-split-parameters string) " ")) + "\n"))) (defun riece-handle-nick-message (prefix string) (let* ((old (riece-prefix-nickname prefix)) @@ -44,11 +59,12 @@ (riece-naming-assert-rename old new) (if (riece-identity-member old-identity riece-current-channels) (setq channels (cons new channels))) - (riece-insert-change (mapcar - (lambda (channel) - (riece-channel-buffer (riece-make-identity - channel riece-server-name))) - channels) + (riece-insert-change (delq nil (mapcar + (lambda (channel) + (riece-channel-buffer + (riece-make-identity + channel riece-server-name))) + channels)) (format "%s -> %s\n" (riece-format-identity old-identity t) (riece-format-identity new-identity t))) @@ -60,8 +76,7 @@ (format "%s -> %s" (riece-format-identity old-identity t) (riece-format-identity new-identity t))) - "\n")) - (riece-redisplay-buffers))) + "\n")))) (defun riece-handle-privmsg-message (prefix string) (let* ((user (riece-prefix-nickname prefix)) @@ -73,7 +88,9 @@ riece-server-name) (riece-make-identity (car targets) riece-server-name) - message)))) + message nil + (riece-identity-equal-no-server + user riece-real-nickname))))) (defun riece-handle-notice-message (prefix string) (let* ((user (if prefix @@ -87,7 +104,9 @@ riece-server-name) (riece-make-identity (car targets) riece-server-name) - message 'notice)) + message 'notice + (riece-identity-equal-no-server + user riece-real-nickname))) ;; message from server (riece-insert-notice (list riece-dialogue-buffer riece-others-buffer) @@ -131,8 +150,7 @@ (riece-user-get-user-at-host user) (riece-format-identity channel-identity t))) "\n"))) - (setq channels (cdr channels))) - (riece-redisplay-buffers))) + (setq channels (cdr channels))))) (defun riece-handle-part-message (prefix string) (let* ((user (riece-prefix-nickname prefix)) @@ -169,8 +187,7 @@ (riece-format-identity channel-identity t)) message)) "\n"))) - (setq channels (cdr channels))) - (riece-redisplay-buffers))) + (setq channels (cdr channels))))) (defun riece-handle-kick-message (prefix string) (let* ((kicker (riece-prefix-nickname prefix)) @@ -206,8 +223,7 @@ (riece-format-identity user-identity t) (riece-format-identity channel-identity t)) message)) - "\n"))) - (riece-redisplay-buffers))) + "\n"))))) (defun riece-handle-quit-message (prefix string) (let* ((user (riece-prefix-nickname prefix)) @@ -224,11 +240,11 @@ (riece-naming-assert-part user (car pointer)) (setq pointer (cdr pointer))) (let ((buffers - (mapcar - (lambda (channel) - (riece-channel-buffer (riece-make-identity channel - riece-server-name))) - channels))) + (delq nil (mapcar + (lambda (channel) + (riece-channel-buffer (riece-make-identity + channel riece-server-name))) + channels)))) (riece-insert-change buffers (concat @@ -248,8 +264,7 @@ (format "%s has left IRC" (riece-format-identity user-identity t)) message)) - "\n")))) - (riece-redisplay-buffers)) + "\n"))))) (defun riece-handle-kill-message (prefix string) (let* ((killer (riece-prefix-nickname prefix)) @@ -268,11 +283,11 @@ (riece-naming-assert-part user (car pointer)) (setq pointer (cdr pointer))) (let ((buffers - (mapcar - (lambda (channel) - (riece-channel-buffer (riece-make-identity channel - riece-server-name))) - channels))) + (delq nil (mapcar + (lambda (channel) + (riece-channel-buffer (riece-make-identity + channel riece-server-name))) + channels)))) (riece-insert-change buffers (concat @@ -294,8 +309,7 @@ (riece-format-identity killer-identity t) (riece-format-identity user-identity t)) message)) - "\n"))) - (riece-redisplay-buffers))) + "\n"))))) (defun riece-handle-invite-message (prefix string) (let* ((user (riece-prefix-nickname prefix)) @@ -325,6 +339,8 @@ (user-identity (riece-make-identity user riece-server-name)) (channel-identity (riece-make-identity channel riece-server-name))) (riece-channel-set-topic (riece-get-channel channel) topic) + (riece-emit-signal 'channel-topic-changed + channel-identity topic) (let ((buffer (riece-channel-buffer channel-identity))) (riece-insert-change buffer @@ -342,47 +358,18 @@ (riece-format-identity channel-identity t) (riece-format-identity user-identity t) topic)) - "\n")) - (riece-redisplay-buffers)))) - -(defsubst riece-parse-channel-modes (string channel) - (while (string-match "^[-+]\\([^ ]*\\) *" string) - (let ((toggle (aref string 0)) - (modes (string-to-list (match-string 1 string)))) - (setq string (substring string (match-end 0))) - (while modes - (if (and (memq (car modes) '(?O ?o ?v ?k ?l ?b ?e ?I)) - (string-match "\\([^-+][^ ]*\\) *" string)) - (let ((parameter (match-string 1 string))) - (setq string (substring string (match-end 0))) - (cond - ((eq (car modes) ?o) - (riece-channel-toggle-operator channel parameter - (eq toggle ?+))) - ((eq (car modes) ?v) - (riece-channel-toggle-speaker channel parameter - (eq toggle ?+))) - ((eq (car modes) ?b) - (riece-channel-toggle-banned channel parameter - (eq toggle ?+))) - ((eq (car modes) ?e) - (riece-channel-toggle-uninvited channel parameter - (eq toggle ?+))) - ((eq (car modes) ?I) - (riece-channel-toggle-invited channel parameter - (eq toggle ?+))))) - (riece-channel-toggle-mode channel (car modes) - (eq toggle ?+))) - (setq modes (cdr modes)))))) + "\n"))))) (defun riece-handle-mode-message (prefix string) (let* ((user (riece-prefix-nickname prefix)) (user-identity (riece-make-identity user riece-server-name)) channel) - (when (string-match "\\([^ ]+\\) *:?" string) + (when (string-match "^\\([^ ]+\\) *:?" string) (setq channel (match-string 1 string) string (substring string (match-end 0))) - (riece-parse-channel-modes string channel) + (if (string-match (concat "^" riece-channel-regexp "$") channel) + (riece-naming-assert-channel-modes channel + (riece-parse-modes string))) (let* ((channel-identity (riece-make-identity channel riece-server-name)) (buffer (riece-channel-buffer channel-identity))) (riece-insert-change @@ -401,8 +388,7 @@ (riece-format-identity channel-identity t) (riece-format-identity user-identity t) string)) - "\n")) - (riece-redisplay-buffers))))) + "\n")))))) (provide 'riece-handle)