Skip to content

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

Do not process storyboard if disabled

Chocobozzz833a280d1070
diff --git a/server/core/lib/activitypub/actors/get.ts b/server/core/lib/activitypub/actors/get.ts
index 4837c01ac7..8838fb43a6 100644
--- a/server/core/lib/activitypub/actors/get.ts
+++ b/server/core/lib/activitypub/actors/get.ts
@@ -91,17 +91,17 @@ async function getOrCreateAPOwner (actorObject: ActivityPubActor, actorId: strin
}
}
-async function findOwner (rootId: string, attributedTo: APObjectId[] | APObjectId, type: 'Person' | 'Group') {
+async function findOwner (rootUrl: string, attributedTo: APObjectId[] | APObjectId, type: 'Person' | 'Group') {
for (const actorToCheck of arrayify(attributedTo)) {
const actorObject = await fetchAPObjectIfNeeded<ActivityPubActor>(getAPId(actorToCheck))
if (!actorObject) {
- logger.warn(`Unknown attributed to actor ${actorToCheck} for owner ${rootId}`)
+ logger.warn(`Unknown attributed to actor ${actorToCheck} for owner ${rootUrl}`)
continue
}
- if (checkUrlsSameHost(actorObject.id, rootId) !== true) {
- logger.warn(`Account attributed to ${actorObject.id} does not have the same host than owner actor url ${rootId}`)
+ if (checkUrlsSameHost(actorObject.id, rootUrl) !== true) {
+ logger.warn(`Account attributed to ${actorObject.id} does not have the same host than owner actor url ${rootUrl}`)
continue
}
diff --git a/server/core/lib/job-queue/handlers/generate-storyboard.ts b/server/core/lib/job-queue/handlers/generate-storyboard.ts
index 4c0b8a9850..ffabac9dd9 100644
--- a/server/core/lib/job-queue/handlers/generate-storyboard.ts
+++ b/server/core/lib/job-queue/handlers/generate-storyboard.ts
@@ -23,20 +23,25 @@ async function processGenerateStoryboard (job: Job): Promise<void> {
const payload = job.data as GenerateStoryboardPayload
const lTags = lTagsBase(payload.videoUUID)
- logger.info('Processing generate storyboard of %s in job %s.', payload.videoUUID, job.id, lTags)
+ logger.info(`Processing generate storyboard of ${payload.videoUUID} in job ${job.id}.`, lTags)
+
+ if (CONFIG.STORYBOARDS.ENABLED !== true) {
+ logger.info(`Storyboard disabled, do not process storyboard of ${payload.videoUUID} in job ${job.id}.`, lTags)
+ return
+ }
const inputFileMutexReleaser = await VideoPathManager.Instance.lockFiles(payload.videoUUID)
try {
const video = await VideoModel.loadFull(payload.videoUUID)
if (!video) {
- logger.info('Video %s does not exist anymore, skipping storyboard generation.', payload.videoUUID, lTags)
+ logger.info(`Video ${payload.videoUUID} does not exist anymore, skipping storyboard generation.`, lTags)
return
}
const inputFile = video.getMaxQualityFile(VideoFileStream.VIDEO)
if (!inputFile) {
- logger.info('Do not generate a storyboard of %s since the video does not have a video stream', payload.videoUUID, lTags)
+ logger.info(`Do not generate a storyboard of ${payload.videoUUID} since the video does not have a video stream`, lTags)
return
}
@@ -62,7 +67,7 @@ async function processGenerateStoryboard (job: Job): Promise<void> {
const { totalSprites, spriteDuration } = buildSpritesMetadata({ video })
if (totalSprites === 0) {
- logger.info('Do not generate a storyboard of %s because the video is not long enough', payload.videoUUID, lTags)
+ logger.info(`Do not generate a storyboard of ${payload.videoUUID} because the video is not long enough`, lTags)
return
}
@@ -72,7 +77,7 @@ async function processGenerateStoryboard (job: Job): Promise<void> {
})
logger.debug(
- 'Generating storyboard from video of %s to %s', video.uuid, destination,
+ `Generating storyboard from video of ${video.uuid} to ${destination}`,
{ ...lTags, totalSprites, spritesCount, spriteDuration, videoDuration: video.duration, spriteHeight, spriteWidth }
)
@@ -96,7 +101,7 @@ async function processGenerateStoryboard (job: Job): Promise<void> {
return sequelizeTypescript.transaction(async transaction => {
const videoStillExists = await VideoModel.load(video.id, transaction)
if (!videoStillExists) {
- logger.info('Video %s does not exist anymore, skipping storyboard generation.', payload.videoUUID, lTags)
+ logger.info(`Video ${payload.videoUUID} does not exist anymore, skipping storyboard generation.`, lTags)
deleteFileAndCatch(destination)
return
}
@@ -114,7 +119,7 @@ async function processGenerateStoryboard (job: Job): Promise<void> {
videoId: video.id
}, { transaction })
- logger.info('Storyboard generation %s ended for video %s.', destination, video.uuid, lTags)
+ logger.info(`Storyboard generation ${destination} ended for video ${video.uuid}.`, lTags)
if (payload.federate) {
await federateVideoIfNeeded(video, false, transaction)