"\\)\\(\\*\\)?=\\([-+]\\)\\([^ ]+\\)")
(car replies))
(let ((user (match-string 1 (car replies)))
+ (operator (not (null (match-beginning 2))))
(away (eq (match-string 3 (car replies)) ?-))
(user-at-host (match-string 4 (car replies)))
- (operator (not (null (match-beginning 2)))))
+ status)
+ (if away
+ (setq status (cons "away" status)))
+ (if operator
+ (setq status (cons "operator" status)))
(riece-user-toggle-away user away)
+ (riece-emit-signal 'user-away-changed
+ (riece-make-identity user riece-server-name)
+ away)
(riece-user-toggle-operator user operator)
+ (riece-emit-signal 'user-operator-changed
+ (riece-make-identity user riece-server-name)
+ operator)
(riece-insert-info
(list riece-dialogue-buffer riece-others-buffer)
(concat
(riece-concat-server-name
- (format "%s is (%s) [%s, %s]"
- (riece-format-identity
- (riece-make-identity user riece-server-name)
- t)
- (riece-strip-user-at-host user-at-host)
- (if operator
- "operator"
- "not operator")
- (if away
- "away"
- "not away")))
+ (riece-concat-user-status
+ status
+ (format "%s is (%s)"
+ (riece-format-identity
+ (riece-make-identity user riece-server-name)
+ t)
+ (riece-strip-user-at-host user-at-host))))
"\n"))))
- (setq replies (cdr replies)))
- (riece-update-status-indicators)
- (force-mode-line-update t)))
+ (setq replies (cdr replies)))))
(defun riece-handle-303-message (prefix number name string)
(riece-insert-info
(let ((user (match-string 1 string))
(message (substring string (match-end 0))))
(riece-user-toggle-away user t)
+ (riece-emit-signal 'user-away-changed
+ (riece-make-identity user riece-server-name)
+ t)
(riece-insert-info
(list riece-dialogue-buffer riece-others-buffer)
(concat
(riece-make-identity user riece-server-name)
t)
message))
- "\n"))))
- (riece-update-status-indicators)
- (force-mode-line-update t))
+ "\n")))))
(defun riece-handle-305-message (prefix number name string)
(riece-user-toggle-away riece-real-nickname nil)
- (riece-update-status-indicators)
- (force-mode-line-update t))
+ (riece-emit-signal 'user-away-changed
+ (riece-make-identity riece-real-nickname
+ riece-server-name)
+ nil))
(defun riece-handle-306-message (prefix number name string)
(riece-user-toggle-away riece-real-nickname t)
- (riece-update-status-indicators)
- (force-mode-line-update t))
+ (riece-emit-signal 'user-away-changed
+ (riece-make-identity riece-real-nickname
+ riece-server-name)
+ t))
(defun riece-handle-311-message (prefix number name string)
(if (string-match
(defun riece-handle-317-message (prefix number name string)
(if (string-match
- (concat "^\\(" riece-user-regexp "\\) \\([0-9]+\\) :")
+ (concat "^\\(" riece-user-regexp "\\) \\([0-9]+\\) [^:]*:seconds")
string)
(let ((user (match-string 1 string))
(idle (match-string 2 string)))
"RPL_NAMREPLY \"<channel> :[[@|+]<nick> [[@|+]<nick> [...]]]\"."
(if (string-match "^[=\*@] *\\([^ ]+\\) +:" string)
(let ((channel (match-string 1 string))
- users)
+ (start 0)
+ user users)
(setq string (substring string (match-end 0)))
- (if (string-match " *$" string)
- (setq string (substring string 0 (match-beginning 0))))
- (setq users (split-string string))
- (while users
- (if (eq (aref (car users) 0) ?@)
- (progn
- (riece-naming-assert-join (substring (car users) 1) channel)
- (riece-channel-toggle-operator
- channel (substring (car users) 1) t))
- (if (eq (aref (car users) 0) ?+)
- (progn
- (riece-naming-assert-join (substring (car users) 1) channel)
- (riece-channel-toggle-speaker
- channel (substring (car users) 1) t))
- (riece-naming-assert-join (car users) channel)))
- (setq users (cdr users)))
- (riece-redisplay-buffers))))
+ (while (string-match
+ (concat "\\([@+]\\)?\\(" riece-user-regexp "\\) *")
+ string start)
+ (put-text-property (match-beginning 2) (match-end 2)
+ 'riece-identity
+ (riece-make-identity (match-string 2 string)
+ riece-server-name)
+ string)
+ (setq start (match-end 0)
+ user (if (match-beginning 1)
+ (if (eq (aref string (match-beginning 1)) ?@)
+ (list (match-string 2 string) ?o)
+ (if (eq (aref string (match-beginning 1)) ?+)
+ (list (match-string 2 string) ?v)))
+ (list (match-string 2 string)))
+ users (cons user users)))
+ (riece-naming-assert-channel-users (nreverse users) channel)
+ (let* ((channel-identity (riece-make-identity channel
+ riece-server-name))
+ (buffer (riece-channel-buffer channel-identity)))
+ (riece-insert-info buffer (concat "Users: " string "\n"))
+ (riece-insert-info
+ (if (and riece-channel-buffer-mode
+ (not (eq buffer riece-channel-buffer)))
+ (list riece-dialogue-buffer riece-others-buffer)
+ riece-dialogue-buffer)
+ (concat
+ (riece-concat-server-name
+ (format "Users on %s: %s"
+ (riece-format-identity channel-identity t) string))
+ "\n"))))))
(defun riece-handle-322-message (prefix number name string)
(if (string-match "^\\([^ ]+\\) \\([0-9]+\\) :" string)
(defun riece-handle-324-message (prefix number name string)
(if (string-match "^\\([^ ]+\\) \\([^ ]+\\) " string)
(let* ((channel (match-string 1 string))
- (mode-string (substring string (match-beginning 2)))
- (modes (string-to-list (match-string 2 string)))
- (toggle (car modes)))
- (setq modes (cdr modes))
- (while modes
- (riece-channel-toggle-mode channel (car modes) (eq toggle ?+))
- (setq modes (cdr modes)))
+ (mode-string (match-string 2 string)))
+ (riece-naming-assert-channel-modes channel
+ (riece-parse-modes mode-string))
(let* ((channel-identity (riece-make-identity channel
riece-server-name))
(buffer (riece-channel-buffer channel-identity)))
(format "Mode for %s: %s"
(riece-format-identity channel-identity t)
mode-string))
- "\n")))
- (riece-update-channel-indicator)
- (force-mode-line-update t))))
+ "\n"))))))
(defun riece-handle-set-topic (prefix number name string remove)
(if (string-match "^\\([^ ]+\\) :" string)
(if remove
(riece-channel-set-topic (riece-get-channel channel) nil)
(riece-channel-set-topic (riece-get-channel channel) message)
- (riece-insert-info buffer (concat "Topic: " message "\n"))
- (riece-insert-info
- (if (and riece-channel-buffer-mode
- (not (eq buffer riece-channel-buffer)))
- (list riece-dialogue-buffer riece-others-buffer)
- riece-dialogue-buffer)
- (concat
- (riece-concat-server-name
- (format "Topic for %s: %s"
- (riece-format-identity channel-identity t)
- message))
- "\n"))
- (riece-update-channel-indicator)))))
+ (riece-insert-info buffer (concat "Topic: " message "\n"))
+ (riece-insert-info
+ (if (and riece-channel-buffer-mode
+ (not (eq buffer riece-channel-buffer)))
+ (list riece-dialogue-buffer riece-others-buffer)
+ riece-dialogue-buffer)
+ (concat
+ (riece-concat-server-name
+ (format "Topic for %s: %s"
+ (riece-format-identity channel-identity t)
+ message))
+ "\n")))
+ (riece-emit-signal 'channel-topic-changed
+ channel-identity
+ (unless remove
+ message)))))
(defun riece-handle-331-message (prefix number name string)
(riece-handle-set-topic prefix number name string t))
(name (substring string (match-end 0)))
(buffer (riece-channel-buffer (riece-make-identity
channel riece-server-name)))
- (info (format "%10s = %s (%s) [%s, %s, %s hops, on %s]"
+ (info (format "%10s = %s (%s)"
(concat
(if (memq flag '(?@ ?+))
(char-to-string flag)
t))
name
(riece-strip-user-at-host
- (concat user "@" host))
- (if operator
- "operator"
- "not operator")
- (if away
- "away"
- "not away")
- hops
- server)))
+ (concat user "@" host))))
+ status)
+ (if operator
+ (setq status (cons "operator" status)))
+ (if away
+ (setq status (cons "away" status)))
+ (unless (equal hops "0")
+ (setq status (cons (concat "on " server)
+ (cons (concat hops " hops")
+ status))))
+ (if status
+ (setq status (nreverse status)))
(riece-naming-assert-join nick channel)
(riece-user-toggle-away user away)
+ (riece-emit-signal 'user-away-changed
+ (riece-make-identity user riece-server-name)
+ away)
(riece-user-toggle-operator user operator)
- (riece-insert-info buffer (concat info "\n"))
+ (riece-emit-signal 'user-operator-changed
+ (riece-make-identity user riece-server-name)
+ operator)
+ (riece-insert-info buffer (concat (riece-concat-user-status
+ status info)
+ "\n"))
(riece-insert-info
(if (and riece-channel-buffer-mode
(not (eq buffer riece-channel-buffer)))
riece-dialogue-buffer)
(concat
(riece-concat-server-name
- (concat
- (riece-format-identity
- (riece-make-identity channel riece-server-name)
- t)
- " "
- info))
- "\n"))
- (riece-redisplay-buffers))))
+ (riece-concat-user-status
+ status
+ (concat
+ (riece-format-identity
+ (riece-make-identity channel riece-server-name)
+ t)
+ " "
+ info)))
+ "\n")))))
(defun riece-handle-315-message (prefix number name string))
(defun riece-handle-318-message (prefix number name string))
projects / riece / blobdiff