From c1dc6941d8c289026c8c9d77370d48fe96bca223 Mon Sep 17 00:00:00 2001 From: Gregor Kaljulaid Date: Tue, 18 Aug 2020 21:42:00 +0300 Subject: [PATCH] Fix Land time showing time in past if it hasn't updated --- torntools/scripts/content/travel/ttTravelAbroad.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/torntools/scripts/content/travel/ttTravelAbroad.js b/torntools/scripts/content/travel/ttTravelAbroad.js index ae90fa56e..c2b431f43 100644 --- a/torntools/scripts/content/travel/ttTravelAbroad.js +++ b/torntools/scripts/content/travel/ttTravelAbroad.js @@ -53,11 +53,13 @@ window.addEventListener('load', async () => { if (await isFlying()) { // Landing time if (doc.find('.flight-info .destination-title')) { - const landDate = new Date(userdata.travel.timestamp * 1000); - const [hours, minutes, seconds] = [landDate.getHours(), landDate.getMinutes(), landDate.getSeconds()]; + const landDate = new Date(userdata.travel.timestamp * 1000) - new Date() < 0 ? 'N/A' : new Date(userdata.travel.timestamp * 1000); + let hours, minutes, seconds; + + if (landDate !== 'N/A') [hours, minutes, seconds] = [landDate.getHours(), landDate.getMinutes(), landDate.getSeconds()]; const landingTimeDiv = doc.new({ type: 'div', attributes: { style: 'text-align: center;' } }); - const landingTimeDescription = doc.new({ type: 'span', class: 'description', text: `Landing at ${formatTime([hours, minutes, seconds], settings.format.time)}` }); + const landingTimeDescription = doc.new({ type: 'span', class: 'description', text: `Landing at ${landDate === 'N/A' ? 'N/A' : formatTime([hours, minutes, seconds], settings.format.time)}` }); landingTimeDiv.appendChild(landingTimeDescription); doc.find('.flight-info').insertBefore(landingTimeDiv, doc.find('.flight-info .destination-title').nextElementSibling); }