feat: add some relativedate error handling

This commit is contained in:
Xyphyn committed 2023-09-04 15:01:08 -07:00
1 parent d6b5bfe3bb
commit 6afe926d4d
7 files changed
+23 -7

No files matched your search

+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "photon-lemmy", "name": "photon-lemmy",
"version": "1.3.1", "version": "1.3.2",
"private": true, "private": true,
"scripts": { "scripts": {
"dev": "vite dev", "dev": "vite dev",
+2 -1
View File
@@ -4,6 +4,7 @@
import StickyCard from '$lib/components/ui/StickyCard.svelte' import StickyCard from '$lib/components/ui/StickyCard.svelte'
import FormattedNumber from '$lib/components/util/FormattedNumber.svelte' import FormattedNumber from '$lib/components/util/FormattedNumber.svelte'
import RelativeDate from '$lib/components/util/RelativeDate.svelte' import RelativeDate from '$lib/components/util/RelativeDate.svelte'
import { publishedToDate } from '$lib/components/util/date.js'
import { getClient } from '$lib/lemmy.js' import { getClient } from '$lib/lemmy.js'
import type { PersonView, SiteView, Tagline } from 'lemmy-js-client' import type { PersonView, SiteView, Tagline } from 'lemmy-js-client'
import { Button, Popover } from 'mono-svelte' import { Button, Popover } from 'mono-svelte'
@@ -35,7 +36,7 @@
</div> </div>
<span class="flex flex-row items-center gap-1 text-sm"> <span class="flex flex-row items-center gap-1 text-sm">
<Icon src={Calendar} width={16} height={16} mini /> <Icon src={Calendar} width={16} height={16} mini />
<RelativeDate date={new Date(site.site.published + 'Z')} /> <RelativeDate date={publishedToDate(site.site.published)} />
</span> </span>
<div class="text-sm flex flex-row flex-wrap gap-3"> <div class="text-sm flex flex-row flex-wrap gap-3">
<span class="flex flex-row items-center gap-1"> <span class="flex flex-row items-center gap-1">
@@ -18,6 +18,7 @@
import { toast } from 'mono-svelte' import { toast } from 'mono-svelte'
import { profile } from '$lib/auth.js' import { profile } from '$lib/auth.js'
import { Button, Modal } from 'mono-svelte' import { Button, Modal } from 'mono-svelte'
import { publishedToDate } from '$lib/components/util/date.js'
export let node: CommentNodeI export let node: CommentNodeI
export let postId: number export let postId: number
@@ -102,7 +103,7 @@
</div> </div>
{/if} {/if}
<RelativeDate <RelativeDate
date={new Date(node.comment_view.comment.published + 'Z')} date={publishedToDate(node.comment_view.comment.published)}
/> />
<span>•</span> <span>•</span>
<span> <span>
@@ -22,6 +22,7 @@
Plus, Plus,
UserGroup, UserGroup,
} from 'svelte-hero-icons' } from 'svelte-hero-icons'
import { publishedToDate } from '$lib/components/util/date.js'
export let community_view: CommunityView export let community_view: CommunityView
export let moderators: CommunityModeratorView[] export let moderators: CommunityModeratorView[]
@@ -93,7 +94,7 @@
</div> </div>
<span class="flex flex-row items-center gap-1 text-sm"> <span class="flex flex-row items-center gap-1 text-sm">
<Icon src={Calendar} width={16} height={16} mini /> <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> </span>
<div class="text-sm flex flex-row flex-wrap gap-3"> <div class="text-sm flex flex-row flex-wrap gap-3">
<span class="flex flex-row items-center gap-1"> <span class="flex flex-row items-center gap-1">
+12 -2
View File
@@ -6,6 +6,16 @@
style: 'narrow', style: 'narrow',
} }
const toLocaleDateString = (date: Date): string => {
try {
return date.toLocaleString()
} catch (err) {
return 'Invalid Date'
}
}
$: dateTime = toLocaleDateString(date)
function formatRelativeDate(date: Date) { function formatRelativeDate(date: Date) {
try { try {
const now = relativeTo?.getTime() ?? Date.now() const now = relativeTo?.getTime() ?? Date.now()
@@ -38,11 +48,11 @@
} }
return 'Now' return 'Now'
} catch (err) { } catch (err) {
return 'Now' return 'Invalid Date'
} }
} }
</script> </script>
<time datetime={date.toISOString()} title={date.toLocaleDateString()}> <time datetime={dateTime} title={dateTime}>
{formatRelativeDate(date)} {formatRelativeDate(date)}
</time> </time>
+2
View File
@@ -0,0 +1,2 @@
export const publishedToDate = (published: string) =>
published.endsWith('Z') ? new Date(published) : new Date(`${published}Z`)
+2 -1
View File
@@ -34,6 +34,7 @@
import Placeholder from '$lib/components/ui/Placeholder.svelte' import Placeholder from '$lib/components/ui/Placeholder.svelte'
import { Button, Modal, Select } from 'mono-svelte' import { Button, Modal, Select } from 'mono-svelte'
import MarkdownEditor from '$lib/components/markdown/MarkdownEditor.svelte' import MarkdownEditor from '$lib/components/markdown/MarkdownEditor.svelte'
import { publishedToDate } from '$lib/components/util/date.js'
export let data export let data
@@ -199,7 +200,7 @@
<Icon src={Calendar} width={16} height={16} mini /> <Icon src={Calendar} width={16} height={16} mini />
<span class="capitalize"> <span class="capitalize">
<RelativeDate <RelativeDate
date={new Date(data.person_view.person.published + 'Z')} date={publishedToDate(data.person_view.person.published)}
/> />
</span> </span>
</span> </span>