* riece-naming.el (riece-naming-assert-join): Rename signal 'join
[elisp/riece.git] / lisp / riece-naming.el
index afd7f7e..1e9352e 100644 (file)
 
 ;;; Code:
 
-(eval-when-compile (require 'riece-inlines))
-
 (require 'riece-globals)
 (require 'riece-channel)
 (require 'riece-user)
 (require 'riece-display)
 
 (defun riece-naming-assert-join (user-name channel-name)
-  (if (scandinavian-equal-ignore-case user-name riece-real-nickname)
-      (riece-join-channel channel-name))
   (riece-user-toggle-channel user-name channel-name t)
-  (riece-channel-toggle-user channel-name user-name t))
+  (riece-channel-toggle-user channel-name user-name t)
+  (let ((user-identity (riece-make-identity user-name
+                                           riece-server-name))
+       (channel-identity (riece-make-identity channel-name
+                                              riece-server-name)))
+    (when (riece-identity-equal-no-server user-name riece-real-nickname)
+      (riece-join-channel channel-identity)
+      (riece-switch-to-channel channel-identity)
+      (setq riece-join-channel-candidate nil))
+    (riece-emit-signal (riece-make-signal 'riece-naming-assert-join
+                                         user-identity
+                                         channel-identity))))
 
 (defun riece-naming-assert-part (user-name channel-name)
-  (if (scandinavian-equal-ignore-case user-name riece-real-nickname)
-      (progn
-       (riece-part-channel channel-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-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)
+  (let ((user-identity (riece-make-identity user-name
+                                           riece-server-name))
+       (channel-identity (riece-make-identity channel-name
+                                              riece-server-name)))
+    (if (riece-identity-equal-no-server user-name riece-real-nickname)
+       (riece-part-channel channel-identity))
+    (riece-emit-signal (riece-make-signal 'riece-naming-assert-part
+                                         user-identity
+                                         channel-identity))))
 
 (defun riece-naming-assert-rename (old-name new-name)
-  (if (scandinavian-equal-ignore-case old-name riece-real-nickname)
+  (if (riece-identity-equal-no-server old-name riece-real-nickname)
       (setq riece-last-nickname riece-real-nickname
            riece-real-nickname new-name))
   (let* ((old (riece-get-user old-name))
         (channels (riece-user-channels old))
-        users pointer)
+        users user)
     (while channels
       (setq users (riece-channel-get-users (car channels))
-           pointer (member old-name users))
-      (if pointer
-         (setcar pointer new-name))
-      (setq users (riece-channel-get-operators (car channels))
-           pointer (member old-name users))
-      (if pointer
-         (setcar pointer new-name))
-      (setq users (riece-channel-get-speakers (car channels))
-           pointer (member old-name users))
-      (if pointer
-         (setcar pointer new-name))
+           user (riece-identity-assoc old-name users t))
+      (if user
+         (setcar user new-name))
       (setq channels (cdr channels)))
-    (riece-rename-user old-name new-name)))
+    (riece-rename-user old-name new-name))
+  ;; Rename the channel buffer.
+  (let* ((old-identity (riece-make-identity old-name riece-server-name))
+        (new-identity (riece-make-identity new-name riece-server-name))
+        (pointer (riece-identity-member old-identity riece-current-channels)))
+    (when pointer
+      (setcar pointer new-identity)
+      (with-current-buffer (riece-channel-buffer old-identity)
+       (rename-buffer (riece-channel-buffer-name new-identity) t)
+       (setq riece-channel-buffer-alist
+             (cons (cons new-identity (current-buffer))
+                   (delq (riece-identity-assoc old-identity
+                                               riece-channel-buffer-alist)
+                         riece-channel-buffer-alist))))
+      (if (riece-identity-equal old-identity riece-current-channel)
+         (riece-switch-to-channel new-identity)))
+    (riece-emit-signal (riece-make-signal 'riece-naming-assert-rename
+                                         old-identity new-identity))))
+
+(defun riece-naming-assert-channel-users (users channel-name)
+  (let ((channel-identity (riece-make-identity channel-name
+                                              riece-server-name))
+       user-identity-list)
+    (while users
+      (riece-user-toggle-channel (car (car users)) channel-name t)
+      (riece-channel-toggle-user channel-name (car (car users)) t)
+      (if (memq ?o (cdr (car users)))
+         (riece-channel-toggle-operator channel-name (car (car users)) t)
+       (if (memq ?v (cdr (car users)))
+           (riece-channel-toggle-speaker channel-name (car (car users)) t)
+         (riece-channel-toggle-operator channel-name (car (car users)) nil)
+         (riece-channel-toggle-speaker channel-name (car (car users)) nil)))
+      (setq user-identity-list
+           (cons (cons (riece-make-identity (car (car users))
+                                            riece-server-name)
+                       (cdr (car users)))
+                 user-identity-list))
+      (when (riece-identity-equal-no-server (car (car users))
+                                           riece-real-nickname)
+       (riece-join-channel channel-identity)
+       (riece-switch-to-channel channel-identity)
+       (setq riece-join-channel-candidate nil))
+      (setq users (cdr users)))
+    (riece-emit-signal (riece-make-signal 'riece-naming-assert-channel-users
+                                         (nreverse user-identity-list)
+                                         channel-identity))))
 
 (provide 'riece-naming)
+
+;;; riece-naming.el ends here