aboutsummaryrefslogtreecommitdiffhomepage
path: root/server
diff options
context:
space:
mode:
authorkontrollanten <6680299+kontrollanten@users.noreply.github.com>2021-10-12 14:23:44 +0200
committerGitHub <noreply@github.com>2021-10-12 14:23:44 +0200
commit7399a79f73cc2015e64fad49361439a322ee1d3b (patch)
tree134903063dbc66e5f3b12cc59669d061403bdde1 /server
parent10ef089102f2225c5ec3ed426bc612e4f2bc8655 (diff)
downloadPeerTube-7399a79f73cc2015e64fad49361439a322ee1d3b.tar.gz
PeerTube-7399a79f73cc2015e64fad49361439a322ee1d3b.tar.zst
PeerTube-7399a79f73cc2015e64fad49361439a322ee1d3b.zip
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
Diffstat (limited to 'server')
-rw-r--r--server/initializers/config.ts9
-rw-r--r--server/lib/server-config-manager.ts7
2 files changed, 16 insertions, 0 deletions
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 = {
58 PREFIX: config.get<string>('email.subject.prefix') + ' ' 58 PREFIX: config.get<string>('email.subject.prefix') + ' '
59 } 59 }
60 }, 60 },
61
62 CLIENT: {
63 VIDEOS: {
64 MINIATURE: {
65 get SHOW_AUTHOR_DISPLAY_NAME () { return config.get<boolean>('client.videos.miniature.show_author_display_name') }
66 }
67 }
68 },
69
61 STORAGE: { 70 STORAGE: {
62 TMP_DIR: buildPath(config.get<string>('storage.tmp')), 71 TMP_DIR: buildPath(config.get<string>('storage.tmp')),
63 ACTOR_IMAGES: buildPath(config.get<string>('storage.avatars')), 72 ACTOR_IMAGES: buildPath(config.get<string>('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 {
43 43
44 return { 44 return {
45 allowEdits: CONFIG.WEBADMIN.CONFIGURATION.EDITS.ALLOWED, 45 allowEdits: CONFIG.WEBADMIN.CONFIGURATION.EDITS.ALLOWED,
46 client: {
47 videos: {
48 miniature: {
49 showAuthorDisplayName: CONFIG.CLIENT.VIDEOS.MINIATURE.SHOW_AUTHOR_DISPLAY_NAME
50 }
51 }
52 },
46 instance: { 53 instance: {
47 name: CONFIG.INSTANCE.NAME, 54 name: CONFIG.INSTANCE.NAME,
48 shortDescription: CONFIG.INSTANCE.SHORT_DESCRIPTION, 55 shortDescription: CONFIG.INSTANCE.SHORT_DESCRIPTION,