From befef02cd95067ad1bb027e27d6a605e26c09063 Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Sun, 20 Aug 2023 11:34:32 +0200
Subject: [PATCH] fix drift usage

---
 frontend/src/lib/components/TimeAgo.svelte | 27 ++++------------------
 frontend/src/lib/forLater.ts               |  2 +-
 2 files changed, 6 insertions(+), 23 deletions(-)

diff --git a/frontend/src/lib/components/TimeAgo.svelte b/frontend/src/lib/components/TimeAgo.svelte
index 7764abff14..ceffdf5758 100644
--- a/frontend/src/lib/components/TimeAgo.svelte
+++ b/frontend/src/lib/components/TimeAgo.svelte
@@ -1,6 +1,5 @@
 <script lang="ts">
-	import { JobService } from '$lib/gen'
-	import { dbClockDrift } from '$lib/stores'
+	import { getNow } from '$lib/forLater'
 	import { displayDate } from '$lib/utils'
 	import { onDestroy, onMount } from 'svelte'
 
@@ -33,7 +32,7 @@
 	}
 
 	function isToday(someDate: Date): boolean {
-		const today = new Date()
+		const today = getNow()
 		return (
 			someDate.getDate() == today.getDate() &&
 			someDate.getMonth() == today.getMonth() &&
@@ -42,32 +41,16 @@
 	}
 
 	function daysAgo(someDate: Date): number {
-		const today = new Date()
+		const today = getNow()
 		return Math.floor((today.getTime() - someDate.getTime()) / 86400000)
 	}
 
 	function secondsAgo(date: Date) {
-		return Math.max(0, Math.floor((new Date().getTime() - date.getTime()) / 1000))
+		return Math.max(0, Math.floor((getNow().getTime() - date.getTime()) / 1000))
 	}
 
-	async function computeDrift() {
-		const storeDrift = $dbClockDrift
-		if (storeDrift) {
-			return storeDrift
-		} else {
-			const now = Date.now()
-			const dbClock = await JobService.getDbClock()
-			const drift = now - dbClock
-			$dbClockDrift = drift
-			return drift
-		}
-	}
-
-	async function adjustDate(date: Date): Promise<Date> {
-		return new Date(date.getTime() + (await computeDrift()))
-	}
 	async function displayDaysAgo(dateString: string): Promise<string> {
-		const date = await adjustDate(new Date(dateString))
+		const date = await new Date(dateString)
 		const nbSecondsAgo = secondsAgo(date)
 		if (nbSecondsAgo < 600) {
 			return `${nbSecondsAgo}s ago`
diff --git a/frontend/src/lib/forLater.ts b/frontend/src/lib/forLater.ts
index 2604ae7ba0..ede60a5605 100644
--- a/frontend/src/lib/forLater.ts
+++ b/frontend/src/lib/forLater.ts
@@ -14,7 +14,7 @@ function adjustDate(drift: number): Date {
 export async function computeDrift() {
 	const now = Date.now()
 	const dbClock = await JobService.getDbClock()
-	dbClockDrift.set(now - dbClock)
+	dbClockDrift.set(dbClock - now)
 }
 
 export function forLater(scheduledString: string): boolean {