OpenCloud
/
PeerTube
mirror of https://github.com/Chocobozzz/PeerTube
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix privacy input altered by plugins

pull/4214/head
Chocobozzz 2021-07-12 14:48:57 +02:00
parent 3e9cf56480
commit b980bcff7b
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
client/src/app/shared/shared-main/video/video.service.ts
View File

@ -378,8 +378,8 @@ export class VideoService implements VideosProvider {
) )
} }
explainedPrivacyLabels (privacies: VideoConstant<VideoPrivacy>[], defaultPrivacyId = VideoPrivacy.PUBLIC) { explainedPrivacyLabels (serverPrivacies: VideoConstant<VideoPrivacy>[], defaultPrivacyId = VideoPrivacy.PUBLIC) {
const base = [ const descriptions = [
{ {
id: VideoPrivacy.PRIVATE, id: VideoPrivacy.PRIVATE,
description: $localize`Only I can see this video` description: $localize`Only I can see this video`
@ -398,13 +398,9 @@ export class VideoService implements VideosProvider {
} }
] ]
const videoPrivacies = base
.filter(o => !!privacies.find(p => p.id === o.id)) // filter down to privacies that where in the input
.map(o => ({ ...privacies[o.id - 1], ...o })) // merge the input privacies that contain a label, and extend them with a description
return { return {
defaultPrivacyId: videoPrivacies.find(p => p.id === defaultPrivacyId)?.id || videoPrivacies[0].id, defaultPrivacyId: serverPrivacies.find(p => p.id === defaultPrivacyId)?.id || serverPrivacies[0].id,
videoPrivacies videoPrivacies: serverPrivacies.map(p => ({ ...p, description: descriptions.find(p => p.id).description }))
} }
} }