dayjs

Author: feruzm

lib/queries/direct-contacts-query.ts

@@ -3,7 +3,7 @@ import { DirectContact, useKeysQuery, useNostrFetchQuery } from "../nostr";
 import { Event, Kind } from "nostr-tools";
 import { useContext } from "react";
 import { ChatContext } from "../chat-context-provider";
-import { isAfter } from "date-fns";
+import dayjs from "dayjs";
 
 function convertEventToDirectContacts(
   events: Event[],
@@ -95,7 +95,7 @@ export function useDirectContactsQuery() {
             if (
               a.lastSeenDate instanceof Date &&
               b.lastSeenDate instanceof Date &&
-              isAfter(a.lastSeenDate, b.lastSeenDate)
+              dayjs(a.lastSeenDate).isAfter(dayjs(b.lastSeenDate))
             ) {
               return -1;
             }

lib/queries/unread-count-query.ts

@@ -6,7 +6,7 @@ import {
 } from "../nostr";
 import { useMessagesQuery } from "./messages-query";
 import { useMemo } from "react";
-import { isAfter } from "date-fns";
+import dayjs from "dayjs";
 
 export function useUnreadCountQuery(
   contact?: DirectContact,
@@ -20,7 +20,7 @@ export function useUnreadCountQuery(
   const computeUnread = (lastSeenDate: Date) => {
     const firstMessageAfterLastSeenDate = messages.findIndex(
       (m) =>
-        isAfter(new Date(m.created * 1000), lastSeenDate) &&
+        dayjs(m.created * 1000).isAfter(dayjs(lastSeenDate)) &&
         m.creator !== publicKey,
     );
     if (firstMessageAfterLastSeenDate > -1) {

lib/utils/format-message-time.ts

@@ -1,7 +1,10 @@
-import { format } from "date-fns";
+import dayjs from "dayjs";
+import advancedFormat from "dayjs/plugin/advancedFormat";
+
+dayjs.extend(advancedFormat);
 
 export const formatMessageTime = (unixTs: number) =>
-  format(new Date(unixTs), "h:mm a");
+  dayjs(unixTs).format("h:mm a");
 
 export const formatMessageDate = (unixTs: number) =>
-  format(new Date(unixTs), "dddd, MMMM Do");
+  dayjs(unixTs).format("dddd, MMMM Do");

lib/utils/get-relative-date.ts

@@ -1,20 +1,20 @@
-import { differenceInDays, differenceInHours, differenceInYears, format, getDay } from "date-fns";
+import dayjs from "dayjs";
 
 export function getRelativeDate(timestamp?: number) {
   if (!timestamp) {
     return "";
   }
 
-  const date = new Date(timestamp * 1000);
-  const now = new Date();
+  const date = dayjs.unix(timestamp);
+  const now = dayjs();
 
-  if (getDay(now) === getDay(date) && differenceInHours(now, date) <= 24) {
-    return format(date, "HH:mm");
-  } else if (differenceInDays(now, date) <= 7) {
-    return format(date, "EEE");
-  } else if (differenceInYears(now, date) === 0) {
-    return format(date, "dd.MM");
+  if (now.day() === date.day() && now.diff(date, "hour") <= 24) {
+    return date.format("HH:mm");
+  } else if (now.diff(date, "day") <= 7) {
+    return date.format("ddd");
+  } else if (now.diff(date, "year") === 0) {
+    return date.format("DD.MM");
   } else {
-    return format(date, "dd.MM.yyyy");
+    return date.format("DD.MM.YYYY");
   }
 }

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ecency/ns-query",
   "description": "React-query based Nostr protocol SDK for Ecency vision and mobile",
-  "version": "1.2.11-next",
+  "version": "1.2.12-next",
   "repository": "https://github.com/ecency/ns-query",
   "author": "ildar.timerbaev <dkildar@gmail.com>",
   "license": "MIT",
@@ -39,7 +39,7 @@
   "peerDependencies": {
     "@tanstack/react-query": "^5.15.0",
     "axios": "1.6.2",
-    "date-fns": "^2.30.0",
+    "dayjs": "^1.11.10",
     "react": "^18.3.1"
   },
   "dependencies": {

vite.config.js

@@ -21,7 +21,7 @@ export default defineConfig({
         "react",
         "react/jsx-runtime",
         "@tanstack/react-query",
-        "date-fns",
+        "dayjs",
         "crypto",
       ],
     },