X-Git-Url: https://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Friece-ctcp.el;h=45eebf826c312df0089b34c4757c0e1a2308ca3a;hb=31af90ee9dadd320e1820f0524de9dc3460f4ea4;hp=d7ffe6b7f0f05c7be14e5e62611a5cd8122fe4f3;hpb=953b56a014d618e194b33c18fe445dc83e7be715;p=riece

diff --git a/lisp/riece-ctcp.el b/lisp/riece-ctcp.el
index d7ffe6b..45eebf8 100644
--- a/lisp/riece-ctcp.el
+++ b/lisp/riece-ctcp.el
@@ -77,8 +77,9 @@
 			(run-hook-with-args-until-success
 			 hook prefix (car targets) message))
 		(if function
-		    (riece-ignore-errors (symbol-name function)
-		      (funcall function prefix (car targets) message)))
+		    (riece-funcall-ignore-errors (symbol-name function)
+						  function prefix (car targets)
+						  message))
 		(riece-ignore-errors (symbol-name after-hook)
 		  (run-hook-with-args-until-success
 		   after-hook prefix (car targets) message))))
@@ -169,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))
@@ -222,8 +235,9 @@
 			(run-hook-with-args-until-success
 			 hook prefix (car targets) message))
 		(if function
-		    (riece-ignore-errors (symbol-name function)
-		      (funcall function prefix (car targets) message)))
+		    (riece-funcall-ignore-errors
+		     (symbol-name function)
+		     function prefix (car targets) message))
 		(riece-ignore-errors (symbol-name after-hook)
 		  (run-hook-with-args-until-success
 		   after-hook prefix (car targets) message))))
@@ -336,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)