Skip to content

ActivityPub-federated video streaming platform using P2P directly in your web browser

Fix federation after privacy change

Chocobozzz6a93aaccdbba
diff --git a/packages/models/src/runners/runner-jobs/runner-job-private-payload.model.ts b/packages/models/src/runners/runner-jobs/runner-job-private-payload.model.ts
index a3612577dc..9454d14dd7 100644
--- a/packages/models/src/runners/runner-jobs/runner-job-private-payload.model.ts
+++ b/packages/models/src/runners/runner-jobs/runner-job-private-payload.model.ts
@@ -17,7 +17,6 @@ export type RunnerJobPrivatePayload =
export interface RunnerJobVODWebVideoTranscodingPrivatePayload {
videoUUID: string
- isNewVideo: boolean
deleteInputFileId: number | null
canMoveVideoState: boolean
@@ -25,7 +24,6 @@ export interface RunnerJobVODWebVideoTranscodingPrivatePayload {
export interface RunnerJobVODAudioMergeTranscodingPrivatePayload {
videoUUID: string
- isNewVideo: boolean
deleteInputFileId: number | null
canMoveVideoState: boolean
@@ -33,7 +31,6 @@ export interface RunnerJobVODAudioMergeTranscodingPrivatePayload {
export interface RunnerJobVODHLSTranscodingPrivatePayload {
videoUUID: string
- isNewVideo: boolean
deleteWebVideoFiles: boolean
canMoveVideoState: boolean
diff --git a/packages/models/src/server/job.model.ts b/packages/models/src/server/job.model.ts
index 74e2a636dd..10894e3957 100644
--- a/packages/models/src/server/job.model.ts
+++ b/packages/models/src/server/job.model.ts
@@ -152,7 +152,6 @@ export type ManageVideoTorrentPayload = {
interface BaseTranscodingPayload {
videoUUID: string
canMoveVideoState: boolean
- isNewVideo?: boolean
}
export interface HLSTranscodingPayload extends BaseTranscodingPayload {
@@ -212,12 +211,7 @@ export type MoveStoragePayload = MoveVideoStoragePayload | MoveCaptionPayload
export interface MoveVideoStoragePayload {
videoUUID: string
- // FIXME: old API compatibility, remove in PeerTube v9
- isNewVideo?: boolean
- previousVideoState?: VideoStateType
-
moveVideoState?: {
- isNewVideo: boolean
previousVideoState: VideoStateType
}
}
@@ -314,7 +308,6 @@ export type NotifyPayload = {
export interface FederateVideoPayload {
videoUUID: string
- isNewVideoForFederation: boolean
}
// ---------------------------------------------------------------------------
@@ -322,9 +315,9 @@ export interface FederateVideoPayload {
export interface TranscodingJobBuilderPayload {
videoUUID: string
- optimizeJob?: {
- isNewVideo: boolean
- }
+ // This is a transcoding job to optimize the video
+ // Set {} for now, can accept more options in the future
+ optimizeJob?: {}
// Array of jobs to create
jobs?: {
diff --git a/packages/tests/src/api/notifications/user-notifications.ts b/packages/tests/src/api/notifications/user-notifications.ts
index d1fd8a83bb..3805311d06 100644
--- a/packages/tests/src/api/notifications/user-notifications.ts
+++ b/packages/tests/src/api/notifications/user-notifications.ts
@@ -434,7 +434,7 @@ describe('Test user notifications', function () {
}
})
- it('Should send a notification is a live replay of a non permanent live is published', async function () {
+ it('Should send a notification when a live replay of a non permanent live is published', async function () {
this.timeout(120000)
const { shortUUID } = await servers[1].live.create({
@@ -460,7 +460,7 @@ describe('Test user notifications', function () {
await checkMyVideoIsPublished({ ...baseParams, videoName: 'non permanent live', shortUUID, checkType: 'presence' })
})
- it('Should send a notification is a live replay of a permanent live is published', async function () {
+ it('Should send a notification when a live replay of a permanent live is published', async function () {
this.timeout(120000)
const { shortUUID } = await servers[1].live.create({
diff --git a/packages/tests/src/api/users/user-import.ts b/packages/tests/src/api/users/user-import.ts
index d5f84fc5ab..1a353f955b 100644
--- a/packages/tests/src/api/users/user-import.ts
+++ b/packages/tests/src/api/users/user-import.ts
@@ -19,7 +19,6 @@ import { ObjectStorageCommand, PeerTubeServer, cleanupTests, waitJobs } from '@p
import { testAvatarSize, testImage } from '@tests/shared/checks.js'
import { prepareImportExportTests } from '@tests/shared/import-export.js'
import { MockSmtpServer } from '@tests/shared/mock-servers/mock-email.js'
-import { SQLCommand } from '@tests/shared/sql-command.js'
import { completeCheckHlsPlaylist } from '@tests/shared/streaming-playlists.js'
import { completeVideoCheck } from '@tests/shared/videos.js'
import { expect } from 'chai'
@@ -401,6 +400,9 @@ function runTest (withObjectStorage: boolean) {
expect(publicVideo).to.exist
expect(publicVideo.privacy.id).to.equal(VideoPrivacy.PUBLIC)
+ expect(publicVideo.originallyPublishedAt).to.exist
+ expect(new Date(publicVideo.originallyPublishedAt)).to.be.below(new Date(publicVideo.publishedAt))
+
const playerSetting = await remoteServer.playerSettings.getForVideo({
videoId: publicVideo.uuid,
token: remoteServer.accessToken,
@@ -487,15 +489,6 @@ function runTest (withObjectStorage: boolean) {
})
}
- // Imported video should preserve firstPublishedAt from the original
- {
- const sqlCommand = new SQLCommand(remoteServer)
- const firstPublishedAt = await sqlCommand.getVideoField(otherVideo.uuid, 'firstPublishedAt')
- expect(firstPublishedAt).to.exist
-
- await sqlCommand.cleanup()
- }
-
const { data: captions } = await remoteServer.captions.list({ videoId: otherVideo.uuid })
await completeCheckHlsPlaylist({
diff --git a/server/core/controllers/api/videos/captions.ts b/server/core/controllers/api/videos/captions.ts
index bae110d44c..fd1dbd53c6 100644
--- a/server/core/controllers/api/videos/captions.ts
+++ b/server/core/controllers/api/videos/captions.ts
@@ -104,7 +104,7 @@ async function createVideoCaption (req: express.Request, res: express.Response)
transaction: t
})
- return federateVideoIfNeeded(video, false, t)
+ return federateVideoIfNeeded(video, t)
})
})
@@ -136,7 +136,7 @@ async function deleteVideoCaption (req: express.Request, res: express.Response)
transaction: t
})
- return federateVideoIfNeeded(video, false, t)
+ return federateVideoIfNeeded(video, t)
})
})
diff --git a/server/core/controllers/api/videos/chapters.ts b/server/core/controllers/api/videos/chapters.ts
index 91a8bc9261..48759da76b 100644
--- a/server/core/controllers/api/videos/chapters.ts
+++ b/server/core/controllers/api/videos/chapters.ts
@@ -54,7 +54,7 @@ async function replaceVideoChapters (req: express.Request, res: express.Response
transaction: t
})
- await federateVideoIfNeeded(video, false, t)
+ await federateVideoIfNeeded(video, t)
})
})
diff --git a/server/core/controllers/api/videos/embed-privacy.ts b/server/core/controllers/api/videos/embed-privacy.ts
index 6fddde722b..b956387835 100644
--- a/server/core/controllers/api/videos/embed-privacy.ts
+++ b/server/core/controllers/api/videos/embed-privacy.ts
@@ -121,7 +121,7 @@ async function updateVideoEmbedPrivacy (req: express.Request, res: express.Respo
transaction: t
})
- await federateVideoIfNeeded(video, false, t)
+ await federateVideoIfNeeded(video, t)
})
logger.info(`Video embed policy for video with name ${video.name} and uuid ${video.uuid} have been updated`, lTags(video.uuid))
diff --git a/server/core/controllers/api/videos/files.ts b/server/core/controllers/api/videos/files.ts
index e7c767d771..d15e47bc04 100644
--- a/server/core/controllers/api/videos/files.ts
+++ b/server/core/controllers/api/videos/files.ts
@@ -80,7 +80,7 @@ async function removeHLSPlaylistController (req: express.Request, res: express.R
logger.info('Deleting HLS playlist of %s.', video.url, lTags(video.uuid))
await removeHLSPlaylist(video)
- await federateVideoIfNeeded(video, false, undefined)
+ await federateVideoIfNeeded(video)
return res.sendStatus(HttpStatusCode.NO_CONTENT_204)
}
@@ -94,7 +94,7 @@ async function removeHLSFileController (req: express.Request, res: express.Respo
const playlist = await removeHLSFile(video, videoFileId)
if (playlist) await updateM3U8AndShaPlaylist(video, playlist)
- await federateVideoIfNeeded(video, false, undefined)
+ await federateVideoIfNeeded(video)
return res.sendStatus(HttpStatusCode.NO_CONTENT_204)
}
@@ -107,7 +107,7 @@ async function removeAllWebVideoFilesController (req: express.Request, res: expr
logger.info('Deleting Web Video files of %s.', video.url, lTags(video.uuid))
await removeAllWebVideoFiles(video)
- await federateVideoIfNeeded(video, false, undefined)
+ await federateVideoIfNeeded(video)
return res.sendStatus(HttpStatusCode.NO_CONTENT_204)
}
@@ -119,7 +119,7 @@ async function removeWebVideoFileController (req: express.Request, res: express.
logger.info('Deleting Web Video file %d of %s.', videoFileId, video.url, lTags(video.uuid))
await removeWebVideoFile(video, videoFileId)
- await federateVideoIfNeeded(video, false, undefined)
+ await federateVideoIfNeeded(video)
return res.sendStatus(HttpStatusCode.NO_CONTENT_204)
}
diff --git a/server/core/controllers/api/videos/live.ts b/server/core/controllers/api/videos/live.ts
index f0a0162890..fea8de4478 100644
--- a/server/core/controllers/api/videos/live.ts
+++ b/server/core/controllers/api/videos/live.ts
@@ -169,7 +169,7 @@ async function updateLiveVideo (req: express.Request, res: express.Response) {
})
})
- await federateVideoIfNeeded(video, false)
+ await federateVideoIfNeeded(video)
return res.status(HttpStatusCode.NO_CONTENT_204).end()
}
diff --git a/server/core/controllers/api/videos/source.ts b/server/core/controllers/api/videos/source.ts
index 53ebd3dda5..732f91e52a 100644
--- a/server/core/controllers/api/videos/source.ts
+++ b/server/core/controllers/api/videos/source.ts
@@ -193,10 +193,7 @@ async function addVideoJobsAfterUpload (video: MVideoFull, videoFile: MVideoFile
{
type: 'federate-video' as const,
- payload: {
- videoUUID: video.uuid,
- isNewVideoForFederation: false
- }
+ payload: { videoUUID: video.uuid }
}
]
@@ -206,7 +203,6 @@ async function addVideoJobsAfterUpload (video: MVideoFull, videoFile: MVideoFile
type: 'move-to-object-storage',
video,
moveVideoState: {
- isNewVideo: false,
previousVideoState: undefined
}
})
@@ -218,9 +214,7 @@ async function addVideoJobsAfterUpload (video: MVideoFull, videoFile: MVideoFile
type: 'transcoding-job-builder' as const,
payload: {
videoUUID: video.uuid,
- optimizeJob: {
- isNewVideo: false
- }
+ optimizeJob: {}
}
})
}
diff --git a/server/core/controllers/api/videos/transcoding.ts b/server/core/controllers/api/videos/transcoding.ts
index 497d78c0e3..f582f6002a 100644
--- a/server/core/controllers/api/videos/transcoding.ts
+++ b/server/core/controllers/api/videos/transcoding.ts
@@ -68,7 +68,6 @@ async function createTranscoding (req: express.Request, res: express.Response) {
video,
resolutions,
transcodingType: body.transcodingType,
- isNewVideo: false,
user: null // Don't specify priority since these transcoding jobs are fired by the admin
})
diff --git a/server/core/controllers/api/videos/update.ts b/server/core/controllers/api/videos/update.ts
index a844efbe3a..7c29e22d9d 100644
--- a/server/core/controllers/api/videos/update.ts
+++ b/server/core/controllers/api/videos/update.ts
@@ -11,7 +11,7 @@ import { exists } from '@server/helpers/custom-validators/misc.js'
import { getVideoThumbnailFile } from '@server/helpers/video.js'
import { sendDeleteVideo } from '@server/lib/activitypub/send/send-delete.js'
import { changeVideoChannelShare } from '@server/lib/activitypub/share.js'
-import { isNewVideoForFederation, isPrivacyForFederation } from '@server/lib/activitypub/videos/federate.js'
+import { isPrivacyForFederation } from '@server/lib/activitypub/videos/federate.js'
import { AutomaticTagger } from '@server/lib/automatic-tags/automatic-tagger.js'
import { setAndSaveVideoAutomaticTags } from '@server/lib/automatic-tags/automatic-tags.js'
import { createLocalVideoThumbnailsFromImage } from '@server/lib/thumbnail.js'
@@ -76,7 +76,7 @@ async function updateVideo (req: express.Request, res: express.Response) {
const videoFileLockReleaser = await VideoPathManager.Instance.lockFiles(videoFromReq.uuid)
try {
- const { videoInstanceUpdated, newVideoForFederation, newVideoForSubscription } = await sequelizeTypescript.transaction(async t => {
+ const { videoInstanceUpdated, newVideoForSubscription } = await sequelizeTypescript.transaction(async t => {
// Refresh video since thumbnails to prevent concurrent updates
const video = await VideoModel.loadFull(videoFromReq.id, t)
@@ -118,11 +118,9 @@ async function updateVideo (req: express.Request, res: express.Response) {
}
// Privacy update?
- let newVideoForFederation = false
let newVideoForSubscription = false
if (body.privacy !== undefined) {
- newVideoForFederation = isNewVideoForFederation(video.privacy, body.privacy, video.firstPublishedAt)
newVideoForSubscription = isNewVideoForSubscription({
currentPrivacy: video.privacy,
newPrivacy: body.privacy,
@@ -229,7 +227,7 @@ async function updateVideo (req: express.Request, res: express.Response) {
)
logger.info('Video with name %s and uuid %s updated.', video.name, video.uuid, lTags(video.uuid))
- return { videoInstanceUpdated, newVideoForFederation, newVideoForSubscription }
+ return { videoInstanceUpdated, newVideoForSubscription }
})
Hooks.runAction('action:api.video.updated', { video: videoInstanceUpdated, body: req.body, req, res })
@@ -238,7 +236,6 @@ async function updateVideo (req: express.Request, res: express.Response) {
video: videoInstanceUpdated,
nameChanged: !!body.name,
oldPrivacy,
- isNewVideoForFederation: newVideoForFederation,
isNewVideoForSubscription: newVideoForSubscription
})
} catch (err) {
diff --git a/server/core/lib/activitypub/process/process-dislike.ts b/server/core/lib/activitypub/process/process-dislike.ts
index e3e08ad659..0876e692bf 100644
--- a/server/core/lib/activitypub/process/process-dislike.ts
+++ b/server/core/lib/activitypub/process/process-dislike.ts
@@ -57,6 +57,6 @@ async function processDislike (activity: ActivityDislike, byActor: MActorSignatu
await rate.save({ transaction: t })
- await federateVideoIfNeeded(video, false, t)
+ await federateVideoIfNeeded(video, t)
})
}
diff --git a/server/core/lib/activitypub/process/process-like.ts b/server/core/lib/activitypub/process/process-like.ts
index e6538876c6..8c7c77230e 100644
--- a/server/core/lib/activitypub/process/process-like.ts
+++ b/server/core/lib/activitypub/process/process-like.ts
@@ -59,6 +59,6 @@ async function processLikeVideo (byActor: MActorSignature, activity: ActivityLik
await rate.save({ transaction: t })
- await federateVideoIfNeeded(video, false, t)
+ await federateVideoIfNeeded(video, t)
})
}
diff --git a/server/core/lib/activitypub/process/process-undo.ts b/server/core/lib/activitypub/process/process-undo.ts
index 3312ca69fc..84d45d14d1 100644
--- a/server/core/lib/activitypub/process/process-undo.ts
+++ b/server/core/lib/activitypub/process/process-undo.ts
@@ -84,7 +84,7 @@ async function processUndoLike (byActor: MActorSignature, activity: ActivityUndo
await video.decrement('likes', { transaction: t })
video.likes--
- await federateVideoIfNeeded(video, false, t)
+ await federateVideoIfNeeded(video, t)
})
}
@@ -108,7 +108,7 @@ async function processUndoDislike (byActor: MActorSignature, activity: ActivityU
await video.decrement('dislikes', { transaction: t })
video.dislikes--
- await federateVideoIfNeeded(video, false, t)
+ await federateVideoIfNeeded(video, t)
})
}
diff --git a/server/core/lib/activitypub/send/send-announce.ts b/server/core/lib/activitypub/send/send-announce.ts
index 2396e7f6f5..06e599b428 100644
--- a/server/core/lib/activitypub/send/send-announce.ts
+++ b/server/core/lib/activitypub/send/send-announce.ts
@@ -6,7 +6,14 @@ import { MVideoShare } from '../../../types/models/video/index.js'
import { audiencify, getPublicAudience } from '../audience.js'
import { broadcastToFollowers, getActorsInvolvedInVideo } from './shared/send-utils.js'
-export async function sendVideoAnnounce (byActor: MActorLight, videoShare: MVideoShare, video: MVideo, transaction: Transaction) {
+export async function sendVideoAnnounce (options: {
+ byActor: MActorLight
+ videoShare: MVideoShare
+ video: MVideo
+ transaction: Transaction
+}) {
+ const { byActor, videoShare, video, transaction } = options
+
const activity = buildAnnounceWithVideoAudience(byActor, videoShare, video)
logger.info('Creating job to send announce %s.', videoShare.url)
diff --git a/server/core/lib/activitypub/send/send-update.ts b/server/core/lib/activitypub/send/send-update.ts
index 809134cafd..931434a0c7 100644
--- a/server/core/lib/activitypub/send/send-update.ts
+++ b/server/core/lib/activitypub/send/send-update.ts
@@ -123,7 +123,7 @@ export async function sendUpdateVideoPlaylist (videoPlaylist: MVideoPlaylistFull
}
export async function sendUpdateVideoPlayerSettings (video: MVideoFull, settings: MPlayerSetting, transaction: Transaction) {
- if (!canVideoBeFederated(video, false)) return
+ if (!canVideoBeFederated(video)) return
const byActor = video.VideoChannel.Account.Actor
const settingsUrl = getLocalVideoPlayerSettingsActivityPubUrl(video)
diff --git a/server/core/lib/activitypub/share.ts b/server/core/lib/activitypub/share.ts
index 5a820c4471..2c4e8c3e83 100644
--- a/server/core/lib/activitypub/share.ts
+++ b/server/core/lib/activitypub/share.ts
@@ -28,7 +28,7 @@ export async function changeVideoChannelShare (
await undoShareByVideoChannel(video, oldVideoChannel, t)
- await shareByVideoChannel(video, t)
+ await shareByVideoChannelIfNeeded({ video, skipFederation: false, transaction: t })
}
export async function addVideoShares (shareUrls: string[], video: MVideoId) {
@@ -46,40 +46,67 @@ export async function addVideoShares (shareUrls: string[], video: MVideoId) {
}, { concurrency: CRAWL_REQUEST_CONCURRENCY })
}
-export async function shareByServer (video: MVideo, t: Transaction) {
+export async function isSharedByServer (options: {
+ video: MVideo
+ transaction: Transaction
+}) {
+ const { video, transaction } = options
+
+ const serverActor = await getServerActor()
+
+ const serverShareUrl = getLocalVideoAnnounceActivityPubUrl(serverActor, video)
+
+ const share = await VideoShareModel.loadByUrl(serverShareUrl, transaction)
+
+ return !!share
+}
+
+export async function shareByServerIfNeeded (options: {
+ video: MVideo
+ skipFederation: boolean
+ transaction: Transaction
+}) {
+ const { video, skipFederation, transaction } = options
+
const serverActor = await getServerActor()
const serverShareUrl = getLocalVideoAnnounceActivityPubUrl(serverActor, video)
- const [ serverShare ] = await VideoShareModel.findOrCreate({
- defaults: {
- actorId: serverActor.id,
- videoId: video.id,
- url: serverShareUrl
- },
- where: {
- url: serverShareUrl
- },
- transaction: t
- })
-
- return sendVideoAnnounce(serverActor, serverShare, video, t)
+
+ let share = await VideoShareModel.loadByUrl(serverShareUrl, transaction)
+ if (share) return
+
+ share = await VideoShareModel.create({
+ actorId: serverActor.id,
+ videoId: video.id,
+ url: serverShareUrl
+ }, { transaction: transaction })
+
+ if (skipFederation !== true) {
+ await sendVideoAnnounce({ byActor: serverActor, videoShare: share, video, transaction: transaction })
+ }
}
-export async function shareByVideoChannel (video: MVideoAccountLight, t: Transaction) {
+export async function shareByVideoChannelIfNeeded (options: {
+ video: MVideoAccountLight
+ skipFederation: boolean
+ transaction: Transaction
+}) {
+ const { video, skipFederation, transaction } = options
+
const videoChannelShareUrl = getLocalVideoAnnounceActivityPubUrl(video.VideoChannel.Actor, video)
- const [ videoChannelShare ] = await VideoShareModel.findOrCreate({
- defaults: {
- actorId: video.VideoChannel.Actor.id,
- videoId: video.id,
- url: videoChannelShareUrl
- },
- where: {
- url: videoChannelShareUrl
- },
- transaction: t
- })
-
- return sendVideoAnnounce(video.VideoChannel.Actor, videoChannelShare, video, t)
+
+ let share = await VideoShareModel.loadByUrl(videoChannelShareUrl, transaction)
+ if (share) return
+
+ share = await VideoShareModel.create({
+ actorId: video.VideoChannel.Actor.id,
+ videoId: video.id,
+ url: videoChannelShareUrl
+ }, { transaction: transaction })
+
+ if (skipFederation !== true) {
+ await sendVideoAnnounce({ byActor: video.VideoChannel.Actor, videoShare: share, video, transaction: transaction })
+ }
}
// ---------------------------------------------------------------------------
diff --git a/server/core/lib/activitypub/video-rates.ts b/server/core/lib/activitypub/video-rates.ts
index c9b1884bdf..44ab5e3e15 100644
--- a/server/core/lib/activitypub/video-rates.ts
+++ b/server/core/lib/activitypub/video-rates.ts
@@ -1,5 +1,5 @@
-import { Transaction } from 'sequelize'
import { VideoRateType } from '@peertube/peertube-models'
+import { Transaction } from 'sequelize'
import { MAccountActor, MActorUrl, MVideoAccountLight, MVideoFull, MVideoId } from '../../types/models/index.js'
import { sendLike, sendUndoDislike, sendUndoLike } from './send/index.js'
import { sendDislike } from './send/send-dislike.js'
@@ -13,7 +13,7 @@ async function sendVideoRateChange (
dislikes: number,
t: Transaction
) {
- if (video.isLocal()) return federateVideoIfNeeded(video, false, t)
+ if (video.isLocal()) return federateVideoIfNeeded(video, t)
return sendVideoRateChangeToOrigin(account, video, likes, dislikes, t)
}
diff --git a/server/core/lib/activitypub/videos/federate.ts b/server/core/lib/activitypub/videos/federate.ts
index 5a8b370fe4..5b4e09f949 100644
--- a/server/core/lib/activitypub/videos/federate.ts
+++ b/server/core/lib/activitypub/videos/federate.ts
@@ -4,45 +4,41 @@ import { CONFIG } from '@server/initializers/config.js'
import { MVideoAPLight, MVideoWithBlacklistRights } from '@server/types/models/index.js'
import { Transaction } from 'sequelize'
import { sendCreateVideo, sendUpdateVideo } from '../send/index.js'
-import { shareByServer, shareByVideoChannel } from '../share.js'
+import { isSharedByServer, shareByServerIfNeeded, shareByVideoChannelIfNeeded } from '../share.js'
-export async function federateVideoIfNeeded (videoArg: MVideoAPLight, isNewVideo: boolean, transaction?: Transaction) {
- if (!canVideoBeFederated(videoArg, isNewVideo)) return
+export async function federateVideoIfNeeded (videoArg: MVideoAPLight, transaction?: Transaction) {
+ if (!canVideoBeFederated(videoArg)) return
+
+ const alreadyShared = await isSharedByServer({ video: videoArg, transaction })
const video = await videoArg.lightAPToFullAP(transaction)
- if (isNewVideo) {
- // Now we'll add the video's meta data to our followers
+ if (!alreadyShared) {
await sendCreateVideo(video, transaction)
await Promise.all([
- shareByServer(video, transaction),
- shareByVideoChannel(video, transaction)
+ shareByServerIfNeeded({ video, skipFederation: false, transaction }),
+ shareByVideoChannelIfNeeded({ video, skipFederation: false, transaction })
])
} else {
+ // Keep send update after these functions, so it takes into account new shares created
+ await Promise.all([
+ shareByServerIfNeeded({ video, skipFederation: true, transaction }),
+ shareByVideoChannelIfNeeded({ video, skipFederation: true, transaction })
+ ])
+
await sendUpdateVideo(video, transaction)
}
}
-export function canVideoBeFederated (video: MVideoWithBlacklistRights, isNewVideo = false) {
+export function canVideoBeFederated (video: MVideoWithBlacklistRights) {
// Check this is not a blacklisted video
- if (video.isBlacklisted() === true) {
- if (isNewVideo === false) return false
- if (video.VideoBlacklist.unfederated === true) return false
- }
+ if (video.isBlacklisted() === true && video.VideoBlacklist.unfederated === true) return false
// Check the video is public/unlisted and published
return isPrivacyForFederation(video.privacy) && isStateForFederation(video.state)
}
-export function isNewVideoPrivacyForFederation (currentPrivacy: VideoPrivacyType, newPrivacy: VideoPrivacyType) {
- return !isPrivacyForFederation(currentPrivacy) && isPrivacyForFederation(newPrivacy)
-}
-
-export function isNewVideoForFederation (currentPrivacy: VideoPrivacyType, newPrivacy: VideoPrivacyType, firstPublishedAt?: Date) {
- return isNewVideoPrivacyForFederation(currentPrivacy, newPrivacy) && !firstPublishedAt
-}
-
export function isPrivacyForFederation (privacy: VideoPrivacyType) {
const castedPrivacy = forceNumber(privacy)
diff --git a/server/core/lib/job-queue/handlers/federate-video.ts b/server/core/lib/job-queue/handlers/federate-video.ts
index 3e4a1e4970..612f2eaed8 100644
--- a/server/core/lib/job-queue/handlers/federate-video.ts
+++ b/server/core/lib/job-queue/handlers/federate-video.ts
@@ -16,7 +16,7 @@ export function processFederateVideo (job: Job) {
const video = await VideoModel.loadFull(payload.videoUUID, t)
if (!video) return
- return federateVideoIfNeeded(video, payload.isNewVideoForFederation, t)
+ return federateVideoIfNeeded(video, t)
})
})
}
diff --git a/server/core/lib/job-queue/handlers/move-to-file-system.ts b/server/core/lib/job-queue/handlers/move-to-file-system.ts
index a27303421f..80efd51baf 100644
--- a/server/core/lib/job-queue/handlers/move-to-file-system.ts
+++ b/server/core/lib/job-queue/handlers/move-to-file-system.ts
@@ -11,13 +11,9 @@ export async function processMoveToFileSystem (job: Job) {
if (isMoveVideoStoragePayload(payload)) { // Move all video related files
logger.info(`Moving video ${payload.videoUUID} to file system in job ${job.id}.`, lTagsBase(payload.videoUUID))
- const moveVideoState = payload.isNewVideo !== undefined
- ? { isNewVideo: payload.isNewVideo, previousVideoState: payload.previousVideoState }
- : payload.moveVideoState
-
return moveVideoToFS({
videoUUID: payload.videoUUID,
- moveVideoState,
+ moveVideoState: payload.moveVideoState,
loggerTags: lTagsBase().tags
})
} else if (isMoveCaptionPayload(payload)) { // Only caption file
diff --git a/server/core/lib/job-queue/handlers/move-to-object-storage.ts b/server/core/lib/job-queue/handlers/move-to-object-storage.ts
index e3c047f128..9b6900c5b4 100644
--- a/server/core/lib/job-queue/handlers/move-to-object-storage.ts
+++ b/server/core/lib/job-queue/handlers/move-to-object-storage.ts
@@ -15,13 +15,9 @@ export async function processMoveToObjectStorage (job: Job) {
if (isMoveVideoStoragePayload(payload)) { // Move all video related files
logger.info(`Moving video ${payload.videoUUID} to object storage in job ${job.id}`, lTagsBase(payload.videoUUID))
- const moveVideoState = payload.isNewVideo !== undefined
- ? { isNewVideo: payload.isNewVideo, previousVideoState: payload.previousVideoState }
- : payload.moveVideoState
-
await moveVideoToObjectStorage({
videoUUID: payload.videoUUID,
- moveVideoState,
+ moveVideoState: payload.moveVideoState,
loggerTags: lTagsBase().tags
})
} else if (isMoveCaptionPayload(payload)) { // Only caption file
diff --git a/server/core/lib/job-queue/handlers/transcoding-job-builder.ts b/server/core/lib/job-queue/handlers/transcoding-job-builder.ts
index 41bb749686..726afbe808 100644
--- a/server/core/lib/job-queue/handlers/transcoding-job-builder.ts
+++ b/server/core/lib/job-queue/handlers/transcoding-job-builder.ts
@@ -1,4 +1,3 @@
-import { pick } from '@peertube/peertube-core-utils'
import { TranscodingJobBuilderPayload, VideoFileStream } from '@peertube/peertube-models'
import { createOptimizeOrMergeAudioJobs } from '@server/lib/transcoding/create-transcoding-job.js'
import { UserModel } from '@server/models/user/user.js'
@@ -25,8 +24,6 @@ async function processTranscodingJobBuilder (job: Job) {
const videoFile = video.getMaxQualityFile(VideoFileStream.VIDEO) || video.getMaxQualityFile(VideoFileStream.AUDIO)
await createOptimizeOrMergeAudioJobs({
- ...pick(payload.optimizeJob, [ 'isNewVideo' ]),
-
video,
videoFile,
user
diff --git a/server/core/lib/job-queue/handlers/video-file-import.ts b/server/core/lib/job-queue/handlers/video-file-import.ts
index fcda0b0d29..104d5ec2c4 100644
--- a/server/core/lib/job-queue/handlers/video-file-import.ts
+++ b/server/core/lib/job-queue/handlers/video-file-import.ts
@@ -1,17 +1,17 @@
-import { Job } from 'bullmq'
-import { copy } from 'fs-extra/esm'
+import { getVideoStreamDimensionsInfo } from '@peertube/peertube-ffmpeg'
import { VideoFileImportPayload } from '@peertube/peertube-models'
-import { createTorrentAndSetInfoHash } from '@server/lib/webtorrent.js'
import { CONFIG } from '@server/initializers/config.js'
import { federateVideoIfNeeded } from '@server/lib/activitypub/videos/index.js'
+import { buildNewFile } from '@server/lib/video-file.js'
+import { buildMoveVideoJob } from '@server/lib/video-jobs.js'
import { VideoPathManager } from '@server/lib/video-path-manager.js'
+import { createTorrentAndSetInfoHash } from '@server/lib/webtorrent.js'
import { VideoModel } from '@server/models/video/video.js'
import { MVideoFull } from '@server/types/models/index.js'
-import { getVideoStreamDimensionsInfo } from '@peertube/peertube-ffmpeg'
+import { Job } from 'bullmq'
+import { copy } from 'fs-extra/esm'
import { logger } from '../../../helpers/logger.js'
import { JobQueue } from '../job-queue.js'
-import { buildMoveVideoJob } from '@server/lib/video-jobs.js'
-import { buildNewFile } from '@server/lib/video-file.js'
async function processVideoFileImport (job: Job) {
const payload = job.data as VideoFileImportPayload
@@ -32,13 +32,12 @@ async function processVideoFileImport (job: Job) {
type: 'move-to-object-storage',
video,
moveVideoState: {
- isNewVideo: false,
previousVideoState: video.state
}
})
)
} else {
- await federateVideoIfNeeded(video, false)
+ await federateVideoIfNeeded(video)
}
return video
diff --git a/server/core/lib/job-queue/handlers/video-import.ts b/server/core/lib/job-queue/handlers/video-import.ts
index d5b5175a0d..947adeefce 100644
--- a/server/core/lib/job-queue/handlers/video-import.ts
+++ b/server/core/lib/job-queue/handlers/video-import.ts
@@ -240,7 +240,7 @@ async function processFile (options: {
// Now we can federate the video (reload from database, we need more attributes)
const videoForFederation = await VideoModel.loadFull(video.uuid, t)
- await federateVideoIfNeeded(videoForFederation, true, t)
+ await federateVideoIfNeeded(videoForFederation, t)
// Update video import object
videoImportWithFiles.state = VideoImportState.SUCCESS
@@ -322,7 +322,6 @@ async function afterImportSuccess (options: {
type: 'move-to-object-storage',
video,
moveVideoState: {
- isNewVideo: true,
previousVideoState: VideoState.TO_IMPORT
}
})
@@ -331,7 +330,7 @@ async function afterImportSuccess (options: {
}
if (video.state === VideoState.TO_TRANSCODE) { // Create transcoding jobs?
- await createOptimizeOrMergeAudioJobs({ video, videoFile, isNewVideo: true, user })
+ await createOptimizeOrMergeAudioJobs({ video, videoFile, user })
}
}
diff --git a/server/core/lib/job-queue/handlers/video-live-ending.ts b/server/core/lib/job-queue/handlers/video-live-ending.ts
index e9287f5d9f..2e51fbcff6 100644
--- a/server/core/lib/job-queue/handlers/video-live-ending.ts
+++ b/server/core/lib/job-queue/handlers/video-live-ending.ts
@@ -223,7 +223,7 @@ async function saveReplayToExternalVideo (options: {
await createStoryboardJob(replayVideo)
await createTranscriptionTaskIfNeeded(replayVideo)
- await moveToNextState({ video: replayVideo, isNewVideo: true })
+ await moveToNextState({ video: replayVideo })
}
async function copyOrRegenerateThumbnails (options: {
@@ -326,7 +326,7 @@ async function replaceLiveByReplay (options: {
}
// We consider this is a new video
- await moveToNextState({ video: videoWithFiles, isNewVideo: true })
+ await moveToNextState({ video: videoWithFiles })
await createStoryboardJob(videoWithFiles)
await createTranscriptionTaskIfNeeded(videoWithFiles)
@@ -390,7 +390,7 @@ async function cleanupLiveAndFederate (options: {
try {
const fullVideo = await VideoModel.loadFull(video.id)
- return federateVideoIfNeeded(fullVideo, false, undefined)
+ return federateVideoIfNeeded(fullVideo)
} catch (err) {
logger.warn('Cannot federate live after cleanup', { videoId: video.id, err })
}
diff --git a/server/core/lib/job-queue/handlers/video-studio-edition.ts b/server/core/lib/job-queue/handlers/video-studio-edition.ts
index 97221c7b5f..b112baa56f 100644
--- a/server/core/lib/job-queue/handlers/video-studio-edition.ts
+++ b/server/core/lib/job-queue/handlers/video-studio-edition.ts
@@ -106,7 +106,7 @@ async function processVideoStudioEdition (job: Job, abortSignal?: AbortSignal) {
const video = await VideoModel.load(payload.videoUUID, transaction)
if (!video || video.state === VideoState.PUBLISHED) return
- await video.setNewState(VideoState.PUBLISHED, false, transaction)
+ await video.setNewStateAndPublishedAt({ newState: VideoState.PUBLISHED, transaction })
})
} catch (err) {
logger.error('Cannot reset video state after studio error', { err, ...lTags })
diff --git a/server/core/lib/job-queue/handlers/video-transcoding.ts b/server/core/lib/job-queue/handlers/video-transcoding.ts
index db26505534..7bf1c74545 100644
--- a/server/core/lib/job-queue/handlers/video-transcoding.ts
+++ b/server/core/lib/job-queue/handlers/video-transcoding.ts
@@ -105,7 +105,7 @@ async function handleWebVideoMergeAudioJob (options: {
logger.info('Merge audio transcoding job for %s ended.', video.uuid, lTags(video.uuid), { payload })
- await onTranscodingEnded({ isNewVideo: payload.isNewVideo, moveVideoToNextState: payload.canMoveVideoState, video })
+ await onTranscodingEnded({ moveVideoToNextState: payload.canMoveVideoState, video })
}
async function handleWebVideoOptimizeJob (options: {
@@ -123,7 +123,7 @@ async function handleWebVideoOptimizeJob (options: {
logger.info('Optimize transcoding job for %s ended.', video.uuid, lTags(video.uuid), { payload })
- await onTranscodingEnded({ isNewVideo: payload.isNewVideo, moveVideoToNextState: payload.canMoveVideoState, video })
+ await onTranscodingEnded({ moveVideoToNextState: payload.canMoveVideoState, video })
}
// ---------------------------------------------------------------------------
@@ -144,7 +144,7 @@ async function handleNewWebVideoResolutionJob (options: {
logger.info('Web Video transcoding job for %s ended.', video.uuid, lTags(video.uuid), { payload })
// Always move video to next state, we're ready enough with this resolution
- await onTranscodingEnded({ isNewVideo: payload.isNewVideo, moveVideoToNextState: payload.canMoveVideoState, video })
+ await onTranscodingEnded({ moveVideoToNextState: payload.canMoveVideoState, video })
}
// ---------------------------------------------------------------------------
@@ -216,5 +216,5 @@ async function handleHLSJob (options: {
// Splitted audio, wait audio & video generation before moving the video in its next state
const moveVideoToNextState = payload.canMoveVideoState && !missingStream
- await onTranscodingEnded({ isNewVideo: payload.isNewVideo, moveVideoToNextState, video })
+ await onTranscodingEnded({ moveVideoToNextState, video })
}
diff --git a/server/core/lib/live/live-manager.ts b/server/core/lib/live/live-manager.ts
index 2f3b6b3d27..2f45808afe 100644
--- a/server/core/lib/live/live-manager.ts
+++ b/server/core/lib/live/live-manager.ts
@@ -522,7 +522,6 @@ class LiveManager {
const now = new Date()
video.publishedAt = now
- video.firstPublishedAt = video.firstPublishedAt ?? now
video.aspectRatio = audioOnlyOutput
? 0
@@ -535,7 +534,7 @@ class LiveManager {
await wait(getLiveSegmentTime(live.latencyMode) * 1000 * VIDEO_LIVE.EDGE_LIVE_DELAY_SEGMENTS_NOTIFICATION)
try {
- await federateVideoIfNeeded(video, false)
+ await federateVideoIfNeeded(video)
} catch (err) {
logger.error('Cannot federate live video %s.', video.url, { err, ...localLTags })
}
@@ -610,7 +609,7 @@ class LiveManager {
PeerTubeSocket.Instance.sendVideoLiveNewState(fullVideo)
- await federateVideoIfNeeded(fullVideo, false)
+ await federateVideoIfNeeded(fullVideo)
Hooks.runAction('action:live.video.state.updated', { video: fullVideo })
} catch (err) {
diff --git a/server/core/lib/local-video-creator.ts b/server/core/lib/local-video-creator.ts
index abc7916e1c..c7cd2901cb 100644
--- a/server/core/lib/local-video-creator.ts
+++ b/server/core/lib/local-video-creator.ts
@@ -9,6 +9,7 @@ import {
VideoEmbedPrivacyPolicy,
VideoEmbedPrivacyPolicyType,
VideoPrivacy,
+ VideoState,
VideoStateType
} from '@peertube/peertube-models'
import { buildUUID } from '@peertube/peertube-node-utils'
@@ -251,7 +252,7 @@ export class LocalVideoCreator {
}).catch(err => logger.error('Cannot build new video jobs of %s.', this.video.uuid, { err, ...this.lTags(this.video.uuid) }))
})
} else {
- await federateVideoIfNeeded(this.video, true, transaction)
+ await federateVideoIfNeeded(this.video, transaction)
}
}).catch(err => {
// Reset elements to reinsert them in the database
@@ -309,7 +310,7 @@ export class LocalVideoCreator {
let firstPublishedAt: Date = null
if (videoInfo.firstPublishedAt) {
firstPublishedAt = new Date(videoInfo.firstPublishedAt)
- } else if (privacy !== VideoPrivacy.PRIVATE) {
+ } else if (privacy !== VideoPrivacy.PRIVATE && videoInfo.state === VideoState.PUBLISHED) {
firstPublishedAt = now
}
diff --git a/server/core/lib/move-storage/move-to-file-system.ts b/server/core/lib/move-storage/move-to-file-system.ts
index ce8f160244..2a802c9ff6 100644
--- a/server/core/lib/move-storage/move-to-file-system.ts
+++ b/server/core/lib/move-storage/move-to-file-system.ts
@@ -35,7 +35,6 @@ export async function moveVideoToFS (options: {
videoUUID: string
moveVideoState?: {
- isNewVideo: boolean
previousVideoState: VideoStateType
}
diff --git a/server/core/lib/move-storage/move-to-object-storage.ts b/server/core/lib/move-storage/move-to-object-storage.ts
index 3374d8f663..78bf0e93c0 100644
--- a/server/core/lib/move-storage/move-to-object-storage.ts
+++ b/server/core/lib/move-storage/move-to-object-storage.ts
@@ -31,7 +31,6 @@ export async function moveVideoToObjectStorage (options: {
videoUUID: string
moveVideoState?: {
- isNewVideo: boolean
previousVideoState: VideoStateType
}
@@ -55,7 +54,7 @@ export async function moveVideoToObjectStorage (options: {
await moveToNextState({ video: { uuid: videoUUID }, ...moveVideoState })
} else {
const videoFull = await VideoModel.loadFull(videoUUID)
- if (videoFull) await federateVideoIfNeeded(videoFull, false, undefined)
+ if (videoFull) await federateVideoIfNeeded(videoFull)
}
}
diff --git a/server/core/lib/move-storage/shared/move-caption.ts b/server/core/lib/move-storage/shared/move-caption.ts
index 7158c60512..a632114e15 100644
--- a/server/core/lib/move-storage/shared/move-caption.ts
+++ b/server/core/lib/move-storage/shared/move-caption.ts
@@ -40,7 +40,7 @@ export async function moveCaptionToStorage (options: {
return sequelizeTypescript.transaction(async t => {
const videoFull = await VideoModel.loadFull(caption.Video.id, t)
- await federateVideoIfNeeded(videoFull, false, t)
+ await federateVideoIfNeeded(videoFull, t)
})
})
} finally {
diff --git a/server/core/lib/runners/job-handlers/abstract-vod-transcoding-job-handler.ts b/server/core/lib/runners/job-handlers/abstract-vod-transcoding-job-handler.ts
index 96374e6de3..f588cb1c55 100644
--- a/server/core/lib/runners/job-handlers/abstract-vod-transcoding-job-handler.ts
+++ b/server/core/lib/runners/job-handlers/abstract-vod-transcoding-job-handler.ts
@@ -1,10 +1,4 @@
-import {
- RunnerJobState,
- RunnerJobStateType,
- RunnerJobSuccessPayload,
- RunnerJobUpdatePayload,
- RunnerJobVODPrivatePayload
-} from '@peertube/peertube-models'
+import { RunnerJobState, RunnerJobStateType, RunnerJobSuccessPayload, RunnerJobUpdatePayload } from '@peertube/peertube-models'
import { retryTransactionWrapper } from '@server/helpers/database-utils.js'
import { logger } from '@server/helpers/logger.js'
import { moveToFailedTranscodingState, moveToNextState } from '@server/lib/video-state.js'
@@ -52,7 +46,7 @@ export abstract class AbstractVODTranscodingJobHandler<C, U extends RunnerJobUpd
}) {
const { runnerJob } = options
- const video = await loadRunnerVideo(options.runnerJob, this.lTags)
+ const video = await loadRunnerVideo(runnerJob, this.lTags)
if (!video) return
const pending = await VideoJobInfoModel.decrease(video.uuid, 'pendingTranscode')
@@ -65,8 +59,7 @@ export abstract class AbstractVODTranscodingJobHandler<C, U extends RunnerJobUpd
this.lTags(video.uuid)
)
- const privatePayload = runnerJob.privatePayload as RunnerJobVODPrivatePayload
- await retryTransactionWrapper(moveToNextState, { video, isNewVideo: privatePayload.isNewVideo })
+ await retryTransactionWrapper(moveToNextState, { video })
}
}
}
diff --git a/server/core/lib/runners/job-handlers/shared/utils.ts b/server/core/lib/runners/job-handlers/shared/utils.ts
index 1cdfaf1824..d6ad2f6973 100644
--- a/server/core/lib/runners/job-handlers/shared/utils.ts
+++ b/server/core/lib/runners/job-handlers/shared/utils.ts
@@ -25,7 +25,7 @@ export async function onVODWebVideoOrAudioMergeTranscodingJob (options: {
await onWebVideoFileTranscoding({ video, videoOutputPath: videoFilePath, deleteWebInputVideoFile, wasAudioFile })
- await onTranscodingEnded({ isNewVideo: privatePayload.isNewVideo, moveVideoToNextState: privatePayload.canMoveVideoState, video })
+ await onTranscodingEnded({ moveVideoToNextState: privatePayload.canMoveVideoState, video })
}
export async function loadRunnerVideo (runnerJob: MRunnerJob, lTags: LoggerTagsFn, transaction?: Transaction) {
diff --git a/server/core/lib/runners/job-handlers/video-studio-transcoding-job-handler.ts b/server/core/lib/runners/job-handlers/video-studio-transcoding-job-handler.ts
index 77f87b23ab..edcb07fe13 100644
--- a/server/core/lib/runners/job-handlers/video-studio-transcoding-job-handler.ts
+++ b/server/core/lib/runners/job-handlers/video-studio-transcoding-job-handler.ts
@@ -163,7 +163,7 @@ export class VideoStudioTranscodingJobHandler
const video = await loadRunnerVideo(options.runnerJob, this.lTags, transaction)
if (!video || video.state === VideoState.PUBLISHED) return
- await video.setNewState(VideoState.PUBLISHED, false, transaction)
+ await video.setNewStateAndPublishedAt({ newState: VideoState.PUBLISHED, transaction })
})
}
}
diff --git a/server/core/lib/runners/job-handlers/vod-audio-merge-transcoding-job-handler.ts b/server/core/lib/runners/job-handlers/vod-audio-merge-transcoding-job-handler.ts
index 04afad01f5..658284a425 100644
--- a/server/core/lib/runners/job-handlers/vod-audio-merge-transcoding-job-handler.ts
+++ b/server/core/lib/runners/job-handlers/vod-audio-merge-transcoding-job-handler.ts
@@ -16,7 +16,6 @@ import { loadRunnerVideo, onVODWebVideoOrAudioMergeTranscodingJob } from './shar
type CreateOptions = {
video: MVideo
- isNewVideo: boolean
resolution: number
fps: number
priority: number
@@ -45,7 +44,7 @@ export class VODAudioMergeTranscodingJobHandler
}
const privatePayload: RunnerJobVODWebVideoTranscodingPrivatePayload = {
- ...pick(options, [ 'isNewVideo', 'deleteInputFileId', 'canMoveVideoState' ]),
+ ...pick(options, [ 'deleteInputFileId', 'canMoveVideoState' ]),
videoUUID: video.uuid
}
diff --git a/server/core/lib/runners/job-handlers/vod-hls-transcoding-job-handler.ts b/server/core/lib/runners/job-handlers/vod-hls-transcoding-job-handler.ts
index b107beb1b3..ccd0d8fa6b 100644
--- a/server/core/lib/runners/job-handlers/vod-hls-transcoding-job-handler.ts
+++ b/server/core/lib/runners/job-handlers/vod-hls-transcoding-job-handler.ts
@@ -22,7 +22,6 @@ import { hasMissingHLSStreams, loadRunnerVideo } from './shared/utils.js'
type CreateOptions = {
video: MVideoWithFile
- isNewVideo: boolean
deleteWebVideoFiles: boolean
resolution: number
fps: number
@@ -69,7 +68,7 @@ export class VODHLSTranscodingJobHandler
}
const privatePayload: RunnerJobVODHLSTranscodingPrivatePayload = {
- ...pick(options, [ 'isNewVideo', 'deleteWebVideoFiles', 'inputStreams', 'canMoveVideoState', 'transcodingRequestAt' ]),
+ ...pick(options, [ 'deleteWebVideoFiles', 'inputStreams', 'canMoveVideoState', 'transcodingRequestAt' ]),
videoUUID: video.uuid
}
@@ -130,7 +129,6 @@ export class VODHLSTranscodingJobHandler
}
await onTranscodingEnded({
- isNewVideo: privatePayload.isNewVideo,
moveVideoToNextState: privatePayload.canMoveVideoState && !missingStream,
video
})
diff --git a/server/core/lib/runners/job-handlers/vod-web-video-transcoding-job-handler.ts b/server/core/lib/runners/job-handlers/vod-web-video-transcoding-job-handler.ts
index 40919abd40..30239ec307 100644
--- a/server/core/lib/runners/job-handlers/vod-web-video-transcoding-job-handler.ts
+++ b/server/core/lib/runners/job-handlers/vod-web-video-transcoding-job-handler.ts
@@ -17,7 +17,6 @@ import { loadRunnerVideo, onVODWebVideoOrAudioMergeTranscodingJob } from './shar
type CreateOptions = {
video: MVideoWithFile
- isNewVideo: boolean
resolution: number
fps: number
priority: number
@@ -57,7 +56,7 @@ export class VODWebVideoTranscodingJobHandler
}
const privatePayload: RunnerJobVODWebVideoTranscodingPrivatePayload = {
- ...pick(options, [ 'isNewVideo', 'deleteInputFileId', 'canMoveVideoState' ]),
+ ...pick(options, [ 'deleteInputFileId', 'canMoveVideoState' ]),
videoUUID: video.uuid
}
diff --git a/server/core/lib/schedulers/update-videos-scheduler.ts b/server/core/lib/schedulers/update-videos-scheduler.ts
index ebb336539d..ea5e5d6754 100644
--- a/server/core/lib/schedulers/update-videos-scheduler.ts
+++ b/server/core/lib/schedulers/update-videos-scheduler.ts
@@ -5,7 +5,6 @@ import { logger, loggerTagsFactory } from '../../helpers/logger.js'
import { SCHEDULER_INTERVALS_MS } from '../../initializers/constants.js'
import { sequelizeTypescript } from '../../initializers/database.js'
import { ScheduleVideoUpdateModel } from '../../models/video/schedule-video-update.js'
-import { isNewVideoForFederation } from '../activitypub/videos/federate.js'
import { Notifier } from '../notifier/index.js'
import { onVideoLocalUpdate } from '../video-jobs.js'
import { VideoPathManager } from '../video-path-manager.js'
@@ -54,7 +53,6 @@ export class UpdateVideosScheduler extends AbstractScheduler {
private async updateAVideo (schedule: MScheduleVideoUpdate) {
let oldPrivacy: VideoPrivacyType
- let newVideoForFederation = false
let newVideoForSubscriptions = false
let published = false
@@ -65,7 +63,6 @@ export class UpdateVideosScheduler extends AbstractScheduler {
logger.info('Executing scheduled video update on ' + video.uuid, lTags(video.uuid))
if (schedule.privacy) {
- newVideoForFederation = isNewVideoForFederation(video.privacy, schedule.privacy, video.firstPublishedAt)
newVideoForSubscriptions = isNewVideoForSubscription({
currentPrivacy: video.privacy,
newPrivacy: schedule.privacy,
@@ -94,7 +91,6 @@ export class UpdateVideosScheduler extends AbstractScheduler {
await onVideoLocalUpdate({
video,
oldPrivacy,
- isNewVideoForFederation: newVideoForFederation,
isNewVideoForSubscription: newVideoForSubscriptions,
nameChanged: false
})
diff --git a/server/core/lib/schedulers/video-stats-buffer-scheduler.ts b/server/core/lib/schedulers/video-stats-buffer-scheduler.ts
index d4235115cf..e374feca63 100644
--- a/server/core/lib/schedulers/video-stats-buffer-scheduler.ts
+++ b/server/core/lib/schedulers/video-stats-buffer-scheduler.ts
@@ -55,7 +55,7 @@ export class VideoStatsBufferScheduler extends AbstractScheduler {
}
// Send video update
- await federateVideoIfNeeded(video, false)
+ await federateVideoIfNeeded(video)
} catch (err) {
logger.error(`Cannot process local video stats buffer of video ${videoId}.`, { err, ...lTags() })
}
diff --git a/server/core/lib/stats/shared/video-viewer-counters.ts b/server/core/lib/stats/shared/video-viewer-counters.ts
index 1380b75f28..d702a90b09 100644
--- a/server/core/lib/stats/shared/video-viewer-counters.ts
+++ b/server/core/lib/stats/shared/video-viewer-counters.ts
@@ -206,7 +206,7 @@ export class VideoViewerCounters {
this.notifyClients(video)
// Let total viewers expire on remote instances if there are no more viewers
- if (newViewers.length !== 0 && video.isLocal() && canVideoBeFederated(video, false)) {
+ if (newViewers.length !== 0 && video.isLocal() && canVideoBeFederated(video)) {
await this.federateTotalViewers(video)
}
}
diff --git a/server/core/lib/storyboard.ts b/server/core/lib/storyboard.ts
index 99e2d733a5..801507cf39 100644
--- a/server/core/lib/storyboard.ts
+++ b/server/core/lib/storyboard.ts
@@ -92,7 +92,7 @@ export async function insertStoryboardInDatabase (options: {
}, { transaction })
if (federate) {
- await federateVideoIfNeeded(video, false, transaction)
+ await federateVideoIfNeeded(video, transaction)
}
})
})
diff --git a/server/core/lib/transcoding/create-transcoding-job.ts b/server/core/lib/transcoding/create-transcoding-job.ts
index a376d9f63a..91446966d4 100644
--- a/server/core/lib/transcoding/create-transcoding-job.ts
+++ b/server/core/lib/transcoding/create-transcoding-job.ts
@@ -5,7 +5,6 @@ import { TranscodingJobQueueBuilder, TranscodingRunnerJobBuilder } from './share
export function createOptimizeOrMergeAudioJobs (options: {
video: MVideoFull
videoFile: MVideoFile
- isNewVideo: boolean
user: MUserId
}) {
return getJobBuilder().createOptimizeOrMergeAudioJobs(options)
@@ -17,7 +16,6 @@ export function createTranscodingJobs (options: {
transcodingType: 'hls' | 'web-video'
video: MVideoFull
resolutions: number[]
- isNewVideo: boolean
user: MUserId
}) {
return getJobBuilder().createTranscodingJobs(options)
diff --git a/server/core/lib/transcoding/ended-transcoding.ts b/server/core/lib/transcoding/ended-transcoding.ts
index b9ee961379..8bbde3d618 100644
--- a/server/core/lib/transcoding/ended-transcoding.ts
+++ b/server/core/lib/transcoding/ended-transcoding.ts
@@ -10,15 +10,14 @@ import { moveToNextState } from '../video-state.js'
export async function onTranscodingEnded (options: {
video: MVideo
- isNewVideo: boolean
moveVideoToNextState: boolean
}) {
- const { video, isNewVideo, moveVideoToNextState } = options
+ const { video, moveVideoToNextState } = options
await VideoJobInfoModel.decrease(video.uuid, 'pendingTranscode')
if (moveVideoToNextState) {
- const changedState = await retryTransactionWrapper(moveToNextState, { video, isNewVideo })
+ const changedState = await retryTransactionWrapper(moveToNextState, { video })
// Still send the transcoded file to external storage if needed
if (!changedState && CONFIG.OBJECT_STORAGE.ENABLED && await hasVideoResourcesToBeMoved(video, FileStorage.OBJECT_STORAGE)) {
diff --git a/server/core/lib/transcoding/shared/job-builders/abstract-job-builder.ts b/server/core/lib/transcoding/shared/job-builders/abstract-job-builder.ts
index c311bf46aa..42eb02edec 100644
--- a/server/core/lib/transcoding/shared/job-builders/abstract-job-builder.ts
+++ b/server/core/lib/transcoding/shared/job-builders/abstract-job-builder.ts
@@ -15,10 +15,9 @@ export abstract class AbstractJobBuilder<P extends { transcodingPriority: Transc
async createOptimizeOrMergeAudioJobs (options: {
video: MVideoFull
videoFile: MVideoFile
- isNewVideo: boolean
user: MUserId
}) {
- const { video, videoFile, isNewVideo, user } = options
+ const { video, videoFile, user } = options
let mergeOrOptimizePayload: P
let children: P[][] = []
@@ -38,7 +37,6 @@ export abstract class AbstractJobBuilder<P extends { transcodingPriority: Transc
mergeOrOptimizePayload = this.buildMergeAudioPayload({
video,
- isNewVideo,
inputFile: videoFile,
resolution: maxResolution,
fps: maxFPS,
@@ -53,7 +51,6 @@ export abstract class AbstractJobBuilder<P extends { transcodingPriority: Transc
mergeOrOptimizePayload = this.buildOptimizePayload({
video,
- isNewVideo,
inputFile: videoFile,
resolution: maxResolution,
fps: maxFPS,
@@ -76,7 +73,6 @@ export abstract class AbstractJobBuilder<P extends { transcodingPriority: Transc
resolution: maxResolution,
fps: maxFPS,
video,
- isNewVideo,
inputStreams,
transcodingRequestAt,
@@ -97,7 +93,6 @@ export abstract class AbstractJobBuilder<P extends { transcodingPriority: Transc
resolution: 0,
fps: 0,
video,
- isNewVideo,
inputStreams,
transcodingRequestAt,
@@ -116,7 +111,6 @@ export abstract class AbstractJobBuilder<P extends { transcodingPriority: Transc
inputVideoResolution: maxResolution,
inputVideoFPS: maxFPS,
hasAudio: videoFile.hasAudio(),
- isNewVideo,
hlsAudioAlreadyGenerated
})
@@ -138,10 +132,9 @@ export abstract class AbstractJobBuilder<P extends { transcodingPriority: Transc
transcodingType: 'hls' | 'web-video'
video: MVideoFull
resolutions: number[]
- isNewVideo: boolean
user: MUserId | null
}) {
- const { video, transcodingType, resolutions, isNewVideo } = options
+ const { video, transcodingType, resolutions } = options
const separatedAudio = CONFIG.TRANSCODING.HLS.SPLIT_AUDIO_AND_VIDEO
const transcodingRequestAt = new Date().toISOString()
@@ -165,7 +158,6 @@ export abstract class AbstractJobBuilder<P extends { transcodingPriority: Transc
video,
resolution,
fps,
- isNewVideo,
separatedAudio,
canMoveVideoState: true,
inputStreams,
@@ -181,7 +173,6 @@ export abstract class AbstractJobBuilder<P extends { transcodingPriority: Transc
video,
resolution,
fps,
- isNewVideo,
canMoveVideoState: true,
transcodingPriority: 'optional'
})
@@ -200,7 +191,6 @@ export abstract class AbstractJobBuilder<P extends { transcodingPriority: Transc
video,
resolution: VideoResolution.H_NOVIDEO,
fps,
- isNewVideo,
separatedAudio,
canMoveVideoState: true,
transcodingRequestAt,
@@ -218,7 +208,6 @@ export abstract class AbstractJobBuilder<P extends { transcodingPriority: Transc
inputVideoFPS: number
inputStreams: VideoFileStreamType[]
hasAudio: boolean
- isNewVideo: boolean
hlsAudioAlreadyGenerated: boolean
transcodingRequestAt: string
}) {
@@ -227,7 +216,6 @@ export abstract class AbstractJobBuilder<P extends { transcodingPriority: Transc
inputVideoResolution,
inputVideoFPS,
inputStreams,
- isNewVideo,
hlsAudioAlreadyGenerated,
hasAudio,
transcodingRequestAt
@@ -272,7 +260,6 @@ export abstract class AbstractJobBuilder<P extends { transcodingPriority: Transc
video,
resolution,
fps,
- isNewVideo,
canMoveVideoState: true,
transcodingPriority: 'optional'
})
@@ -294,7 +281,6 @@ export abstract class AbstractJobBuilder<P extends { transcodingPriority: Transc
video,
resolution,
fps,
- isNewVideo,
separatedAudio: hasAudio && CONFIG.TRANSCODING.HLS.SPLIT_AUDIO_AND_VIDEO,
canMoveVideoState: true,
transcodingPriority: 'optional',
@@ -330,7 +316,6 @@ export abstract class AbstractJobBuilder<P extends { transcodingPriority: Transc
protected abstract buildMergeAudioPayload (options: {
video: MVideoFull
inputFile: MVideoFile
- isNewVideo: boolean
resolution: number
fps: number
@@ -340,7 +325,6 @@ export abstract class AbstractJobBuilder<P extends { transcodingPriority: Transc
protected abstract buildOptimizePayload (options: {
video: MVideoFull
- isNewVideo: boolean
inputFile: MVideoFile
resolution: number
fps: number
@@ -353,7 +337,6 @@ export abstract class AbstractJobBuilder<P extends { transcodingPriority: Transc
video: MVideoFull
resolution: number
fps: number
- isNewVideo: boolean
separatedAudio: boolean
deleteWebVideoFiles?: boolean // default false
@@ -369,7 +352,6 @@ export abstract class AbstractJobBuilder<P extends { transcodingPriority: Transc
video: MVideoFull
resolution: number
fps: number
- isNewVideo: boolean
transcodingPriority: TranscodingPriorityType
canMoveVideoState: boolean
diff --git a/server/core/lib/transcoding/shared/job-builders/transcoding-job-queue-builder.ts b/server/core/lib/transcoding/shared/job-builders/transcoding-job-queue-builder.ts
index 870a5de689..58fa62d1a4 100644
--- a/server/core/lib/transcoding/shared/job-builders/transcoding-job-queue-builder.ts
+++ b/server/core/lib/transcoding/shared/job-builders/transcoding-job-queue-builder.ts
@@ -92,7 +92,6 @@ export class TranscodingJobQueueBuilder extends AbstractJobBuilder<FullPayload>
video: MVideo
resolution: number
fps: number
- isNewVideo: boolean
separatedAudio: boolean
transcodingPriority: TranscodingPriorityType
@@ -112,7 +111,6 @@ export class TranscodingJobQueueBuilder extends AbstractJobBuilder<FullPayload>
...pick(options, [
'resolution',
'fps',
- 'isNewVideo',
'separatedAudio',
'canMoveVideoState',
'transcodingPriority',
@@ -128,7 +126,6 @@ export class TranscodingJobQueueBuilder extends AbstractJobBuilder<FullPayload>
video: MVideo
resolution: number
fps: number
- isNewVideo: boolean
transcodingPriority: TranscodingPriorityType
canMoveVideoState: boolean
@@ -140,7 +137,6 @@ export class TranscodingJobQueueBuilder extends AbstractJobBuilder<FullPayload>
videoUUID: video.uuid,
...pick(options, [
- 'isNewVideo',
'resolution',
'fps',
'transcodingPriority',
@@ -151,7 +147,6 @@ export class TranscodingJobQueueBuilder extends AbstractJobBuilder<FullPayload>
protected buildMergeAudioPayload (options: {
video: MVideo
- isNewVideo: boolean
fps: number
resolution: number
@@ -167,7 +162,6 @@ export class TranscodingJobQueueBuilder extends AbstractJobBuilder<FullPayload>
...pick(options, [
'resolution',
'fps',
- 'isNewVideo',
'transcodingPriority',
'canMoveVideoState'
])
@@ -176,7 +170,6 @@ export class TranscodingJobQueueBuilder extends AbstractJobBuilder<FullPayload>
protected buildOptimizePayload (options: {
video: MVideo
- isNewVideo: boolean
transcodingPriority: TranscodingPriorityType
canMoveVideoState: boolean
@@ -189,7 +182,6 @@ export class TranscodingJobQueueBuilder extends AbstractJobBuilder<FullPayload>
videoUUID: video.uuid,
...pick(options, [
- 'isNewVideo',
'transcodingPriority',
'canMoveVideoState'
])
diff --git a/server/core/lib/transcoding/shared/job-builders/transcoding-runner-job-builder.ts b/server/core/lib/transcoding/shared/job-builders/transcoding-runner-job-builder.ts
index b32812c502..da09756e67 100644
--- a/server/core/lib/transcoding/shared/job-builders/transcoding-runner-job-builder.ts
+++ b/server/core/lib/transcoding/shared/job-builders/transcoding-runner-job-builder.ts
@@ -93,7 +93,6 @@ export class TranscodingRunnerJobBuilder extends AbstractJobBuilder<FullPayload>
video: MVideoFull
resolution: number
fps: number
- isNewVideo: boolean
separatedAudio: boolean
transcodingPriority: TranscodingPriorityType
@@ -114,7 +113,6 @@ export class TranscodingRunnerJobBuilder extends AbstractJobBuilder<FullPayload>
'video',
'resolution',
'fps',
- 'isNewVideo',
'separatedAudio',
'canMoveVideoState',
'transcodingRequestAt',
@@ -132,7 +130,6 @@ export class TranscodingRunnerJobBuilder extends AbstractJobBuilder<FullPayload>
video: MVideoFull
resolution: number
fps: number
- isNewVideo: boolean
transcodingPriority: TranscodingPriorityType
canMoveVideoState: boolean
@@ -145,7 +142,6 @@ export class TranscodingRunnerJobBuilder extends AbstractJobBuilder<FullPayload>
'video',
'resolution',
'fps',
- 'isNewVideo',
'canMoveVideoState',
'transcodingPriority',
'canMoveVideoState'
@@ -161,7 +157,6 @@ export class TranscodingRunnerJobBuilder extends AbstractJobBuilder<FullPayload>
protected buildMergeAudioPayload (options: {
video: MVideoFull
inputFile: MVideoFile
- isNewVideo: boolean
fps: number
resolution: number
@@ -178,7 +173,6 @@ export class TranscodingRunnerJobBuilder extends AbstractJobBuilder<FullPayload>
'video',
'resolution',
'fps',
- 'isNewVideo',
'canMoveVideoState'
]),
@@ -192,7 +186,6 @@ export class TranscodingRunnerJobBuilder extends AbstractJobBuilder<FullPayload>
protected buildOptimizePayload (options: {
video: MVideoFull
inputFile: MVideoFile
- isNewVideo: boolean
fps: number
resolution: number
@@ -209,7 +202,6 @@ export class TranscodingRunnerJobBuilder extends AbstractJobBuilder<FullPayload>
'video',
'resolution',
'fps',
- 'isNewVideo',
'canMoveVideoState'
]),
diff --git a/server/core/lib/user-import-export/importers/videos-importer.ts b/server/core/lib/user-import-export/importers/videos-importer.ts
index 02b66a530b..44e743adaf 100644
--- a/server/core/lib/user-import-export/importers/videos-importer.ts
+++ b/server/core/lib/user-import-export/importers/videos-importer.ts
@@ -65,8 +65,8 @@ type SanitizedObject = Pick<
| 'downloadEnabled'
| 'videoEmbedPrivacy'
| 'waitTranscoding'
- | 'firstPublishedAt'
| 'originallyPublishedAt'
+ | 'publishedAt'
| 'tags'
| 'live'
| 'passwords'
@@ -104,8 +104,8 @@ export class VideosImporter extends AbstractUserImporter<VideoExportJSON, Import
if (!isVideoSourceFilenameValid(o.source?.inputFilename)) o.source = undefined
+ if (!o.publishedAt || !isVideoPublicationDateValid(o.publishedAt)) o.publishedAt = null
if (!o.originallyPublishedAt || !isVideoPublicationDateValid(o.originallyPublishedAt)) o.originallyPublishedAt = null
- if (!o.firstPublishedAt || !isVideoPublicationDateValid(o.firstPublishedAt)) o.firstPublishedAt = null
if (!o.videoEmbedPrivacy) o.videoEmbedPrivacy = { policy: VideoEmbedPrivacyPolicy.ALL_ALLOWED, domains: [] }
if (!isVideoEmbedPrivacyPolicyValid(o.videoEmbedPrivacy.policy)) o.videoEmbedPrivacy.policy = VideoEmbedPrivacyPolicy.ALL_ALLOWED
@@ -168,8 +168,8 @@ export class VideosImporter extends AbstractUserImporter<VideoExportJSON, Import
'downloadEnabled',
'videoEmbedPrivacy',
'waitTranscoding',
- 'firstPublishedAt',
'originallyPublishedAt',
+ 'publishedAt',
'tags',
'captions',
'live',
@@ -248,10 +248,11 @@ export class VideosImporter extends AbstractUserImporter<VideoExportJSON, Import
'commentsPolicy',
'downloadEnabled',
'waitTranscoding',
- 'originallyPublishedAt',
- 'firstPublishedAt'
+ 'originallyPublishedAt'
]),
+ originallyPublishedAt: videoImportData.originallyPublishedAt || videoImportData.publishedAt,
+
videoPasswords: videoImportData.passwords,
duration,
diff --git a/server/core/lib/video-blacklist.ts b/server/core/lib/video-blacklist.ts
index 2ffbee00e9..81396d16e0 100644
--- a/server/core/lib/video-blacklist.ts
+++ b/server/core/lib/video-blacklist.ts
@@ -177,7 +177,7 @@ export async function unblacklistVideo (videoBlacklist: MVideoBlacklist, video:
// Re federate the video
if (unfederated === true) {
- await federateVideoIfNeeded(await VideoModel.loadFull(video.id, t), true, t)
+ await federateVideoIfNeeded(await VideoModel.loadFull(video.id, t), t)
}
return videoBlacklistType
diff --git a/server/core/lib/video-captions.ts b/server/core/lib/video-captions.ts
index d796096ee5..7f2d44cad7 100644
--- a/server/core/lib/video-captions.ts
+++ b/server/core/lib/video-captions.ts
@@ -263,7 +263,7 @@ export async function onTranscriptionEnded (options: {
}
await sequelizeTypescript.transaction(async t => {
- await federateVideoIfNeeded(video, false, t)
+ await federateVideoIfNeeded(video, t)
})
Notifier.Instance.notifyOfGeneratedVideoTranscription(caption)
diff --git a/server/core/lib/video-channel.ts b/server/core/lib/video-channel.ts
index 97828db9bc..05dff8c9f5 100644
--- a/server/core/lib/video-channel.ts
+++ b/server/core/lib/video-channel.ts
@@ -31,6 +31,6 @@ export async function federateAllVideosOfChannel (videoChannel: MChannelId) {
for (const videoId of videoIds) {
const video = await VideoModel.loadFull(videoId)
- await federateVideoIfNeeded(video, false)
+ await federateVideoIfNeeded(video)
}
}
diff --git a/server/core/lib/video-jobs.ts b/server/core/lib/video-jobs.ts
index a1ae69a7b5..988fa0c79a 100644
--- a/server/core/lib/video-jobs.ts
+++ b/server/core/lib/video-jobs.ts
@@ -16,7 +16,6 @@ export async function buildMoveVideoJob (options: {
type: 'move-to-object-storage' | 'move-to-file-system'
moveVideoState?: {
- isNewVideo: boolean
previousVideoState: VideoStateType
}
}) {
@@ -58,10 +57,7 @@ export async function buildLocalStoryboardJobIfNeeded (options: {
if (federate === true) {
return {
type: 'federate-video' as 'federate-video',
- payload: {
- videoUUID: video.uuid,
- isNewVideoForFederation: false
- }
+ payload: { videoUUID: video.uuid }
}
}
@@ -124,10 +120,7 @@ export async function addVideoJobsAfterCreation (options: {
{
type: 'federate-video' as 'federate-video',
- payload: {
- videoUUID: video.uuid,
- isNewVideoForFederation: true
- }
+ payload: { videoUUID: video.uuid }
}
]
@@ -138,7 +131,6 @@ export async function addVideoJobsAfterCreation (options: {
type: 'move-to-object-storage',
video,
moveVideoState: {
- isNewVideo: true,
previousVideoState: undefined
}
})
@@ -150,9 +142,7 @@ export async function addVideoJobsAfterCreation (options: {
type: 'transcoding-job-builder' as 'transcoding-job-builder',
payload: {
videoUUID: video.uuid,
- optimizeJob: {
- isNewVideo: true
- }
+ optimizeJob: {}
}
})
}
@@ -169,13 +159,12 @@ export async function addVideoJobsAfterCreation (options: {
export async function onVideoLocalUpdate (options: {
video: MVideoFull
- isNewVideoForFederation: boolean
isNewVideoForSubscription: boolean
nameChanged: boolean
oldPrivacy?: VideoPrivacyType
}) {
- const { video, nameChanged, oldPrivacy, isNewVideoForFederation, isNewVideoForSubscription } = options
+ const { video, nameChanged, oldPrivacy, isNewVideoForSubscription } = options
const jobs: CreateJobTypeAndPayload[] = []
const filePathChanged = exists(oldPrivacy)
@@ -211,10 +200,7 @@ export async function onVideoLocalUpdate (options: {
jobs.push({
type: 'federate-video',
- payload: {
- videoUUID: video.uuid,
- isNewVideoForFederation
- }
+ payload: { videoUUID: video.uuid }
})
if (isNewVideoForSubscription) {
diff --git a/server/core/lib/video-state.ts b/server/core/lib/video-state.ts
index 27bffbf814..fb1dd528a3 100644
--- a/server/core/lib/video-state.ts
+++ b/server/core/lib/video-state.ts
@@ -42,9 +42,8 @@ export function buildNextVideoState (currentState?: VideoStateType) {
export function moveToNextState (options: {
video: MVideoUUID
previousVideoState?: VideoStateType
- isNewVideo?: boolean // Default true
}) {
- const { video, previousVideoState, isNewVideo = true } = options
+ const { video, previousVideoState } = options
return retryTransactionWrapper(() => {
return sequelizeTypescript.transaction(async t => {
@@ -55,7 +54,7 @@ export function moveToNextState (options: {
// Already in its final state
if (videoDatabase.state === VideoState.PUBLISHED) {
- await federateVideoIfNeeded(videoDatabase, false, t)
+ await federateVideoIfNeeded(videoDatabase, t)
logger.debug(`Video ${videoDatabase.uuid} is already published, no state change.`, lTags(videoDatabase.uuid))
@@ -65,12 +64,12 @@ export function moveToNextState (options: {
const newState = buildNextVideoState(videoDatabase.state)
if (newState === VideoState.PUBLISHED) {
- await moveToPublishedState({ video: videoDatabase, previousVideoState, isNewVideo, transaction: t })
+ await moveToPublishedState({ video: videoDatabase, previousVideoState, transaction: t })
return true
}
if (newState === VideoState.TO_MOVE_TO_EXTERNAL_STORAGE) {
- await moveToExternalStorageState({ video: videoDatabase, isNewVideo, transaction: t })
+ await moveToExternalStorageState({ video: videoDatabase, transaction: t })
return true
}
@@ -88,15 +87,14 @@ export function moveToNextState (options: {
export async function moveToExternalStorageState (options: {
video: MVideoFull
- isNewVideo: boolean
transaction: Transaction
}) {
- const { video, isNewVideo, transaction } = options
+ const { video, transaction } = options
const previousVideoState = video.state
if (video.state !== VideoState.TO_MOVE_TO_EXTERNAL_STORAGE) {
- await video.setNewState(VideoState.TO_MOVE_TO_EXTERNAL_STORAGE, isNewVideo, transaction)
+ await video.setNewStateAndPublishedAt({ newState: VideoState.TO_MOVE_TO_EXTERNAL_STORAGE, transaction })
}
logger.info('Creating external storage move job for video %s.', video.uuid, lTags(video.uuid))
@@ -106,7 +104,7 @@ export async function moveToExternalStorageState (options: {
await buildMoveVideoJob({
type: 'move-to-object-storage',
video,
- moveVideoState: { isNewVideo, previousVideoState }
+ moveVideoState: { previousVideoState }
})
)
@@ -120,15 +118,14 @@ export async function moveToExternalStorageState (options: {
export async function moveToFileSystemState (options: {
video: MVideoFull
- isNewVideo: boolean
transaction: Transaction
}) {
- const { video, isNewVideo, transaction } = options
+ const { video, transaction } = options
const previousVideoState = video.state
if (video.state !== VideoState.TO_MOVE_TO_FILE_SYSTEM) {
- await video.setNewState(VideoState.TO_MOVE_TO_FILE_SYSTEM, false, transaction)
+ await video.setNewStateAndPublishedAt({ newState: VideoState.TO_MOVE_TO_FILE_SYSTEM, transaction })
}
logger.info('Creating move to file system job for video %s.', video.uuid, { tags: [ video.uuid ] })
@@ -138,10 +135,7 @@ export async function moveToFileSystemState (options: {
await buildMoveVideoJob({
type: 'move-to-file-system',
video,
- moveVideoState: {
- previousVideoState,
- isNewVideo
- }
+ moveVideoState: { previousVideoState }
})
)
@@ -158,19 +152,19 @@ export async function moveToFileSystemState (options: {
export function moveToFailedTranscodingState (video: MVideo) {
if (video.state === VideoState.TRANSCODING_FAILED) return
- return video.setNewState(VideoState.TRANSCODING_FAILED, false, undefined)
+ return video.setNewStateAndPublishedAt({ newState: VideoState.TRANSCODING_FAILED, transaction: undefined })
}
export function moveToFailedMoveToObjectStorageState (video: MVideo) {
if (video.state === VideoState.TO_MOVE_TO_EXTERNAL_STORAGE_FAILED) return
- return video.setNewState(VideoState.TO_MOVE_TO_EXTERNAL_STORAGE_FAILED, false, undefined)
+ return video.setNewStateAndPublishedAt({ newState: VideoState.TO_MOVE_TO_EXTERNAL_STORAGE_FAILED, transaction: undefined })
}
export function moveToFailedMoveToFileSystemState (video: MVideo) {
if (video.state === VideoState.TO_MOVE_TO_FILE_SYSTEM_FAILED) return
- return video.setNewState(VideoState.TO_MOVE_TO_FILE_SYSTEM_FAILED, false, undefined)
+ return video.setNewStateAndPublishedAt({ newState: VideoState.TO_MOVE_TO_FILE_SYSTEM_FAILED, transaction: undefined })
}
// ---------------------------------------------------------------------------
@@ -179,18 +173,19 @@ export function moveToFailedMoveToFileSystemState (video: MVideo) {
async function moveToPublishedState (options: {
video: MVideoFull
- isNewVideo: boolean
transaction: Transaction
previousVideoState?: VideoStateType
}) {
- const { video, isNewVideo, transaction, previousVideoState } = options
+ const { video, transaction, previousVideoState } = options
const previousState = previousVideoState ?? video.state
- logger.info('Publishing video %s.', video.uuid, { isNewVideo, previousState, ...lTags(video.uuid) })
+ logger.info('Publishing video %s.', video.uuid, { previousState, ...lTags(video.uuid) })
- await video.setNewState(VideoState.PUBLISHED, isNewVideo, transaction)
+ const isNewVideo = !video.firstPublishedAt
- await federateVideoIfNeeded(video, isNewVideo, transaction)
+ await video.setNewStateAndPublishedAt({ newState: VideoState.PUBLISHED, transaction })
+
+ await federateVideoIfNeeded(video, transaction)
if (previousState === VideoState.TO_EDIT) {
Notifier.Instance.notifyOfFinishedVideoStudioEdition(video)
diff --git a/server/core/lib/video-studio.ts b/server/core/lib/video-studio.ts
index d920f03bd3..d1dabe60c3 100644
--- a/server/core/lib/video-studio.ts
+++ b/server/core/lib/video-studio.ts
@@ -120,18 +120,13 @@ export async function onVideoStudioEnded (options: {
await buildLocalStoryboardJobIfNeeded({ video, federate: false }),
{
type: 'federate-video' as 'federate-video',
- payload: {
- videoUUID: video.uuid,
- isNewVideoForFederation: false
- }
+ payload: { videoUUID: video.uuid }
},
{
type: 'transcoding-job-builder' as 'transcoding-job-builder',
payload: {
videoUUID: video.uuid,
- optimizeJob: {
- isNewVideo: false
- }
+ optimizeJob: {}
}
}
)
diff --git a/server/core/models/video/video.ts b/server/core/models/video/video.ts
index 23ed6b374f..b23d58ccdc 100644
--- a/server/core/models/video/video.ts
+++ b/server/core/models/video/video.ts
@@ -2397,13 +2397,19 @@ export class VideoModel extends SequelizeModel<VideoModel> {
// ---------------------------------------------------------------------------
- async setNewState (newState: VideoStateType, isNewVideo: boolean, transaction: Transaction) {
+ async setNewStateAndPublishedAt (options: {
+ newState: VideoStateType
+ transaction: Transaction
+ }) {
+ const { newState, transaction } = options
+
if (this.state === newState) throw new Error('Cannot use same state ' + newState)
this.state = newState
- if (this.state === VideoState.PUBLISHED && isNewVideo) {
+ if (this.state === VideoState.PUBLISHED && !this.firstPublishedAt) {
this.publishedAt = new Date()
+ this.firstPublishedAt = this.publishedAt
}
await this.save({ transaction })
diff --git a/server/scripts/create-move-video-storage-job.ts b/server/scripts/create-move-video-storage-job.ts
index 2d3bbdeba9..44e00317cf 100644
--- a/server/scripts/create-move-video-storage-job.ts
+++ b/server/scripts/create-move-video-storage-job.ts
@@ -88,7 +88,7 @@ async function run () {
await createMoveJobIfNeeded({
video: videoFull,
targetStorage: FileStorage.OBJECT_STORAGE,
- handler: () => moveToExternalStorageState({ video: videoFull, isNewVideo: false, transaction: undefined })
+ handler: () => moveToExternalStorageState({ video: videoFull, transaction: undefined })
})
continue
@@ -99,7 +99,7 @@ async function run () {
video: videoFull,
targetStorage: FileStorage.FILE_SYSTEM,
- handler: () => moveToFileSystemState({ video: videoFull, isNewVideo: false, transaction: undefined })
+ handler: () => moveToFileSystemState({ video: videoFull, transaction: undefined })
})
}
}
diff --git a/server/scripts/migrations/peertube-4.0.ts b/server/scripts/migrations/peertube-4.0.ts
index 515ae94f02..74f0af4a5c 100644
--- a/server/scripts/migrations/peertube-4.0.ts
+++ b/server/scripts/migrations/peertube-4.0.ts
@@ -1,7 +1,3 @@
-import Bluebird from 'bluebird'
-import { move } from 'fs-extra/esm'
-import { readFile, writeFile } from 'fs/promises'
-import { join } from 'path'
import { initDatabaseModels } from '@server/initializers/database.js'
import { federateVideoIfNeeded } from '@server/lib/activitypub/videos/index.js'
import { JobQueue } from '@server/lib/job-queue/index.js'
@@ -13,6 +9,10 @@ import {
import { VideoPathManager } from '@server/lib/video-path-manager.js'
import { VideoStreamingPlaylistModel } from '@server/models/video/video-streaming-playlist.js'
import { VideoModel } from '@server/models/video/video.js'
+import Bluebird from 'bluebird'
+import { move } from 'fs-extra/esm'
+import { readFile, writeFile } from 'fs/promises'
+import { join } from 'path'
run()
.then(() => process.exit(0))
@@ -103,7 +103,7 @@ async function processVideo (videoId: number) {
await playlist.save()
const allVideo = await VideoModel.loadFull(video.id)
- await federateVideoIfNeeded(allVideo, false)
+ await federateVideoIfNeeded(allVideo)
console.log(`Successfully moved HLS files of ${video.name}.`)
}
diff --git a/server/scripts/regenerate-thumbnails.ts b/server/scripts/regenerate-thumbnails.ts
index a4bdf655c5..05eb81c13c 100644
--- a/server/scripts/regenerate-thumbnails.ts
+++ b/server/scripts/regenerate-thumbnails.ts
@@ -47,7 +47,7 @@ async function processVideo (id: number) {
await processThumbnails({ entity: video, generateFilename: () => generateImageFilename() })
- await federateVideoIfNeeded(video, false)
+ await federateVideoIfNeeded(video)
}
async function processPlaylist (id: number) {