X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Friece-message.el;h=c943e50ce5910c359fe93f020115041984a56080;hb=3bbc5d21a4c1da31e57ace8cc46af33fe5b90f26;hp=8db0334957caa084f13a510221968efcaddd0780;hpb=2f4262da5526b425faf59d33c81f1275e6f7927e;p=elisp%2Friece.git

diff --git a/lisp/riece-message.el b/lisp/riece-message.el
index 8db0334..c943e50 100644
--- a/lisp/riece-message.el
+++ b/lisp/riece-message.el
@@ -66,10 +66,10 @@
 
 (defun riece-message-make-open-bracket (message)
   "Make `open-bracket' string for MESSAGE."
-  (if (riece-message-own-p message)
-      ">"
-    (if (eq (riece-message-type message) 'notice)
-	"{"
+  (if (eq (riece-message-type message) 'notice)
+      "{"
+    (if (riece-message-own-p message)
+	">"
       (if (riece-message-private-p message)
 	  "="
 	(if (riece-message-external-p message)
@@ -78,10 +78,10 @@
 
 (defun riece-message-make-close-bracket (message)
   "Make `close-bracket' string for MESSAGE."
-  (if (riece-message-own-p message)
-      "<"
-    (if (eq (riece-message-type message) 'notice)
-	"}"
+  (if (eq (riece-message-type message) 'notice)
+      "}"
+    (if (riece-message-own-p message)
+	"<"
       (if (riece-message-private-p message)
 	  "="
 	(if (riece-message-external-p message)
@@ -114,7 +114,7 @@
 		  (riece-message-target message))))
     (unless (riece-identity-member target riece-current-channels)
       (riece-join-channel target)
-      ;; If you are not joined any channel,
+      ;; If you are not joined to any channel,
       ;; switch to the target immediately.
       (unless riece-current-channel
 	(riece-switch-to-channel target)))
@@ -142,17 +142,28 @@ Normally they are *Dialogue* and/or *Others*."
 	(list riece-dialogue-buffer riece-others-buffer)
       riece-dialogue-buffer)))
 
-(defun riece-display-message-1 (message)
+(defun riece-format-message (message &optional global)
   (let ((open-bracket
 	 (funcall riece-message-make-open-bracket-function message))
 	(close-bracket
 	 (funcall riece-message-make-close-bracket-function message))
 	(name
-	 (funcall riece-message-make-name-function message))
-	(global-name
-	 (funcall riece-message-make-global-name-function message))
-	(buffer (riece-message-buffer message))
-	(server-name (riece-identity-server (riece-message-speaker message)))
+	 (if global
+	     (funcall riece-message-make-global-name-function message)
+	   (funcall riece-message-make-name-function message)))
+	(server-name (riece-identity-server (riece-message-speaker message))))
+    (riece-with-server-buffer server-name
+      (concat
+       (if global
+	   (riece-concat-server-name
+	    (concat open-bracket name close-bracket
+		    " " (riece-message-text message)))
+	 (concat open-bracket name close-bracket
+		 " " (riece-message-text message)))
+       "\n"))))
+
+(defun riece-display-message-1 (message)
+  (let ((buffer (riece-message-buffer message))
 	parent-buffers)
     (when (and buffer
 	       (riece-message-own-p message)
@@ -161,23 +172,16 @@ Normally they are *Dialogue* and/or *Others*."
 	(setq riece-freeze nil))
       (riece-emit-signal 'buffer-freeze-changed buffer nil))
     (setq parent-buffers (riece-message-parent-buffers message buffer))
-    (riece-insert buffer
-		  (concat open-bracket name close-bracket
-			  " " (riece-message-text message) "\n"))
-    (riece-insert parent-buffers
-		  (if (equal server-name "")
-		      (concat open-bracket global-name close-bracket
-			      " " (riece-message-text message) "\n")
-		     (concat open-bracket global-name close-bracket
-			     " " (riece-message-text message)
-			     " (from " server-name ")\n")))
-    (run-hook-with-args 'riece-after-display-message-functions message)))
+    (riece-insert buffer (riece-format-message message))
+    (riece-insert parent-buffers (riece-format-message message t))
+    (with-current-buffer buffer
+      (run-hook-with-args 'riece-after-display-message-functions message))))
 
 (defun riece-display-message (message)
   "Display MESSAGE object."
   (let ((functions riece-message-filter-functions))
     (setq message (copy-sequence message))
-    (while functions
+    (while (and functions message)
       (setq message (funcall (car functions) message)
 	    functions (cdr functions)))
     (if message
@@ -214,6 +218,27 @@ Currently possible values are `action' and `notice'."
   "Return t if MESSAGE is not from the network."
   (aref message 4))
 
+(defun riece-message-set-speaker (message speaker)
+  "Set the sender of MESSAGE."
+  (aset message 0 speaker))
+
+(defun riece-message-set-target (message target)
+  "Set the receiver of MESSAGE."
+  (aset message 1 target))
+
+(defun riece-message-set-text (message text)
+  "Set the text part of MESSAGE."
+  (aset message 2 text))
+
+(defun riece-message-set-type (message type)
+  "Set the type of MESSAGE.
+Currently possible values are `action' and `notice'."
+  (aset message 3 type))
+
+(defun riece-message-set-own-p (message own-p)
+  "Set t if MESSAGE is not from the network."
+  (aset message 4 own-p))
+
 (defun riece-message-private-p (message)
   "Return t if MESSAGE is a private message."
   (not (or (riece-channel-p (riece-identity-prefix