* riece-cache.el: Renamed from riece-lru.el.

[riece] / lisp / riece-server.el

diff --git a/lisp/riece-server.el b/lisp/riece-server.el
index 3204193..4a64df1 100644 (file)
--- a/lisp/riece-server.el
+++ b/lisp/riece-server.el
@@ -29,6 +29,7 @@
 (require 'riece-coding)                        ;riece-default-coding-system
 (require 'riece-identity)
 (require 'riece-compat)
+(require 'riece-cache)
 
 (eval-and-compile
   (defvar riece-server-keyword-map
@@ -72,7 +73,7 @@ the `riece-server-keyword-map' variable."
          plist)
       (setq plist (cons `(:host ,host) plist))
       (unless (equal service "")
-       (setq plist (cons `(:service ,(string-to-int service)) plist)))
+       (setq plist (cons `(:service ,(string-to-number service)) plist)))
       (unless (equal password "")
        (setq plist (cons `(:password ,(substring password 1)) plist)))
       (apply #'nconc plist))))
@@ -162,8 +163,7 @@ the `riece-server-keyword-map' variable."
          (setq riece-send-size 0))
       (while (and (not (riece-queue-empty riece-send-queue))
                  (<= riece-send-size riece-max-send-size))
-       (setq string (riece-encode-coding-string
-                     (riece-queue-dequeue riece-send-queue))
+       (setq string (riece-queue-dequeue riece-send-queue)
              length (length string))
        (if (> length riece-max-send-size)
            (message "Long message (%d > %d)" length riece-max-send-size)
@@ -193,13 +193,21 @@ the `riece-server-keyword-map' variable."
          (if (riece-server-opened "")
              "")))))
 
-(defun riece-send-string (string)
-  (let* ((server-name (riece-current-server-name))
-        (process (riece-server-process server-name)))
+(defun riece-send-string (string &optional identity)
+  (let* ((server-name (if identity
+                         (riece-identity-server identity)
+                       (riece-current-server-name)))
+        (process (riece-server-process server-name))
+        coding-system)
     (unless process
       (error "%s" (substitute-command-keys
                   "Type \\[riece-command-open-server] to open server.")))
-    (riece-process-send-string process string)))
+    (riece-process-send-string
+     process
+     (with-current-buffer (process-buffer process)
+       (if identity
+          (riece-encode-coding-string-for-identity string identity)
+        (riece-encode-coding-string string))))))
 
 (defun riece-open-server (server server-name)
   (let ((protocol (or (plist-get server :protocol)
@@ -264,6 +272,8 @@ the `riece-server-keyword-map' variable."
     (make-local-variable 'riece-channel-obarray)
     (setq riece-channel-obarray (make-vector riece-channel-obarray-size 0))
     (make-local-variable 'riece-coding-system)
+    (make-local-variable 'riece-user-cache)
+    (setq riece-user-cache (riece-make-cache riece-user-cache-max-size))
     (buffer-disable-undo)
     (erase-buffer)))