From 2c102aac13ec537ff72ec09a50d3197ed3bc8185 Mon Sep 17 00:00:00 2001 From: kontrollanten <6680299+kontrollanten@users.noreply.github.com> Date: Tue, 8 Mar 2022 13:39:27 +0100 Subject: Display avatar in video miniatures (#4823) * show avatar in video miniatures closes #4040 * fix: videos for api, include avatars * add config for display video miniature avatar * Revert "fix: videos for api, include avatars" This reverts commit 5520a3eda6805338317a394d0553f2f82095a425. * video-min: set display avatar to false as default * remove empty line * rename display_avatar > display_author_avatar * fix renaming displayAvatar > displayAuthorAvatar --- server/initializers/checker-before-init.ts | 1 + server/initializers/config.ts | 3 ++- server/lib/server-config-manager.ts | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) (limited to 'server') diff --git a/server/initializers/checker-before-init.ts b/server/initializers/checker-before-init.ts index 36401f95c..10dd98f43 100644 --- a/server/initializers/checker-before-init.ts +++ b/server/initializers/checker-before-init.ts @@ -33,6 +33,7 @@ function checkMissedConfig () { 'transcoding.resolutions.2160p', 'video_editor.enabled', 'import.videos.http.enabled', 'import.videos.torrent.enabled', 'import.videos.concurrency', 'auto_blacklist.videos.of_users.enabled', 'trending.videos.interval_days', + 'client.videos.miniature.display_author_avatar', 'client.videos.miniature.prefer_author_display_name', 'client.menu.login.redirect_on_single_external_auth', 'defaults.publish.download_enabled', 'defaults.publish.comments_enabled', 'defaults.publish.privacy', 'defaults.publish.licence', 'instance.name', 'instance.short_description', 'instance.description', 'instance.terms', 'instance.default_client_route', diff --git a/server/initializers/config.ts b/server/initializers/config.ts index 63056b41d..7a13a1368 100644 --- a/server/initializers/config.ts +++ b/server/initializers/config.ts @@ -62,7 +62,8 @@ const CONFIG = { CLIENT: { VIDEOS: { MINIATURE: { - get PREFER_AUTHOR_DISPLAY_NAME () { return config.get('client.videos.miniature.prefer_author_display_name') } + get PREFER_AUTHOR_DISPLAY_NAME () { return config.get('client.videos.miniature.prefer_author_display_name') }, + get DISPLAY_AUTHOR_AVATAR () { return config.get('client.videos.miniature.display_author_avatar') } } }, MENU: { diff --git a/server/lib/server-config-manager.ts b/server/lib/server-config-manager.ts index 38512f384..43ca2332b 100644 --- a/server/lib/server-config-manager.ts +++ b/server/lib/server-config-manager.ts @@ -46,6 +46,7 @@ class ServerConfigManager { client: { videos: { miniature: { + displayAuthorAvatar: CONFIG.CLIENT.VIDEOS.MINIATURE.DISPLAY_AUTHOR_AVATAR, preferAuthorDisplayName: CONFIG.CLIENT.VIDEOS.MINIATURE.PREFER_AUTHOR_DISPLAY_NAME } }, -- cgit v1.2.3