Merge branch 'master' of dumpfm:/pichat/repo

1 files changed, 19 insertions, 1 deletions

diff --git a/src/admin.clj b/src/admin.clj
index 3a5abe7..1073095 100644
--- a/src/admin.clj
+++ b/src/admin.clj
@@ -35,6 +35,10 @@
 SELECT * FROM users ORDER BY created_on DESC LIMIT 5000
 ")
 
+(def fetch-recent-users-query "
+SELECT * FROM users WHERE last_login IS NOT NULL ORDER BY last_login DESC LIMIT 1000
+")
+
 (def fetch-active-mutes-query "
 SELECT  m.*,
         (m.set_on + m.duration) AS expiry,
@@ -75,6 +79,9 @@ LIMIT 1
 (defn fetch-new-users []
   (do-select [fetch-new-users-query]))
 
+(defn fetch-recent-users []
+  (do-select [fetch-recent-users-query]))
+
 (defn fetch-active-mutes []
   (do-select [fetch-active-mutes-query]))
 
@@ -178,7 +185,7 @@ AND cancelled = false
      (.setAttribute st "inactive" (f inactive))
      (.toString st))))
 
-;; Recent users list
+;; New users list
 
 (defn show-users [session params]
   (if-vip
@@ -189,6 +196,17 @@ AND cancelled = false
      (.setAttribute st "users" (f users))
      (.toString st))))
 
+;; Recent users list
+
+(defn show-lastlog [session params]
+  (if-vip
+   (let [st         (fetch-template "users" session)
+         users      (fetch-recent-users)
+         formatter  (partial apply-formats user-formatter)
+         f          #(map (comp stringify-and-escape formatter) %)]
+     (.setAttribute st "users" (f users))
+     (.toString st))))
+
 ;; Debug Page
 
 (defn error-header [& text]