From 53dfec57a8bfcc9abefba6d8a5ec88012478eed1 Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Sat, 27 Apr 2024 09:15:59 +0900
Subject: [PATCH] refactor (backend): remove misc/langmap.ts

---
 packages/backend/src/misc/langmap.ts                         | 4 ----
 packages/backend/src/remote/activitypub/models/note.ts       | 2 +-
 packages/backend/src/server/api/endpoints/notes/create.ts    | 2 +-
 packages/backend/src/server/api/endpoints/notes/edit.ts      | 2 +-
 packages/backend/src/server/api/endpoints/notes/translate.ts | 2 +-
 packages/backend/src/services/note/create.ts                 | 2 +-
 packages/firefish-js/src/index.ts                            | 5 +++--
 7 files changed, 8 insertions(+), 11 deletions(-)
 delete mode 100644 packages/backend/src/misc/langmap.ts

diff --git a/packages/backend/src/misc/langmap.ts b/packages/backend/src/misc/langmap.ts
deleted file mode 100644
index d36796d403..0000000000
--- a/packages/backend/src/misc/langmap.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import { langmap as _langmap } from "firefish-js";
-export const langmap = _langmap;
-
-export type PostLanguage = keyof typeof langmap;
diff --git a/packages/backend/src/remote/activitypub/models/note.ts b/packages/backend/src/remote/activitypub/models/note.ts
index 2d847ef968..87480b6291 100644
--- a/packages/backend/src/remote/activitypub/models/note.ts
+++ b/packages/backend/src/remote/activitypub/models/note.ts
@@ -52,7 +52,7 @@ import { UserProfiles } from "@/models/index.js";
 import { In } from "typeorm";
 import { config } from "@/config.js";
 import { truncate } from "@/misc/truncate.js";
-import { langmap } from "@/misc/langmap.js";
+import { langmap } from "firefish-js";
 import { inspect } from "node:util";
 
 export function validateNote(object: any, uri: string) {
diff --git a/packages/backend/src/server/api/endpoints/notes/create.ts b/packages/backend/src/server/api/endpoints/notes/create.ts
index eb4d9ca5a2..7f07bb2336 100644
--- a/packages/backend/src/server/api/endpoints/notes/create.ts
+++ b/packages/backend/src/server/api/endpoints/notes/create.ts
@@ -17,7 +17,7 @@ import { ApiError } from "@/server/api/error.js";
 import define from "@/server/api/define.js";
 import { HOUR } from "backend-rs";
 import { getNote } from "@/server/api/common/getters.js";
-import { langmap } from "@/misc/langmap.js";
+import { langmap } from "firefish-js";
 
 export const meta = {
 	tags: ["notes"],
diff --git a/packages/backend/src/server/api/endpoints/notes/edit.ts b/packages/backend/src/server/api/endpoints/notes/edit.ts
index 238c01420d..e13151e5f3 100644
--- a/packages/backend/src/server/api/endpoints/notes/edit.ts
+++ b/packages/backend/src/server/api/endpoints/notes/edit.ts
@@ -34,7 +34,7 @@ import renderNote from "@/remote/activitypub/renderer/note.js";
 import renderUpdate from "@/remote/activitypub/renderer/update.js";
 import { deliverToRelays } from "@/services/relay.js";
 // import { deliverQuestionUpdate } from "@/services/note/polls/update.js";
-import { langmap } from "@/misc/langmap.js";
+import { langmap } from "firefish-js";
 
 export const meta = {
 	tags: ["notes"],
diff --git a/packages/backend/src/server/api/endpoints/notes/translate.ts b/packages/backend/src/server/api/endpoints/notes/translate.ts
index 094b7fed33..8b84baa0b2 100644
--- a/packages/backend/src/server/api/endpoints/notes/translate.ts
+++ b/packages/backend/src/server/api/endpoints/notes/translate.ts
@@ -1,7 +1,7 @@
 import { ApiError } from "@/server/api/error.js";
 import { getNote } from "@/server/api/common/getters.js";
 import { translate } from "@/misc/translate.js";
-import type { PostLanguage } from "@/misc/langmap.js";
+import type { PostLanguage } from "firefish-js";
 import define from "@/server/api/define.js";
 
 export const meta = {
diff --git a/packages/backend/src/services/note/create.ts b/packages/backend/src/services/note/create.ts
index 679a2f886e..7b4d6b0039 100644
--- a/packages/backend/src/services/note/create.ts
+++ b/packages/backend/src/services/note/create.ts
@@ -63,7 +63,7 @@ import { db } from "@/db/postgre.js";
 import { getActiveWebhooks } from "@/misc/webhook-cache.js";
 import { redisClient } from "@/db/redis.js";
 import { Mutex } from "redis-semaphore";
-import { langmap } from "@/misc/langmap.js";
+import { langmap } from "firefish-js";
 import Logger from "@/services/logger.js";
 import { inspect } from "node:util";
 import { undefinedToNull } from "@/prelude/undefined-to-null.js";
diff --git a/packages/firefish-js/src/index.ts b/packages/firefish-js/src/index.ts
index 126ab47e53..b5baa85989 100644
--- a/packages/firefish-js/src/index.ts
+++ b/packages/firefish-js/src/index.ts
@@ -31,11 +31,12 @@ export const languages = consts.languages;
 export const ffVisibility = consts.ffVisibility;
 export const instanceSortParam = consts.instanceSortParam;
 
-import { langmap } from "./misc/langmap.js";
+import { langmap, type PostLanguage } from "./misc/langmap.js";
+export { langmap, type PostLanguage };
 
 // api extractor not supported yet
 //export * as api from './api';
 //export * as entities from './entities';
 import * as api from "./api.js";
 import * as entities from "./entities.js";
-export { api, entities, langmap };
+export { api, entities };