X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Flib%2Factivitypub%2Fvideos.ts;h=2899acff3a7448fa96b0aa2433f3809aee0cc865;hb=5cf135001124cd19183336dbfcae1cd432217b00;hp=263c2629c87561096841d268e51b511a927c8eac;hpb=1f7ab4f3104df051f2d2cd4ed85ff6092c92efeb;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/lib/activitypub/videos.ts b/server/lib/activitypub/videos.ts index 263c2629c..2899acff3 100644 --- a/server/lib/activitypub/videos.ts +++ b/server/lib/activitypub/videos.ts @@ -4,13 +4,14 @@ import { join } from 'path' import * as request from 'request' import { ActivityIconObject } from '../../../shared/index' import { VideoTorrentObject } from '../../../shared/models/activitypub/objects' -import { VideoPrivacy } from '../../../shared/models/videos' -import { isVideoTorrentObjectValid } from '../../helpers/custom-validators/activitypub/videos' +import { VideoPrivacy, VideoRateType } from '../../../shared/models/videos' +import { sanitizeAndCheckVideoTorrentObject } from '../../helpers/custom-validators/activitypub/videos' import { isVideoFileInfoHashValid } from '../../helpers/custom-validators/videos' import { retryTransactionWrapper } from '../../helpers/database-utils' import { logger } from '../../helpers/logger' import { doRequest, doRequestAndSaveToFile } from '../../helpers/requests' import { ACTIVITY_PUB, CONFIG, REMOTE_SCHEME, sequelizeTypescript, STATIC_PATHS, VIDEO_MIMETYPE_EXT } from '../../initializers' +import { AccountVideoRateModel } from '../../models/account/account-video-rate' import { ActorModel } from '../../models/activitypub/actor' import { TagModel } from '../../models/video/tag' import { VideoModel } from '../../models/video/video' @@ -18,6 +19,7 @@ import { VideoChannelModel } from '../../models/video/video-channel' import { VideoFileModel } from '../../models/video/video-file' import { VideoShareModel } from '../../models/video/video-share' import { getOrCreateActorAndServerAndModel } from './actor' +import { addVideoComments } from './video-comments' function fetchRemoteVideoPreview (video: VideoModel, reject: Function) { const host = video.VideoChannel.Account.Actor.Server.host @@ -54,32 +56,27 @@ function generateThumbnailFromUrl (video: VideoModel, icon: ActivityIconObject) async function videoActivityObjectToDBAttributes (videoChannel: VideoChannelModel, videoObject: VideoTorrentObject, - to: string[] = [], - cc: string[] = []) { - let privacy = VideoPrivacy.PRIVATE - if (to.indexOf(ACTIVITY_PUB.PUBLIC) !== -1) privacy = VideoPrivacy.PUBLIC - else if (cc.indexOf(ACTIVITY_PUB.PUBLIC) !== -1) privacy = VideoPrivacy.UNLISTED - + to: string[] = []) { + const privacy = to.indexOf(ACTIVITY_PUB.PUBLIC) !== -1 ? VideoPrivacy.PUBLIC : VideoPrivacy.UNLISTED const duration = videoObject.duration.replace(/[^\d]+/, '') - let language = null + + let language: string = null if (videoObject.language) { - language = parseInt(videoObject.language.identifier, 10) + language = videoObject.language.identifier } - let category = null + let category: number = null if (videoObject.category) { category = parseInt(videoObject.category.identifier, 10) } - let licence = null + let licence: number = null if (videoObject.licence) { licence = parseInt(videoObject.licence.identifier, 10) } - let description = null - if (videoObject.content) { - description = videoObject.content - } + const description = videoObject.content || null + const support = videoObject.support || null return { name: videoObject.name, @@ -89,7 +86,8 @@ async function videoActivityObjectToDBAttributes (videoChannel: VideoChannelMode licence, language, description, - nsfw: videoObject.nsfw, + support, + nsfw: videoObject.sensitive, commentsEnabled: videoObject.commentsEnabled, channelId: videoChannel.id, duration: parseInt(duration, 10), @@ -139,6 +137,13 @@ function videoFileActivityUrlToDBAttributes (videoCreated: VideoModel, videoObje return attributes } +function getOrCreateVideoChannel (videoObject: VideoTorrentObject) { + const channel = videoObject.attributedTo.find(a => a.type === 'Group') + if (!channel) throw new Error('Cannot find associated video channel to video ' + videoObject.url) + + return getOrCreateActorAndServerAndModel(channel.id) +} + async function getOrCreateVideo (videoObject: VideoTorrentObject, channelActor: ActorModel) { logger.debug('Adding remote video %s.', videoObject.id) @@ -149,12 +154,12 @@ async function getOrCreateVideo (videoObject: VideoTorrentObject, channelActor: const videoFromDatabase = await VideoModel.loadByUUIDOrURLAndPopulateAccount(videoObject.uuid, videoObject.id, t) if (videoFromDatabase) return videoFromDatabase - const videoData = await videoActivityObjectToDBAttributes(channelActor.VideoChannel, videoObject, videoObject.to, videoObject.cc) + const videoData = await videoActivityObjectToDBAttributes(channelActor.VideoChannel, videoObject, videoObject.to) const video = VideoModel.build(videoData) // Don't block on request generateThumbnailFromUrl(video, videoObject.icon) - .catch(err => logger.warn('Cannot generate thumbnail of %s.', videoObject.id, err)) + .catch(err => logger.warn('Cannot generate thumbnail of %s.', videoObject.id, { err })) const videoCreated = await video.save(sequelizeOptions) @@ -179,7 +184,9 @@ async function getOrCreateVideo (videoObject: VideoTorrentObject, channelActor: async function getOrCreateAccountAndVideoAndChannel (videoObject: VideoTorrentObject | string, actor?: ActorModel) { if (typeof videoObject === 'string') { - const videoFromDatabase = await VideoModel.loadByUrlAndPopulateAccount(videoObject) + const videoUrl = videoObject + + const videoFromDatabase = await VideoModel.loadByUrlAndPopulateAccount(videoUrl) if (videoFromDatabase) { return { video: videoFromDatabase, @@ -188,8 +195,8 @@ async function getOrCreateAccountAndVideoAndChannel (videoObject: VideoTorrentOb } } - videoObject = await fetchRemoteVideo(videoObject) - if (!videoObject) throw new Error('Cannot fetch remote video') + videoObject = await fetchRemoteVideo(videoUrl) + if (!videoObject) throw new Error('Cannot fetch remote video with url: ' + videoUrl) } if (!actor) { @@ -199,10 +206,7 @@ async function getOrCreateAccountAndVideoAndChannel (videoObject: VideoTorrentOb actor = await getOrCreateActorAndServerAndModel(actorObj.id) } - const channel = videoObject.attributedTo.find(a => a.type === 'Group') - if (!channel) throw new Error('Cannot find associated video channel to video ' + videoObject.url) - - const channelActor = await getOrCreateActorAndServerAndModel(channel.id) + const channelActor = await getOrCreateVideoChannel(videoObject) const options = { arguments: [ videoObject, channelActor ], @@ -211,9 +215,57 @@ async function getOrCreateAccountAndVideoAndChannel (videoObject: VideoTorrentOb const video = await retryTransactionWrapper(getOrCreateVideo, options) + // Process outside the transaction because we could fetch remote data + if (videoObject.likes && Array.isArray(videoObject.likes.orderedItems)) { + logger.info('Adding likes of video %s.', video.uuid) + await createRates(videoObject.likes.orderedItems, video, 'like') + } + + if (videoObject.dislikes && Array.isArray(videoObject.dislikes.orderedItems)) { + logger.info('Adding dislikes of video %s.', video.uuid) + await createRates(videoObject.dislikes.orderedItems, video, 'dislike') + } + + if (videoObject.shares && Array.isArray(videoObject.shares.orderedItems)) { + logger.info('Adding shares of video %s.', video.uuid) + await addVideoShares(video, videoObject.shares.orderedItems) + } + + if (videoObject.comments && Array.isArray(videoObject.comments.orderedItems)) { + logger.info('Adding comments of video %s.', video.uuid) + await addVideoComments(video, videoObject.comments.orderedItems) + } + return { actor, channelActor, video } } +async function createRates (actorUrls: string[], video: VideoModel, rate: VideoRateType) { + let rateCounts = 0 + const tasks: Bluebird[] = [] + + for (const actorUrl of actorUrls) { + const actor = await getOrCreateActorAndServerAndModel(actorUrl) + const p = AccountVideoRateModel + .create({ + videoId: video.id, + accountId: actor.Account.id, + type: rate + }) + .then(() => rateCounts += 1) + + tasks.push(p) + } + + await Promise.all(tasks) + + logger.info('Adding %d %s to video %s.', rateCounts, rate, video.uuid) + + // This is "likes" and "dislikes" + await video.increment(rate + 's', { by: rateCounts }) + + return +} + async function addVideoShares (instance: VideoModel, shareUrls: string[]) { for (const shareUrl of shareUrls) { // Fetch url @@ -222,18 +274,24 @@ async function addVideoShares (instance: VideoModel, shareUrls: string[]) { json: true, activityPub: true }) - const actorUrl = body.actor - if (!actorUrl) continue + if (!body || !body.actor) { + logger.warn('Cannot add remote share with url: %s, skipping...', shareUrl) + continue + } + const actorUrl = body.actor const actor = await getOrCreateActorAndServerAndModel(actorUrl) const entry = { actorId: actor.id, - videoId: instance.id + videoId: instance.id, + url: shareUrl } await VideoShareModel.findOrCreate({ - where: entry, + where: { + url: shareUrl + }, defaults: entry }) } @@ -247,6 +305,7 @@ export { videoActivityObjectToDBAttributes, videoFileActivityUrlToDBAttributes, getOrCreateVideo, + getOrCreateVideoChannel, addVideoShares} // --------------------------------------------------------------------------- @@ -263,7 +322,7 @@ async function fetchRemoteVideo (videoUrl: string): Promise const { body } = await doRequest(options) - if (isVideoTorrentObjectValid(body) === false) { + if (sanitizeAndCheckVideoTorrentObject(body) === false) { logger.debug('Remote video JSON is not valid.', { body }) return undefined }