r8485: add time for topicwhotime

diff --git a/irc-logger.asd b/irc-logger.asd
index b36a25d145f300f3e496d3ef5a4de56d8e0d8000..89e883e03d3f4243dffb9cd555a48446c96ce5b6 100644 (file)
--- a/irc-logger.asd
+++ b/irc-logger.asd
@@ -7,7 +7,7 @@
 (in-package irc-logger-system)
 
 (defsystem irc-logger
-    :depends-on (cl-irc cl-ppcre)
+    :depends-on (cl-irc cl-ppcre uffi)
     :components ((:file "package")
                 (:file "logger" :depends-on ("package"))))
 

diff --git a/logger.lisp b/logger.lisp
index 7c341299b3d07f120ed3c9b436477dbbd18197f4..449f154a08e97c76b37f1e0c0e4c43b87347b252 100644 (file)
--- a/logger.lisp
+++ b/logger.lisp
@@ -246,12 +246,26 @@
     (format stream "~S~%" 
            (string-right-trim '(#\return) (raw-message-string msg)))))
 
+(uffi:def-foreign-type time-t :unsigned-long)
+(uffi:def-function ("ctime" c-ctime) 
+    ((time (* time-t)))
+  :returning :cstring)
+
 (defun last-sexp-field (type msg)
   (cond
    ((null msg)
     nil)
    ((eq type :kick)
     (trailing-argument msg))
+   ((eq type :rpl_topicwhotime)
+    (when (stringp (car (last (arguments msg))))
+      (let ((secs (parse-integer (car (last (arguments msg))) :junk-allowed t)))
+       (when secs
+         (string-right-trim '(#\newline #\return)
+                            (uffi:convert-from-cstring
+                             (uffi:with-foreign-object (time 'time-t)
+                               (setf (uffi:deref-pointer time :unsigned-long) secs)
+                               (c-ctime time))))))))
    ((need-user-address? type)
     (user-address msg))))
 
@@ -471,8 +485,8 @@
 
 (defun rpl_topicwhotime-hook (msg)
   (output-event msg :rpl_topicwhotime
-               (format nil "~{~A~^ ~}" (arguments msg))
-               (trailing-argument msg)))
+               (second (arguments msg))
+               (third (arguments msg))))
 
 
 (defun invite-hook (msg)
@@ -542,7 +556,8 @@
        irc::irc-rpl_killdone-message irc::irc-rpl_closing-message
        irc::irc-rpl_topic-message irc::irc-rpl_namreply-message
        irc::irc-rpl_endofnames-message irc::irc-rpl_topicwhotime-message
-       irc::irc-rpl_motd irc::irc-rpl_motdstart-message irc::irc-rpl_endofmotd-message)
+       irc::irc-rpl_motd-message irc::irc-rpl_motdstart-message
+       irc::irc-rpl_endofmotd-message)
        ;; nothing to do
        )
       (t
@@ -634,7 +649,7 @@
 (defun add-logger (nick server &key channels output (password "")
                                    realname username private-log unknown-log
                                    (logging-stream t) (async t)
-                                   (formats '(:text)))
+                                   (formats '(:sexp)))
   (when (find-logger-with-nick nick)
     (format
      (get-private-log-stream (find-logger-with-nick nick))