X-Git-Url: https://cgit.sxemacs.org/?p=riece;a=blobdiff_plain;f=lisp%2Friece-naming.el;h=69cef4cc72a78ed746e4bedbdea4938b25521a30;hp=fa085ba62d893f00d796ad42081ae0ef42058a3f;hb=c93b87a80b0cc2e0c77bb0955380bd3284c254e8;hpb=fe7ce5e9a344721b1ecdd4d9ec1adce5dc908a49 diff --git a/lisp/riece-naming.el b/lisp/riece-naming.el index fa085ba..69cef4c 100644 --- a/lisp/riece-naming.el +++ b/lisp/riece-naming.el @@ -24,56 +24,115 @@ ;;; Code: -(eval-when-compile (require 'riece-inlines)) - (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 (string-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) + (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 (string-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 user-name (riece-current-nickname)) - (let* ((identity (riece-make-identity channel-name)) - (pointer (riece-identity-member - 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 (string-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)) + (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)) + (pointer users)) + (while pointer + (riece-user-toggle-channel (car (car pointer)) channel-name t) + (riece-channel-toggle-user channel-name (car (car pointer)) t) + (if (memq ?o (cdr (car pointer))) + (riece-channel-toggle-operator channel-name (car (car pointer)) t) + (if (memq ?v (cdr (car pointer))) + (riece-channel-toggle-speaker channel-name (car (car pointer)) t) + (riece-channel-toggle-operator channel-name (car (car pointer)) nil) + (riece-channel-toggle-speaker channel-name (car (car pointer)) nil))) + (setq pointer (cdr pointer))) + ;; Remove nonexistent users. + (setq pointer (riece-channel-users (riece-get-channel channel-name))) + (while pointer + (unless (assoc (car (car pointer)) users) + (riece-user-toggle-channel (car (car pointer)) channel-name nil) + (riece-channel-toggle-user channel-name (car (car pointer)) nil)) + (setq pointer (cdr pointer))) + (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