From 46ed55544cafcd22dc1c4e911a0c31d326835d1a Mon Sep 17 00:00:00 2001 From: kontrollanten <6680299+kontrollanten@users.noreply.github.com> Date: Mon, 20 Sep 2021 10:25:29 +0200 Subject: [PATCH] add option to always show channel display name closes #4040 --- .../video-avatar-channel.component.html | 19 +++++++++++++----- .../video-avatar-channel.component.scss | 20 ++++--------------- .../video-avatar-channel.component.ts | 3 ++- .../+video-watch/video-watch.component.html | 10 +++++----- .../+video-watch/video-watch.component.ts | 4 ++++ .../video-miniature.component.html | 4 ++-- .../video-miniature.component.ts | 5 +++++ config/default.yaml | 3 +++ config/production.yaml.example | 3 +++ server/initializers/config.ts | 5 ++++- server/lib/server-config-manager.ts | 4 +++- shared/models/server/server-config.model.ts | 2 ++ 12 files changed, 51 insertions(+), 31 deletions(-) diff --git a/client/src/app/+videos/+video-watch/shared/metadata/video-avatar-channel.component.html b/client/src/app/+videos/+video-watch/shared/metadata/video-avatar-channel.component.html index 5a7221858..d433c7aba 100644 --- a/client/src/app/+videos/+video-watch/shared/metadata/video-avatar-channel.component.html +++ b/client/src/app/+videos/+video-watch/shared/metadata/video-avatar-channel.component.html @@ -1,11 +1,20 @@ -
+
diff --git a/client/src/app/+videos/+video-watch/shared/metadata/video-avatar-channel.component.scss b/client/src/app/+videos/+video-watch/shared/metadata/video-avatar-channel.component.scss index 1ff8fb96e..71c5e4b5a 100644 --- a/client/src/app/+videos/+video-watch/shared/metadata/video-avatar-channel.component.scss +++ b/client/src/app/+videos/+video-watch/shared/metadata/video-avatar-channel.component.scss @@ -20,23 +20,11 @@ position: relative; margin-bottom: 5px; - &.generic-channel { - .account { - @include main(); - } - - .channel { - display: none !important; - } + .main-avatar { + @include main(); } - &:not(.generic-channel) { - .account { - @include secondary(); - } - - .channel { - @include main(); - } + .second-avatar { + @include secondary(); } } diff --git a/client/src/app/+videos/+video-watch/shared/metadata/video-avatar-channel.component.ts b/client/src/app/+videos/+video-watch/shared/metadata/video-avatar-channel.component.ts index 63edd7bad..146c440b3 100644 --- a/client/src/app/+videos/+video-watch/shared/metadata/video-avatar-channel.component.ts +++ b/client/src/app/+videos/+video-watch/shared/metadata/video-avatar-channel.component.ts @@ -10,7 +10,8 @@ export class VideoAvatarChannelComponent implements OnInit { @Input() video: Video @Input() byAccount: string - @Input() genericChannel: boolean + @Input() showAccount: boolean + @Input() showChannel: boolean channelLinkTitle = '' accountLinkTitle = '' diff --git a/client/src/app/+videos/+video-watch/video-watch.component.html b/client/src/app/+videos/+video-watch/video-watch.component.html index 45cfba167..763c80e54 100644 --- a/client/src/app/+videos/+video-watch/video-watch.component.html +++ b/client/src/app/+videos/+video-watch/video-watch.component.html @@ -60,19 +60,19 @@
- +
- - + + {{ video.channel.displayName }} - + By {{ video.byAccount }} - + {{ video.byAccount }} diff --git a/client/src/app/+videos/+video-watch/video-watch.component.ts b/client/src/app/+videos/+video-watch/video-watch.component.ts index acfd46a41..614a9124f 100644 --- a/client/src/app/+videos/+video-watch/video-watch.component.ts +++ b/client/src/app/+videos/+video-watch/video-watch.component.ts @@ -67,6 +67,8 @@ export class VideoWatchComponent implements OnInit, OnDestroy { remoteServerDown = false + onlyShowAuthorChannel: boolean + private nextVideoUUID = '' private nextVideoTitle = '' @@ -116,6 +118,8 @@ export class VideoWatchComponent implements OnInit, OnDestroy { ngOnInit () { this.serverConfig = this.serverService.getHTMLConfig() + this.onlyShowAuthorChannel = this.serverConfig.instance.onlyShowAuthorChannel + PeertubePlayerManager.initState() this.loadRouteParams() diff --git a/client/src/app/shared/shared-video-miniature/video-miniature.component.html b/client/src/app/shared/shared-video-miniature/video-miniature.component.html index f51c298f2..4befd0706 100644 --- a/client/src/app/shared/shared-video-miniature/video-miniature.component.html +++ b/client/src/app/shared/shared-video-miniature/video-miniature.component.html @@ -39,10 +39,10 @@ - {{ video.byVideoChannel }} + {{ serverConfig.instance.showAuthorDisplayNameInMiniatures ? video.channel.displayName : video.byVideoChannel }}
diff --git a/client/src/app/shared/shared-video-miniature/video-miniature.component.ts b/client/src/app/shared/shared-video-miniature/video-miniature.component.ts index cb81ba3bd..6e9d4f162 100644 --- a/client/src/app/shared/shared-video-miniature/video-miniature.component.ts +++ b/client/src/app/shared/shared-video-miniature/video-miniature.component.ts @@ -240,6 +240,11 @@ export class VideoMiniatureComponent implements OnInit { } private setUpBy () { + if (this.serverConfig.instance.onlyShowAuthorChannel === true) { + this.ownerDisplayType = 'videoChannel' + return + } + const accountName = this.video.account.name // If the video channel name is an UUID (not really displayable, we changed this behaviour in v1.0.0-beta.12) diff --git a/config/default.yaml b/config/default.yaml index 3865ab5cf..4b76bc187 100644 --- a/config/default.yaml +++ b/config/default.yaml @@ -399,6 +399,9 @@ instance: terms: 'No terms for now.' # Support markdown code_of_conduct: '' # Supports markdown + only_show_channel_author: false + show_author_display_name_in_miniatures: false + # Who moderates the instance? What is the policy regarding NSFW videos? Political videos? etc moderation_information: '' # Supports markdown diff --git a/config/production.yaml.example b/config/production.yaml.example index 94238fad0..3cfb98300 100644 --- a/config/production.yaml.example +++ b/config/production.yaml.example @@ -409,6 +409,9 @@ instance: terms: 'No terms for now.' # Support markdown code_of_conduct: '' # Supports markdown + only_show_channel_author: false + show_author_display_name_in_miniatures: false + # Who moderates the instance? What is the policy regarding NSFW videos? Political videos? etc moderation_information: '' # Supports markdown diff --git a/server/initializers/config.ts b/server/initializers/config.ts index be9fc61f0..289e9fe42 100644 --- a/server/initializers/config.ts +++ b/server/initializers/config.ts @@ -334,7 +334,10 @@ const CONFIG = { }, get ROBOTS () { return config.get('instance.robots') }, get SECURITYTXT () { return config.get('instance.securitytxt') }, - get SECURITYTXT_CONTACT () { return config.get('admin.email') } + get SECURITYTXT_CONTACT () { return config.get('admin.email') }, + + get ONLY_SHOW_CHANNEL_AUTHOR () { return config.get('instance.only_show_channel_author') }, + get SHOW_AUTHOR_DISPLAY_NAME_IN_MINIATURES () { return config.get('instance.show_author_display_name_in_miniatures') } }, SERVICES: { TWITTER: { diff --git a/server/lib/server-config-manager.ts b/server/lib/server-config-manager.ts index 80d87a9d3..fe89cee4c 100644 --- a/server/lib/server-config-manager.ts +++ b/server/lib/server-config-manager.ts @@ -51,7 +51,9 @@ class ServerConfigManager { customizations: { javascript: CONFIG.INSTANCE.CUSTOMIZATIONS.JAVASCRIPT, css: CONFIG.INSTANCE.CUSTOMIZATIONS.CSS - } + }, + onlyShowAuthorChannel: CONFIG.INSTANCE.ONLY_SHOW_CHANNEL_AUTHOR, + showAuthorDisplayNameInMiniatures: CONFIG.INSTANCE.SHOW_AUTHOR_DISPLAY_NAME_IN_MINIATURES }, search: { remoteUri: { diff --git a/shared/models/server/server-config.model.ts b/shared/models/server/server-config.model.ts index 585e99aca..faa72c3db 100644 --- a/shared/models/server/server-config.model.ts +++ b/shared/models/server/server-config.model.ts @@ -43,6 +43,8 @@ export interface ServerConfig { javascript: string css: string } + onlyShowAuthorChannel: boolean + showAuthorDisplayNameInMiniatures: boolean } search: {