X-Git-Url: https://cgit.sxemacs.org/?p=riece;a=blobdiff_plain;f=lisp%2Friece-naming.el;h=dd5ad10748d371e78103d4a2a96adc49abc6ddcf;hp=51f80292536ac6d76b71930d5b7014f1f085244a;hb=9ac48ffd104797eb269aeb17742fa7a1991f0f04;hpb=4b29776da15420296d4042f9433aab1430fabca6

diff --git a/lisp/riece-naming.el b/lisp/riece-naming.el
index 51f8029..dd5ad10 100644
--- a/lisp/riece-naming.el
+++ b/lisp/riece-naming.el
@@ -27,29 +27,27 @@
 (require 'riece-globals)
 (require 'riece-channel)
 (require 'riece-user)
-(require 'riece-display)
+(require 'riece-signal)
 
 (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-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)
+  (riece-emit-signal 'user-joined-channel
+		     (riece-make-identity user-name
+					  riece-server-name)
+		     (riece-make-identity channel-name
+					  riece-server-name)))
 
 (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-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)
+  (riece-emit-signal 'user-left-channel
+		     (riece-make-identity user-name
+					  riece-server-name)
+		     (riece-make-identity channel-name
+					  riece-server-name)))
 
 (defun riece-naming-assert-rename (old-name new-name)
   (if (riece-identity-equal-no-server old-name riece-real-nickname)
@@ -57,21 +55,82 @@
 	    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))
+  (riece-emit-signal 'user-renamed
+		     (riece-make-identity old-name riece-server-name)
+		     (riece-make-identity new-name riece-server-name)))
+
+(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)
+	    users (cdr users)))
+    (riece-emit-signal 'user-list-changed channel-identity)))
+
+(defun riece-naming-assert-channel-modes (channel modes)
+  (while modes
+    (cond
+     ((eq (riece-mode-flag (car (car modes))) ?o)
+      (riece-channel-toggle-operator channel
+				     (riece-mode-parameter (car (car modes)))
+				     (nth 1 (car modes)))
+      (riece-emit-signal 'channel-operators-changed
+			 (riece-make-identity channel
+					      riece-server-name)
+			 (riece-make-identity (riece-mode-parameter
+					       (car (car modes)))
+					      riece-server-name)
+			 (nth 1 (car modes))))
+     ((eq (riece-mode-flag (car (car modes))) ?v)
+      (riece-channel-toggle-speaker channel
+				    (riece-mode-parameter (car (car modes)))
+				    (nth 1 (car modes)))
+      (riece-emit-signal 'channel-speakers-changed
+			 (riece-make-identity channel
+					      riece-server-name)
+			 (riece-make-identity (riece-mode-parameter
+					       (car (car modes)))
+					      riece-server-name)
+			 (nth 1 (car modes))))
+     ((eq (riece-mode-flag (car (car modes))) ?b)
+      (riece-channel-toggle-banned channel
+				   (riece-mode-parameter (car (car modes)))
+				   (nth 1 (car modes))))
+     ((eq (riece-mode-flag (car (car modes))) ?e)
+      (riece-channel-toggle-uninvited channel
+				      (riece-mode-parameter (car (car modes)))
+				      (nth 1 (car modes))))
+     ((eq (riece-mode-flag (car (car modes))) ?I)
+      (riece-channel-toggle-invited channel
+				    (riece-mode-parameter (car (car modes)))
+				    (nth 1 (car modes))))
+     (t
+      (apply #'riece-channel-toggle-mode channel (car modes))))
+    (setq modes (cdr modes)))
+  (riece-emit-signal 'channel-modes-changed
+		     (riece-make-identity channel riece-server-name)))
 
 (provide 'riece-naming)
+
+;;; riece-naming.el ends here