X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Flib%2Factivitypub%2Fplaylist.ts;h=7166c68a6529451dbf94ef9f38fa6cfb506505f2;hb=b5c361089f03f4d459fa1cdc49ff66dee736af12;hp=721c19603b46f52b1e25fd44bb0a7e2c84de175a;hpb=1735c825726edaa0af5035cb6cbb0cc0db502c6d;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/lib/activitypub/playlist.ts b/server/lib/activitypub/playlist.ts index 721c19603..7166c68a6 100644 --- a/server/lib/activitypub/playlist.ts +++ b/server/lib/activitypub/playlist.ts @@ -1,25 +1,29 @@ +import * as Bluebird from 'bluebird' +import { HttpStatusCode } from '../../../shared/core-utils/miscs/http-error-codes' +import { PlaylistElementObject } from '../../../shared/models/activitypub/objects/playlist-element-object' import { PlaylistObject } from '../../../shared/models/activitypub/objects/playlist-object' -import { crawlCollectionPage } from './crawl' -import { ACTIVITY_PUB, CRAWL_REQUEST_CONCURRENCY } from '../../initializers/constants' -import { AccountModel } from '../../models/account/account' +import { VideoPlaylistPrivacy } from '../../../shared/models/videos/playlist/video-playlist-privacy.model' +import { checkUrlsSameHost } from '../../helpers/activitypub' +import { isPlaylistElementObjectValid, isPlaylistObjectValid } from '../../helpers/custom-validators/activitypub/playlist' import { isArray } from '../../helpers/custom-validators/misc' -import { getOrCreateActorAndServerAndModel } from './actor' import { logger } from '../../helpers/logger' +import { doJSONRequest, PeerTubeRequestError } from '../../helpers/requests' +import { ACTIVITY_PUB, CRAWL_REQUEST_CONCURRENCY } from '../../initializers/constants' +import { sequelizeTypescript } from '../../initializers/database' import { VideoPlaylistModel } from '../../models/video/video-playlist' -import { doRequest } from '../../helpers/requests' -import { checkUrlsSameHost } from '../../helpers/activitypub' -import * as Bluebird from 'bluebird' -import { PlaylistElementObject } from '../../../shared/models/activitypub/objects/playlist-element-object' -import { getOrCreateVideoAndAccountAndChannel } from './videos' -import { isPlaylistElementObjectValid, isPlaylistObjectValid } from '../../helpers/custom-validators/activitypub/playlist' import { VideoPlaylistElementModel } from '../../models/video/video-playlist-element' -import { VideoModel } from '../../models/video/video' -import { VideoPlaylistPrivacy } from '../../../shared/models/videos/playlist/video-playlist-privacy.model' -import { sequelizeTypescript } from '../../initializers/database' -import { createPlaylistThumbnailFromUrl } from '../thumbnail' +import { MAccountDefault, MAccountId, MVideoId } from '../../types/models' +import { MVideoPlaylist, MVideoPlaylistId, MVideoPlaylistOwner } from '../../types/models/video/video-playlist' +import { FilteredModelAttributes } from '../../types/sequelize' +import { createPlaylistMiniatureFromUrl } from '../thumbnail' +import { getOrCreateActorAndServerAndModel } from './actor' +import { crawlCollectionPage } from './crawl' +import { getOrCreateVideoAndAccountAndChannel } from './videos' -function playlistObjectToDBAttributes (playlistObject: PlaylistObject, byAccount: AccountModel, to: string[]) { - const privacy = to.indexOf(ACTIVITY_PUB.PUBLIC) !== -1 ? VideoPlaylistPrivacy.PUBLIC : VideoPlaylistPrivacy.UNLISTED +function playlistObjectToDBAttributes (playlistObject: PlaylistObject, byAccount: MAccountId, to: string[]) { + const privacy = to.includes(ACTIVITY_PUB.PUBLIC) + ? VideoPlaylistPrivacy.PUBLIC + : VideoPlaylistPrivacy.UNLISTED return { name: playlistObject.name, @@ -34,7 +38,7 @@ function playlistObjectToDBAttributes (playlistObject: PlaylistObject, byAccount } } -function playlistElementObjectToDBAttributes (elementObject: PlaylistElementObject, videoPlaylist: VideoPlaylistModel, video: VideoModel) { +function playlistElementObjectToDBAttributes (elementObject: PlaylistElementObject, videoPlaylist: MVideoPlaylistId, video: MVideoId) { return { position: elementObject.position, url: elementObject.id, @@ -45,18 +49,14 @@ function playlistElementObjectToDBAttributes (elementObject: PlaylistElementObje } } -async function createAccountPlaylists (playlistUrls: string[], account: AccountModel) { +async function createAccountPlaylists (playlistUrls: string[], account: MAccountDefault) { await Bluebird.map(playlistUrls, async playlistUrl => { try { const exists = await VideoPlaylistModel.doesPlaylistExist(playlistUrl) if (exists === true) return // Fetch url - const { body } = await doRequest({ - uri: playlistUrl, - json: true, - activityPub: true - }) + const { body } = await doJSONRequest(playlistUrl, { activityPub: true }) if (!isPlaylistObjectValid(body)) { throw new Error(`Invalid playlist object when fetch account playlists: ${JSON.stringify(body)}`) @@ -73,7 +73,7 @@ async function createAccountPlaylists (playlistUrls: string[], account: AccountM }, { concurrency: CRAWL_REQUEST_CONCURRENCY }) } -async function createOrUpdateVideoPlaylist (playlistObject: PlaylistObject, byAccount: AccountModel, to: string[]) { +async function createOrUpdateVideoPlaylist (playlistObject: PlaylistObject, byAccount: MAccountId, to: string[]) { const playlistAttributes = playlistObjectToDBAttributes(playlistObject, byAccount, to) if (isArray(playlistObject.attributedTo) && playlistObject.attributedTo.length === 1) { @@ -86,8 +86,7 @@ async function createOrUpdateVideoPlaylist (playlistObject: PlaylistObject, byAc } } - // FIXME: sequelize typings - const [ playlist ] = (await VideoPlaylistModel.upsert(playlistAttributes, { returning: true }) as any) + const [ playlist ] = await VideoPlaylistModel.upsert(playlistAttributes, { returning: true }) let accItems: string[] = [] await crawlCollectionPage(playlistObject.id, items => { @@ -100,29 +99,24 @@ async function createOrUpdateVideoPlaylist (playlistObject: PlaylistObject, byAc if (playlistObject.icon) { try { - const thumbnailModel = await createPlaylistThumbnailFromUrl(playlistObject.icon.url, refreshedPlaylist) - thumbnailModel.videoPlaylistId = refreshedPlaylist.id - - refreshedPlaylist.setThumbnail(await thumbnailModel.save()) + const thumbnailModel = await createPlaylistMiniatureFromUrl({ downloadUrl: playlistObject.icon.url, playlist: refreshedPlaylist }) + await refreshedPlaylist.setAndSaveThumbnail(thumbnailModel, undefined) } catch (err) { logger.warn('Cannot generate thumbnail of %s.', playlistObject.id, { err }) } + } else if (refreshedPlaylist.hasThumbnail()) { + await refreshedPlaylist.Thumbnail.destroy() + refreshedPlaylist.Thumbnail = null } return resetVideoPlaylistElements(accItems, refreshedPlaylist) } -async function refreshVideoPlaylistIfNeeded (videoPlaylist: VideoPlaylistModel): Promise { +async function refreshVideoPlaylistIfNeeded (videoPlaylist: MVideoPlaylistOwner): Promise { if (!videoPlaylist.isOutdated()) return videoPlaylist try { - const { statusCode, playlistObject } = await fetchRemoteVideoPlaylist(videoPlaylist.url) - if (statusCode === 404) { - logger.info('Cannot refresh remote video playlist %s: it does not exist anymore. Deleting it.', videoPlaylist.url) - - await videoPlaylist.destroy() - return undefined - } + const { playlistObject } = await fetchRemoteVideoPlaylist(videoPlaylist.url) if (playlistObject === undefined) { logger.warn('Cannot refresh remote playlist %s: invalid body.', videoPlaylist.url) @@ -136,6 +130,13 @@ async function refreshVideoPlaylistIfNeeded (videoPlaylist: VideoPlaylistModel): return videoPlaylist } catch (err) { + if ((err as PeerTubeRequestError).statusCode === HttpStatusCode.NOT_FOUND_404) { + logger.info('Cannot refresh remote video playlist %s: it does not exist anymore. Deleting it.', videoPlaylist.url) + + await videoPlaylist.destroy() + return undefined + } + logger.warn('Cannot refresh video playlist %s.', videoPlaylist.url, { err }) await videoPlaylist.setAsRefreshed() @@ -155,17 +156,12 @@ export { // --------------------------------------------------------------------------- -async function resetVideoPlaylistElements (elementUrls: string[], playlist: VideoPlaylistModel) { - const elementsToCreate: object[] = [] // FIXME: sequelize typings +async function resetVideoPlaylistElements (elementUrls: string[], playlist: MVideoPlaylist) { + const elementsToCreate: FilteredModelAttributes[] = [] await Bluebird.map(elementUrls, async elementUrl => { try { - // Fetch url - const { body } = await doRequest({ - uri: elementUrl, - json: true, - activityPub: true - }) + const { body } = await doJSONRequest(elementUrl, { activityPub: true }) if (!isPlaylistElementObjectValid(body)) throw new Error(`Invalid body in video get playlist element ${elementUrl}`) @@ -195,21 +191,14 @@ async function resetVideoPlaylistElements (elementUrls: string[], playlist: Vide } async function fetchRemoteVideoPlaylist (playlistUrl: string): Promise<{ statusCode: number, playlistObject: PlaylistObject }> { - const options = { - uri: playlistUrl, - method: 'GET', - json: true, - activityPub: true - } - logger.info('Fetching remote playlist %s.', playlistUrl) - const { response, body } = await doRequest(options) + const { body, statusCode } = await doJSONRequest(playlistUrl, { activityPub: true }) if (isPlaylistObjectValid(body) === false || checkUrlsSameHost(body.id, playlistUrl) !== true) { logger.debug('Remote video playlist JSON is not valid.', { body }) - return { statusCode: response.statusCode, playlistObject: undefined } + return { statusCode, playlistObject: undefined } } - return { statusCode: response.statusCode, playlistObject: body } + return { statusCode, playlistObject: body } }