From c1991992ae489d98a7b9b3772a1f5e126704fe1f Mon Sep 17 00:00:00 2001
From: Made Baruna <made.setia@gmail.com>
Date: Fri, 12 Mar 2021 18:39:43 +0700
Subject: [PATCH] Use server time on timeline

---
 src/routes/timeline/_detail.svelte | 5 +++--
 src/routes/timeline/index.svelte   | 5 +++--
 src/stores/server.js               | 4 ++++
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/routes/timeline/_detail.svelte b/src/routes/timeline/_detail.svelte
index ad74f0eb..deae27cf 100644
--- a/src/routes/timeline/_detail.svelte
+++ b/src/routes/timeline/_detail.svelte
@@ -1,14 +1,15 @@
 <script>
   import dayjs from 'dayjs';
   import { onMount } from 'svelte';
+  import { getCurrentTime } from '../../stores/server';
 
   export let event;
-  
+
   let now = dayjs();
 
   onMount(() => {
     const interval = setInterval(() => {
-      now = dayjs();
+      now = getCurrentTime();
     }, 1000);
 
     return () => {
diff --git a/src/routes/timeline/index.svelte b/src/routes/timeline/index.svelte
index 2470c4ce..58d23145 100644
--- a/src/routes/timeline/index.svelte
+++ b/src/routes/timeline/index.svelte
@@ -4,6 +4,7 @@
   import duration from 'dayjs/plugin/duration';
   dayjs.extend(duration);
 
+  import { getCurrentTime } from '../../stores/server';
   import { eventsData } from '../../data/timeline';
 
   import EventItem from './_item.svelte';
@@ -96,7 +97,7 @@
       }
     });
 
-  let today = dayjs();
+  let today = getCurrentTime();
   $: todayOffset = Math.abs(firstDay.diff(today, 'day', true));
 
   const dayTotal = Math.abs(Math.ceil(firstDay.diff(lastEventTime, 'day', true))) + 2 * padding;
@@ -135,7 +136,7 @@
     });
 
     const interval = setInterval(() => {
-      today = dayjs();
+      today = getCurrentTime();
     }, 1000);
 
     return () => {
diff --git a/src/stores/server.js b/src/stores/server.js
index 751a0bcf..98803de7 100644
--- a/src/stores/server.js
+++ b/src/stores/server.js
@@ -19,6 +19,10 @@ const timeOffset = {
 
 const weekdays = ['sunday', 'monday', 'tuesday', 'wednesday', 'thursday', 'friday', 'saturday'];
 
+export const getCurrentTime = () => {
+  return dayjs().utcOffset(timeOffset[get(server)]);
+}
+
 export const getCurrentDay = () => {
   const time = dayjs().utcOffset(timeOffset[get(server)]);
   let day = time.day();