(require 'riece-display)
(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)
+ (if (riece-identity-equal-no-server user-name riece-real-nickname)
+ (let ((channel-identity (riece-make-identity channel-name
+ riece-server-name)))
+ (riece-join-channel channel-identity)
+ (riece-switch-to-channel channel-identity)
+ (setq riece-join-channel-candidate nil))))
(defun riece-naming-assert-part (user-name 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-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-part-channel (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)
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)))))
(provide 'riece-naming)
+
+;;; riece-naming.el ends here