* riece-ctcp.el (riece-handle-ctcp-action-request): Prepend target.

(riece-command-ctcp-action): Ditto.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a43c610..10abc6c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2005-02-27  Daiki Ueno  <ueno@unixuser.org>
+
+       * riece-ctcp.el (riece-handle-ctcp-action-request): Prepend target.
+       (riece-command-ctcp-action): Ditto.
+
 2005-02-25  TAKAHASHI Kaoru  <kaoru@kaisei.org>
 
        * riece-globals.el (riece-obarray-size, riece-obarray): Abolish.

diff --git a/lisp/riece-ctcp.el b/lisp/riece-ctcp.el
index 35d3eb5..45eebf8 100644 (file)
--- a/lisp/riece-ctcp.el
+++ b/lisp/riece-ctcp.el
@@ -170,15 +170,27 @@
                    (riece-channel-buffer (riece-make-identity
                                           target riece-server-name))))
        (user (riece-prefix-nickname prefix)))
-    (riece-insert buffer (concat riece-ctcp-action-prefix user " " string
+    (riece-insert buffer (concat riece-ctcp-action-prefix
+                                (riece-format-identity
+                                 (riece-make-identity user riece-server-name)
+                                 t)
+                                " " string
                                 "\n"))
     (riece-insert
      (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 (concat riece-ctcp-action-prefix user
-                                              " " string)) "\n"))))
+     (concat (riece-concat-server-name
+             (concat riece-ctcp-action-prefix
+                     (riece-format-identity
+                      (riece-make-identity target riece-server-name)
+                      t)
+                     ": "
+                     (riece-format-identity
+                      (riece-make-identity user riece-server-name)
+                      t)
+                     " " string)) "\n"))))
 
 (defun riece-handle-ctcp-time-request (prefix target string)
   (let* ((target-identity (riece-make-identity target riece-server-name))
@@ -338,8 +350,8 @@
       (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) ")")))
+                (riece-format-identity target t) ": "
+                (riece-identity-prefix (riece-current-nickname)) " " action)))
       "\n"))))
 
 (defun riece-command-ctcp-time (target)