From 48a20500f8cbe8ed4093256ec68cd753b75ead9e Mon Sep 17 00:00:00 2001 From: contributor Date: Thu, 13 Nov 2025 19:54:32 +0200 Subject: [PATCH] explicit param to keep or convert local date for enex import --- apps/server/src/services/import/enex.ts | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/apps/server/src/services/import/enex.ts b/apps/server/src/services/import/enex.ts index 5fe70fa47..711723516 100644 --- a/apps/server/src/services/import/enex.ts +++ b/apps/server/src/services/import/enex.ts @@ -237,8 +237,8 @@ function importEnex(taskContext: TaskContext<"importNotes">, file: File, parentN function updateDates(note: BNote, utcDateCreated?: string, utcDateModified?: string) { // it's difficult to force custom dateCreated and dateModified to Note entity, so we do it post-creation with SQL - const dateCreated = formatDateTimeToLocalDbFormat(utcDateCreated); - const dateModified = formatDateTimeToLocalDbFormat(utcDateModified); + const dateCreated = formatDateTimeToLocalDbFormat(utcDateCreated, false); + const dateModified = formatDateTimeToLocalDbFormat(utcDateModified, false); sql.execute( ` UPDATE notes @@ -411,17 +411,23 @@ function importEnex(taskContext: TaskContext<"importNotes">, file: File, parentN }); } -function formatDateTimeToLocalDbFormat(date: Date | string | null | undefined) { - if (!date) { +function formatDateTimeToLocalDbFormat( + utcDateFromEnex: Date | string | null | undefined, + keepUtc: boolean) { + + if (!utcDateFromEnex) { return undefined; } - const d = dayjs(date); - if (!d.isValid()) { + let date = dayjs(utcDateFromEnex); + if (keepUtc) { + date = date.utc(); + } + if (!date.isValid()) { return undefined; } - return d.format(date_utils.LOCAL_DATETIME_FORMAT); + return date.format(date_utils.LOCAL_DATETIME_FORMAT); } export default { importEnex };