X-Git-Url: http://cgit.sxemacs.org/?p=riece;a=blobdiff_plain;f=lisp%2Friece-handle.el;h=fe1440ac2561128370778ca8b18f82a62e9c3137;hp=e3cc584634e84340d87cd2c53b4b6c574341b0ab;hb=5fd4264d143d5a307c65fe07ff2030d9175ed821;hpb=41f70b5a0e3fdc63c54bb5ce34c024b0d4d625d5

diff --git a/lisp/riece-handle.el b/lisp/riece-handle.el
index e3cc584..fe1440a 100644
--- a/lisp/riece-handle.el
+++ b/lisp/riece-handle.el
@@ -1,4 +1,4 @@
-;;; riece-handle.el --- basic message handlers
+;;; riece-handle.el --- basic message handlers -*- lexical-binding: t -*-
 ;; Copyright (C) 1998-2003 Daiki Ueno
 
 ;; Author: Daiki Ueno <ueno@unixuser.org>
@@ -37,7 +37,7 @@
 (require 'riece-500)
 
 (defun riece-default-handle-numeric-reply
-  (client-prefix prefix number name string)
+  (client-prefix _prefix _number _name string)
   (riece-insert
    (list riece-dialogue-buffer riece-others-buffer)
    (concat client-prefix
@@ -116,14 +116,15 @@
 			     (riece-make-identity (car targets)
 						  riece-server-name)
 			     message 'notice
-			     (riece-identity-equal-no-server
-			      user riece-real-nickname)))
+			     (if riece-real-nickname
+				 (riece-identity-equal-no-server
+				  user riece-real-nickname))))
       ;; message from server
       (riece-insert-notice
        (list riece-dialogue-buffer riece-others-buffer)
        (concat (riece-concat-server-name message) "\n")))))
 
-(defun riece-handle-ping-message (prefix string)
+(defun riece-handle-ping-message (_prefix string)
   (riece-send-string (format "PONG :%s\r\n"
 			     (if (eq (aref string 0) ?:)
 				 (substring string 1)
@@ -140,27 +141,30 @@
       (if (and riece-gather-channel-modes
 	       (riece-identity-equal-no-server user riece-real-nickname))
 	  (riece-send-string (format "MODE %s\r\n" (car channels))))
-      (let* ((channel-identity (riece-make-identity (car channels)
-						    riece-server-name))
-	     (buffer (riece-channel-buffer channel-identity)))
-	(riece-insert-change
-	 buffer
-	 (format "%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)))
-	(riece-insert-change
-	 (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 (%s) has joined %s"
+      (unless (and (memq 'joins riece-hide-list)
+		   (not (riece-identity-equal-no-server
+			 user riece-real-nickname)))
+	(let* ((channel-identity (riece-make-identity (car channels)
+						      riece-server-name))
+	       (buffer (riece-channel-buffer channel-identity)))
+	  (riece-insert-change
+	   buffer
+	   (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)))
-	  "\n")))
+	  (riece-insert-change
+	   (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 (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 decoded)
@@ -171,36 +175,39 @@
 	 (channels (split-string (car 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))
+      (unless (and (memq 'parts riece-hide-list)
+		   (not (riece-identity-equal-no-server
+			 user riece-real-nickname)))
+	(let* ((channel-identity (riece-make-identity (car channels)
+						      riece-server-name))
+	       (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 (riece-mcat "%s has left %s")
+		     (riece-format-identity user-identity t)
+		     (riece-format-identity channel-identity t))
 	     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"
-		   (riece-format-identity user-identity t)
-		   (riece-format-identity channel-identity t))
-	   message)
-	  "\n"))
-	(riece-insert-change
-	 (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
-	   (riece-concat-message
-	    (format "%s has left %s"
-		    (riece-format-identity user-identity t)
-		    (riece-format-identity channel-identity t))
-	    message))
-	  "\n")))
+	    "\n"))
+	  (riece-insert-change
+	   (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
+	     (riece-concat-message
+	      (format (riece-mcat "%s has left %s")
+		      (riece-format-identity user-identity t)
+		      (riece-format-identity channel-identity t))
+	      message))
+	    "\n"))))
       (riece-naming-assert-part user (car channels))
       (setq channels (cdr channels)))))
 
@@ -223,7 +230,7 @@
        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))
@@ -237,7 +244,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))
@@ -258,32 +265,35 @@
     (while pointer
       (riece-naming-assert-part user (car pointer))
       (setq pointer (cdr pointer)))
-    (let ((buffers
-	   (delq nil (mapcar
-		      (lambda (channel)
-			(riece-channel-buffer (riece-make-identity
-					       channel riece-server-name)))
-		      channels))))
-      (riece-insert-change
-       buffers
-       (concat
-	(riece-concat-message
-	 (format "%s has left IRC"
-		 (riece-format-identity user-identity t))
-	 message)
-	"\n"))
-      (riece-insert-change
-       (if (and riece-channel-buffer-mode
-		(not (memq riece-channel-buffer buffers)))
-	   (list riece-dialogue-buffer riece-others-buffer)
-	 riece-dialogue-buffer)
-       (concat
-	(riece-concat-server-name
-	 (riece-concat-message
-	  (format "%s has left IRC"
-		  (riece-format-identity user-identity t))
-	  message))
-	"\n")))))
+    (unless (and (memq 'quits riece-hide-list)
+		 (not (riece-identity-equal-no-server
+		       user riece-real-nickname)))
+      (let ((buffers
+	     (delq nil (mapcar
+			(lambda (channel)
+			  (riece-channel-buffer (riece-make-identity
+						 channel riece-server-name)))
+			channels))))
+	(riece-insert-change
+	 buffers
+	 (concat
+	  (riece-concat-message
+	   (format (riece-mcat "%s has left IRC")
+		   (riece-format-identity user-identity t))
+	   message)
+	  "\n"))
+	(riece-insert-change
+	 (if (and riece-channel-buffer-mode
+		  (not (memq riece-channel-buffer buffers)))
+	     (list riece-dialogue-buffer riece-others-buffer)
+	   riece-dialogue-buffer)
+	 (concat
+	  (riece-concat-server-name
+	   (riece-concat-message
+	    (format (riece-mcat "%s has left IRC")
+		    (riece-format-identity user-identity t))
+	    message))
+	  "\n"))))))
 
 (defun riece-handle-kill-message (prefix string)
   (let* ((killer (riece-prefix-nickname prefix))
@@ -311,7 +321,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)
@@ -324,7 +334,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))
@@ -342,7 +352,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
@@ -367,7 +377,7 @@
     (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
@@ -377,7 +387,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))
@@ -397,7 +407,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
@@ -407,7 +417,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))