* riece-lsdb.el: Require 'riece-identity; add autoload setting for

[riece] / lisp / riece-lsdb.el

diff --git a/lisp/riece-lsdb.el b/lisp/riece-lsdb.el
index 3c739c9..4ec0f5b 100644 (file)
--- a/lisp/riece-lsdb.el
+++ b/lisp/riece-lsdb.el
@@ -29,35 +29,46 @@
 
 ;;; Code:
 
-(autoload 'lsdb-maybe-load-hash-tables "lsdb")
+(require 'riece-identity)
 
 (eval-when-compile
+  (autoload 'lsdb-maybe-load-hash-tables "lsdb")
   (autoload 'lsdb-lookup-records "lsdb")
   (autoload 'lsdb-puthash "lsdb")
-  (autoload 'lsdb-remhash "lsdb")
+  (autoload 'lsdb-maphash "lsdb")
   (autoload 'lsdb-gethash "lsdb")
-  (autoload 'lsdb-display-records "lsdb"))
+  (autoload 'lsdb-display-records "lsdb")
+  (autoload 'lsdb-update-record "lsdb"))
 
 (defvar riece-lsdb-cache nil)
 
 (defun riece-lsdb-update-cache (record)
   (let ((irc (cdr (assq 'irc record))))
     (while irc
-      (lsdb-puthash (car irc) (car record) riece-lsdb-cache)
+      (lsdb-puthash (car irc)
+                   (cons (car record)
+                         (lsdb-gethash (car irc) riece-lsdb-cache))
+                   riece-lsdb-cache)
       (setq irc (cdr irc)))))
 
 (defun riece-lsdb-delete-cache (record)
   (let ((irc (cdr (assq 'irc record))))
     (while irc
-      (lsdb-remhash (car irc) riece-lsdb-cache)
+      (lsdb-puthash (car irc)
+                   (delete (car record)
+                           (lsdb-gethash (car irc) riece-lsdb-cache))
+                   riece-lsdb-cache)
       (setq irc (cdr irc)))))
 
 (defun riece-lsdb-lookup-records (user)
   (lsdb-maybe-load-hash-tables)
-  (let ((name (lsdb-gethash (riece-format-identity user t)
-                           riece-lsdb-cache)))
-    (if name
-       (lsdb-lookup-records name))))
+  (let ((names (lsdb-gethash (riece-format-identity user t)
+                            riece-lsdb-cache))
+       records)
+    (while names
+      (setq records (append records (lsdb-lookup-records (car names))))
+      (setq names (cdr names)))
+    records))
 
 (defun riece-lsdb-display-records (user)
   (interactive
@@ -70,6 +81,34 @@
        (lsdb-display-records records)
       (message "No entry for `%s'" (riece-format-identity user t)))))
 
+(defvar lsdb-hash-table)
+(defun riece-lsdb-add-user (user full-name)
+  (interactive
+   (let ((completion-ignore-case t)
+        (table lsdb-hash-table))
+     (unless (vectorp table)
+       (setq table (make-vector 29 0))
+       (lsdb-maphash (lambda (key value)
+                      (intern key table))
+                    lsdb-hash-table))
+     (list (riece-completing-read-identity
+           "User: "
+           (riece-get-users-on-server (riece-current-server-name)))
+          (completing-read "Full name: " table))))
+  (let* ((record (lsdb-gethash full-name lsdb-hash-table))
+        (irc (riece-format-identity user t))
+        (old (cdr (assq 'irc record))))
+    ;; Remove all properties before adding entry.
+    (set-text-properties 0 (length irc) nil irc)
+    (unless (member irc old)
+      (lsdb-update-record (list full-name
+                               ;; LSDB does not allow empty 'net entry.
+                               (or (nth 1 (assq 'net (lsdb-lookup-records
+                                                      full-name)))
+                                   ""))
+                         (list (cons 'irc (cons irc old)))))))
+
+(defvar riece-command-mode-map)
 (defun riece-lsdb-insinuate ()
   (require 'lsdb)
   (add-to-list 'lsdb-secondary-hash-tables
@@ -79,7 +118,9 @@
   (add-to-list 'lsdb-after-delete-record-functions
               'riece-lsdb-delete-cache)
   (define-key riece-command-mode-map
-    "\C-cL" 'riece-lsdb-display-records))
+    "\C-c\C-ll" 'riece-lsdb-display-records)
+  (define-key riece-command-mode-map
+    "\C-c\C-la" 'riece-lsdb-add-user))
 
 (provide 'riece-lsdb)