use @joinfirefish/megalodon

packages/backend/package.json

@@ -31,6 +31,7 @@
 		"@bull-board/ui": "5.8.0",
 		"@discordapp/twemoji": "14.1.2",
 		"@elastic/elasticsearch": "7.17.0",
+		"@joinfirefish/megalodon": "^8.1.4",
 		"@koa/cors": "3.4.3",
 		"@koa/multer": "3.0.2",
 		"@koa/router": "9.0.1",
@@ -87,7 +88,6 @@
 		"koa-send": "5.0.1",
 		"koa-slow": "2.1.0",
 		"koa-views": "7.0.2",
-		"megalodon": "8.1.1",
 		"meilisearch": "0.34.1",
 		"mfm-js": "0.23.3",
 		"mime-types": "2.1.35",

packages/backend/src/server/api/mastodon/ApiMastodonCompatibleService.ts

@@ -1,5 +1,5 @@
 import Router from "@koa/router";
-import megalodon, { MegalodonInterface } from "megalodon";
+import megalodon, { MegalodonInterface } from "@joinfirefish/megalodon";
 import { apiAuthMastodon } from "./endpoints/auth.js";
 import { apiAccountMastodon } from "./endpoints/account.js";
 import { apiStatusMastodon } from "./endpoints/status.js";

packages/backend/src/server/api/mastodon/converters.ts

