-
Notifications
You must be signed in to change notification settings - Fork 51
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
show more detailed upload dates for today and yesterday (#222)
* Always show month and day of the chapters release date with 2 digits In case the month or date is one digit a leading 0 will be added * Show more detailed upload date information for chapter uploads from today or yesterday In case the upload date is from today or yesterday the shown upload date will be e.g. "Today at 02:50", otherwise, just the date will be shown e.g. "04.01.2023"
- Loading branch information
Showing
2 changed files
with
80 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,72 @@ | ||
/* | ||
* Copyright (C) Contributors to the Suwayomi project | ||
* | ||
* This Source Code Form is subject to the terms of the Mozilla Public | ||
* License, v. 2.0. If a copy of the MPL was not distributed with this | ||
* file, You can obtain one at https://mozilla.org/MPL/2.0/. | ||
*/ | ||
|
||
export const isWithinLastXMillis = (date: Date, timeMS: number) => { | ||
const timeDifference = Date.now() - date.getTime(); | ||
return timeDifference <= timeMS; | ||
}; | ||
|
||
export const getElapsedTimeSinceStartOfDay = (date: Date) => { | ||
const startOfDay = new Date(date.getFullYear(), date.getMonth(), date.getDate()); | ||
return date.getTime() - startOfDay.getTime(); | ||
}; | ||
|
||
/** | ||
* Returns a string in localized format for the passed date. | ||
* | ||
* In case the date is from today or yesterday a special string will be returned including "Today" | ||
* or "Yesterday" with the localized time of the passed date. | ||
* | ||
* @example | ||
* const today = new Date(); | ||
* const yesterday = new Date(today.getTime() - 1000 * 60 * 60 * 24); | ||
* const someDate = new Date(1337, 4, 20); | ||
* | ||
* const todayAsString = getDateString(today); // => "Today at 02:50 AM" | ||
* const yesterdayAsString = getDateString(yesterday) // => "Yesterday at 02:50 AM" | ||
* const someDate = getDateString(someDate) // => "04/20/1337" | ||
* | ||
* | ||
* @param date | ||
*/ | ||
export const getUploadDateString = (date: Date | number) => { | ||
const uploadDate = date instanceof Date ? date : new Date(date); | ||
|
||
const today = new Date(); | ||
const todayElapsedTime = getElapsedTimeSinceStartOfDay(today); | ||
const yesterday = new Date(today.getTime() - todayElapsedTime - 1000 * 60 * 60 * 24); | ||
const elapsedTimeSinceYesterday = today.getTime() - yesterday.getTime(); | ||
|
||
const wasUploadedToday = isWithinLastXMillis(uploadDate, todayElapsedTime); | ||
const wasUploadedYesterday = isWithinLastXMillis(uploadDate, elapsedTimeSinceYesterday); | ||
|
||
const addTimeString = wasUploadedToday || wasUploadedYesterday; | ||
const timeString = addTimeString | ||
? uploadDate.toLocaleTimeString( | ||
undefined, | ||
{ | ||
hour: '2-digit', | ||
minute: '2-digit', | ||
}, | ||
) | ||
: ''; | ||
|
||
if (wasUploadedToday) { | ||
return `Today at ${timeString}`; | ||
} | ||
|
||
if (wasUploadedYesterday) { | ||
return `Yesterday at ${timeString}`; | ||
} | ||
|
||
return uploadDate.toLocaleDateString(undefined, { | ||
year: 'numeric', | ||
month: '2-digit', | ||
day: '2-digit', | ||
}); | ||
}; |