From d3c6c51a9f8e88b8b7c231d3f9f3b5ebf4f99673 Mon Sep 17 00:00:00 2001
From: Shiloh <dogdazedd@gmail.com>
Date: Mon, 14 Oct 2024 18:32:54 -0700
Subject: [PATCH 01/12] basic implementation of timestamps in game log

---
 .gitignore                     |  1 +
 src/cljs/nr/gameboard/log.cljs | 18 +++++++++++-------
 src/css/chat.styl              |  3 +++
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 572a1c40a2..c570c37b08 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,6 +16,7 @@ pom.xml
 .nrepl-history
 .rebel_readline_history
 .idea
+*.iml
 .eastwood
 .cache
 
diff --git a/src/cljs/nr/gameboard/log.cljs b/src/cljs/nr/gameboard/log.cljs
index 068c3085d7..e956b4aa1b 100644
--- a/src/cljs/nr/gameboard/log.cljs
+++ b/src/cljs/nr/gameboard/log.cljs
@@ -215,13 +215,17 @@
                (map
                  (fn [{:keys [user text timestamp]}]
                    ^{:key timestamp}
-                   (if (= user "__system__")
-                     [:div.system (render-message (render-player-highlight text @corp @runner))]
-                     [:div.message
-                      [avatar user {:opts {:size 38}}]
-                      [:div.content
-                       [:div.username (:username user)]
-                       [:div (render-message text)]]]))
+                   [:div.message-container
+                    (when (not= text "[hr]")
+                      [:div.timestamp "[ " (.toLocaleTimeString (js/Date. timestamp)) " ]"])
+                    (if (= user "__system__")
+                      [:div.system (render-message (render-player-highlight text @corp @runner))]
+                      [:div.message
+                       [avatar user {:opts {:size 38}}]
+                       [:div.content
+                        [:div.username (:username user)]
+                        [:div (render-message text)]]]
+                      )])
                  @log)))})))
 
 (defn log-pane []
diff --git a/src/css/chat.styl b/src/css/chat.styl
index 6b24df6467..b5a462f0de 100644
--- a/src/css/chat.styl
+++ b/src/css/chat.styl
@@ -31,6 +31,9 @@
         left: -70px
         transition(all 0.2s ease-in-out)
 
+.message-container .timestamp
+    font-size: .5rem
+
 .message
     display-flex()
     margin-bottom: 5px

From 59c96cdb46f0d9e232cc70836ca80f2f927bf823 Mon Sep 17 00:00:00 2001
From: Shiloh <dogdazedd@gmail.com>
Date: Tue, 15 Oct 2024 02:01:12 -0700
Subject: [PATCH 02/12] move timestamps inline, refactor into functions, adjust
 css structure

---
 src/cljs/nr/gameboard/log.cljs | 63 +++++++++++++++++++++-------------
 src/css/chat.styl              | 20 +++++++++--
 2 files changed, 58 insertions(+), 25 deletions(-)

diff --git a/src/cljs/nr/gameboard/log.cljs b/src/cljs/nr/gameboard/log.cljs
index e956b4aa1b..71f963d2eb 100644
--- a/src/cljs/nr/gameboard/log.cljs
+++ b/src/cljs/nr/gameboard/log.cljs
@@ -1,20 +1,20 @@
 (ns nr.gameboard.log
   (:require
-   [clojure.string :as string]
-   [jinteki.utils :refer [command-info]]
-   [nr.angel-arena.log :as angel-arena-log]
-   [nr.appstate :refer [app-state current-gameid]]
-   [nr.avatar :refer [avatar]]
-   [nr.gameboard.actions :refer [send-command]]
-   [nr.gameboard.card-preview :refer [card-preview-mouse-out
-                                      card-preview-mouse-over zoom-channel]]
-   [nr.gameboard.state :refer [game-state not-spectator?]]
-   [nr.translations :refer [tr]]
-   [nr.utils :refer [influence-dot player-highlight-option-class
-                     render-message render-player-highlight]]
-   [nr.ws :as ws]
-   [reagent.core :as r]
-   [reagent.dom :as rdom]))
+    [clojure.string :as string]
+    [jinteki.utils :refer [command-info]]
+    [nr.angel-arena.log :as angel-arena-log]
+    [nr.appstate :refer [app-state current-gameid]]
+    [nr.avatar :refer [avatar]]
+    [nr.gameboard.actions :refer [send-command]]
+    [nr.gameboard.card-preview :refer [card-preview-mouse-out
+                                       card-preview-mouse-over zoom-channel]]
+    [nr.gameboard.state :refer [game-state not-spectator?]]
+    [nr.translations :refer [tr]]
+    [nr.utils :refer [influence-dot player-highlight-option-class
+                      render-message render-player-highlight]]
+    [nr.ws :as ws]
+    [reagent.core :as r]
+    [reagent.dom :as rdom]))
 
 (def commands (distinct (map :name command-info)))
 (def command-info-map (->> command-info
@@ -178,6 +178,23 @@
          [indicate-action]
          [command-menu !input-ref state]]))))
 
