ActivityPub-federated video streaming platform using P2P directly in your web browser
Prefer INNER JOIN
Chocobozzz6c6da1c51216
diff --git a/packages/tests/src/api/transcoding/video-studio.ts b/packages/tests/src/api/transcoding/video-studio.tsindex fe59308b12..7d18c29e6a 100644--- a/packages/tests/src/api/transcoding/video-studio.ts+++ b/packages/tests/src/api/transcoding/video-studio.ts@@ -118,7 +118,6 @@ describe('Test video studio', function () {await servers[0].config.save()await servers[0].config.enableMinimumTranscoding({ splitAudioAndVideo: true })await renewVideo('video_short1.webm')- await servers[0].config.rollback()const video = await servers[0].videos.get({ id: videoUUID })for (const file of video.files) {@@ -146,6 +145,8 @@ describe('Test video studio', function () {for (const server of servers) {await checkVideoDuration(server, videoUUID, 4)}++ await servers[0].config.rollback()})})diff --git a/server/core/models/shared/sql/actor-helpers.ts b/server/core/models/shared/sql/actor-helpers.tsindex 9488b63b9a..2b9449e7db 100644--- a/server/core/models/shared/sql/actor-helpers.ts+++ b/server/core/models/shared/sql/actor-helpers.ts@@ -3,15 +3,20 @@ import { ActorImageType } from '@peertube/peertube-models'export function getActorJoin (options: {base?: stringon: string+ required: booleanincludeAvatars?: boolean // default false}) {- const { base = '', on, includeAvatars = false } = options+ const { base = '', on, includeAvatars = false, required } = optionsconst avatarsJoin = includeAvatars? getAvatarsJoin({ base: `${base}Actor`, on: `"${base}Actor"."id"` }): ''- return ` LEFT JOIN "actor" "${base}Actor" ON "${base}Actor"."id" = ${on} ` ++ const join = required+ ? 'INNER JOIN'+ : 'LEFT JOIN'++ return ` ${join} "actor" "${base}Actor" ON "${base}Actor"."id" = ${on} ` +`LEFT JOIN "server" "${base}Actor->Server" ` +` ON "${base}Actor->Server"."id" = "${base}Actor"."serverId" ` +avatarsJoin@@ -23,23 +28,29 @@ export function getChannelJoin (options: {includeAccount: booleanincludeAvatars: booleanincludeActors: boolean+ required: boolean}) {- const { base = '', on, includeAccount, includeAvatars, includeActors } = options+ const { base = '', on, includeAccount, includeAvatars, includeActors, required } = optionsconst accountJoin = includeAccount? getAccountJoin({base: `${base}VideoChannel->`,on: `"${base}VideoChannel"."accountId"`,includeAvatars,- includeActor: includeActors+ includeActor: includeActors,+ required}): ''const actorJoin = includeActors- ? getActorJoin({ base: `${base}VideoChannel->`, on: `"${base}VideoChannel"."actorId"`, includeAvatars })+ ? getActorJoin({ base: `${base}VideoChannel->`, on: `"${base}VideoChannel"."actorId"`, includeAvatars, required }): ''- return ` LEFT JOIN "videoChannel" "${base}VideoChannel" ON "${base}VideoChannel"."id" = ${on} ` ++ const join = required+ ? 'INNER JOIN'+ : 'LEFT JOIN'++ return ` ${join} "videoChannel" "${base}VideoChannel" ON "${base}VideoChannel"."id" = ${on} ` +actorJoin +accountJoin}@@ -49,11 +60,12 @@ export function getAccountJoin (options: {on: stringincludeAvatars: booleanincludeActor: boolean+ required: boolean}) {- const { base = '', on, includeAvatars, includeActor } = options+ const { base = '', on, includeAvatars, includeActor, required } = optionsconst actorJoin = includeActor- ? getActorJoin({ base: `${base}Account->`, on: `"${base}Account"."actorId"`, includeAvatars })+ ? getActorJoin({ base: `${base}Account->`, on: `"${base}Account"."actorId"`, includeAvatars, required }): ''return ` LEFT JOIN "account" "${base}Account" ON "${base}Account"."id" = ${on} ` +diff --git a/server/core/models/video/sql/comment/video-comment-list-query-builder.ts b/server/core/models/video/sql/comment/video-comment-list-query-builder.tsindex dfad1d22f9..604b475fa1 100644--- a/server/core/models/video/sql/comment/video-comment-list-query-builder.ts+++ b/server/core/models/video/sql/comment/video-comment-list-query-builder.ts@@ -227,7 +227,8 @@ export class VideoCommentListQueryBuilder extends AbstractListQuery {this.subQueryJoin += getAccountJoin({on: `"VideoCommentModel"."accountId"`,includeAvatars: false,- includeActor: false+ includeActor: false,+ required: false})this.builtAccountJoin = true@@ -239,7 +240,8 @@ export class VideoCommentListQueryBuilder extends AbstractListQuery {this.subQueryJoin += getActorJoin({base: 'Account->',on: `"Account"."actorId"`,- includeAvatars: false+ includeAvatars: false,+ required: false})this.builtAccountActorJoin = true@@ -248,7 +250,7 @@ export class VideoCommentListQueryBuilder extends AbstractListQuery {private buildVideoJoin () {if (this.builtVideoJoin) return- this.subQueryJoin += ' LEFT JOIN "video" "Video" ON "Video"."id" = "VideoCommentModel"."videoId" '+ this.subQueryJoin += ' INNER JOIN "video" "Video" ON "Video"."id" = "VideoCommentModel"."videoId" 'this.builtVideoJoin = true}@@ -263,7 +265,8 @@ export class VideoCommentListQueryBuilder extends AbstractListQuery {on: '"Video"."channelId"',includeAccount: false,includeAvatars: false,- includeActors: false+ includeActors: false,+ required: true})this.builtVideoChannelJoin = true@@ -275,7 +278,8 @@ export class VideoCommentListQueryBuilder extends AbstractListQuery {this.subQueryJoin += getActorJoin({base: 'Video->VideoChannel->',on: '"Video->VideoChannel"."actorId"',- includeAvatars: false+ includeAvatars: false,+ required: true})this.builtVideoChannelActorJoin = truediff --git a/server/core/models/video/sql/import/video-import-list-query-builder.ts b/server/core/models/video/sql/import/video-import-list-query-builder.tsindex c622fdac0f..ab035a89be 100644--- a/server/core/models/video/sql/import/video-import-list-query-builder.ts+++ b/server/core/models/video/sql/import/video-import-list-query-builder.ts@@ -110,7 +110,14 @@ export class VideoImportListQueryBuilder extends AbstractListQuery {if (this.builtVideoJoin) returnthis.subQueryJoin += ` LEFT JOIN "video" "Video" ON "Video"."id" = "VideoImportModel"."videoId" ` +- getChannelJoin({ base: 'Video->', on: '"Video"."channelId"', includeAccount: true, includeActors: true, includeAvatars: false })+ getChannelJoin({+ base: 'Video->',+ on: '"Video"."channelId"',+ includeAccount: true,+ includeActors: true,+ includeAvatars: false,+ required: false+ })this.builtVideoJoin = true}diff --git a/server/core/models/video/sql/video-channel-sync/video-channel-sync-list-query-builder.ts b/server/core/models/video/sql/video-channel-sync/video-channel-sync-list-query-builder.tsindex d83172f9e4..15370c7fdf 100644--- a/server/core/models/video/sql/video-channel-sync/video-channel-sync-list-query-builder.ts+++ b/server/core/models/video/sql/video-channel-sync/video-channel-sync-list-query-builder.ts@@ -60,7 +60,8 @@ export class VideoChannelSyncListQueryBuilder extends AbstractListQuery {on: `"VideoChannelSyncModel"."videoChannelId"`,includeAccount: false,includeAvatars: false,- includeActors: true+ includeActors: true,+ required: true})this.builtChannelJoin = true}