;;; Code:
(require 'riece-options)
+(require 'riece-globals)
(require 'riece-identity)
-;;; String representation of a channel:
-(defconst riece-channel-regexp "^[+&#!]")
-
-(defun riece-channel-p (string)
- "Return t if STRING is a channel.
-\(i.e. it matches `riece-channel-regexp')"
- (string-match riece-channel-regexp string))
-
;;; Channel object:
(defun riece-find-channel (name)
"Get a channel object named NAME from the server buffer."
- (riece-with-server-buffer
- (let ((symbol (intern-soft (riece-identity-canonicalize-prefix
- (riece-identity-prefix name))
- riece-obarray)))
- (if symbol
- (symbol-value symbol)))))
+ (let ((symbol (intern-soft (riece-identity-canonicalize-prefix name)
+ riece-obarray)))
+ (if symbol
+ (symbol-value symbol))))
(defun riece-forget-channel (name)
- (riece-with-server-buffer
- (let ((symbol (intern-soft (riece-identity-canonicalize-prefix
- (riece-identity-prefix name))
- riece-obarray)))
- (when symbol
- (makunbound symbol)
- (unintern (symbol-name symbol) riece-obarray)))))
-
-(defun riece-make-channel (&optional users operators speakers
- topic modes banned invited uninvited
- key)
+ (let ((symbol (intern-soft (riece-identity-canonicalize-prefix name)
+ riece-obarray)))
+ (when symbol
+ (makunbound symbol)
+ (unintern (symbol-name symbol) riece-obarray))))
+
+(defun riece-make-channel (users topic modes banned invited uninvited key)
"Make an instance of channel object.
-Arguments are appropriate to channel users, operators, speakers
-\(+v), topic, modes, banned users, invited users, uninvited users, and
-the channel key, respectively."
- (vector users operators speakers topic modes banned invited uninvited))
+Arguments are appropriate to channel users, topic, modes, banned
+users, invited users, uninvited users, and the channel key,
+respectively."
+ (vector users topic modes banned invited uninvited))
(defun riece-get-channel (name)
- (riece-with-server-buffer
- (let ((symbol (intern-soft (riece-identity-canonicalize-prefix
- (riece-identity-prefix name))
- riece-obarray)))
- (if symbol
- (symbol-value symbol)
- (set (intern (riece-identity-canonicalize-prefix
- (riece-identity-prefix name))
- riece-obarray)
- (riece-make-channel))))))
+ (let ((symbol (intern-soft (riece-identity-canonicalize-prefix name)
+ riece-obarray)))
+ (if symbol
+ (symbol-value symbol)
+ (set (intern (riece-identity-canonicalize-prefix name)
+ riece-obarray)
+ (riece-make-channel nil nil nil nil nil nil nil)))))
(defun riece-channel-users (channel)
"Return the users of CHANNEL."
(aref channel 0))
-(defun riece-channel-operators (channel)
- "Return the operators of CHANNEL."
- (aref channel 1))
-
-(defun riece-channel-speakers (channel)
- "Return the speakers of CHANNEL."
- (aref channel 2))
-
(defun riece-channel-topic (channel)
"Return the topic of CHANNEL."
- (aref channel 3))
+ (aref channel 1))
(defun riece-channel-modes (channel)
"Return the modes of CHANNEL."
- (aref channel 4))
+ (aref channel 2))
(defun riece-channel-banned (channel)
"Return the banned users of CHANNEL."
- (aref channel 5))
+ (aref channel 3))
(defun riece-channel-invited (channel)
"Return the invited users of CHANNEL."
- (aref channel 6))
+ (aref channel 4))
(defun riece-channel-uninvited (channel)
"Return the uninvited users of CHANNEL."
- (aref channel 7))
+ (aref channel 5))
(defun riece-channel-key (channel)
"Return the key of CHANNEL."
- (aref channel 8))
+ (aref channel 6))
(defun riece-channel-set-users (channel value)
"Set the users of CHANNEL to VALUE."
(aset channel 0 value))
-(defun riece-channel-set-operators (channel value)
- "Set the operators of CHANNEL to VALUE."
- (aset channel 1 value))
-
-(defun riece-channel-set-speakers (channel value)
- "Set the speakers of CHANNEL to VALUE."
- (aset channel 2 value))
-
(defun riece-channel-set-topic (channel value)
"Set the topic of CHANNEL to VALUE."
- (aset channel 3 value))
+ (aset channel 1 value))
(defun riece-channel-set-modes (channel value)
"Set the modes of CHANNEL to VALUE."
- (aset channel 4 value))
+ (aset channel 2 value))
(defun riece-channel-set-banned (channel value)
"Set the banned users of CHANNEL to VALUE."
- (aset channel 5 value))
+ (aset channel 3 value))
(defun riece-channel-set-invited (channel value)
"Set the invited users of CHANNEL to VALUE."
- (aset channel 6 value))
+ (aset channel 4 value))
(defun riece-channel-set-uninvited (channel value)
"Set the uninvited users of CHANNEL to VALUE."
- (aset channel 7 value))
+ (aset channel 5 value))
(defun riece-channel-set-key (channel value)
"Set the key of CHANNEL to VALUE."
- (aset channel 8 value))
+ (aset channel 6 value))
-(defun riece-channel-get-users (&optional name)
+(defun riece-channel-get-users (name)
"Return channel's users as list."
- (riece-channel-users
- (riece-get-channel (or name riece-current-channel))))
+ (riece-channel-users (riece-get-channel name)))
-(defun riece-channel-get-operators (&optional name)
- "Return channel's operators as list."
- (riece-channel-operators
- (riece-get-channel (or name riece-current-channel))))
-
-(defun riece-channel-get-speakers (&optional name)
- "Return channel's speakers as list."
- (riece-channel-speakers
- (riece-get-channel (or name riece-current-channel))))
-
-(defun riece-channel-get-topic (&optional name)
+(defun riece-channel-get-topic (name)
"Return channel's topic."
- (riece-channel-topic
- (riece-get-channel (or name riece-current-channel))))
+ (riece-channel-topic (riece-get-channel name)))
-(defun riece-channel-get-modes (&optional name)
+(defun riece-channel-get-modes (name)
"Return channel's modes as list."
- (riece-channel-modes
- (riece-get-channel (or name riece-current-channel))))
+ (riece-channel-modes (riece-get-channel name)))
-(defun riece-channel-get-banned (&optional name)
+(defun riece-channel-get-banned (name)
"Return channel's banned users as list."
- (riece-channel-banned
- (riece-get-channel (or name riece-current-channel))))
+ (riece-channel-banned (riece-get-channel name)))
-(defun riece-channel-get-invited (&optional name)
+(defun riece-channel-get-invited (name)
"Return channel's invited users as list."
- (riece-channel-invited
- (riece-get-channel (or name riece-current-channel))))
+ (riece-channel-invited (riece-get-channel name)))
-(defun riece-channel-get-uninvited (&optional name)
+(defun riece-channel-get-uninvited (name)
"Return channel's uninvited users as list."
- (riece-channel-uninvited
- (riece-get-channel (or name riece-current-channel))))
+ (riece-channel-uninvited (riece-get-channel name)))
-(defun riece-channel-get-key (&optional name)
+(defun riece-channel-get-key (name)
"Return channel's key."
- (riece-channel-key
- (riece-get-channel (or name riece-current-channel))))
+ (riece-channel-key (riece-get-channel name)))
;;; Functions called from `riece-handle-mode-message':
(defun riece-channel-toggle-mode (name mode flag)
"Add or remove channel MODE of channel."
- (let* ((channel (riece-get-channel (or name riece-current-channel)))
+ (let* ((channel (riece-get-channel name))
(modes (riece-channel-modes channel)))
(if flag
(unless (memq mode modes)
(defun riece-channel-toggle-banned (name pattern flag)
"Add or remove banned PATTERN of channel."
- (let* ((channel (riece-get-channel (or name riece-current-channel)))
+ (let* ((channel (riece-get-channel name))
(banned (riece-channel-banned channel)))
(if flag
(unless (member pattern banned)
(defun riece-channel-toggle-invited (name pattern flag)
"Add or remove invited PATTERN of channel."
- (let* ((channel (riece-get-channel (or name riece-current-channel)))
+ (let* ((channel (riece-get-channel name))
(invited (riece-channel-invited channel)))
(if flag
(unless (member pattern invited)
(defun riece-channel-toggle-uninvited (name pattern flag)
"Add or remove uninvited PATTERN to channel."
- (let* ((channel (riece-get-channel (or name riece-current-channel)))
+ (let* ((channel (riece-get-channel name))
(uninvited (riece-channel-uninvited channel)))
(if flag
(unless (member pattern uninvited)
(defun riece-channel-toggle-user (name user flag)
"Add or remove an user to channel."
- (let* ((channel (riece-get-channel (or name riece-current-channel)))
+ (let* ((channel (riece-get-channel name))
(users (riece-channel-users channel)))
(if flag
- (unless (member user users)
- (riece-channel-set-users channel (cons user users)))
- (if (setq user (car (member user users)))
+ (unless (riece-identity-assoc user users t)
+ (riece-channel-set-users channel (cons (list user) users)))
+ (if (setq user (car (riece-identity-assoc user users t)))
(riece-channel-set-users channel (delq user users))))))
(defun riece-channel-toggle-operator (name user flag)
"Add or remove an operator to channel."
- (let* ((channel (riece-get-channel (or name riece-current-channel)))
- (operators (riece-channel-operators channel)))
+ (let* ((channel (riece-get-channel name))
+ (users (riece-channel-users channel)))
+ (setq user (riece-identity-assoc user users t))
(if flag
- (unless (member user operators)
- (riece-channel-set-operators channel (cons user operators)))
- (if (setq user (car (member user operators)))
- (riece-channel-set-operators channel (delq user operators))))))
+ (if user
+ (setcdr user (cons ?o (cdr user)))
+ (riece-channel-set-users channel (cons (list user ?o) users)))
+ (if user
+ (setcdr user (delq ?o (cdr user)))))))
(defun riece-channel-toggle-speaker (name user flag)
"Add or remove an speaker to channel."
- (let* ((channel (riece-get-channel (or name riece-current-channel)))
- (speakers (riece-channel-speakers channel)))
+ (let* ((channel (riece-get-channel name))
+ (users (riece-channel-users channel)))
+ (setq user (riece-identity-assoc user users t))
(if flag
- (unless (member user speakers)
- (riece-channel-set-speakers channel (cons user speakers)))
- (if (setq user (car (member user speakers)))
- (riece-channel-set-speakers channel (delq user speakers))))))
+ (if user
+ (setcdr user (cons ?v (cdr user)))
+ (riece-channel-set-users channel (cons (list user ?v) users)))
+ (if user
+ (setcdr user (delq ?v (cdr user)))))))
(provide 'riece-channel)
projects / riece / blobdiff