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

Fix video description when importing by url

pull/1144/head
Chocobozzz 2018-09-28 10:18:37 +02:00
parent 161b061d4e
commit c39e86b898
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
server/models/video/video-format-utils.ts
View File

@ -12,6 +12,7 @@ import {
} from '../../lib/activitypub' } from '../../lib/activitypub'
export type VideoFormattingJSONOptions = { export type VideoFormattingJSONOptions = {
completeDescription?: boolean
additionalAttributes: { additionalAttributes: {
state?: boolean, state?: boolean,
waitTranscoding?: boolean, waitTranscoding?: boolean,
@ -44,7 +45,7 @@ function videoModelToFormattedJSON (video: VideoModel, options?: VideoFormatting
label: VideoModel.getPrivacyLabel(video.privacy) label: VideoModel.getPrivacyLabel(video.privacy)
}, },
nsfw: video.nsfw, nsfw: video.nsfw,
description: video.getTruncatedDescription(), description: options.completeDescription === true ? video.description : video.getTruncatedDescription(),
isLocal: video.isOwned(), isLocal: video.isOwned(),
duration: video.duration, duration: video.duration,
views: video.views, views: video.views,

5
server/models/video/video-import.ts
View File

@ -146,12 +146,11 @@ export class VideoImportModel extends Model<VideoImportModel> {
toFormattedJSON (): VideoImport { toFormattedJSON (): VideoImport {
const videoFormatOptions = { const videoFormatOptions = {
completeDescription: true,
additionalAttributes: { state: true, waitTranscoding: true, scheduledUpdate: true } additionalAttributes: { state: true, waitTranscoding: true, scheduledUpdate: true }
} }
const video = this.Video const video = this.Video
? Object.assign(this.Video.toFormattedJSON(videoFormatOptions), { ? Object.assign(this.Video.toFormattedJSON(videoFormatOptions), { tags: this.Video.Tags.map(t => t.name) })
tags: this.Video.Tags.map(t => t.name)
})
: undefined : undefined
return { return {