* riece-options.el (riece-addons): Add riece-button.

[riece] / lisp / riece-unread.el

diff --git a/lisp/riece-unread.el b/lisp/riece-unread.el
index 5ba652f..9e89695 100644 (file)
--- a/lisp/riece-unread.el
+++ b/lisp/riece-unread.el
@@ -23,11 +23,13 @@
 
 ;;; Commentary:
 
-;; This add-on displays unread mark ("!") for channels which have
-;; "unread messages".
+;; This add-on marks channels where new messages are arrived.
 
-;; To use, add the following line to your ~/.riece/init.el:
-;; (add-to-list 'riece-addons 'riece-unread)
+;; You can check the unread channels via `C-c g' in the commands
+;; buffer, by adding the following lines to ~/.riece/init.el:
+
+;;   (add-hook 'riece-guess-channel-try-functions
+;;             'riece-guess-channel-from-unread)
 
 ;;; Code:
 
@@ -42,11 +44,6 @@
   :prefix "riece-"
   :group 'riece)
 
-(defcustom riece-channel-list-unread-face 'riece-channel-list-unread-face
-  "Face used for displaying unread channels."
-  :type 'face
-  :group 'riece-highlight-faces)
-
 (defface riece-channel-list-unread-face
   '((((class color)
       (background dark))
@@ -58,19 +55,19 @@
      (:bold t)))
   "Face used for displaying unread channels."
   :group 'riece-highlight-faces)
+(defvar riece-channel-list-unread-face 'riece-channel-list-unread-face)
 
 (defvar riece-unread-channels nil)
 
-(defun riece-unread-display-message-function (message)
+(defun riece-unread-after-display-message-function (message)
   (unless (or (riece-message-own-p message)
              (equal (riece-message-target message) riece-current-channel))
     (setq riece-unread-channels
-         (delete (riece-message-target message) riece-unread-channels))
-    (add-to-list 'riece-unread-channels
-                (riece-message-target message))
+         (cons (riece-message-target message)
+               (delete (riece-message-target message) riece-unread-channels)))
     (riece-unread-update-channel-list-buffer)))
 
-(defun riece-unread-channel-switch-hook ()
+(defun riece-unread-after-switch-to-channel-function (last)
   (setq riece-unread-channels
        (delete riece-current-channel
                riece-unread-channels))
@@ -84,15 +81,15 @@
              buffer-read-only)
          (goto-char (point-min))
          (while (not (eobp))
-           (if (looking-at "\\( ?[0-9]+:\\)\\(.\\)\\(.+\\)")
-               (let ((channel (save-match-data
-                                (riece-parse-identity (match-string 3)))))
+           (if (looking-at "\\( ?[0-9]+:\\)\\(.\\)")
+               (let ((channel (get-text-property (match-end 0)
+                                                 'riece-identity)))
                  (replace-match
                   (concat "\\1"
-                          (if (member channel riece-unread-channels)
+                          (if (riece-identity-member channel
+                                                     riece-unread-channels)
                               "!"
-                            "\\2")
-                          "\\3"))))
+                            "\\2")))))
            (forward-line))))))
       
 (defun riece-unread-switch-to-channel ()
@@ -101,21 +98,30 @@
       (riece-command-switch-to-channel (car riece-unread-channels))
     (error "No unread channel!")))
 
+(defun riece-guess-channel-from-unread ()
+  riece-unread-channels)
+
 (defvar riece-command-mode-map)
 (defvar riece-dialogue-mode-map)
 (defvar riece-channel-list-mode-map)
 
 (defun riece-unread-requires ()
-  (if (memq 'riece-highlight riece-addons)
-      '(riece-highlight)))
+  (let (requires)
+    (if (memq 'riece-highlight riece-addons)
+       (setq requires (cons 'riece-highlight requires)))
+;;;    (if (memq 'riece-guess riece-addons)
+;;;    (setq requires (cons 'riece-guess requires)))
+    requires))
 
 (defun riece-unread-insinuate ()
   (add-hook 'riece-after-display-message-functions
-           'riece-unread-display-message-function)
-  (add-hook 'riece-channel-switch-hook
-           'riece-unread-channel-switch-hook)
-  (add-hook 'riece-update-buffer-functions
-           'riece-unread-update-channel-list-buffer t)
+           'riece-unread-after-display-message-function)
+  (add-hook 'riece-after-switch-to-channel-functions
+           'riece-unread-after-switch-to-channel-function)
+  (add-hook 'riece-channel-list-mode-hook
+           (lambda ()
+             (add-hook 'riece-update-buffer-functions
+                       'riece-unread-update-channel-list-buffer t)))
   (define-key riece-command-mode-map
     "\C-c\C-u" 'riece-unread-switch-to-channel)
   (define-key riece-dialogue-mode-map
@@ -125,7 +131,11 @@
   (if (memq 'riece-highlight riece-addons)
       (setq riece-channel-list-mark-face-alist
            (cons '(?! . riece-channel-list-unread-face)
-                 riece-channel-list-mark-face-alist))))
+                 riece-channel-list-mark-face-alist)))
+;;;  (if (memq 'riece-guess riece-addons)
+;;;      (add-hook 'riece-guess-channel-try-functions
+;;;            'riece-guess-channel-from-unread))
+  )
 
 (provide 'riece-unread)