Make it possible to suppress join/part/quit messages.

        * lisp/riece-options.el (riece-hide-joins-parts-quits): New user
        variable to control suppression of join/part/quit messages.

        * lisp/riece-handle.el (riece-handle-join-message): Use it.
        (riece-handle-part-message): Use it.
        (riece-handle-quit-message): Use it.

        * lisp/ChangeLog: Update.

Signed-off-by: Steve Youngs <steve@sxemacs.org>

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7cf5276..de00866 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2014-04-01  Steve Youngs  <steve@sxemacs.org>
+
+       * riece-options.el (riece-hide-joins-parts-quits): New user
+       variable to control suppression of join/part/quit messages.
+
+       * riece-handle.el (riece-handle-join-message): Use it.
+       (riece-handle-part-message): Use it.
+       (riece-handle-quit-message): Use it.
+
 2013-06-26  Daiki Ueno  <ueno@unixuser.org>
 
        * riece-log.el (riece-log-display-message-function): Use the same

diff --git a/lisp/riece-handle.el b/lisp/riece-handle.el
index f2cbf06..cb1e2d3 100644 (file)
--- a/lisp/riece-handle.el
+++ b/lisp/riece-handle.el
@@ -141,69 +141,71 @@
       (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 (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)))
-       (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")
+      (unless (memq 'joins riece-hide-joins-parts-quits)
+       (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)
-  (let* ((user (riece-prefix-nickname prefix))
-        (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) ","))
-        (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 (memq 'parts riece-hide-joins-parts-quits)
+    (let* ((user (riece-prefix-nickname prefix))
+          (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) ","))
+          (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))
+              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 (riece-mcat "%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 (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)))))
+           "\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))))))
 
 (defun riece-handle-kick-message (prefix decoded)
   (let* ((kicker (riece-prefix-nickname prefix))
@@ -259,32 +261,33 @@
     (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 (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")))))
+    (unless (memq 'quits riece-hide-joins-parts-quits)
+      (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))

diff --git a/lisp/riece-options.el b/lisp/riece-options.el
index c886a1c..b6e41a8 100644 (file)
--- a/lisp/riece-options.el
+++ b/lisp/riece-options.el
@@ -364,6 +364,16 @@ specifying the coding systems for decoding and encoding respectively."
   :type 'function
   :group 'riece-options)
 
+(defcustom riece-hide-joins-parts-quits '()
+  "Whether to hide join/part/quit messages.
+
+This should be a list of up to 3 symbols, namely: `joins', `parts',
+`quits'."
+  :type '(set (symbol :tag "Hide Joins" joins)
+             (symbol :tag "Hide Parts" parts)
+             (symbol :tag "Hide Quits" quits))
+  :group 'riece-options)
+
 (provide 'riece-options)
 
 ;;; riece-options.el ends here