+(defn format-system-timestamp [timestamp text corp runner]
+  (if (contains? (set [corp runner]) (first (string/split text #" ")))
+    [:div.timestamp-wrapper
+      [:span.timestamp "[" (.toLocaleTimeString (js/Date. timestamp)) "]"]
+      (render-message (render-player-highlight text corp runner))
+      ]
+    (render-message (render-player-highlight text corp runner))
+    )
+  )
+
+(defn format-user-timestamp [timestamp user]
+  [:div.timestamp-wrapper
+   [:div.timestamp "[" (.toLocaleTimeString (js/Date. timestamp)) "]"]
+   [:div.username (:username user)]
+   ]
+  )
+
 (defn log-messages []
   (let [log (r/cursor game-state [:log])
         corp (r/cursor game-state [:corp :user :username])
@@ -215,17 +232,17 @@
                (map
                  (fn [{:keys [user text timestamp]}]
                    ^{:key timestamp}
-                   [:div.message-container
-                    (when (not= text "[hr]")
-                      [:div.timestamp "[ " (.toLocaleTimeString (js/Date. timestamp)) " ]"])
-                    (if (= user "__system__")
-                      [:div.system (render-message (render-player-highlight text @corp @runner))]
+                   (if (= user "__system__")
+                      [:div.system
+                        (format-system-timestamp timestamp text @corp @runner)]
                       [:div.message
-                       [avatar user {:opts {:size 38}}]
+                       [:div.avatar-box
+                        [avatar user {:opts {:size 38}}]
+                        ]
                        [:div.content
-                        [:div.username (:username user)]
+                        (format-user-timestamp timestamp user)
                         [:div (render-message text)]]]
-                      )])
+                      ))
                  @log)))})))
 
 (defn log-pane []
diff --git a/src/css/chat.styl b/src/css/chat.styl
index b5a462f0de..e7c6accf8f 100644
--- a/src/css/chat.styl
+++ b/src/css/chat.styl
@@ -31,8 +31,18 @@
         left: -70px
         transition(all 0.2s ease-in-out)
 
-.message-container .timestamp
-    font-size: .5rem
+.timestamp-wrapper
+    display: inline
+
+.timestamp-wrapper .timestamp
+    color: #999999
+    margin-right: .5em
+    font-size .5rem
+    display inline
+
+.timestamp-wrapper :nth-child(2)
+    display inline
+    word-wrap break-word
 
 .message
     display-flex()
@@ -47,6 +57,12 @@
     .content
         flex(1)
 
+    .avatar-box
+        margin-right: .1rem
+        display: flex
+        align-items: center
+        height auto
+
     .block-menu
         display: none
         position: absolute

From 0ec65529446bd31b7e9a5fe98182d2e92fca33e3 Mon Sep 17 00:00:00 2001
From: Shiloh <dogdazedd@gmail.com>
Date: Tue, 15 Oct 2024 11:30:32 -0700
Subject: [PATCH 03/12] option in settings

---
 src/cljs/nr/account.cljs            |  9 +++++++++
 src/cljs/nr/appstate.cljs           |  1 +
 src/cljs/nr/gameboard/log.cljs      | 24 +++++++++++++++---------
 src/cljs/nr/gameboard/settings.cljs |  8 ++++++++
 src/cljs/nr/gameboard/state.cljs    |  3 +++
 src/css/base.styl                   |  2 +-
 src/css/chat.styl                   |  3 +++
 7 files changed, 40 insertions(+), 10 deletions(-)

diff --git a/src/cljs/nr/account.cljs b/src/cljs/nr/account.cljs
index 3a25864779..f0f7fd71e6 100644
--- a/src/cljs/nr/account.cljs
+++ b/src/cljs/nr/account.cljs
@@ -50,6 +50,7 @@
   (swap! app-state assoc-in [:options :stacked-cards] (:stacked-cards @s))
   (swap! app-state assoc-in [:options :ghost-trojans] (:ghost-trojans @s))
   (swap! app-state assoc-in [:options :sides-overlap] (:sides-overlap @s))
+  (swap! app-state assoc-in [:options :log-timestamps] (:log-timestamps @s))
   (swap! app-state assoc-in [:options :runner-board-order] (:runner-board-order @s))
   (swap! app-state assoc-in [:options :log-width] (:log-width @s))
   (swap! app-state assoc-in [:options :log-top] (:log-top @s))
@@ -70,6 +71,7 @@
   (.setItem js/localStorage "stacked-cards" (:stacked-cards @s))
   (.setItem js/localStorage "ghost-trojans" (:ghost-trojans @s))
   (.setItem js/localStorage "sides-overlap" (:sides-overlap @s))
+  (.setItem js/localStorage "log-timestamps" (:log-timestamps @s))
   (.setItem js/localStorage "runner-board-order" (:runner-board-order @s))
   (.setItem js/localStorage "card-back" (:card-back @s))
   (.setItem js/localStorage "card-zoom" (:card-zoom @s))
@@ -384,6 +386,12 @@
                              :checked (:sides-overlap @s)
                              :on-change #(swap! s assoc-in [:sides-overlap] (.. % -target -checked))}]
              (tr [:settings.sides-overlap "Runner and Corp board may overlap"])]]