@@ -1,4 +1,4 @@
-import { Entity } from "megalodon";
+import { Entity } from "@joinfirefish/megalodon";
 import { convertId, IdType } from "../index.js";
 
 function simpleConvert(data: any) {

packages/backend/src/server/api/mastodon/endpoints/auth.ts

@@ -1,4 +1,4 @@
-import megalodon, { MegalodonInterface } from "megalodon";
+import megalodon, { MegalodonInterface } from "@joinfirefish/megalodon";
 import Router from "@koa/router";
 import { koaBody } from "koa-body";
 import { getClient } from "../ApiMastodonCompatibleService.js";

packages/backend/src/server/api/mastodon/endpoints/filter.ts

@@ -1,4 +1,4 @@
-import megalodon, { MegalodonInterface } from "megalodon";
+import megalodon, { MegalodonInterface } from "@joinfirefish/megalodon";
 import Router from "@koa/router";
 import { getClient } from "../ApiMastodonCompatibleService.js";
 import { IdType, convertId } from "../../index.js";

packages/backend/src/server/api/mastodon/endpoints/meta.ts

@@ -1,4 +1,4 @@
-import { Entity } from "megalodon";
+import { Entity } from "@joinfirefish/megalodon";
 import config from "@/config/index.js";
 import { fetchMeta } from "@/misc/fetch-meta.js";
 import { MAX_NOTE_TEXT_LENGTH, FILE_TYPE_BROWSERSAFE } from "@/const.js";

packages/backend/src/server/api/mastodon/endpoints/notifications.ts

@@ -1,4 +1,4 @@
-import megalodon, { MegalodonInterface } from "megalodon";
+import megalodon, { MegalodonInterface } from "@joinfirefish/megalodon";
 import Router from "@koa/router";
 import { koaBody } from "koa-body";
 import { convertId, IdType } from "../../index.js";

packages/backend/src/server/api/mastodon/endpoints/search.ts

@@ -1,7 +1,7 @@
 import Router from "@koa/router";
 import { getClient } from "../ApiMastodonCompatibleService.js";
 import axios from "axios";
-import Converter from "megalodon";
+import Converter from "@joinfirefish/megalodon";
 import { convertTimelinesArgsId, limitToInt } from "./timeline.js";
 import { convertAccount, convertStatus } from "../converters.js";
 

packages/backend/src/server/api/stream/index.ts

@@ -25,7 +25,7 @@ import { readNotification } from "../common/read-notification.js";
 import channels from "./channels/index.js";
 import type Channel from "./channel.js";
 import type { StreamEventEmitter, StreamMessages } from "./types.js";
-import Converter from "megalodon";
+import Converter from "@joinfirefish/megalodon";
 import { getClient } from "../mastodon/ApiMastodonCompatibleService.js";
 
 /**

packages/backend/src/server/index.ts

@@ -22,7 +22,7 @@ import { createTemp } from "@/misc/create-temp.js";
 import { publishMainStream } from "@/services/stream.js";
 import * as Acct from "@/misc/acct.js";
 import { envOption } from "@/env.js";
-import megalodon, { MegalodonInterface } from "megalodon";
+import megalodon, { MegalodonInterface } from "@joinfirefish/megalodon";
 import activityPub from "./activitypub.js";
 import nodeinfo from "./nodeinfo.js";
 import wellKnown from "./well-known.js";

pnpm-lock.yaml

@@ -111,6 +111,9 @@ importers:
       '@elastic/elasticsearch':
         specifier: 7.17.0
         version: 7.17.0
+      '@joinfirefish/megalodon':
+        specifier: ^8.1.4
+        version: 8.1.4
       '@koa/cors':
         specifier: 3.4.3
         version: 3.4.3
@@ -279,9 +282,6 @@ importers:
       koa-views:
         specifier: 7.0.2
         version: 7.0.2(@types/koa@2.13.8)(ejs@3.1.9)(pug@3.0.2)
-      megalodon:
-        specifier: ^8.1.1
-        version: 8.1.1
       meilisearch:
         specifier: 0.34.1
         version: 0.34.1
@@ -2383,6 +2383,31 @@ packages:
       chalk: 4.1.2
     dev: true
 
+  /@joinfirefish/megalodon@8.1.4:
+    resolution: {integrity: sha512-w9Z/hY0s5/DbrQeps8K9AfS5ZQHi563xOMVId9iIk8EBvwBICGZH4huIGds7+b+uHja5HOL7IRw+oECvyK5nZw==}
+    engines: {node: '>=15.0.0'}
+    dependencies:
+      '@types/oauth': 0.9.2
+      '@types/ws': 8.5.5
+      axios: 1.5.1
+      dayjs: 1.11.10
+      form-data: 4.0.0
+      https-proxy-agent: 7.0.2
+      isomorphic-ws: 5.0.0(ws@8.14.2)
+      oauth: 0.10.0
+      object-assign-deep: 0.4.0
+      parse-link-header: 2.0.0
+      socks-proxy-agent: 8.0.2
+      typescript: 5.2.2
+      uuid: 9.0.1
+      ws: 8.14.2
+    transitivePeerDependencies:
+      - bufferutil
+      - debug
+      - supports-color
+      - utf-8-validate
+    dev: false
+
   /@jridgewell/gen-mapping@0.3.3:
     resolution: {integrity: sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==}
     engines: {node: '>=6.0.0'}
@@ -10751,6 +10776,14 @@ packages:
     engines: {node: '>=0.10.0'}
     dev: true
 
+  /isomorphic-ws@5.0.0(ws@8.14.2):
+    resolution: {integrity: sha512-muId7Zzn9ywDsyXgTIafTry2sV3nySZeUDe6YedVd1Hvuuep5AsIlqK+XefWpYTyJG5e503F2xIuT2lcU6rCSw==}
+    peerDependencies:
+      ws: '*'
+    dependencies:
+      ws: 8.14.2
+    dev: false
+
   /isstream@0.1.2:
     resolution: {integrity: sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==}
 
@@ -12405,30 +12438,6 @@ packages:
     engines: {node: '>= 0.6'}
     dev: false
 
-  /megalodon@8.1.1:
-    resolution: {integrity: sha512-K7YjGmRbNkJao2E0hadJCW3IDloufVPUbYA/3+RFDFZvZO5v1MBz3rU4OixIgrHHY74PVTkSU8YHzyv7KA4rhA==}
-    engines: {node: '>=15.0.0'}
-    dependencies:
-      '@types/oauth': 0.9.2
-      '@types/ws': 8.5.5
-      axios: 1.5.1
-      dayjs: 1.11.10
-      form-data: 4.0.0
-      https-proxy-agent: 7.0.2
-      oauth: 0.10.0
-      object-assign-deep: 0.4.0
-      parse-link-header: 2.0.0
-      socks-proxy-agent: 8.0.2
-      typescript: 5.2.2
-      uuid: 9.0.1
-      ws: 8.14.2
-    transitivePeerDependencies:
-      - bufferutil
-      - debug
-      - supports-color
-      - utf-8-validate
-    dev: false
-
   /meilisearch@0.34.1:
     resolution: {integrity: sha512-7mrLp88JfrbvhAMhOjNPzHGd2iCLHgzNhkveMxppMOToMLQw4Ygof4ksQ9uFi7SKq3UwEhIoMoFT1rUHLD3vWQ==}
     dependencies: