fixed #10

src/utils/DateTime.js

@@ -22,19 +22,10 @@ export const FormatDate = (date) => {
   const matchDate = DateTime.fromSeconds(date || 0)
   const diff = DateTime.now().diff(matchDate)
 
-  if (diff.as('days') > 10)
+  if (diff.as('days') > 8)
     return matchDate.toLocaleString({weekday: 'short', day: '2-digit', month: '2-digit', year: 'numeric'})
-  else if (diff.as('days') < 1)
-    if (diff.as('hours') < 1)
-      return Math.floor(diff.as('minutes')) + ' minutes ago'
-    else if (Math.floor(diff.as('hours')) === 1)
-      return Math.floor(diff.as('hours')) + ' hour ago'
-    else
-      return Math.floor(diff.as('hours')) + ' hours ago'
-  else if (Math.floor(diff.as('days')) === 1)
-    return Math.floor(diff.as('days')) + ' day ago'
   else
-    return Math.floor(diff.as('days')) + ' days ago'
+    return matchDate.toRelative()
 }
 
 export const FormatFullDate = (date) => {
@@ -50,3 +41,14 @@ export const FormatFullDate = (date) => {
     second: '2-digit'
   })
 }
+
+export const FormatVacDate = (date, match) => {
+  const vacDate = DateTime.fromSeconds(date || 0)
+  const matchDate = DateTime.fromSeconds(match || 0)
+
+  if (vacDate.diff(matchDate).as('days') >= -30) {
+    return vacDate.toRelative()
+  } else {
+    return ''
+  }
+}

src/utils/index.js

@@ -1,4 +1,4 @@
-import {FormatDate, FormatDuration, FormatFullDate, FormatFullDuration} from "./DateTime";
+import {FormatDate, FormatDuration, FormatFullDate, FormatFullDuration, FormatVacDate} from "./DateTime";
 import {GoToLink, GoToMatch, GoToPlayer} from "./GoTo";
 import {SaveLastVisitedToLocalStorage} from "./LocalStorage";
 import {GetHLTV_1} from "./HLTV";
@@ -7,7 +7,7 @@ import {GetUser, TrackMe, getPlayerValue} from "./ApiRequests";
 import {setTitle, GetWinLoss, truncate, checkStatEmpty, getPlayerArr, constructAvatarUrl, GetAvgRank, FixMapName, closeNav} from "./Utils";
 
 export {
-  FormatDate, FormatFullDuration, FormatFullDate, FormatDuration,
+  FormatDate, FormatFullDuration, FormatFullDate, FormatDuration, FormatVacDate,
   GoToMatch, GoToPlayer, GoToLink,
   SaveLastVisitedToLocalStorage,
   GetHLTV_1,