summaryrefslogtreecommitdiff
path: root/packages/backend/src/server/api
diff options
context:
space:
mode:
authorMar0xy <marie@kaifa.ch>2023-09-25 12:37:58 +0200
committerMar0xy <marie@kaifa.ch>2023-09-25 12:37:58 +0200
commitaaa3a34d601fb7a11ca46bfecf8425cd79772165 (patch)
tree4c0562d8d7d4512cd0c755f9cc9deea2fb7abc10 /packages/backend/src/server/api
parentchore: return proper software name in nodeinfo (diff)
downloadsharkey-aaa3a34d601fb7a11ca46bfecf8425cd79772165.tar.gz
sharkey-aaa3a34d601fb7a11ca46bfecf8425cd79772165.tar.bz2
sharkey-aaa3a34d601fb7a11ca46bfecf8425cd79772165.zip
chore: swap base_url getting on some endpoints
Diffstat (limited to 'packages/backend/src/server/api')
-rw-r--r--packages/backend/src/server/api/mastodon/MastodonApiServerService.ts2
-rw-r--r--packages/backend/src/server/api/mastodon/endpoints/account.ts3
2 files changed, 2 insertions, 3 deletions
diff --git a/packages/backend/src/server/api/mastodon/MastodonApiServerService.ts b/packages/backend/src/server/api/mastodon/MastodonApiServerService.ts
index cd0fe2433d..128cb3491a 100644
--- a/packages/backend/src/server/api/mastodon/MastodonApiServerService.ts
+++ b/packages/backend/src/server/api/mastodon/MastodonApiServerService.ts
@@ -93,7 +93,7 @@ export class MastodonApiServerService {
},
order: { id: 'ASC' },
});
- const contact = admin == null ? null : convertAccount((await client.getAccount(admin.id, BASE_URL)).data);
+ const contact = admin == null ? null : convertAccount((await client.getAccount(admin.id)).data);
reply.send(await getInstance(data.data, contact, this.config, await this.metaService.fetch()));
} catch (e: any) {
/* console.error(e); */
diff --git a/packages/backend/src/server/api/mastodon/endpoints/account.ts b/packages/backend/src/server/api/mastodon/endpoints/account.ts
index 0e93583533..b9e9cb862f 100644
--- a/packages/backend/src/server/api/mastodon/endpoints/account.ts
+++ b/packages/backend/src/server/api/mastodon/endpoints/account.ts
@@ -106,8 +106,7 @@ export class ApiAccountMastodon {
try {
const data = await this.client.getAccountStatuses(
convertId((this.request.params as any).id, IdType.SharkeyId),
- convertTimelinesArgsId(argsToBools(limitToInt(this.request.query as any))),
- this.BASE_URL,
+ convertTimelinesArgsId(argsToBools(limitToInt(this.request.query as any)))
);
return data.data.map((status) => convertStatus(status));
} catch (e: any) {