enhance: stats apiの重い処理をスキップできるように

This commit is contained in:
kakkokari-gtyih 2024-11-27 00:57:40 +09:00
parent ae1d0b08eb
commit c0efad6ee3
9 changed files with 59 additions and 2 deletions

4
locales/index.d.ts vendored
View File

@ -5222,6 +5222,10 @@ export interface Locale extends ILocale {
*
*/
"acknowledgeNotesAndEnable": string;
/**
* APIを利用する
*/
"enableEnhancedServerStats": string;
"_accountSettings": {
/**
*

View File

@ -1301,6 +1301,7 @@ lockdown: "ロックダウン"
pleaseSelectAccount: "アカウントを選択してください"
availableRoles: "利用可能なロール"
acknowledgeNotesAndEnable: "注意事項を理解した上でオンにします。"
enableEnhancedServerStats: "拡張されたサーバー統計APIを利用する"
_accountSettings:
requireSigninToViewContents: "コンテンツの表示にログインを必須にする"

View File

@ -0,0 +1,16 @@
/*
* SPDX-FileCopyrightText: syuilo and misskey-project
* SPDX-License-Identifier: AGPL-3.0-only
*/
export class EnableEnhancedServerStats1732635823870 {
name = 'EnableEnhancedServerStats1732635823870'
async up(queryRunner) {
await queryRunner.query(`ALTER TABLE "meta" ADD "enableEnhancedServerStats" boolean NOT NULL DEFAULT true`);
}
async down(queryRunner) {
await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "enableEnhancedServerStats"`);
}
}

View File

@ -544,6 +544,11 @@ export class MiMeta {
})
public enableIdenticonGeneration: boolean;
@Column('boolean', {
default: true,
})
public enableEnhancedServerStats: boolean;
@Column('jsonb', {
default: { },
})

View File

@ -356,6 +356,10 @@ export const meta = {
type: 'boolean',
optional: false, nullable: false,
},
enableEnhancedServerStats: {
type: 'boolean',
optional: false, nullable: false,
},
enableIdenticonGeneration: {
type: 'boolean',
optional: false, nullable: false,
@ -641,6 +645,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
enableChartsForFederatedInstances: instance.enableChartsForFederatedInstances,
enableStatsForFederatedInstances: instance.enableStatsForFederatedInstances,
enableServerMachineStats: instance.enableServerMachineStats,
enableEnhancedServerStats: instance.enableEnhancedServerStats,
enableIdenticonGeneration: instance.enableIdenticonGeneration,
bannedEmailDomains: instance.bannedEmailDomains,
policies: { ...DEFAULT_POLICIES, ...instance.policies },

View File

@ -138,6 +138,7 @@ export const paramDef = {
enableChartsForFederatedInstances: { type: 'boolean' },
enableStatsForFederatedInstances: { type: 'boolean' },
enableServerMachineStats: { type: 'boolean' },
enableEnhancedServerStats: { type: 'boolean' },
enableIdenticonGeneration: { type: 'boolean' },
serverRules: { type: 'array', items: { type: 'string' } },
bannedEmailDomains: { type: 'array', items: { type: 'string' } },
@ -587,6 +588,10 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
set.enableServerMachineStats = ps.enableServerMachineStats;
}
if (ps.enableEnhancedServerStats !== undefined) {
set.enableEnhancedServerStats = ps.enableEnhancedServerStats;
}
if (ps.enableIdenticonGeneration !== undefined) {
set.enableIdenticonGeneration = ps.enableIdenticonGeneration;
}

View File

@ -4,7 +4,7 @@
*/
import { Inject, Injectable } from '@nestjs/common';
import type { InstancesRepository, NoteReactionsRepository } from '@/models/_.js';
import type { MiMeta, InstancesRepository, NoteReactionsRepository } from '@/models/_.js';
import { Endpoint } from '@/server/api/endpoint-base.js';
import { DI } from '@/di-symbols.js';
import NotesChart from '@/core/chart/charts/notes.js';
@ -60,6 +60,9 @@ export const paramDef = {
@Injectable()
export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-disable-line import/no-default-export
constructor(
@Inject(DI.meta)
private instanceMeta: MiMeta,
@Inject(DI.instancesRepository)
private instancesRepository: InstancesRepository,
@ -83,7 +86,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
//originalReactionsCount,
instances,
] = await Promise.all([
this.noteReactionsRepository.count({ cache: 3600000 }), // 1 hour
this.instanceMeta.enableEnhancedServerStats ? this.noteReactionsRepository.count({ cache: 3600000 }) : Promise.resolve(0), // 1 hour
//this.noteReactionsRepository.count({ where: { userHost: IsNull() }, cache: 3600000 }),
this.instancesRepository.count({ cache: 3600000 }),
]);

View File

@ -15,6 +15,13 @@ SPDX-License-Identifier: AGPL-3.0-only
</MkSwitch>
</div>
<div class="_panel" style="padding: 16px;">
<MkSwitch v-model="enableEnhancedServerStats" @change="onChange_enableEnhancedServerStats">
<template #label>{{ i18n.ts.enableEnhancedServerStats }}</template>
<template #caption>{{ i18n.ts.turnOffToImprovePerformance }}</template>
</MkSwitch>
</div>
<div class="_panel" style="padding: 16px;">
<MkSwitch v-model="enableIdenticonGeneration" @change="onChange_enableIdenticonGeneration">
<template #label>{{ i18n.ts.enableIdenticonGeneration }}</template>
@ -125,6 +132,7 @@ import MkFormFooter from '@/components/MkFormFooter.vue';
const meta = await misskeyApi('admin/meta');
const enableServerMachineStats = ref(meta.enableServerMachineStats);
const enableEnhancedServerStats = ref(meta.enableEnhancedServerStats);
const enableIdenticonGeneration = ref(meta.enableIdenticonGeneration);
const enableChartsForRemoteUser = ref(meta.enableChartsForRemoteUser);
const enableStatsForFederatedInstances = ref(meta.enableStatsForFederatedInstances);
@ -138,6 +146,14 @@ function onChange_enableServerMachineStats(value: boolean) {
});
}
function onChange_enableEnhancedServerStats(value: boolean) {
os.apiWithDialog('admin/update-meta', {
enableEnhancedServerStats: value,
}).then(() => {
fetchInstance(true);
});
}
function onChange_enableIdenticonGeneration(value: boolean) {
os.apiWithDialog('admin/update-meta', {
enableIdenticonGeneration: value,

View File

@ -5179,6 +5179,7 @@ export type operations = {
enableChartsForFederatedInstances: boolean;
enableStatsForFederatedInstances: boolean;
enableServerMachineStats: boolean;
enableEnhancedServerStats: boolean;
enableIdenticonGeneration: boolean;
manifestJsonOverride: string;
policies: Record<string, never>;
@ -9575,6 +9576,7 @@ export type operations = {
enableChartsForFederatedInstances?: boolean;
enableStatsForFederatedInstances?: boolean;
enableServerMachineStats?: boolean;
enableEnhancedServerStats?: boolean;
enableIdenticonGeneration?: boolean;
serverRules?: string[];
bannedEmailDomains?: string[];