From 943c2c73d476eeac475135e931540b79d2ee3ee4 Mon Sep 17 00:00:00 2001
From: Mike Cao <mike@mikecao.com>
Date: Thu, 10 Sep 2020 20:37:07 -0700
Subject: [PATCH 1/4] Added check for bots.

---
 package.json         | 3 ++-
 pages/api/collect.js | 5 +++++
 yarn.lock            | 5 +++++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index b8ff901c53..71f90cae6f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "umami",
-  "version": "0.26.0",
+  "version": "0.27.0",
   "description": "A simple, fast, website analytics alternative to Google Analytics. ",
   "author": "Mike Cao <mike@mikecao.com>",
   "license": "MIT",
@@ -59,6 +59,7 @@
     "geolite2-redist": "^1.0.7",
     "immer": "^7.0.8",
     "is-localhost-ip": "^1.4.0",
+    "isbot-fast": "^1.2.0",
     "jose": "^1.28.0",
     "maxmind": "^4.1.4",
     "moment-timezone": "^0.5.31",
diff --git a/pages/api/collect.js b/pages/api/collect.js
index 56d2ea79f8..399e88e96f 100644
--- a/pages/api/collect.js
+++ b/pages/api/collect.js
@@ -1,8 +1,13 @@
 import { savePageView, saveEvent } from 'lib/queries';
 import { useCors, useSession } from 'lib/middleware';
 import { ok, badRequest } from 'lib/response';
+import isBot from 'isbot-fast';
 
 export default async (req, res) => {
+  if (isBot(req.headers['user-agent'])) {
+    return ok(res);
+  }
+
   await useCors(req, res);
   await useSession(req, res);
 
diff --git a/yarn.lock b/yarn.lock
index 52c57c7e1e..7e0a5f7492 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4965,6 +4965,11 @@ isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
   integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
 
+isbot-fast@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/isbot-fast/-/isbot-fast-1.2.0.tgz#ef0ef1d5db34eb60777250ae26fceb72b94153e2"
+  integrity sha512-twjuQzy2gKMDVfKGQyQqrx6Uy4opu/fiVUTTpdqtFsd7OQijIp5oXvb27n5EemYXaijh5fomndJt/SPRLsEdSg==
+
 isexe@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"

From 8b9c3350b2400c9b89c053c0ccee2bed856cd7d9 Mon Sep 17 00:00:00 2001
From: Mike Cao <mike@mikecao.com>
Date: Thu, 10 Sep 2020 21:05:02 -0700
Subject: [PATCH 2/4] Fix data check in tables.

---
 components/metrics/MetricsTable.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/components/metrics/MetricsTable.js b/components/metrics/MetricsTable.js
index 81374f8650..e86adf4848 100644
--- a/components/metrics/MetricsTable.js
+++ b/components/metrics/MetricsTable.js
@@ -87,7 +87,7 @@ export default function MetricsTable({
             </div>
           </div>
           <div className={styles.body}>
-            {data?.length === 0 && (
+            {rankings?.length === 0 && (
               <div className={styles.empty}>
                 <FormattedMessage
                   id="message.no-data-available"
@@ -97,14 +97,14 @@ export default function MetricsTable({
             )}
             {limit
               ? rankings.map(row => getRow(row))
-              : data?.length > 0 && (
+              : rankings.length > 0 && (
                   <FixedSizeList height={500} itemCount={rankings.length} itemSize={30}>
                     {Row}
                   </FixedSizeList>
                 )}
           </div>
           <div className={styles.footer}>
-            {limit && data.length > limit && (
+            {limit && rankings.length > limit && (
               <Button icon={<Arrow />} size="xsmall" onClick={() => onExpand(type)}>
                 <div>
                   <FormattedMessage id="button.more" defaultMessage="More" />

From 4ae7ad35fffd9804362b423e18c4cc73af8fc5df Mon Sep 17 00:00:00 2001
From: Mike Cao <mike@mikecao.com>
Date: Thu, 10 Sep 2020 21:12:04 -0700
Subject: [PATCH 3/4] Update url checking logic.

---
 tracker/index.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tracker/index.js b/tracker/index.js
index 9a5051b8a9..f7f0092773 100644
--- a/tracker/index.js
+++ b/tracker/index.js
@@ -58,14 +58,14 @@ import { removeTrailingSlash } from '../lib/url';
 
   /* Handle history */
 
-  const handlePush = (state, title, navigatedURL) => {
+  const handlePush = (state, title, url) => {
     removeEvents();
     currentRef = currentUrl;
-    const newUrl = navigatedURL.toString();
+    const newUrl = url.toString();
 
-    if (newUrl.startsWith('http')) {
-      const url = new URL(newUrl);
-      currentUrl = `${url.pathname}${url.search}`;
+    if (newUrl.substring(0, 4) === 'http') {
+      const { pathname, search } = new URL(newUrl);
+      currentUrl = `${pathname}${search}`;
     } else {
       currentUrl = newUrl;
     }

From a66d3155d011ef50f5ef449efb84d8014af0f4bc Mon Sep 17 00:00:00 2001
From: Mike Cao <mike@mikecao.com>
Date: Thu, 10 Sep 2020 21:35:17 -0700
Subject: [PATCH 4/4] Localize chart tooltip.

---
 components/metrics/BarChart.js           | 11 +++++++++--
 components/metrics/MetricCard.module.css |  4 ++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/components/metrics/BarChart.js b/components/metrics/BarChart.js
index 2291d5bbfb..ccbd23af1f 100644
--- a/components/metrics/BarChart.js
+++ b/components/metrics/BarChart.js
@@ -64,8 +64,14 @@ export default function BarChart({
     } else {
       const [label, value] = body[0].lines[0].split(':');
 
+      console.log(
+        +title[0],
+        new Date(+title[0]),
+        dateFormat(new Date(+title[0]), 'EEE MMMM d yyyy', locale),
+      );
+
       setTooltip({
-        title: title[0],
+        title: dateFormat(new Date(+title[0]), 'EEE MMMM d yyyy', locale),
         value,
         label,
         labelColor: labelColors[0].backgroundColor,
@@ -95,7 +101,7 @@ export default function BarChart({
             distribution: 'series',
             time: {
               unit,
-              tooltipFormat: 'ddd MMMM DD YYYY',
+              tooltipFormat: 'x',
             },
             ticks: {
               callback: renderXLabel,
@@ -138,6 +144,7 @@ export default function BarChart({
     options.scales.xAxes[0].time.unit = unit;
     options.scales.xAxes[0].ticks.callback = renderXLabel;
     options.animation.duration = animationDuration;
+    options.tooltips.custom = renderTooltip;
 
     onUpdate(chart.current);
   }
diff --git a/components/metrics/MetricCard.module.css b/components/metrics/MetricCard.module.css
index b75ad4ba9b..ed868f99a6 100644
--- a/components/metrics/MetricCard.module.css
+++ b/components/metrics/MetricCard.module.css
@@ -2,7 +2,8 @@
   display: flex;
   flex-direction: column;
   justify-content: center;
-  min-width: 140px;
+  min-width: 120px;
+  margin-right: 20px;
 }
 
 .value {
@@ -15,5 +16,4 @@
 
 .label {
   font-size: var(--font-size-normal);
-  padding-right: 20px;
 }