feat: add some relativedate error handling
This commit is contained in:
1 parent
d6b5bfe3bb
commit
6afe926d4d
7 files changed
+23
-7
No files matched your search
@@ -4,6 +4,7 @@
|
||||
import StickyCard from '$lib/components/ui/StickyCard.svelte'
|
||||
import FormattedNumber from '$lib/components/util/FormattedNumber.svelte'
|
||||
import RelativeDate from '$lib/components/util/RelativeDate.svelte'
|
||||
import { publishedToDate } from '$lib/components/util/date.js'
|
||||
import { getClient } from '$lib/lemmy.js'
|
||||
import type { PersonView, SiteView, Tagline } from 'lemmy-js-client'
|
||||
import { Button, Popover } from 'mono-svelte'
|
||||
@@ -35,7 +36,7 @@
|
||||
</div>
|
||||
<span class="flex flex-row items-center gap-1 text-sm">
|
||||
<Icon src={Calendar} width={16} height={16} mini />
|
||||
<RelativeDate date={new Date(site.site.published + 'Z')} />
|
||||
<RelativeDate date={publishedToDate(site.site.published)} />
|
||||
</span>
|
||||
<div class="text-sm flex flex-row flex-wrap gap-3">
|
||||
<span class="flex flex-row items-center gap-1">
|
||||
|
||||
@@ -18,6 +18,7 @@
|
||||
import { toast } from 'mono-svelte'
|
||||
import { profile } from '$lib/auth.js'
|
||||
import { Button, Modal } from 'mono-svelte'
|
||||
import { publishedToDate } from '$lib/components/util/date.js'
|
||||
|
||||
export let node: CommentNodeI
|
||||
export let postId: number
|
||||
@@ -102,7 +103,7 @@
|
||||
</div>
|
||||
{/if}
|
||||
<RelativeDate
|
||||
date={new Date(node.comment_view.comment.published + 'Z')}
|
||||
date={publishedToDate(node.comment_view.comment.published)}
|
||||
/>
|
||||
<span>•</span>
|
||||
<span>
|
||||
|
||||
@@ -22,6 +22,7 @@
|
||||
Plus,
|
||||
UserGroup,
|
||||
} from 'svelte-hero-icons'
|
||||
import { publishedToDate } from '$lib/components/util/date.js'
|
||||
|
||||
export let community_view: CommunityView
|
||||
export let moderators: CommunityModeratorView[]
|
||||
@@ -93,7 +94,7 @@
|
||||
</div>
|
||||
<span class="flex flex-row items-center gap-1 text-sm">
|
||||
<Icon src={Calendar} width={16} height={16} mini />
|
||||
<RelativeDate date={new Date(community_view.community.published + 'Z')} />
|
||||
<RelativeDate date={publishedToDate(community_view.community.published)} />
|
||||
</span>
|
||||
<div class="text-sm flex flex-row flex-wrap gap-3">
|
||||
<span class="flex flex-row items-center gap-1">
|
||||
|
||||
@@ -6,6 +6,16 @@
|
||||
style: 'narrow',
|
||||
}
|
||||
|
||||
const toLocaleDateString = (date: Date): string => {
|
||||
try {
|
||||
return date.toLocaleString()
|
||||
} catch (err) {
|
||||
return 'Invalid Date'
|
||||
}
|
||||
}
|
||||
|
||||
$: dateTime = toLocaleDateString(date)
|
||||
|
||||
function formatRelativeDate(date: Date) {
|
||||
try {
|
||||
const now = relativeTo?.getTime() ?? Date.now()
|
||||
@@ -38,11 +48,11 @@
|
||||
}
|
||||
return 'Now'
|
||||
} catch (err) {
|
||||
return 'Now'
|
||||
return 'Invalid Date'
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<time datetime={date.toISOString()} title={date.toLocaleDateString()}>
|
||||
<time datetime={dateTime} title={dateTime}>
|
||||
{formatRelativeDate(date)}
|
||||
</time>
|
||||
@@ -0,0 +1,2 @@
|
||||
export const publishedToDate = (published: string) =>
|
||||
published.endsWith('Z') ? new Date(published) : new Date(`${published}Z`)
|
||||
Reference in new issue
Block a user