Merge pull request #12060 from misskey-dev/develop

Release: 2023.10.2

6 files changed, 8 insertions, 30 deletions

diff --git a/packages/backend/src/misc/id/aid.ts b/packages/backend/src/misc/id/aid.ts
index ec8aa849c9..e7b59f262b 100644
--- a/packages/backend/src/misc/id/aid.ts
+++ b/packages/backend/src/misc/id/aid.ts
@@ -24,8 +24,7 @@ function getNoise(): string {
 	return counter.toString(36).padStart(2, '0').slice(-2);
 }
 
-export function genAid(date: Date): string {
-	const t = date.getTime();
+export function genAid(t: number): string {
 	if (isNaN(t)) throw new Error('Failed to create AID: Invalid Date');
 	counter++;
 	return getTime(t) + getNoise();
diff --git a/packages/backend/src/misc/id/aidx.ts b/packages/backend/src/misc/id/aidx.ts
index 5b031ea4c0..bed223225a 100644
--- a/packages/backend/src/misc/id/aidx.ts
+++ b/packages/backend/src/misc/id/aidx.ts
@@ -31,8 +31,7 @@ function getNoise(): string {
 	return counter.toString(36).padStart(NOISE_LENGTH, '0').slice(-NOISE_LENGTH);
 }
 
-export function genAidx(date: Date): string {
-	const t = date.getTime();
+export function genAidx(t: number): string {
 	if (isNaN(t)) throw new Error('Failed to create AIDX: Invalid Date');
 	counter++;
 	return getTime(t) + nodeId + getNoise();
diff --git a/packages/backend/src/misc/id/meid.ts b/packages/backend/src/misc/id/meid.ts
index 82cda37237..366738de05 100644
--- a/packages/backend/src/misc/id/meid.ts
+++ b/packages/backend/src/misc/id/meid.ts
@@ -29,8 +29,8 @@ function getRandom() {
 	return str;
 }
 
-export function genMeid(date: Date): string {
-	return getTime(date.getTime()) + getRandom();
+export function genMeid(t: number): string {
+	return getTime(t) + getRandom();
 }
 
 export function parseMeid(id: string): { date: Date; } {
diff --git a/packages/backend/src/misc/id/meidg.ts b/packages/backend/src/misc/id/meidg.ts
index fba7156718..426a46970b 100644
--- a/packages/backend/src/misc/id/meidg.ts
+++ b/packages/backend/src/misc/id/meidg.ts
@@ -29,8 +29,8 @@ function getRandom() {
 	return str;
 }
 
-export function genMeidg(date: Date): string {
-	return 'g' + getTime(date.getTime()) + getRandom();
+export function genMeidg(t: number): string {
+	return 'g' + getTime(t) + getRandom();
 }
 
 export function parseMeidg(id: string): { date: Date; } {
diff --git a/packages/backend/src/misc/id/object-id.ts b/packages/backend/src/misc/id/object-id.ts
index e3b6e8e433..49bd9591c0 100644
--- a/packages/backend/src/misc/id/object-id.ts
+++ b/packages/backend/src/misc/id/object-id.ts
@@ -29,8 +29,8 @@ function getRandom() {
 	return str;
 }
 
-export function genObjectId(date: Date): string {
-	return getTime(date.getTime()) + getRandom();
+export function genObjectId(t: number): string {
+	return getTime(t) + getRandom();
 }
 
 export function parseObjectId(id: string): { date: Date; } {
diff --git a/packages/backend/src/misc/nyaize.ts b/packages/backend/src/misc/nyaize.ts
deleted file mode 100644
index 0ac77e1006..0000000000
--- a/packages/backend/src/misc/nyaize.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and other misskey contributors
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-export function nyaize(text: string): string {
-	return text
-		// ja-JP
-		.replaceAll('な', 'にゃ').replaceAll('ナ', 'ニャ').replaceAll('ﾅ', 'ﾆｬ')
-		// en-US
-		.replace(/(?<=n)a/gi, x => x === 'A' ? 'YA' : 'ya')
-		.replace(/(?<=morn)ing/gi, x => x === 'ING' ? 'YAN' : 'yan')
-		.replace(/(?<=every)one/gi, x => x === 'ONE' ? 'NYAN' : 'nyan')
-		// ko-KR
-		.replace(/[나-낳]/g, match => String.fromCharCode(
-			match.charCodeAt(0)! + '냐'.charCodeAt(0) - '나'.charCodeAt(0),
-		))
-		.replace(/(다$)|(다(?=\.))|(다(?= ))|(다(?=!))|(다(?=\?))/gm, '다냥')
-		.replace(/(야(?=\?))|(야$)|(야(?= ))/gm, '냥');
-}