* riece-filter.el (riece-handle-numeric-reply): Don't decode messages.

[elisp/riece.git] / lisp / riece-naming.el

diff --git a/lisp/riece-naming.el b/lisp/riece-naming.el
index 51f8029..0bfc08b 100644 (file)
--- a/lisp/riece-naming.el
+++ b/lisp/riece-naming.el
@@ -31,25 +31,21 @@
 
 (defun riece-naming-assert-join (user-name channel-name)
   (if (riece-identity-equal-no-server user-name riece-real-nickname)
-      (riece-join-channel channel-name))
+      (riece-join-channel (riece-make-identity channel-name
+                                              riece-server-name)))
   (riece-user-toggle-channel user-name channel-name t)
   (riece-channel-toggle-user channel-name user-name t))
 
 (defun riece-naming-assert-part (user-name channel-name)
   (if (riece-identity-equal-no-server user-name riece-real-nickname)
       (progn
-       (riece-part-channel channel-name)
+       (riece-part-channel (riece-make-identity channel-name
+                                                riece-server-name))
        (riece-forget-channel channel-name))
     (riece-user-toggle-channel user-name channel-name nil)
     (riece-channel-toggle-user channel-name user-name nil)
     (riece-channel-toggle-operator channel-name user-name nil)
-    (riece-channel-toggle-speaker channel-name user-name nil)
-    (if (riece-identity-equal-safe user-name (riece-current-nickname))
-       (let* ((identity (riece-make-identity channel-name))
-              (pointer (riece-identity-member-safe
-                        identity riece-current-channels)))
-         (if pointer
-             (setcar pointer nil))))))
+    (riece-channel-toggle-speaker channel-name user-name nil)))
 
 (defun riece-naming-assert-rename (old-name new-name)
   (if (riece-identity-equal-no-server old-name riece-real-nickname)