merge: Merge upstream 2025.4.1 (!955)

View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/955

Closes #638, #1037, #734, and #766

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev>

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 6ecd36970d..a168339ac6 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.host,
 				title: this.meta.name || 'Sharkey',