From b0a35beaebdac14124b3fbe05eb46b34b5614aec Mon Sep 17 00:00:00 2001 From: AndzejsP Date: Thu, 15 Jun 2023 17:52:19 +0300 Subject: [PATCH] time fix --- web/src/components/Message.vue | 30 ++++++++++++++++++++++++------ 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/web/src/components/Message.vue b/web/src/components/Message.vue index e0d5f8c6..a00bfbda 100644 --- a/web/src/components/Message.vue +++ b/web/src/components/Message.vue @@ -18,8 +18,8 @@ {{ message.model }}

--> - -
+
+
{{ created_at }}
@@ -102,9 +102,9 @@
-

Binding: {{ message.binding }}

-

Model: {{ message.model }}

-

Seed: {{ message.seed }}

+

Binding: {{ message.binding }}

+

Model: {{ message.model }}

+

Seed: {{ message.seed }}

@@ -255,6 +255,24 @@ export default { return "1 week ago"; } return tdate; + }, + prettyDate(time) { + let date = new Date((time || "").replace(/-/g, "/").replace(/[TZ]/g, " ")), + diff = (((new Date()).getTime() - date.getTime()) / 1000), + day_diff = Math.floor(diff / 86400); + + if (isNaN(day_diff) || day_diff < 0 || day_diff >= 31) + return; + + return day_diff == 0 && ( + diff < 60 && "just now" || + diff < 120 && "1 minute ago" || + diff < 3600 && Math.floor(diff / 60) + " minutes ago" || + diff < 7200 && "1 hour ago" || + diff < 86400 && Math.floor(diff / 3600) + " hours ago") || + day_diff == 1 && "Yesterday" || + day_diff < 7 && day_diff + " days ago" || + day_diff < 31 && Math.ceil(day_diff / 7) + " weeks ago"; } @@ -287,7 +305,7 @@ export default { }, computed: { created_at() { - return this.parseDate(this.message.created_at) + return this.prettyDate(this.message.created_at) } }