Merge strict-naming branch.

[riece] / lisp / riece-ctcp.el

diff --git a/lisp/riece-ctcp.el b/lisp/riece-ctcp.el
index d86eb42..78a4dae 100644 (file)
--- a/lisp/riece-ctcp.el
+++ b/lisp/riece-ctcp.el
@@ -28,6 +28,7 @@
 (require 'riece-misc)
 
 (defvar riece-ctcp-ping-time nil)
+(defvar riece-ctcp-additional-clientinfo nil)
 
 (defvar riece-dialogue-mode-map)
 
@@ -36,7 +37,8 @@
   (add-hook 'riece-notice-hook 'riece-handle-ctcp-response)
   (define-key riece-dialogue-mode-map "\C-cv" 'riece-command-ctcp-version)
   (define-key riece-dialogue-mode-map "\C-cp" 'riece-command-ctcp-ping)
-  (define-key riece-dialogue-mode-map "\C-ca" 'riece-command-ctcp-action))
+  (define-key riece-dialogue-mode-map "\C-ca" 'riece-command-ctcp-action)
+  (define-key riece-dialogue-mode-map "\C-cc" 'riece-command-ctcp-clientinfo))
 
 (defun riece-handle-ctcp-request (prefix string)
   (when (and prefix string
@@ -81,9 +83,8 @@
 
 (defun riece-handle-ctcp-version-request (prefix target string)
   (let ((buffer (if (riece-channel-p target)
-                   (cdr (riece-identity-assoc-no-server
-                         (riece-make-identity target)
-                         riece-channel-buffer-alist))))
+                   (riece-channel-buffer-name
+                    (riece-make-identity target riece-server-name))))
        (user (riece-prefix-nickname prefix)))
     (riece-send-string
      (format "NOTICE %s :\1VERSION %s\1\r\n" user (riece-extended-version)))
@@ -103,9 +104,8 @@
 
 (defun riece-handle-ctcp-ping-request (prefix target string)
   (let ((buffer (if (riece-channel-p target)
-                   (cdr (riece-identity-assoc-no-server
-                         (riece-make-identity target)
-                         riece-channel-buffer-alist))))
+                   (riece-channel-buffer-name
+                    (riece-make-identity target riece-server-name))))
        (user (riece-prefix-nickname prefix)))
     (riece-send-string
      (if string
@@ -125,11 +125,46 @@
               target))
       "\n"))))
 
+(defun riece-handle-ctcp-clientinfo-request (prefix target string)
+  (let ((buffer (if (riece-channel-p target)
+                   (riece-channel-buffer-name
+                    (riece-make-identity target riece-server-name))))
+       (user (riece-prefix-nickname prefix)))
+    (riece-send-string
+     (format "NOTICE %s :\1CLIENTINFO %s\1\r\n"
+            user
+            (let (messages)
+              (mapatoms
+               (lambda (atom)
+                 (let ((case-fold-search t))
+                   (if (and (fboundp atom)
+                            (string-match
+                             "riece-handle-ctcp-\\(.+\\)-request"
+                             (symbol-name atom)))
+                       (setq messages
+                             (cons (match-string 1 (symbol-name atom))
+                                   messages))))))
+              (mapconcat #'upcase (append messages
+                                          riece-ctcp-additional-clientinfo)
+                         " "))))
+    (riece-insert-change buffer (format "CTCP CLIENTINFO from %s\n" user))
+    (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 "CTCP CLIENTINFO from %s (%s) to %s"
+              user
+              (riece-strip-user-at-host (riece-prefix-user-at-host prefix))
+              target))
+      "\n"))))
+
 (defun riece-handle-ctcp-action-request (prefix target string)
   (let ((buffer (if (riece-channel-p target)
-                   (cdr (riece-identity-assoc-no-server
-                         (riece-make-identity target)
-                         riece-channel-buffer-alist))))
+                   (riece-channel-buffer-name
+                    (riece-make-identity target riece-server-name))))
        (user (riece-prefix-nickname prefix)))
     (riece-insert-change buffer (concat user " " string "\n"))
     (riece-insert-change
@@ -204,6 +239,17 @@
               elapsed))
       "\n"))))
 
+(defun riece-handle-ctcp-clientinfo-response (prefix target string)
+  (riece-insert-change
+   (list riece-dialogue-buffer riece-others-buffer)
+   (concat
+    (riece-concat-server-name
+     (format "CTCP CLIENTINFO for %s (%s) = %s"
+            (riece-prefix-nickname prefix)
+            (riece-strip-user-at-host (riece-prefix-user-at-host prefix))
+            string))
+    "\n")))
+
 (defun riece-command-ctcp-version (user)
   (interactive
    (let ((completion-ignore-case t))
@@ -221,6 +267,14 @@
   (riece-send-string (format "PRIVMSG %s :\1PING\1\r\n" user))
   (setq riece-ctcp-ping-time (current-time)))
 
+(defun riece-command-ctcp-clientinfo (user)
+  (interactive
+   (let ((completion-ignore-case t))
+     (list (completing-read
+           "Channel/User: "
+           (mapcar #'list (riece-get-users-on-server))))))
+  (riece-send-string (format "PRIVMSG %s :\1CLIENTINFO\1\r\n" user)))
+
 (defun riece-command-ctcp-action (channel action)
   (interactive
    (list (if current-prefix-arg
@@ -234,9 +288,8 @@
   (riece-send-string (format "PRIVMSG %s :\1ACTION %s\1\r\n"
                             (riece-identity-prefix channel)
                             action))
-  (let ((buffer (cdr (riece-identity-assoc-no-server
-                     (riece-make-identity channel)
-                     riece-channel-buffer-alist))))
+  (let ((buffer (riece-channel-buffer-name
+                (riece-make-identity channel riece-server-name))))
     (riece-insert-change
      buffer
      (concat (riece-identity-prefix (riece-current-nickname)) " " action "\n"))