From 7399a79f73cc2015e64fad49361439a322ee1d3b Mon Sep 17 00:00:00 2001 From: kontrollanten <6680299+kontrollanten@users.noreply.github.com> Date: Tue, 12 Oct 2021 14:23:44 +0200 Subject: add option to always show channel display name (#4422) * add option to always show channel display name closes #4040 * show avatar in video miniatures closes #4040 * Revert "show avatar in video miniatures" This reverts commit 79b1a84140857fc24f7e2233e838d012f72bc56f. * channel display name: fix review comments --- server/initializers/config.ts | 9 +++++++++ server/lib/server-config-manager.ts | 7 +++++++ 2 files changed, 16 insertions(+) (limited to 'server') diff --git a/server/initializers/config.ts b/server/initializers/config.ts index b2a8e9e19..5ee08cf12 100644 --- a/server/initializers/config.ts +++ b/server/initializers/config.ts @@ -58,6 +58,15 @@ const CONFIG = { PREFIX: config.get('email.subject.prefix') + ' ' } }, + + CLIENT: { + VIDEOS: { + MINIATURE: { + get SHOW_AUTHOR_DISPLAY_NAME () { return config.get('client.videos.miniature.show_author_display_name') } + } + } + }, + STORAGE: { TMP_DIR: buildPath(config.get('storage.tmp')), ACTOR_IMAGES: buildPath(config.get('storage.avatars')), diff --git a/server/lib/server-config-manager.ts b/server/lib/server-config-manager.ts index 358f47133..72fcf54cd 100644 --- a/server/lib/server-config-manager.ts +++ b/server/lib/server-config-manager.ts @@ -43,6 +43,13 @@ class ServerConfigManager { return { allowEdits: CONFIG.WEBADMIN.CONFIGURATION.EDITS.ALLOWED, + client: { + videos: { + miniature: { + showAuthorDisplayName: CONFIG.CLIENT.VIDEOS.MINIATURE.SHOW_AUTHOR_DISPLAY_NAME + } + } + }, instance: { name: CONFIG.INSTANCE.NAME, shortDescription: CONFIG.INSTANCE.SHORT_DESCRIPTION, -- cgit v1.2.3