+           [:div
+            [:label [:input {:type "checkbox"
+                             :value true
+                             :checked (:log-timestamps @s)
+                             :on-change #(swap! s assoc-in [:log-timestamps] (.. % -target -checked))}]
+             (tr [:settings.log-timestamps "Show log timestamps"])]]
 
            [:br]
            [:h4 (tr [:settings.runner-layout "Runner layout from Corp perspective"])]
@@ -606,6 +614,7 @@
                        :stacked-cards (get-in @app-state [:options :stacked-cards])
                        :ghost-trojans (get-in @app-state [:options :ghost-trojans])
                        :sides-overlap (get-in @app-state [:options :sides-overlap])
+                       :log-timestamps (get-in @app-state [:options :log-timestamps])
                        :player-stats-icons (get-in @app-state [:options :player-stats-icons])
                        :runner-board-order (get-in @app-state [:options :runner-board-order])
                        :log-width (get-in @app-state [:options :log-width])
diff --git a/src/cljs/nr/appstate.cljs b/src/cljs/nr/appstate.cljs
index be28371693..b9aa85d297 100644
--- a/src/cljs/nr/appstate.cljs
+++ b/src/cljs/nr/appstate.cljs
@@ -40,6 +40,7 @@
                             :player-stats-icons (= (get-local-value "player-stats-icons" "true") "true")
                             :stacked-servers (= (get-local-value "stacked-servers" "true") "true")
                             :sides-overlap (= (get-local-value "sides-overlap" "true") "true")
+                            :log-timestamps (= (get-local-value "log-timestamps" "true") "true")
                             :runner-board-order (let [value (get-local-value "runner-board-order" "irl")]
                                                   (case value
                                                     "true" "jnet"
diff --git a/src/cljs/nr/gameboard/log.cljs b/src/cljs/nr/gameboard/log.cljs
index 71f963d2eb..c62486f304 100644
--- a/src/cljs/nr/gameboard/log.cljs
+++ b/src/cljs/nr/gameboard/log.cljs
@@ -8,7 +8,7 @@
     [nr.gameboard.actions :refer [send-command]]
     [nr.gameboard.card-preview :refer [card-preview-mouse-out
                                        card-preview-mouse-over zoom-channel]]
-    [nr.gameboard.state :refer [game-state not-spectator?]]
+    [nr.gameboard.state :refer [game-state not-spectator? all-users?]]
     [nr.translations :refer [tr]]
     [nr.utils :refer [influence-dot player-highlight-option-class
                       render-message render-player-highlight]]
@@ -179,20 +179,26 @@
          [command-menu !input-ref state]]))))
 
 (defn format-system-timestamp [timestamp text corp runner]
-  (if (contains? (set [corp runner]) (first (string/split text #" ")))
-    [:div.timestamp-wrapper
-      [:span.timestamp "[" (.toLocaleTimeString (js/Date. timestamp)) "]"]
+  (if (get-in @app-state [:options :log-timestamps])
+    (if (not= text "[hr]")
+      [:div.timestamp-wrapper
+       [:span.timestamp "[" (.toLocaleTimeString (js/Date. timestamp)) "]"]
+       (render-message (render-player-highlight text corp runner))
+       ]
       (render-message (render-player-highlight text corp runner))
-      ]
+      )
     (render-message (render-player-highlight text corp runner))
     )
   )
 
 (defn format-user-timestamp [timestamp user]
-  [:div.timestamp-wrapper
-   [:div.timestamp "[" (.toLocaleTimeString (js/Date. timestamp)) "]"]
-   [:div.username (:username user)]
-   ]
+  (if (get-in @app-state [:options :log-timestamps])
+    [:div.timestamp-wrapper
+     [:div.timestamp "[" (.toLocaleTimeString (js/Date. timestamp)) "]"]
+     [:div.username (:username user)]
+     ]
+    [:div.username (:username user)]
+    )
   )
 
 (defn log-messages []
diff --git a/src/cljs/nr/gameboard/settings.cljs b/src/cljs/nr/gameboard/settings.cljs
index 99c00b3741..af06897726 100644
--- a/src/cljs/nr/gameboard/settings.cljs
+++ b/src/cljs/nr/gameboard/settings.cljs
@@ -60,6 +60,14 @@
                                  :on-change #(swap! app-state assoc-in [:options :runner-board-order] (.. % -target -value))
                                  :checked (= (get-in @app-state [:options :runner-board-order]) (:ref option))}]
                  (:name option)]]))]
