X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fmodels%2Fvideo%2Fvideo-playlist.ts;h=1a05f8d4256d39db2ba246ed7c824038448fc2a5;hb=eae0365b5c5468e51e9795b0e894815ebda86b4a;hp=efe5be36d2824a766436f4c5a4bef7169c253cac;hpb=fe19f600dab0f6b00a7aa146ba4bd4bb96536155;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/models/video/video-playlist.ts b/server/models/video/video-playlist.ts index efe5be36d..1a05f8d42 100644 --- a/server/models/video/video-playlist.ts +++ b/server/models/video/video-playlist.ts @@ -18,7 +18,9 @@ import { UpdatedAt } from 'sequelize-typescript' import { v4 as uuidv4 } from 'uuid' +import { setAsUpdated } from '@server/helpers/database-utils' import { MAccountId, MChannelId } from '@server/types/models' +import { AttributesOnly } from '@shared/core-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' @@ -50,11 +52,11 @@ import { MVideoPlaylistIdWithElements } from '../../types/models/video/video-playlist' import { AccountModel, ScopeNames as AccountScopeNames, SummaryOptions } from '../account/account' +import { ActorModel } from '../actor/actor' import { buildServerIdsFollowedBy, buildWhereIdOrUUID, getPlaylistSort, isOutdated, throwIfNotValid } from '../utils' import { ThumbnailModel } from './thumbnail' import { ScopeNames as VideoChannelScopeNames, VideoChannelModel } from './video-channel' import { VideoPlaylistElementModel } from './video-playlist-element' -import { ActorModel } from '../activitypub/actor' enum ScopeNames { AVAILABLE_FOR_LIST = 'AVAILABLE_FOR_LIST', @@ -221,7 +223,7 @@ type AvailableForListOptions = { } ] }) -export class VideoPlaylistModel extends Model { +export class VideoPlaylistModel extends Model>> { @CreatedAt createdAt: Date @@ -495,7 +497,7 @@ export class VideoPlaylistModel extends Model { } getWatchUrl () { - return WEBSERVER.URL + '/videos/watch/playlist/' + this.uuid + return WEBSERVER.URL + '/w/p/' + this.uuid } getEmbedStaticPath () { @@ -530,9 +532,7 @@ export class VideoPlaylistModel extends Model { } setAsRefreshed () { - this.changed('updatedAt', true) - - return this.save() + return setAsUpdated('videoPlaylist', this.id) } isOwned () {