summaryrefslogtreecommitdiff
path: root/packages/backend/src/server/api/mastodon/endpoints
diff options
context:
space:
mode:
authorHazelnoot <acomputerdog@gmail.com>2025-04-01 10:12:59 -0400
committerHazelnoot <acomputerdog@gmail.com>2025-04-01 10:12:59 -0400
commit383633873dea318cb9783fc2228ddf6e7892350e (patch)
tree1fc22ef37bd701f5a68e1a9acc5b881792877894 /packages/backend/src/server/api/mastodon/endpoints
parentMerge branch 'misskey-develop' into merge/2025-03-24 (diff)
downloadsharkey-383633873dea318cb9783fc2228ddf6e7892350e.tar.gz
sharkey-383633873dea318cb9783fc2228ddf6e7892350e.tar.bz2
sharkey-383633873dea318cb9783fc2228ddf6e7892350e.zip
fix backend type errors
Diffstat (limited to 'packages/backend/src/server/api/mastodon/endpoints')
-rw-r--r--packages/backend/src/server/api/mastodon/endpoints/instance.ts21
1 files changed, 5 insertions, 16 deletions
diff --git a/packages/backend/src/server/api/mastodon/endpoints/instance.ts b/packages/backend/src/server/api/mastodon/endpoints/instance.ts
index d6ee92b466..0e363446a4 100644
--- a/packages/backend/src/server/api/mastodon/endpoints/instance.ts
+++ b/packages/backend/src/server/api/mastodon/endpoints/instance.ts
@@ -3,12 +3,11 @@
* SPDX-License-Identifier: AGPL-3.0-only
*/
-import { IsNull } from 'typeorm';
import { Inject, Injectable } from '@nestjs/common';
import { FILE_TYPE_BROWSERSAFE } from '@/const.js';
import type { Config } from '@/config.js';
import { DI } from '@/di-symbols.js';
-import type { MiMeta, UsersRepository } from '@/models/_.js';
+import type { MiMeta } from '@/models/_.js';
import { MastodonConverters } from '@/server/api/mastodon/MastodonConverters.js';
import { MastodonClientService } from '@/server/api/mastodon/MastodonClientService.js';
import { RoleService } from '@/core/RoleService.js';
@@ -21,9 +20,6 @@ export class ApiInstanceMastodon {
@Inject(DI.meta)
private readonly meta: MiMeta,
- @Inject(DI.usersRepository)
- private readonly usersRepository: UsersRepository,
-
@Inject(DI.config)
private readonly config: Config,
@@ -36,19 +32,12 @@ export class ApiInstanceMastodon {
fastify.get('/v1/instance', async (_request, reply) => {
const { client, me } = await this.clientService.getAuthClient(_request);
const data = await client.getInstance();
- const instance = data.data;
- const admin = await this.usersRepository.findOne({
- where: {
- host: IsNull(),
- isRoot: true,
- isDeleted: false,
- isSuspended: false,
- },
- order: { id: 'ASC' },
- });
- const contact = admin == null ? null : await this.mastoConverters.convertAccount((await client.getAccount(admin.id)).data);
+ const contact = this.meta.rootUser != null
+ ? await this.mastoConverters.convertAccount(this.meta.rootUser)
+ : null;
const roles = await this.roleService.getUserPolicies(me?.id ?? null);
+ const instance = data.data;
const response: MastodonEntity.Instance = {
uri: this.config.url,
title: this.meta.name || 'Sharkey',