* riece-300.el (riece-handle-312-message): Use server name

[riece] / lisp / riece-300.el

diff --git a/lisp/riece-300.el b/lisp/riece-300.el
index 034e9c0..5fcd80c 100644 (file)
--- a/lisp/riece-300.el
+++ b/lisp/riece-300.el
@@ -151,7 +151,7 @@
        (concat
        (riece-concat-server-name
         (format "on via server %s: %s"
-                riece-real-server-name
+                (match-string 2 string)
                 (substring string (match-end 0))))
        "\n"))))
 
@@ -289,16 +289,9 @@
 (defun riece-handle-324-message (prefix number name string)
   (if (string-match "^\\([^ ]+\\) \\([^ ]+\\) " string)
       (let* ((channel (match-string 1 string))
-            (mode-string (substring string (match-beginning 2)))
-            (modes (string-to-list (match-string 2 string)))
-            (toggle (car modes)))
-       (setq modes (cdr modes))
-       (while modes
-         (riece-channel-toggle-mode channel (car modes) (eq toggle ?+))
-         (setq modes (cdr modes)))
-       (riece-emit-signal 'channel-modes-changed
-                          (riece-make-identity channel riece-server-name)
-                          modes (eq toggle ?+))
+            (mode-string (match-string 2 string)))
+       (riece-naming-assert-channel-modes channel
+                                          (riece-parse-modes mode-string))
        (let* ((channel-identity (riece-make-identity channel
                                                      riece-server-name))
               (buffer (riece-channel-buffer channel-identity)))