X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fmodels%2Fvideo%2Fvideo-playlist.ts;h=faf4bea789ac290dfcd19b62cdce7eb86eb20985;hb=8c4bbd946d2247c2e239cbbf8773d2d31c1a57aa;hp=8bbe54c49531ba91650c8d7ffbbaea75dd2e3e86;hpb=a8749f7c3b137f433e6944bb99fd721a6f0cfc1e;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/models/video/video-playlist.ts b/server/models/video/video-playlist.ts index 8bbe54c49..faf4bea78 100644 --- a/server/models/video/video-playlist.ts +++ b/server/models/video/video-playlist.ts @@ -21,12 +21,8 @@ import { activityPubCollectionPagination } from '@server/lib/activitypub/collect import { MAccountId, MChannelId } from '@server/types/models' import { buildPlaylistEmbedPath, buildPlaylistWatchPath, pick } from '@shared/core-utils' import { buildUUID, uuidToShort } from '@shared/extra-utils' +import { ActivityIconObject, PlaylistObject, VideoPlaylist, VideoPlaylistPrivacy, VideoPlaylistType } from '@shared/models' import { AttributesOnly } from '@shared/typescript-utils' -import { ActivityIconObject } from '../../../shared/models/activitypub/objects' -import { PlaylistObject } from '../../../shared/models/activitypub/objects/playlist-object' -import { VideoPlaylistPrivacy } from '../../../shared/models/videos/playlist/video-playlist-privacy.model' -import { VideoPlaylistType } from '../../../shared/models/videos/playlist/video-playlist-type.model' -import { VideoPlaylist } from '../../../shared/models/videos/playlist/video-playlist.model' import { isActivityPubUrlValid } from '../../helpers/custom-validators/activitypub/misc' import { isVideoPlaylistDescriptionValid, @@ -53,7 +49,6 @@ import { } from '../../types/models/video/video-playlist' import { AccountModel, ScopeNames as AccountScopeNames, SummaryOptions } from '../account/account' import { ActorModel } from '../actor/actor' -import { setAsUpdated } from '../shared' import { buildServerIdsFollowedBy, buildTrigramSearchIndex, @@ -61,8 +56,9 @@ import { createSimilarityAttribute, getPlaylistSort, isOutdated, + setAsUpdated, throwIfNotValid -} from '../utils' +} from '../shared' import { ThumbnailModel } from './thumbnail' import { ScopeNames as VideoChannelScopeNames, VideoChannelModel } from './video-channel' import { VideoPlaylistElementModel } from './video-playlist-element' @@ -641,7 +637,7 @@ export class VideoPlaylistModel extends Model