From 20fa2d8fb204b2b285922a3925a5a25388ca371f Mon Sep 17 00:00:00 2001 From: P-Chan Date: Tue, 4 Jan 2022 17:55:51 +0900 Subject: [PATCH 1/2] Fix runtime error when device is null Fix #904 --- components/metrics/RealtimeLog.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/components/metrics/RealtimeLog.js b/components/metrics/RealtimeLog.js index 81e25d2e..34de4e6a 100644 --- a/components/metrics/RealtimeLog.js +++ b/components/metrics/RealtimeLog.js @@ -137,7 +137,11 @@ export default function RealtimeLog({ data, websites, websiteId }) { ), browser: {BROWSERS[browser]}, os: {os}, - device: {intl.formatMessage(devices[device])?.toLowerCase()}, + device: + {devices[device] + ? intl.formatMessage(devices[device]).toLowerCase() + : intl.formatMessage({ id: 'label.unknown', defaultMessage: 'Unknown' })} + , }} /> ); From 56c0837e831a9b8e1203f2cdaf21e0e173f49408 Mon Sep 17 00:00:00 2001 From: P-Chan Date: Wed, 5 Jan 2022 20:25:53 +0900 Subject: [PATCH 2/2] Refactor device message --- components/metrics/RealtimeLog.js | 8 ++------ pages/api/collect.js | 2 ++ 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/components/metrics/RealtimeLog.js b/components/metrics/RealtimeLog.js index 34de4e6a..8ea917df 100644 --- a/components/metrics/RealtimeLog.js +++ b/components/metrics/RealtimeLog.js @@ -7,7 +7,7 @@ import Tag from 'components/common/Tag'; import Dot from 'components/common/Dot'; import FilterButtons from 'components/common/FilterButtons'; import NoData from 'components/common/NoData'; -import { devices } from 'components/messages'; +import { devices, getDeviceMessage } from 'components/messages'; import useLocale from 'hooks/useLocale'; import useCountryNames from 'hooks/useCountryNames'; import { BROWSERS } from 'lib/constants'; @@ -137,11 +137,7 @@ export default function RealtimeLog({ data, websites, websiteId }) { ), browser: {BROWSERS[browser]}, os: {os}, - device: - {devices[device] - ? intl.formatMessage(devices[device]).toLowerCase() - : intl.formatMessage({ id: 'label.unknown', defaultMessage: 'Unknown' })} - , + device: {getDeviceMessage(devices[device])}, }} /> ); diff --git a/pages/api/collect.js b/pages/api/collect.js index 41c9cabb..40a913a0 100644 --- a/pages/api/collect.js +++ b/pages/api/collect.js @@ -9,6 +9,8 @@ import { createToken } from 'lib/crypto'; export default async (req, res) => { await useCors(req, res); + console.log('hi!'); + if (isbot(req.headers['user-agent'])) { return ok(res); }