forks/peertube
1
0
Fork 0
Code Releases Activity

Optimize config endpoint

Browse source
This commit is contained in:
Chocobozzz 2024-03-12 16:00:51 +01:00
parent 0f67adf98a
commit 486b4a329f
No known key found for this signature in database
GPG key ID: 583A612D890159BE
4 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
server/core/controllers/api/config.ts
View file

@ -106,7 +106,7 @@ async function getConfig (req: express.Request, res: express.Response) {
} }
async function getAbout (req: express.Request, res: express.Response) { async function getAbout (req: express.Request, res: express.Response) {
const { avatars, banners } = await ActorImageModel.listServerActorImages() const serverActor = await getServerActor()
const about: About = { const about: About = {
instance: { instance: {
@ -127,8 +127,8 @@ async function getAbout (req: express.Request, res: express.Response) {
languages: CONFIG.INSTANCE.LANGUAGES, languages: CONFIG.INSTANCE.LANGUAGES,
categories: CONFIG.INSTANCE.CATEGORIES, categories: CONFIG.INSTANCE.CATEGORIES,
banners: banners.map(b => b.toFormattedJSON()), banners: serverActor.Banners.map(b => b.toFormattedJSON()),
avatars: avatars.map(a => a.toFormattedJSON()) avatars: serverActor.Avatars.map(a => a.toFormattedJSON())
} }
} }

10
server/core/lib/server-config-manager.ts
View file

@ -10,12 +10,12 @@ import { CONFIG, isEmailEnabled } from '@server/initializers/config.js'
import { CONSTRAINTS_FIELDS, DEFAULT_THEME_NAME, PEERTUBE_VERSION } from '@server/initializers/constants.js' import { CONSTRAINTS_FIELDS, DEFAULT_THEME_NAME, PEERTUBE_VERSION } from '@server/initializers/constants.js'
import { isSignupAllowed, isSignupAllowedForCurrentIP } from '@server/lib/signup.js' import { isSignupAllowed, isSignupAllowedForCurrentIP } from '@server/lib/signup.js'
import { ActorCustomPageModel } from '@server/models/account/actor-custom-page.js' import { ActorCustomPageModel } from '@server/models/account/actor-custom-page.js'
import { getServerActor } from '@server/models/application/application.js'
import { PluginModel } from '@server/models/server/plugin.js' import { PluginModel } from '@server/models/server/plugin.js'
import { Hooks } from './plugins/hooks.js' import { Hooks } from './plugins/hooks.js'
import { PluginManager } from './plugins/plugin-manager.js' import { PluginManager } from './plugins/plugin-manager.js'
import { getThemeOrDefault } from './plugins/theme-utils.js' import { getThemeOrDefault } from './plugins/theme-utils.js'
import { VideoTranscodingProfilesManager } from './transcoding/default-transcoding-profiles.js' import { VideoTranscodingProfilesManager } from './transcoding/default-transcoding-profiles.js'
import { ActorImageModel } from '@server/models/actor/actor-image.js'
/** /**
* *
@ -47,9 +47,9 @@ class ServerConfigManager {
async getHTMLServerConfig (): Promise<HTMLServerConfig> { async getHTMLServerConfig (): Promise<HTMLServerConfig> {
if (this.serverCommit === undefined) this.serverCommit = await getServerCommit() if (this.serverCommit === undefined) this.serverCommit = await getServerCommit()
const defaultTheme = getThemeOrDefault(CONFIG.THEME.DEFAULT, DEFAULT_THEME_NAME) const serverActor = await getServerActor()
const { avatars, banners } = await ActorImageModel.listServerActorImages() const defaultTheme = getThemeOrDefault(CONFIG.THEME.DEFAULT, DEFAULT_THEME_NAME)
return { return {
client: { client: {
@ -104,8 +104,8 @@ class ServerConfigManager {
javascript: CONFIG.INSTANCE.CUSTOMIZATIONS.JAVASCRIPT, javascript: CONFIG.INSTANCE.CUSTOMIZATIONS.JAVASCRIPT,
css: CONFIG.INSTANCE.CUSTOMIZATIONS.CSS css: CONFIG.INSTANCE.CUSTOMIZATIONS.CSS
}, },
avatars: avatars.map(a => a.toFormattedJSON()), avatars: serverActor.Avatars.map(a => a.toFormattedJSON()),
banners: banners.map(b => b.toFormattedJSON()) banners: serverActor.Banners.map(b => b.toFormattedJSON())
}, },
search: { search: {
remoteUri: { remoteUri: {

6
server/core/models/actor/actor-image.ts
View file

@ -20,7 +20,6 @@ import { CONFIG } from '../../initializers/config.js'
import { LAZY_STATIC_PATHS, MIMETYPES, WEBSERVER } from '../../initializers/constants.js' import { LAZY_STATIC_PATHS, MIMETYPES, WEBSERVER } from '../../initializers/constants.js'
import { SequelizeModel, buildSQLAttributes, throwIfNotValid } from '../shared/index.js' import { SequelizeModel, buildSQLAttributes, throwIfNotValid } from '../shared/index.js'
import { ActorModel } from './actor.js' import { ActorModel } from './actor.js'
import { getServerActor } from '../application/application.js'
@Table({ @Table({
tableName: 'actorImage', tableName: 'actorImage',
@ -124,9 +123,8 @@ export class ActorImageModel extends SequelizeModel<ActorImageModel> {
return ActorImageModel.findAll(query) return ActorImageModel.findAll(query)
} }
static async listServerActorImages () { static async listActorImages (actor: MActorId) {
const serverActor = await getServerActor() const promises = [ ActorImageType.AVATAR, ActorImageType.BANNER ].map(type => ActorImageModel.listByActor(actor, type))
const promises = [ ActorImageType.AVATAR, ActorImageType.BANNER ].map(type => ActorImageModel.listByActor(serverActor, type))
const [ avatars, banners ] = await Promise.all(promises) const [ avatars, banners ] = await Promise.all(promises)

7
server/core/models/application/application.ts
View file

@ -1,7 +1,8 @@
import { getNodeABIVersion } from '@server/helpers/version.js'
import memoizee from 'memoizee' import memoizee from 'memoizee'
import { AllowNull, Column, Default, DefaultScope, HasOne, IsInt, Table } from 'sequelize-typescript' import { AllowNull, Column, Default, DefaultScope, HasOne, IsInt, Table } from 'sequelize-typescript'
import { getNodeABIVersion } from '@server/helpers/version.js'
import { AccountModel } from '../account/account.js' import { AccountModel } from '../account/account.js'
import { ActorImageModel } from '../actor/actor-image.js'
import { SequelizeModel } from '../shared/index.js' import { SequelizeModel } from '../shared/index.js'
export const getServerActor = memoizee(async function () { export const getServerActor = memoizee(async function () {
@ -11,6 +12,10 @@ export const getServerActor = memoizee(async function () {
const actor = application.Account.Actor const actor = application.Account.Actor
actor.Account = application.Account actor.Account = application.Account
const { avatars, banners } = await ActorImageModel.listActorImages(actor)
actor.Avatars = avatars
actor.Banners = banners
return actor return actor
}, { promise: true }) }, { promise: true })