+     [:section
+      [:h4 (tr [:ingame-settings.log-timestamps "Log timestamps"])]
+      [:div
+       [:label [:input {:type "checkbox"
+                        :value true
+                        :checked (get-in @app-state [:options :log-timestamps])
+                        :on-change #(swap! app-state assoc-in [:options :log-timestamps] (.. % -target -checked))}]
+        (tr [:ingame-settings.log-timestamps "Show log timestamps"])]]]
 
      [:section
       [:h4 (tr [:ingame-settings.board-overlap "Board overlap"])]
diff --git a/src/cljs/nr/gameboard/state.cljs b/src/cljs/nr/gameboard/state.cljs
index c3e7e9a1bf..7442d94a58 100644
--- a/src/cljs/nr/gameboard/state.cljs
+++ b/src/cljs/nr/gameboard/state.cljs
@@ -36,6 +36,9 @@
 (defn not-spectator? []
   (not= :spectator (get-side @game-state)))
 
+(defn all-users? []
+  (get-side @game-state))
+
 (defn check-lock?
   "Check if we can clear client lock based on action-id"
   []
diff --git a/src/css/base.styl b/src/css/base.styl
index f0631347d8..adc0308a2b 100644
--- a/src/css/base.styl
+++ b/src/css/base.styl
@@ -253,7 +253,7 @@ button.off
     margin-left: 2px
     margin-right: 2px
     width: 12px
-    display: inline-block
+    display: inline-block !important
     text-align: center
 
 .warning
diff --git a/src/css/chat.styl b/src/css/chat.styl
index e7c6accf8f..21e278e643 100644
--- a/src/css/chat.styl
+++ b/src/css/chat.styl
@@ -40,6 +40,9 @@
     font-size .5rem
     display inline
 
+.timestamp-wrapper .username
+    line-height .875rem !important
+
 .timestamp-wrapper :nth-child(2)
     display inline
     word-wrap break-word

From 6ed22a622361cc0ec65fff7ed1279247f0d63845 Mon Sep 17 00:00:00 2001
From: Shiloh <dogdazedd@gmail.com>
Date: Tue, 15 Oct 2024 13:11:53 -0700
Subject: [PATCH 04/12] solve css problems

---
 src/cljs/nr/gameboard/log.cljs |  8 +++-----
 src/css/chat.styl              | 16 +++++++---------
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/src/cljs/nr/gameboard/log.cljs b/src/cljs/nr/gameboard/log.cljs
index c62486f304..af3152924c 100644
--- a/src/cljs/nr/gameboard/log.cljs
+++ b/src/cljs/nr/gameboard/log.cljs
@@ -181,7 +181,7 @@
 (defn format-system-timestamp [timestamp text corp runner]
   (if (get-in @app-state [:options :log-timestamps])
     (if (not= text "[hr]")
-      [:div.timestamp-wrapper
+      [:div.timestamp-wrapper-system
        [:span.timestamp "[" (.toLocaleTimeString (js/Date. timestamp)) "]"]
        (render-message (render-player-highlight text corp runner))
        ]
@@ -194,8 +194,8 @@
 (defn format-user-timestamp [timestamp user]
   (if (get-in @app-state [:options :log-timestamps])
     [:div.timestamp-wrapper
-     [:div.timestamp "[" (.toLocaleTimeString (js/Date. timestamp)) "]"]
      [:div.username (:username user)]
+     [:div.timestamp "[" (.toLocaleTimeString (js/Date. timestamp)) "]"]
      ]
     [:div.username (:username user)]
     )
@@ -242,9 +242,7 @@
                       [:div.system
                         (format-system-timestamp timestamp text @corp @runner)]
                       [:div.message
-                       [:div.avatar-box
-                        [avatar user {:opts {:size 38}}]
-                        ]
+                       [avatar user {:opts {:size 38}}]
                        [:div.content
                         (format-user-timestamp timestamp user)
                         [:div (render-message text)]]]
diff --git a/src/css/chat.styl b/src/css/chat.styl
index 21e278e643..acba72df0a 100644
--- a/src/css/chat.styl
+++ b/src/css/chat.styl
@@ -32,21 +32,19 @@
         transition(all 0.2s ease-in-out)
 
 .timestamp-wrapper
-    display: inline
+    display: flex
+    margin-top: -.125rem
+    line-height 1rem !important
 
-.timestamp-wrapper .timestamp
+.timestamp-wrapper .username
+    margin-top: 0 !important
+
+.timestamp
     color: #999999
     margin-right: .5em
     font-size .5rem
     display inline
 
-.timestamp-wrapper .username
-    line-height .875rem !important
-
-.timestamp-wrapper :nth-child(2)
-    display inline
-    word-wrap break-word
-
 .message
     display-flex()
     margin-bottom: 5px

From 967fff6c7170c07d454e268107303aa81636103c Mon Sep 17 00:00:00 2001
From: Shiloh <dogdazedd@gmail.com>
Date: Tue, 15 Oct 2024 13:43:39 -0700
Subject: [PATCH 05/12] remove AM PM

---
 src/cljs/nr/gameboard/log.cljs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/cljs/nr/gameboard/log.cljs b/src/cljs/nr/gameboard/log.cljs
index af3152924c..64b089eb06 100644
--- a/src/cljs/nr/gameboard/log.cljs
+++ b/src/cljs/nr/gameboard/log.cljs
@@ -182,7 +182,7 @@
   (if (get-in @app-state [:options :log-timestamps])
     (if (not= text "[hr]")
       [:div.timestamp-wrapper-system
-       [:span.timestamp "[" (.toLocaleTimeString (js/Date. timestamp)) "]"]
+       [:span.timestamp "[" (string/replace (.toLocaleTimeString (js/Date. timestamp)) #"\s\w*" "") "]"]
        (render-message (render-player-highlight text corp runner))
        ]
       (render-message (render-player-highlight text corp runner))
@@ -195,7 +195,7 @@
   (if (get-in @app-state [:options :log-timestamps])
     [:div.timestamp-wrapper
      [:div.username (:username user)]
-     [:div.timestamp "[" (.toLocaleTimeString (js/Date. timestamp)) "]"]
+     [:div.timestamp "[" (string/replace (.toLocaleTimeString (js/Date. timestamp)) #"\s\w*" "") "]"]
      ]
     [:div.username (:username user)]
     )

From 98de0bb87585f5af36f1e5265d942a6ec879b1fb Mon Sep 17 00:00:00 2001
From: Shiloh <dogdazedd@gmail.com>
Date: Thu, 17 Oct 2024 17:47:46 -0700
Subject: [PATCH 06/12] finalize css, cleanup logic

---
 src/cljs/nr/gameboard/log.cljs |  8 +-------
 src/cljs/nr/utils.cljs         | 25 +++++++++++++++++++------
 src/css/chat.styl              | 19 ++++++++++++++-----
 src/css/gameboard.styl         |  3 ++-
 4 files changed, 36 insertions(+), 19 deletions(-)

diff --git a/src/cljs/nr/gameboard/log.cljs b/src/cljs/nr/gameboard/log.cljs
index 64b089eb06..95d65a2cfb 100644
--- a/src/cljs/nr/gameboard/log.cljs
+++ b/src/cljs/nr/gameboard/log.cljs
@@ -180,13 +180,7 @@
 
 (defn format-system-timestamp [timestamp text corp runner]
   (if (get-in @app-state [:options :log-timestamps])
-    (if (not= text "[hr]")
-      [:div.timestamp-wrapper-system
-       [:span.timestamp "[" (string/replace (.toLocaleTimeString (js/Date. timestamp)) #"\s\w*" "") "]"]
-       (render-message (render-player-highlight text corp runner))
-       ]
-      (render-message (render-player-highlight text corp runner))
-      )
+    (render-message (render-player-highlight text corp runner (str "[" (string/replace (.toLocaleTimeString (js/Date. timestamp)) #"\s\w*" "") "]")))
     (render-message (render-player-highlight text corp runner))
     )
   )
diff --git a/src/cljs/nr/utils.cljs b/src/cljs/nr/utils.cljs
index 26ed05c9c9..1f56c098cf 100644
--- a/src/cljs/nr/utils.cljs
+++ b/src/cljs/nr/utils.cljs
@@ -270,6 +270,8 @@
   fragment, and index each HTML element in the return fragment with the :key
   attribute as required by React"
   [fragment patterns]
+  (print "frag" fragment)
+  (print "shiloh" patterns)
   (let [counter (atom 0)
         set-next-key (fn [elem] (set-react-key (do (swap! counter inc) @counter) elem))]
     (->> (reduce replace-in-fragment fragment patterns)
@@ -308,18 +310,29 @@
   [input]
   (render-specials (render-icons (render-cards input))))
 
-(defn- player-highlight-patterns-impl [corp runner]
-  (letfn [(regex-of [player-name] (re-pattern (str "^" (regex-escape player-name))))]
-    (->> {corp [:span.corp-username corp]
-          runner [:span.runner-username runner]}
+(defn wrap-timestamp
+  [element timestamp]
+  (if (some? timestamp)
+    [:div.timestamp-wrapper-system element [:span.timestamp.timestamp-system timestamp]]
+    element
+    )
+  )
+
+(defn- player-highlight-patterns-impl [corp runner timestamp]
+  (letfn [(regex-of [player-name] (print player-name "shiloh shiloh" corp runner)(re-pattern (str "^" (regex-escape player-name))))]
+    (->> {corp (wrap-timestamp [:span.corp-username corp] timestamp)
+          runner (wrap-timestamp [:span.runner-username runner] timestamp)}
          (filter (fn [[k _]] (not-empty k)))
          (mapcat (fn [[k v]] [[(regex-of k) v]
                               [(regex-of (str "[!]" k)) [:<> [:div.smallwarning "!"] v]]]))
          (sort-by (comp count str first) >))))
 (def player-highlight-patterns (memoize player-highlight-patterns-impl))
 
-(defn render-player-highlight [message corp runner]
-  (render-input message (player-highlight-patterns corp runner)))
+(defn render-player-highlight
+  ([message corp runner] (render-player-highlight message corp runner nil))
+  ([message corp runner timestamp]
+  (render-input message (player-highlight-patterns corp runner timestamp)))
+  )
 
 (defn player-highlight-option-class []
   (case (get-in @app-state [:options :log-player-highlight])
diff --git a/src/css/chat.styl b/src/css/chat.styl
index acba72df0a..07e4dcd8d6 100644
--- a/src/css/chat.styl
+++ b/src/css/chat.styl
@@ -33,17 +33,26 @@
 
 .timestamp-wrapper
     display: flex
-    margin-top: -.125rem
-    line-height 1rem !important
 
 .timestamp-wrapper .username
-    margin-top: 0 !important
+    margin-right: 0
+
+.timestamp-wrapper .timestamp
+    line-height: .5rem
+    margin-top: .15rem
+
+.timestamp-wrapper-system
+    display: inline-flex
+    line-height .75rem !important
 
 .timestamp
     color: #999999
-    margin-right: .5em
     font-size .5rem
-    display inline
+    display inline-flex
+    margin-left: .15rem
+
+//.timestamp-system
+//    margin-left: .1rem
 
 .message
     display-flex()
diff --git a/src/css/gameboard.styl b/src/css/gameboard.styl
index 28795c4ad5..d6856f8992 100644
--- a/src/css/gameboard.styl
+++ b/src/css/gameboard.styl
@@ -1077,7 +1077,8 @@
 
                     .username
                         font-size: .875rem
-                        margin-top: -2px
+                        margin-top: -.0875rem
+                        line-height: .91rem
 
                     .avatar
                         width: 28px

From b89caeef705489ec4933e3ee1d018a8464ab5f30 Mon Sep 17 00:00:00 2001
From: Shiloh <dogdazedd@gmail.com>
Date: Thu, 17 Oct 2024 17:53:23 -0700
Subject: [PATCH 07/12] css nudge

---
 src/css/chat.styl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/css/chat.styl b/src/css/chat.styl
index 07e4dcd8d6..7fe3b5b13e 100644
--- a/src/css/chat.styl
+++ b/src/css/chat.styl
@@ -49,7 +49,7 @@
     color: #999999
     font-size .5rem
     display inline-flex
-    margin-left: .15rem
+    margin-left: .12rem
 
 //.timestamp-system
 //    margin-left: .1rem

From 49c2281fe9c4ce966e82c6ff9e81d965ba832b20 Mon Sep 17 00:00:00 2001
From: Shiloh <dogdazedd@gmail.com>
Date: Thu, 17 Oct 2024 18:02:31 -0700
Subject: [PATCH 08/12] cleanup code, reformat css to avoid collision with
 existing classNames

---
 src/cljs/nr/gameboard/log.cljs   |  2 +-
 src/cljs/nr/gameboard/state.cljs |  3 ---
 src/cljs/nr/utils.cljs           |  2 --
 src/css/chat.styl                | 33 ++++++++++++++------------------
 4 files changed, 15 insertions(+), 25 deletions(-)

diff --git a/src/cljs/nr/gameboard/log.cljs b/src/cljs/nr/gameboard/log.cljs
index 95d65a2cfb..4273aae620 100644
--- a/src/cljs/nr/gameboard/log.cljs
+++ b/src/cljs/nr/gameboard/log.cljs
@@ -8,7 +8,7 @@
     [nr.gameboard.actions :refer [send-command]]
     [nr.gameboard.card-preview :refer [card-preview-mouse-out
                                        card-preview-mouse-over zoom-channel]]
-    [nr.gameboard.state :refer [game-state not-spectator? all-users?]]
+    [nr.gameboard.state :refer [game-state not-spectator?]]
     [nr.translations :refer [tr]]
     [nr.utils :refer [influence-dot player-highlight-option-class
                       render-message render-player-highlight]]
diff --git a/src/cljs/nr/gameboard/state.cljs b/src/cljs/nr/gameboard/state.cljs
index 7442d94a58..c3e7e9a1bf 100644
--- a/src/cljs/nr/gameboard/state.cljs
+++ b/src/cljs/nr/gameboard/state.cljs
@@ -36,9 +36,6 @@
 (defn not-spectator? []
   (not= :spectator (get-side @game-state)))
 
-(defn all-users? []
-  (get-side @game-state))
-
 (defn check-lock?
   "Check if we can clear client lock based on action-id"
   []
diff --git a/src/cljs/nr/utils.cljs b/src/cljs/nr/utils.cljs
index 1f56c098cf..de82615deb 100644
--- a/src/cljs/nr/utils.cljs
+++ b/src/cljs/nr/utils.cljs
@@ -270,8 +270,6 @@
   fragment, and index each HTML element in the return fragment with the :key
   attribute as required by React"
   [fragment patterns]
-  (print "frag" fragment)
-  (print "shiloh" patterns)
   (let [counter (atom 0)
         set-next-key (fn [elem] (set-react-key (do (swap! counter inc) @counter) elem))]
     (->> (reduce replace-in-fragment fragment patterns)
diff --git a/src/css/chat.styl b/src/css/chat.styl
index 7fe3b5b13e..a44c540c81 100644
--- a/src/css/chat.styl
+++ b/src/css/chat.styl
@@ -34,25 +34,26 @@
 .timestamp-wrapper
     display: flex
 
-.timestamp-wrapper .username
-    margin-right: 0
+    .username
+        margin-right: 0
 
-.timestamp-wrapper .timestamp
-    line-height: .5rem
-    margin-top: .15rem
+    .timestamp
+        color: #999999
+        font-size .5rem
+        display inline-flex
+        margin-left: .12rem
+        line-height: .5rem
+        margin-top: .15rem
 
 .timestamp-wrapper-system
     display: inline-flex
     line-height .75rem !important
 
-.timestamp
-    color: #999999
-    font-size .5rem
-    display inline-flex
-    margin-left: .12rem
-
-//.timestamp-system
-//    margin-left: .1rem
+    .timestamp
+        color: #999999
+        font-size .5rem
+        display inline-flex
+        margin-left: .12rem
 
 .message
     display-flex()
@@ -67,12 +68,6 @@
     .content
         flex(1)
 
-    .avatar-box
-        margin-right: .1rem
-        display: flex
-        align-items: center
-        height auto
-
     .block-menu
         display: none
         position: absolute

From 0e5923804adbdd070b03757f9e1e3c53eed1b61e Mon Sep 17 00:00:00 2001
From: Shiloh <dogdazedd@gmail.com>
Date: Thu, 17 Oct 2024 18:09:03 -0700
Subject: [PATCH 09/12] resolve IDE formatting

---
 src/cljs/nr/gameboard/log.cljs | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/cljs/nr/gameboard/log.cljs b/src/cljs/nr/gameboard/log.cljs
index 4273aae620..01f4ab5401 100644
--- a/src/cljs/nr/gameboard/log.cljs
+++ b/src/cljs/nr/gameboard/log.cljs
@@ -1,20 +1,20 @@
 (ns nr.gameboard.log
   (:require
-    [clojure.string :as string]
-    [jinteki.utils :refer [command-info]]
-    [nr.angel-arena.log :as angel-arena-log]
-    [nr.appstate :refer [app-state current-gameid]]
-    [nr.avatar :refer [avatar]]
-    [nr.gameboard.actions :refer [send-command]]
-    [nr.gameboard.card-preview :refer [card-preview-mouse-out
-                                       card-preview-mouse-over zoom-channel]]
-    [nr.gameboard.state :refer [game-state not-spectator?]]
-    [nr.translations :refer [tr]]
-    [nr.utils :refer [influence-dot player-highlight-option-class
-                      render-message render-player-highlight]]
-    [nr.ws :as ws]
-    [reagent.core :as r]
-    [reagent.dom :as rdom]))
+   [clojure.string :as string]
+   [jinteki.utils :refer [command-info]]
+   [nr.angel-arena.log :as angel-arena-log]
+   [nr.appstate :refer [app-state current-gameid]]
+   [nr.avatar :refer [avatar]]
+   [nr.gameboard.actions :refer [send-command]]
+   [nr.gameboard.card-preview :refer [card-preview-mouse-out
+                                      card-preview-mouse-over zoom-channel]]
+   [nr.gameboard.state :refer [game-state not-spectator?]]
+   [nr.translations :refer [tr]]
+   [nr.utils :refer [influence-dot player-highlight-option-class
+                     render-message render-player-highlight]]
+   [nr.ws :as ws]
+   [reagent.core :as r]
+   [reagent.dom :as rdom]))
 
 (def commands (distinct (map :name command-info)))
 (def command-info-map (->> command-info

From 08156cbcba0a716a4fef5f8fd07106d449d98730 Mon Sep 17 00:00:00 2001
From: Shiloh <dogdazedd@gmail.com>
Date: Thu, 17 Oct 2024 18:11:17 -0700
Subject: [PATCH 10/12] remove print statement, format function syntax

---
 src/cljs/nr/utils.cljs | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/cljs/nr/utils.cljs b/src/cljs/nr/utils.cljs
index de82615deb..5980f2bc19 100644
--- a/src/cljs/nr/utils.cljs
+++ b/src/cljs/nr/utils.cljs
@@ -312,12 +312,10 @@
   [element timestamp]
   (if (some? timestamp)
     [:div.timestamp-wrapper-system element [:span.timestamp.timestamp-system timestamp]]
-    element
-    )
-  )
+    element))
 
 (defn- player-highlight-patterns-impl [corp runner timestamp]
-  (letfn [(regex-of [player-name] (print player-name "shiloh shiloh" corp runner)(re-pattern (str "^" (regex-escape player-name))))]
+  (letfn [(regex-of [player-name] (re-pattern (str "^" (regex-escape player-name))))]
     (->> {corp (wrap-timestamp [:span.corp-username corp] timestamp)
           runner (wrap-timestamp [:span.runner-username runner] timestamp)}
          (filter (fn [[k _]] (not-empty k)))

From 031c872d7b2fee7f369664c6587b1fa5cc4401d7 Mon Sep 17 00:00:00 2001
From: Shiloh <dogdazedd@gmail.com>
Date: Sat, 19 Oct 2024 19:48:43 -0700
Subject: [PATCH 11/12] formatting

---
 src/cljs/nr/gameboard/log.cljs | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/cljs/nr/gameboard/log.cljs b/src/cljs/nr/gameboard/log.cljs
index 01f4ab5401..957aef9265 100644
--- a/src/cljs/nr/gameboard/log.cljs
+++ b/src/cljs/nr/gameboard/log.cljs
@@ -234,13 +234,12 @@
                    ^{:key timestamp}
                    (if (= user "__system__")
                       [:div.system
-                        (format-system-timestamp timestamp text @corp @runner)]
+                        [format-system-timestamp timestamp text @corp @runner]]
                       [:div.message
                        [avatar user {:opts {:size 38}}]
                        [:div.content
-                        (format-user-timestamp timestamp user)
-                        [:div (render-message text)]]]
-                      ))
+                        [format-user-timestamp timestamp user]
+                        [:div (render-message text)]]]))
                  @log)))})))
 
 (defn log-pane []

From 653712afbdd6d7863b9f807a6219c6fde7d8a0aa Mon Sep 17 00:00:00 2001
From: Shiloh <dogdazedd@gmail.com>
Date: Sat, 19 Oct 2024 19:51:39 -0700
Subject: [PATCH 12/12] ignore git ignore

---
 .gitignore | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index c570c37b08..572a1c40a2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,7 +16,6 @@ pom.xml
 .nrepl-history
 .rebel_readline_history
 .idea
-*.iml
 .eastwood
 .cache