X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Flib%2Factivitypub%2Fvideo-rates.ts;h=f40c07fea368f90e092163baa545a7ce50c41773;hb=903353d67a8d0fdda8465ed6c57b77a9a5afbe92;hp=e246b1313c85b039fb330719bf26cb62170f3fd7;hpb=b49f22d8f9a52ab75fd38db2d377249eb58fa678;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/lib/activitypub/video-rates.ts b/server/lib/activitypub/video-rates.ts index e246b1313..f40c07fea 100644 --- a/server/lib/activitypub/video-rates.ts +++ b/server/lib/activitypub/video-rates.ts @@ -1,26 +1,22 @@ +import * as Bluebird from 'bluebird' import { Transaction } from 'sequelize' -import { sendLike, sendUndoDislike, sendUndoLike } from './send' +import { doJSONRequest } from '@server/helpers/requests' import { VideoRateType } from '../../../shared/models/videos' -import * as Bluebird from 'bluebird' -import { getOrCreateActorAndServerAndModel } from './actor' -import { AccountVideoRateModel } from '../../models/account/account-video-rate' +import { checkUrlsSameHost, getAPId } from '../../helpers/activitypub' import { logger } from '../../helpers/logger' import { CRAWL_REQUEST_CONCURRENCY } from '../../initializers/constants' -import { doRequest } from '../../helpers/requests' -import { checkUrlsSameHost, getAPId } from '../../helpers/activitypub' -import { getVideoDislikeActivityPubUrlByLocalActor, getVideoLikeActivityPubUrlByLocalActor } from './url' -import { sendDislike } from './send/send-dislike' +import { AccountVideoRateModel } from '../../models/account/account-video-rate' import { MAccountActor, MActorUrl, MVideo, MVideoAccountLight, MVideoId } from '../../types/models' +import { getOrCreateActorAndServerAndModel } from './actor' +import { sendLike, sendUndoDislike, sendUndoLike } from './send' +import { sendDislike } from './send/send-dislike' +import { getVideoDislikeActivityPubUrlByLocalActor, getVideoLikeActivityPubUrlByLocalActor } from './url' async function createRates (ratesUrl: string[], video: MVideo, rate: VideoRateType) { await Bluebird.map(ratesUrl, async rateUrl => { try { // Fetch url - const { body } = await doRequest({ - uri: rateUrl, - json: true, - activityPub: true - }) + const { body } = await doJSONRequest(rateUrl, { activityPub: true }) if (!body || !body.actor) throw new Error('Body or body actor is invalid') const actorUrl = getAPId(body.actor)