usbharu
/
misskey
mirror of https://github.com/misskey-dev/misskey.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

wip

This commit is contained in:
syuilo 2025-02-21 18:27:01 +09:00
parent f236b44f26
commit 744e1d2ba3
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
packages/backend/src/core/entities/MetaEntityService.ts
View File

@ -11,8 +11,7 @@ import type { MiMeta } from '@/models/Meta.js';
import type { AdsRepository } from '@/models/_.js'; import type { AdsRepository } from '@/models/_.js';
import { MAX_NOTE_TEXT_LENGTH } from '@/const.js'; import { MAX_NOTE_TEXT_LENGTH } from '@/const.js';
import { bindThis } from '@/decorators.js'; import { bindThis } from '@/decorators.js';
import { UserEntityService } from '@/core/entities/UserEntityService.js'; import { SystemAccountService } from '@/core/SystemAccountService.js';
import { InstanceActorService } from '@/core/SystemAccountService.js';
import type { Config } from '@/config.js'; import type { Config } from '@/config.js';
import { DI } from '@/di-symbols.js'; import { DI } from '@/di-symbols.js';
import { DEFAULT_POLICIES } from '@/core/RoleService.js'; import { DEFAULT_POLICIES } from '@/core/RoleService.js';
@ -29,8 +28,7 @@ export class MetaEntityService {
@Inject(DI.adsRepository) @Inject(DI.adsRepository)
private adsRepository: AdsRepository, private adsRepository: AdsRepository,
private userEntityService: UserEntityService, private systemAccountService: SystemAccountService,
private instanceActorService: InstanceActorService,
) { } ) { }
@bindThis @bindThis
@ -148,12 +146,14 @@ export class MetaEntityService {
const packed = await this.pack(instance); const packed = await this.pack(instance);
const proxyAccount = await this.systemAccountService.fetch('proxy');
const packDetailed: Packed<'MetaDetailed'> = { const packDetailed: Packed<'MetaDetailed'> = {
...packed, ...packed,
cacheRemoteFiles: instance.cacheRemoteFiles, cacheRemoteFiles: instance.cacheRemoteFiles,
cacheRemoteSensitiveFiles: instance.cacheRemoteSensitiveFiles, cacheRemoteSensitiveFiles: instance.cacheRemoteSensitiveFiles,
requireSetup: !await this.instanceActorService.realLocalUsersPresent(), requireSetup: !await this.instanceActorService.realLocalUsersPresent(), // TODO
proxyAccountName: proxyAccount ? proxyAccount.username : null, // TODO proxyAccountName: proxyAccount.username,
features: { features: {
localTimeline: instance.policies.ltlAvailable, localTimeline: instance.policies.ltlAvailable,
globalTimeline: instance.policies.gtlAvailable, globalTimeline: instance.policies.gtlAvailable,

9
packages/backend/src/server/NodeinfoServerService.ts
View File

@ -9,11 +9,11 @@ import type { Config } from '@/config.js';
import { MetaService } from '@/core/MetaService.js'; import { MetaService } from '@/core/MetaService.js';
import { MAX_NOTE_TEXT_LENGTH } from '@/const.js'; import { MAX_NOTE_TEXT_LENGTH } from '@/const.js';
import { MemorySingleCache } from '@/misc/cache.js'; import { MemorySingleCache } from '@/misc/cache.js';
import { UserEntityService } from '@/core/entities/UserEntityService.js';
import { bindThis } from '@/decorators.js'; import { bindThis } from '@/decorators.js';
import NotesChart from '@/core/chart/charts/notes.js'; import NotesChart from '@/core/chart/charts/notes.js';
import UsersChart from '@/core/chart/charts/users.js'; import UsersChart from '@/core/chart/charts/users.js';
import { DEFAULT_POLICIES } from '@/core/RoleService.js'; import { DEFAULT_POLICIES } from '@/core/RoleService.js';
import { SystemAccountService } from '@/core/SystemAccountService.js';
import type { FastifyInstance, FastifyPluginOptions } from 'fastify'; import type { FastifyInstance, FastifyPluginOptions } from 'fastify';
const nodeinfo2_1path = '/nodeinfo/2.1'; const nodeinfo2_1path = '/nodeinfo/2.1';
@ -26,7 +26,7 @@ export class NodeinfoServerService {
@Inject(DI.config) @Inject(DI.config)
private config: Config, private config: Config,
private userEntityService: UserEntityService, private systemAccountService: SystemAccountService,
private metaService: MetaService, private metaService: MetaService,
private notesChart: NotesChart, private notesChart: NotesChart,
private usersChart: UsersChart, private usersChart: UsersChart,
@ -70,8 +70,7 @@ export class NodeinfoServerService {
const activeHalfyear = null; const activeHalfyear = null;
const activeMonth = null; const activeMonth = null;
// TODO const proxyAccount = await this.systemAccountService.fetch('proxy');
const proxyAccount = meta.proxyAccountId ? await this.userEntityService.pack(meta.proxyAccountId).catch(() => null) : null;
const basePolicies = { ...DEFAULT_POLICIES, ...meta.policies }; const basePolicies = { ...DEFAULT_POLICIES, ...meta.policies };
@ -124,7 +123,7 @@ export class NodeinfoServerService {
maxNoteTextLength: MAX_NOTE_TEXT_LENGTH, maxNoteTextLength: MAX_NOTE_TEXT_LENGTH,
enableEmail: meta.enableEmail, enableEmail: meta.enableEmail,
enableServiceWorker: meta.enableServiceWorker, enableServiceWorker: meta.enableServiceWorker,
proxyAccountName: proxyAccount ? proxyAccount.username : null, proxyAccountName: proxyAccount.username,
themeColor: meta.themeColor ?? '#86b300', themeColor: meta.themeColor ?? '#86b300',
}, },
}; };