X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Friece-handle.el;h=e3cc584634e84340d87cd2c53b4b6c574341b0ab;hb=37d9f1ffeb6772fb036af3c40278a0c53a5a77ae;hp=628d3563b5ee19be5bd22c52911420739c94b3ee;hpb=a05e277e70030250d4d10076002417613fcd7820;p=elisp%2Friece.git

diff --git a/lisp/riece-handle.el b/lisp/riece-handle.el
index 628d356..e3cc584 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
@@ -152,19 +163,22 @@
 	  "\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
-      (riece-naming-assert-part user (car 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
@@ -187,17 +201,22 @@
 		    (riece-format-identity channel-identity t))
 	    message))
 	  "\n")))
+      (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
@@ -234,7 +253,7 @@
 	 (user-identity (riece-make-identity user riece-server-name)))
     ;; If you are talking with the user, quit it.
     (if (riece-identity-member user-identity riece-current-channels)
-	(riece-part-channel user))
+	(riece-part-channel user-identity))
     (setq pointer channels)
     (while pointer
       (riece-naming-assert-part user (car pointer))
@@ -331,13 +350,17 @@
 	       (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)