* riece-handle.el (riece-handle-privmsg-message): Check own

[riece] / lisp / riece-ctcp.el

diff --git a/lisp/riece-ctcp.el b/lisp/riece-ctcp.el
index 5ea2e8d..8c8ba1c 100644 (file)
--- a/lisp/riece-ctcp.el
+++ b/lisp/riece-ctcp.el
@@ -284,10 +284,7 @@
   (interactive
    (list (riece-completing-read-identity
          "Channel/User: "
-         (apply #'nconc
-                (mapcar (lambda (entry)
-                          (riece-get-identities-on-server (car entry)))
-                        riece-server-process-alist)))))
+         (riece-get-identities-on-server (riece-current-server-name)))))
   (riece-send-string (format "PRIVMSG %s :\1VERSION\1\r\n"
                             (riece-identity-prefix target))))
 
@@ -295,10 +292,7 @@
   (interactive
    (list (riece-completing-read-identity
          "Channel/User: "
-         (apply #'nconc
-                (mapcar (lambda (entry)
-                          (riece-get-identities-on-server (car entry)))
-                        riece-server-process-alist)))))
+         (riece-get-identities-on-server (riece-current-server-name)))))
   (riece-send-string (format "PRIVMSG %s :\1PING\1\r\n"
                             (riece-identity-prefix target)))
   (setq riece-ctcp-ping-time (current-time)))
@@ -307,10 +301,7 @@
   (interactive
    (list (riece-completing-read-identity
          "Channel/User: "
-         (apply #'nconc
-                (mapcar (lambda (entry)
-                          (riece-get-identities-on-server (car entry)))
-                        riece-server-process-alist)))))
+         (riece-get-identities-on-server (riece-current-server-name)))))
   (riece-send-string (format "PRIVMSG %s :\1CLIENTINFO\1\r\n"
                             (riece-identity-prefix target))))
 
@@ -319,10 +310,7 @@
    (list (if current-prefix-arg
             (riece-completing-read-identity
              "Channel/User: "
-             (apply #'nconc
-                    (mapcar (lambda (entry)
-                              (riece-get-identities-on-server (car entry)))
-                            riece-server-process-alist)))
+             (riece-get-identities-on-server (riece-current-server-name)))
           riece-current-channel)
         (let (message)
           (beginning-of-line)
@@ -349,9 +337,11 @@
         (list riece-dialogue-buffer riece-others-buffer)
        riece-dialogue-buffer)
      (concat
-      (riece-concat-server-name
-       (concat riece-ctcp-action-prefix
-              (riece-identity-prefix (riece-current-nickname)) " " action))
+      (riece-with-server-buffer (riece-identity-server target)
+       (riece-concat-server-name
+        (concat riece-ctcp-action-prefix
+                (riece-identity-prefix (riece-current-nickname)) " " action
+                " (in " (riece-format-identity target t) ")")))
       "\n"))))
 
 (provide 'riece-ctcp)