From 7acee6f18aac99e359360fc4f2362d5405135a79 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 26 Jan 2018 12:02:18 +0100 Subject: Fix announce activities --- server/lib/activitypub/videos.ts | 53 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 52 insertions(+), 1 deletion(-) (limited to 'server/lib/activitypub/videos.ts') diff --git a/server/lib/activitypub/videos.ts b/server/lib/activitypub/videos.ts index 50e7e5cde..7d535bb0a 100644 --- a/server/lib/activitypub/videos.ts +++ b/server/lib/activitypub/videos.ts @@ -1,15 +1,17 @@ +import * as Bluebird from 'bluebird' import * as magnetUtil from 'magnet-uri' 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 { VideoPrivacy, VideoRateType } from '../../../shared/models/videos' import { isVideoTorrentObjectValid } 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' @@ -17,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 @@ -210,9 +213,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 -- cgit v1.2.3