From 30619301d32cedfc9fbaa8b5818f0ed7dd385acf Mon Sep 17 00:00:00 2001 From: naskya Date: Mon, 8 Apr 2024 16:58:43 +0900 Subject: [PATCH] chore: replace `new Date().getTime()` with `Date.now()` https://github.com/misskey-dev/misskey/commit/959cc8ff37de620bf0082f48f59963c00d045fe9 Co-authored-by: zyoshoka <107108195+zyoshoka@users.noreply.github.com> --- packages/backend/src/daemons/janitor.ts | 2 +- packages/backend/src/misc/gen-id.ts | 2 +- packages/backend/src/remote/activitypub/renderer/update.ts | 2 +- packages/backend/src/server/api/endpoints/i/2fa/key-done.ts | 5 +---- packages/backend/src/server/api/private/signin.ts | 2 +- packages/backend/src/server/index.ts | 4 ++-- packages/backend/src/services/push-notification.ts | 2 +- packages/client/src/components/global/MkTime.vue | 4 ++-- packages/client/src/widgets/unix-clock.vue | 6 +++--- packages/sw/src/sw.ts | 3 +-- 10 files changed, 14 insertions(+), 18 deletions(-) diff --git a/packages/backend/src/daemons/janitor.ts b/packages/backend/src/daemons/janitor.ts index 2050d54d4c..99b809d1c8 100644 --- a/packages/backend/src/daemons/janitor.ts +++ b/packages/backend/src/daemons/janitor.ts @@ -10,7 +10,7 @@ import { LessThan } from "typeorm"; export default function () { async function tick() { await AttestationChallenges.delete({ - createdAt: LessThan(new Date(new Date().getTime() - 5 * 60 * 1000)), + createdAt: LessThan(new Date(Date.now() - 5 * 60 * 1000)), }); } diff --git a/packages/backend/src/misc/gen-id.ts b/packages/backend/src/misc/gen-id.ts index e2d9b0201f..4f5a0d5478 100644 --- a/packages/backend/src/misc/gen-id.ts +++ b/packages/backend/src/misc/gen-id.ts @@ -18,7 +18,7 @@ nativeInitIdGenerator(length, fingerprint); * Ref: https://github.com/paralleldrive/cuid2#parameterized-length */ export function genId(date?: Date): string { - return nativeCreateId((date ?? new Date()).getTime()); + return nativeCreateId(date?.getTime() ?? Date.now()); } export function getTimestamp(id: string): number { diff --git a/packages/backend/src/remote/activitypub/renderer/update.ts b/packages/backend/src/remote/activitypub/renderer/update.ts index 765a52f06d..ecb0ed2192 100644 --- a/packages/backend/src/remote/activitypub/renderer/update.ts +++ b/packages/backend/src/remote/activitypub/renderer/update.ts @@ -3,7 +3,7 @@ import type { User } from "@/models/entities/user.js"; export default (object: any, user: { id: User["id"] }) => { const activity = { - id: `${config.url}/users/${user.id}#updates/${new Date().getTime()}`, + id: `${config.url}/users/${user.id}#updates/${Date.now()}`, actor: `${config.url}/users/${user.id}`, type: "Update", to: ["https://www.w3.org/ns/activitystreams#Public"], diff --git a/packages/backend/src/server/api/endpoints/i/2fa/key-done.ts b/packages/backend/src/server/api/endpoints/i/2fa/key-done.ts index b4bfadfd02..0e52dd0d78 100644 --- a/packages/backend/src/server/api/endpoints/i/2fa/key-done.ts +++ b/packages/backend/src/server/api/endpoints/i/2fa/key-done.ts @@ -117,10 +117,7 @@ export default define(meta, paramDef, async (ps, user) => { }); // Expired challenge (> 5min old) - if ( - new Date().getTime() - attestationChallenge.createdAt.getTime() >= - 5 * 60 * 1000 - ) { + if (Date.now() - attestationChallenge.createdAt.getTime() >= 5 * 60 * 1000) { throw new Error("expired challenge"); } diff --git a/packages/backend/src/server/api/private/signin.ts b/packages/backend/src/server/api/private/signin.ts index fb3596d9b1..af4fd65a7c 100644 --- a/packages/backend/src/server/api/private/signin.ts +++ b/packages/backend/src/server/api/private/signin.ts @@ -185,7 +185,7 @@ export default async (ctx: Koa.Context) => { id: body.challengeId, }); - if (new Date().getTime() - challenge.createdAt.getTime() >= 5 * 60 * 1000) { + if (Date.now() - challenge.createdAt.getTime() >= 5 * 60 * 1000) { await fail(403, { id: "2715a88a-2125-4013-932f-aa6fe72792da", }); diff --git a/packages/backend/src/server/index.ts b/packages/backend/src/server/index.ts index 00ad0baef9..28d62a3ac3 100644 --- a/packages/backend/src/server/index.ts +++ b/packages/backend/src/server/index.ts @@ -158,7 +158,7 @@ mastoRouter.post("/oauth/token", async (ctx) => { access_token: uuid(), token_type: "Bearer", scope: "read", - created_at: Math.floor(new Date().getTime() / 1000), + created_at: Math.floor(Date.now() / 1000), }; ctx.body = ret; return; @@ -193,7 +193,7 @@ mastoRouter.post("/oauth/token", async (ctx) => { access_token: atData.accessToken, token_type: "Bearer", scope: body.scope || "read write follow push", - created_at: Math.floor(new Date().getTime() / 1000), + created_at: Math.floor(Date.now() / 1000), }; serverLogger.info("token-response", ret); ctx.body = ret; diff --git a/packages/backend/src/services/push-notification.ts b/packages/backend/src/services/push-notification.ts index a207fae391..09749059a9 100644 --- a/packages/backend/src/services/push-notification.ts +++ b/packages/backend/src/services/push-notification.ts @@ -92,7 +92,7 @@ export async function pushNotification( ? truncateNotification(body as Packed<"Notification">) : body, userId, - dateTime: new Date().getTime(), + dateTime: Date.now(), }), { proxy: config.proxy, diff --git a/packages/client/src/components/global/MkTime.vue b/packages/client/src/components/global/MkTime.vue index 2ab649da27..1f9333cd74 100644 --- a/packages/client/src/components/global/MkTime.vue +++ b/packages/client/src/components/global/MkTime.vue @@ -37,7 +37,7 @@ const _time = const invalid = Number.isNaN(_time); const absolute = !invalid ? dateTimeFormat.format(_time) : i18n.ts._ago.invalid; -const now = ref((props.origin ?? new Date()).getTime()); +const now = ref(props.origin?.getTime() ?? Date.now()); const relative = computed(() => { if (props.mode === "absolute") return ""; // absoluteではrelativeを使わないので計算しない if (invalid) return i18n.ts._ago.invalid; @@ -77,7 +77,7 @@ const relative = computed(() => { let tickId: number; function tick() { - const _now = new Date().getTime(); + const _now = Date.now(); const agoPrev = (now.value - _time) / 1000; /* ms */ // 現状のinterval now.value = _now; diff --git a/packages/client/src/widgets/unix-clock.vue b/packages/client/src/widgets/unix-clock.vue index ba35769347..1d2b890acb 100644 --- a/packages/client/src/widgets/unix-clock.vue +++ b/packages/client/src/widgets/unix-clock.vue @@ -74,9 +74,9 @@ watch(showColon, (v) => { }); const tick = () => { - const now = new Date(); - ss.value = Math.floor(now.getTime() / 1000).toString(); - ms.value = Math.floor((now.getTime() % 1000) / 10) + const now = Date.now(); + ss.value = Math.floor(now / 1000).toString(); + ms.value = Math.floor((now % 1000) / 10) .toString() .padStart(2, "0"); if (ss.value !== prevSec) showColon.value = true; diff --git a/packages/sw/src/sw.ts b/packages/sw/src/sw.ts index 1cc8298ce5..ecddd252f4 100644 --- a/packages/sw/src/sw.ts +++ b/packages/sw/src/sw.ts @@ -71,8 +71,7 @@ globalThis.addEventListener("push", (ev) => { case "notification": case "unreadAntennaNote": // 1日以上経過している場合は無視 - if (new Date().getTime() - data.dateTime > 1000 * 60 * 60 * 24) - break; + if (Date.now() - data.dateTime > 1000 * 60 * 60 * 24) break; return createNotification(data); case "readAllNotifications":