X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Friece-handle.el;h=87a602a188697cfce2acfececb03ae0735fff70d;hb=c472294c502b9d325213a5d69adb3cb25ef1e839;hp=cf5e0be11bb56dff0ac8f0177f43fd02dd1899fd;hpb=f39b32b3f7d844d6ad9b16e542f5e286775b4e40;p=elisp%2Friece.git diff --git a/lisp/riece-handle.el b/lisp/riece-handle.el index cf5e0be..87a602a 100644 --- a/lisp/riece-handle.el +++ b/lisp/riece-handle.el @@ -19,8 +19,8 @@ ;; 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: @@ -78,26 +78,37 @@ (riece-format-identity new-identity t))) "\n")))) -(defun riece-handle-privmsg-message (prefix string) +(defun riece-handle-privmsg-message (prefix decoded) (let* ((user (riece-prefix-nickname prefix)) - (parameters (riece-split-parameters string)) + (parameters (riece-split-parameters (riece-decoded-string decoded))) (targets (split-string (car parameters) ",")) - (message (nth 1 parameters))) + message) + (setq parameters (riece-split-parameters + (riece-decoded-string-for-identity + decoded + (riece-make-identity (car targets) riece-server-name))) + message (nth 1 parameters)) (riece-display-message (riece-make-message (riece-make-identity user riece-server-name) (riece-make-identity (car targets) riece-server-name) - message nil + message + nil (riece-identity-equal-no-server user riece-real-nickname))))) -(defun riece-handle-notice-message (prefix string) +(defun riece-handle-notice-message (prefix decoded) (let* ((user (if prefix (riece-prefix-nickname prefix))) - (parameters (riece-split-parameters string)) + (parameters (riece-split-parameters (riece-decoded-string decoded))) (targets (split-string (car parameters) ",")) - (message (nth 1 parameters))) + message) + (setq parameters (riece-split-parameters + (riece-decoded-string-for-identity + decoded + (riece-make-identity (car targets) riece-server-name))) + message (nth 1 parameters)) (if user (riece-display-message (riece-make-message (riece-make-identity user @@ -134,7 +145,7 @@ (buffer (riece-channel-buffer channel-identity))) (riece-insert-change buffer - (format "%s (%s) has joined %s\n" + (format (riece-mcat "%s (%s) has joined %s\n") (riece-format-identity user-identity t) (riece-user-get-user-at-host user) (riece-format-identity channel-identity t))) @@ -145,30 +156,34 @@ riece-dialogue-buffer) (concat (riece-concat-server-name - (format "%s (%s) has joined %s" + (format (riece-mcat "%s (%s) has joined %s") (riece-format-identity user-identity t) (riece-user-get-user-at-host user) (riece-format-identity channel-identity t))) "\n"))) (setq channels (cdr channels))))) -(defun riece-handle-part-message (prefix string) +(defun riece-handle-part-message (prefix decoded) (let* ((user (riece-prefix-nickname prefix)) - (parameters (riece-split-parameters string)) + (parameters (riece-split-parameters (riece-decoded-string decoded))) ;; RFC2812 3.2.2 doesn't recommend server to send part ;; messages which contain multiple targets. (channels (split-string (car parameters) ",")) - (message (nth 1 parameters)) (user-identity (riece-make-identity user riece-server-name))) (while channels (let* ((channel-identity (riece-make-identity (car channels) riece-server-name)) - (buffer (riece-channel-buffer channel-identity))) + (buffer (riece-channel-buffer channel-identity)) + message) + (setq parameters (riece-split-parameters + (riece-decoded-string-for-identity decoded + channel-identity)) + message (nth 1 parameters)) (riece-insert-change buffer (concat (riece-concat-message - (format "%s has left %s" + (format (riece-mcat "%s has left %s") (riece-format-identity user-identity t) (riece-format-identity channel-identity t)) message) @@ -181,7 +196,7 @@ (concat (riece-concat-server-name (riece-concat-message - (format "%s has left %s" + (format (riece-mcat "%s has left %s") (riece-format-identity user-identity t) (riece-format-identity channel-identity t)) message)) @@ -189,22 +204,26 @@ (riece-naming-assert-part user (car channels)) (setq channels (cdr channels))))) -(defun riece-handle-kick-message (prefix string) +(defun riece-handle-kick-message (prefix decoded) (let* ((kicker (riece-prefix-nickname prefix)) - (parameters (riece-split-parameters string)) + (parameters (riece-split-parameters (riece-decoded-string decoded))) (channel (car parameters)) (user (nth 1 parameters)) - (message (nth 2 parameters)) + message (kicker-identity (riece-make-identity kicker riece-server-name)) (channel-identity (riece-make-identity channel riece-server-name)) (user-identity (riece-make-identity user riece-server-name))) + (setq parameters (riece-split-parameters + (riece-decoded-string-for-identity decoded + channel-identity)) + message (nth 2 parameters)) (riece-naming-assert-part user channel) (let ((buffer (riece-channel-buffer channel-identity))) (riece-insert-change buffer (concat (riece-concat-message - (format "%s kicked %s out from %s" + (format (riece-mcat "%s kicked %s out from %s") (riece-format-identity kicker-identity t) (riece-format-identity user-identity t) (riece-format-identity channel-identity t)) @@ -218,7 +237,7 @@ (concat (riece-concat-server-name (riece-concat-message - (format "%s kicked %s out from %s\n" + (format (riece-mcat "%s kicked %s out from %s\n") (riece-format-identity kicker-identity t) (riece-format-identity user-identity t) (riece-format-identity channel-identity t)) @@ -249,7 +268,7 @@ buffers (concat (riece-concat-message - (format "%s has left IRC" + (format (riece-mcat "%s has left IRC") (riece-format-identity user-identity t)) message) "\n")) @@ -261,7 +280,7 @@ (concat (riece-concat-server-name (riece-concat-message - (format "%s has left IRC" + (format (riece-mcat "%s has left IRC") (riece-format-identity user-identity t)) message)) "\n"))))) @@ -292,7 +311,7 @@ buffers (concat (riece-concat-message - (format "%s killed %s" + (format (riece-mcat "%s killed %s") (riece-format-identity killer-identity t) (riece-format-identity user-identity t)) message) @@ -305,7 +324,7 @@ (concat (riece-concat-server-name (riece-concat-message - (format "%s killed %s" + (format (riece-mcat "%s killed %s") (riece-format-identity killer-identity t) (riece-format-identity user-identity t)) message)) @@ -323,7 +342,7 @@ (list riece-dialogue-buffer riece-others-buffer) (concat (riece-concat-server-name - (format "%s invites %s to %s" + (format (riece-mcat "%s invites %s to %s") (riece-format-identity (riece-make-identity user riece-server-name)) (riece-format-identity (riece-make-identity @@ -331,20 +350,24 @@ (riece-format-identity channel-identity))) "\n")))) -(defun riece-handle-topic-message (prefix string) +(defun riece-handle-topic-message (prefix decoded) (let* ((user (riece-prefix-nickname prefix)) - (parameters (riece-split-parameters string)) + (parameters (riece-split-parameters (riece-decoded-string decoded))) (channel (car parameters)) - (topic (nth 1 parameters)) + topic (user-identity (riece-make-identity user riece-server-name)) (channel-identity (riece-make-identity channel riece-server-name))) + (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-emit-signal 'channel-topic-changed channel-identity topic) (let ((buffer (riece-channel-buffer channel-identity))) (riece-insert-change buffer - (format "Topic by %s: %s\n" + (format (riece-mcat "Topic by %s: %s\n") (riece-format-identity user-identity t) topic)) (riece-insert-change @@ -354,7 +377,7 @@ riece-dialogue-buffer) (concat (riece-concat-server-name - (format "Topic on %s by %s: %s" + (format (riece-mcat "Topic on %s by %s: %s") (riece-format-identity channel-identity t) (riece-format-identity user-identity t) topic)) @@ -374,7 +397,7 @@ (buffer (riece-channel-buffer channel-identity))) (riece-insert-change buffer - (format "Mode by %s: %s\n" + (format (riece-mcat "Mode by %s: %s\n") (riece-format-identity user-identity t) string)) (riece-insert-change @@ -384,7 +407,7 @@ riece-dialogue-buffer) (concat (riece-concat-server-name - (format "Mode on %s by %s: %s" + (format (riece-mcat "Mode on %s by %s: %s") (riece-format-identity channel-identity t) (riece-format-identity user-identity t) string))