From 6afe926d4d2034167bd9dc481b84c449ef789de5 Mon Sep 17 00:00:00 2001 From: Xyphyn Date: Mon, 4 Sep 2023 15:01:08 -0700 Subject: [PATCH] feat: add some relativedate error handling --- package.json | 2 +- src/lib/components/lemmy/SiteCard.svelte | 3 ++- src/lib/components/lemmy/comment/Comment.svelte | 3 ++- .../lemmy/community/CommunityCard.svelte | 3 ++- src/lib/components/util/RelativeDate.svelte | 14 ++++++++++++-- src/lib/components/util/date.ts | 2 ++ src/routes/u/[name]/+page.svelte | 3 ++- 7 files changed, 23 insertions(+), 7 deletions(-) create mode 100644 src/lib/components/util/date.ts diff --git a/package.json b/package.json index 2c8769a2..ebdccb5d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "photon-lemmy", - "version": "1.3.1", + "version": "1.3.2", "private": true, "scripts": { "dev": "vite dev", diff --git a/src/lib/components/lemmy/SiteCard.svelte b/src/lib/components/lemmy/SiteCard.svelte index 81d96d91..4ec9c2ea 100644 --- a/src/lib/components/lemmy/SiteCard.svelte +++ b/src/lib/components/lemmy/SiteCard.svelte @@ -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 @@ - +
diff --git a/src/lib/components/lemmy/comment/Comment.svelte b/src/lib/components/lemmy/comment/Comment.svelte index 6b5c835f..7ae0a4f9 100644 --- a/src/lib/components/lemmy/comment/Comment.svelte +++ b/src/lib/components/lemmy/comment/Comment.svelte @@ -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 @@
{/if} • diff --git a/src/lib/components/lemmy/community/CommunityCard.svelte b/src/lib/components/lemmy/community/CommunityCard.svelte index 29843948..5f3db57d 100644 --- a/src/lib/components/lemmy/community/CommunityCard.svelte +++ b/src/lib/components/lemmy/community/CommunityCard.svelte @@ -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 @@ - +
diff --git a/src/lib/components/util/RelativeDate.svelte b/src/lib/components/util/RelativeDate.svelte index 72328ea9..73efa6e1 100644 --- a/src/lib/components/util/RelativeDate.svelte +++ b/src/lib/components/util/RelativeDate.svelte @@ -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' } } -