Fix #6: Display relative timestamps

v1.1.0
Max Nuding 2023-04-07 13:27:34 +02:00
parent 6267972605
commit a484810d2f
Signed by: phlaym
GPG Key ID: A06651BAB6777237
3 changed files with 58 additions and 4 deletions

View File

@ -2,10 +2,24 @@
import type { Post } from '$lib/mastodon/response';
import AvatarComponent from '$lib/components/AvatarComponent.svelte';
import AccountComponent from '$lib/components/AccountComponent.svelte';
import { secondsSince, relativeTime } from '$lib/relativeTime';
import { onMount } from "svelte";
export let post: Post;
let dateCreated: string;
$: dateCreated = new Date(post.created_at).toLocaleString();
let displayRelativeTime = false;
const absoluteDate = new Date(post.created_at).toLocaleString();
let dateCreated = absoluteDate;
const timePassed = secondsSince(new Date(post.created_at));
$: if(displayRelativeTime) {
dateCreated = relativeTime($timePassed) ?? absoluteDate;
}
onMount(() => {
// Display relative time only after mount:
// When JS is disabled the server-side rendered absolute date will be shown,
// otherwise the relative date would be outdated very quickly
displayRelativeTime = true;
})
</script>
@ -14,7 +28,7 @@
<div class="post">
<div class="meta">
<AccountComponent account={post.account} />
<small><a href={post.url} target="_blank">{dateCreated}</a></small>
<small><a href={post.url} target="_blank" title="{absoluteDate}">{dateCreated}</a></small>
</div>
<div class="content">{@html post.content}</div>
</div>

40
src/lib/relativeTime.ts Normal file
View File

@ -0,0 +1,40 @@
import { derived, readable, type Readable } from 'svelte/store';
export const time = readable(new Date(), function start(set) {
const interval = setInterval(() => {
set(new Date());
}, 10000); //Every 10sec is enough, we don't need that much granularity
return function stop() {
clearInterval(interval);
};
});
export function secondsSince(date: Date): Readable<number> {
return derived(
time,
$time => Math.round(($time.getTime() - date.getTime()) / 1000)
);
}
export function relativeTime(seconds: number): string | null {
const min = 60;
if (seconds < min) {
return 'just now';
}
const hour = 60 * min;
if (seconds < hour) {
return `${Math.floor(seconds / min)}min`;
}
const day = hour * 24;
if (seconds < day) {
return `${(Math.floor(seconds / hour))}h`;
}
const maxRelative = day * 31;
if (seconds < maxRelative) {
return `${seconds % day}d`;
}
return null;
}

View File

@ -30,7 +30,7 @@ let loadingOlderPosts = false;
// Needed, so that edgeFly() can do its thing:
// To determine whether a newly loaded post is older than the existing ones, is required to know what the oldest
// post was, before the fetch happened.
let oldestBeforeLastFetch: number | null = null;
let oldestBeforeLastFetch: number | null = null;
/**
* Animate either from the top, or the bottom of the window, depending if the post is