From c135d1602441c4f2db689a479a19869aec76e616 Mon Sep 17 00:00:00 2001 From: cutestnekoaqua Date: Sat, 11 Feb 2023 22:50:15 +0100 Subject: [PATCH] meow Co-authored-by: cutls --- packages/backend/package.json | 2 +- .../server/api/mastodon/endpoints/account.ts | 19 +++++++++++++++++++ pnpm-lock.yaml | 8 ++++---- 3 files changed, 24 insertions(+), 5 deletions(-) diff --git a/packages/backend/package.json b/packages/backend/package.json index c1af9b173..7a25ee76b 100644 --- a/packages/backend/package.json +++ b/packages/backend/package.json @@ -79,7 +79,7 @@ "koa-send": "5.0.1", "koa-slow": "2.1.0", "koa-views": "7.0.2", - "@cutls/megalodon": "5.1.15", + "@cutls/megalodon": "5.1.16", "mfm-js": "0.23.2", "mime-types": "2.1.35", "multer": "1.4.4-lts.1", diff --git a/packages/backend/src/server/api/mastodon/endpoints/account.ts b/packages/backend/src/server/api/mastodon/endpoints/account.ts index 0162951d6..2766dbdce 100644 --- a/packages/backend/src/server/api/mastodon/endpoints/account.ts +++ b/packages/backend/src/server/api/mastodon/endpoints/account.ts @@ -4,6 +4,23 @@ import { koaBody } from "koa-body"; import { getClient } from "../ApiMastodonCompatibleService.js"; import { toLimitToInt } from "./timeline.js"; +const relationshopModel = { + id: '', + following: false, + followed_by: false, + delivery_following: false, + blocking: false, + blocked_by: false, + muting: false, + muting_notifications: false, + requested: false, + domain_blocking: false, + showing_reblogs: false, + endorsed: false, + notifying: false, + note: '' +} + export function apiAccountMastodon(router: Router): void { router.get("/v1/accounts/verify_credentials", async (ctx, next) => { const BASE_URL = `${ctx.protocol}://${ctx.hostname}`; @@ -258,6 +275,8 @@ export function apiAccountMastodon(router: Router): void { try { const idsRaw = (ctx.query as any)["id[]"]; const ids = typeof idsRaw === "string" ? [idsRaw] : idsRaw; + relationshopModel.id = idsRaw || '1' + if (!idsRaw) return [relationshopModel] const data = (await client.getRelationships(ids)) as any; ctx.body = data.data; } catch (e: any) { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 056b02cbf..a4a61060c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -57,7 +57,7 @@ importers: '@bull-board/api': ^4.6.4 '@bull-board/koa': ^4.6.4 '@bull-board/ui': ^4.6.4 - '@cutls/megalodon': 5.1.15 + '@cutls/megalodon': 5.1.16 '@discordapp/twemoji': 14.0.2 '@elastic/elasticsearch': 7.17.0 '@koa/cors': 3.4.3 @@ -223,7 +223,7 @@ importers: '@bull-board/api': 4.10.2 '@bull-board/koa': 4.10.2_6tybghmia4wsnt33xeid7y4rby '@bull-board/ui': 4.10.2 - '@cutls/megalodon': 5.1.15 + '@cutls/megalodon': 5.1.16 '@discordapp/twemoji': 14.0.2 '@elastic/elasticsearch': 7.17.0 '@koa/cors': 3.4.3 @@ -847,8 +847,8 @@ packages: dependencies: '@jridgewell/trace-mapping': 0.3.9 - /@cutls/megalodon/5.1.15: - resolution: {integrity: sha512-4+mIKUYYr2CLY3idSxXk56WSTG9ww3opeenmsPRxftTwcjQTYxGntNkWmJWEbzeJ4rPslnvpwD7cFR62bPf41g==} + /@cutls/megalodon/5.1.16: + resolution: {integrity: sha512-s2U3qjcs86v0/p0EPwlQqSMh4UhAqTNxu8xUVsPvzrwXr5TrrJ5AVKunBm5582AEkx47nZkqm/98ZF2iHb0GtQ==} engines: {node: '>=15.0.0'} dependencies: '@types/oauth': 0.9.1