Merge pull request #117 from clojureverse/fix-username-link

[WIP] Fix username link

Author: plexus

bin/librato_report.sh

@@ -109,6 +109,15 @@
        db
        ids))
 
+(defn user-profile
+  "returing all the data about the user acording to the user id slack number"
+  [db id]
+  (ffirst (d/q '[:find (pull ?user [*])
+                 :in $ ?id
+                 :where [?user :user/slack-id ?id]]
+               db
+               id)))
+
 (defn thread-messages
   "Retrieve all child messages for the given parent threads"
   [db parent-tss]

bin/nginx_report.rb

@@ -31,7 +31,7 @@
   "Attach thread messages as :message/children to their parent message"
   [messages thread-messages]
   (let [messages-by-thread-ts (group-by :message/thread-ts thread-messages)]
-    (map (fn[msg]
+    (map (fn [msg]
            (if-let [children (get messages-by-thread-ts (:message/ts msg))]
              (assoc msg :message/children children)
              msg))
@@ -132,6 +132,14 @@
       views/about
       response/render))
 
+(defn user-profile-route [{:keys [endpoint path-params] :as request}]
+  (let [db (db-from-endpoint endpoint)]
+    (-> request
+        make-context
+        (assoc :data/user-profile (queries/user-profile db (:user-id path-params)))
+        views/user-profile-route
+        response/render)))
+
 (defn sitemap-route [{:keys [endpoint] :as request}]
   (let [config @(get-in endpoint [:config :value])
         db (db-from-endpoint endpoint)]
@@ -156,16 +164,18 @@
 (def routes
   [["/" {:name :clojurians-log.routes/index
          :get index-route}]
+   ["/_/_/users/{user-id}" {:name :clojurians-log.routes/user-profile-route
+                            :get user-profile-route}]
    ["/x/x/x/about" {:name :clojurians-log.routes/about
                     :get about-route}]
    ["/x/x/x/sitemap" {:name :clojurians-log.routes/sitemap
                       :get sitemap-route}]
-   ["/x/x/x/healthcheck" {:name :clojurians-log.routes/healthcheck,
+   ["/x/x/x/healthcheck" {:name :clojurians-log.routes/healthcheck
                           :get healthcheck-route}]
-   ["/{channel}" {:name :clojurians-log.routes/channel,
+   ["/{channel}" {:name :clojurians-log.routes/channel
                   :get channel-history-route}]
-   ["/{channel}/{date}" {:name :clojurians-log.routes/channel-date,
+   ["/{channel}/{date}" {:name :clojurians-log.routes/channel-date
                          :get log-route}]
-   ["/{channel}/{date}/{ts}" {:name :clojurians-log.routes/message,
-                              :get log-route}]
-   ["/_/stats/{from-date}/{to-date}" {:name :clojurians-log.routes/message-stats :get message-stats-route}]])
+   ["/{channel}/{date}/{ts}" {:name :clojurians-log.routes/message :get log-route}]
+   ["/_/stats/{from-date}/{to-date}" {:name :clojurians-log.routes/message-stats
+                                      :get message-stats-route}]])

src/clojurians_log/db/queries.clj

@@ -416,4 +416,28 @@
             :line-height "1.33rem"}]
    [:ul {:padding-left "1rem"}]
    [:li {:list-style-type "disc"}]]
-  )
+
+  [:.user-profile-page
+   [:h2 {:text-align "center"
+         :margin-top "20px"
+         :font-family "sans-serif"}]
+   [:section {:box-shadow "0 4px 8px 0 rgba(0, 0, 0, 0.2)"
+              :max-width "350px"
+              :margin "auto"
+              :text-align "center"
+              :font-family "sans-serif"}]
+   [:img {:width "95%"
+          :border-radius "80%"
+          :padding "8px 0px"}]
+   [:.real-name {:color "grey"
+                 :font-size "18px"}]
+   [:.talk-on-slack {:border "none"
+                     :outline "0"
+                     :display "inline-block"
+                     :padding "8px 0px"
+                     :color "white"
+                     :background-color "#000"
+                     :text-align "center"
+                     :cursor "pointer"
+                     :width "100%"
+                     :font-size "18px"}]])

src/clojurians_log/routes.clj

@@ -170,6 +170,11 @@
                              :date future-date})}
         [:div.day-next ">"]])]]])
 
+(defn slack-url [ctx & parts]
+  (apply str
+         (get-in ctx [:request :clojurians-log.application/slack-instance])
+         parts))
+
 (defn- single-message
   "Returns the hiccup of a single message"
   [{:keys [request]
@@ -178,26 +183,26 @@
    {:message/keys [user inst user text thread-ts ts] :as message}]
 
   (let [{:user/keys         [name slack-id]
-         :user-profile/keys [display-name real-name image-48]} user
-        slack-instance (:clojurians-log.application/slack-instance request)]
-
+         :user-profile/keys [display-name real-name image-48]} user]
     ;; things in the profile
     ;; :image_512 :email :real_name_normalized :image_48 :image_192 :real_name :image_72 :image_24
     ;; :avatar_hash :title :team :image_32 :display_name :display_name_normalized
-    (list [:div.message
-           {:id (cl.tu/format-inst-id inst) :class (when (thread-child? message) "thread-msg")}
-           [:a.message_profile-pic {:href (str slack-instance "/team/" slack-id) :style (str "background-image: url(" image-48 ");")}]
-           [:a.message_username {:href (str slack-instance "/team/" slack-id)}
-            (some #(when-not (str/blank? %) %) [display-name real-name name])]
-           [:span.message_timestamp [:a {:rel  "nofollow"
-                                         :href (path-for context
-                                                         :clojurians-log.routes/message
-                                                         {:channel (:channel/name channel)
-                                                          :date date
-                                                          :ts ts})}
-                                     (cl.tu/format-inst-time inst)]]
-           [:span.message_star]
-           [:span.message_content [:p (slack-messages/message->hiccup text usernames emojis)]]])))
+    [:div.message
+     {:id (cl.tu/format-inst-id inst) :class (when (thread-child? message) "thread-msg")}
+     [:a.message_profile-pic {:href (slack-url context "/users/x/x/" slack-id)
+                              :style (str "background-image: url(" image-48 ");")}]
+     ;;[:a.message_username {:href (str slack-instance "/team/" slack-id)}
+     [:a.message_username {:href (str "/_/_/users/" slack-id)}
+      (some #(when-not (str/blank? %) %) [display-name real-name name])]
+     [:span.message_timestamp [:a {:rel  "nofollow"
+                                   :href (path-for context
+                                                   :clojurians-log.routes/message
+                                                   {:channel (:channel/name channel)
+                                                    :date date
+                                                    :ts ts})}
+                               (cl.tu/format-inst-time inst)]]
+     [:span.message_star]
+     [:span.message_content [:p (slack-messages/message->hiccup text usernames emojis)]]]))
 
 (defn- message-hiccup
   "Returns either a single message hiccup, or if the given message starts a thread,
@@ -280,6 +285,21 @@
      [:section#about
       (:data/about-hiccup context)]]]])
 
+(defn- user-profile-html [context]
+  [:html.user-profile-page
+   (page-head context)
+   [:body
+    [:h2 "User Profile"]
+    [:section
+     (let [user-profile (get-in context [:data/user-profile])
+           {:user-profile/keys [display-name real-name image-192]
+            :user/keys [slack-id]} user-profile]
+       (list
+        [:img {:src image-192 :alt (str display-name " avatar")}]
+        [:h1 display-name]
+        [:p.real-name real-name]
+        [:a.talk-on-slack {:href (slack-url context "/team/" slack-id)} "let's talk on Slack"]))]]])
+
 (defn- sitemap-xml [{:data/keys [channel-day-tuples http-origin] :as context}]
   [:urlset {:xmlns "http://www.sitemaps.org/schemas/sitemap/0.9"}
    (for [[{:channel/keys [name]} channel-days] channel-day-tuples]
@@ -312,7 +332,7 @@
    [:body
     [:div
      [:h4 "Slack message stats"]
-     [:p 
+     [:p
       [:strong {:style {:border-bottom "1px solid black"}} (:day (first message-stats))]
       " to "
       [:strong {:style {:border-bottom "1px solid black"}} (:day (last message-stats))]]
@@ -341,8 +361,11 @@
 (defn about [context]
   (assoc context :response/html (about-html context)))
 
+(defn user-profile-route [context]
+  (assoc context :response/html (user-profile-html context)))
+
 (defn sitemap [context]
   (assoc context :response/xml (sitemap-xml context)))
 
 (defn message-stats-page [context]
-  (assoc context :response/html (message-stats-page-html context)))
+  (assoc context :response/html (message-stats-page-html context)))