ActivityPub-federated video streaming platform using P2P directly in your web browser
Fix delete federation, again
Chocobozzz1e35d94793be
diff --git a/server/core/lib/activitypub/send/send-delete.ts b/server/core/lib/activitypub/send/send-delete.tsindex 267153725f..043dd71b5b 100644--- a/server/core/lib/activitypub/send/send-delete.ts+++ b/server/core/lib/activitypub/send/send-delete.ts@@ -11,7 +11,6 @@ import { MActorUrl } from '../../../types/models/index.js'import { MCommentOwnerVideo, MVideoAccountLight, MVideoPlaylistFullSummary } from '../../../types/models/video/index.js'import { audiencify, getCommentAudience } from '../audience.js'import { getDeleteActivityPubUrl } from '../url.js'-import { isPrivacyForFederation } from '../videos/federate.js'import {broadcastToActors,broadcastToFollowers,@@ -20,8 +19,12 @@ import {unicastTo} from './shared/send-utils.js'-async function sendDeleteVideo (video: MVideoAccountLight, transaction: Transaction) {- if (isPrivacyForFederation(video.privacy) === false) return+async function sendDeleteVideo (options: {+ video: MVideoAccountLight+ transaction: Transaction+ deleteForPrivacyChange?: boolean // default false+}) {+ const { video, transaction, deleteForPrivacyChange = false } = optionslogger.info('Creating job to broadcast delete of video %s.', video.url)@@ -33,7 +36,13 @@ async function sendDeleteVideo (video: MVideoAccountLight, transaction: Transactreturn buildDeleteActivity(url, video.url, byActor, audience)}- return sendVideoRelatedActivity(activityBuilder, { byActor, video, contextType: 'Delete', transaction })+ return sendVideoRelatedActivity(activityBuilder, {+ byActor,+ video,+ contextType: 'Delete',+ transaction,+ skipPrivacyCheck: deleteForPrivacyChange+ })}async function sendDeleteActor (byActor: ActorModel, transaction: Transaction) {diff --git a/server/core/lib/activitypub/send/shared/send-utils.ts b/server/core/lib/activitypub/send/shared/send-utils.tsindex c5f1b9d213..11dd5f93e3 100644--- a/server/core/lib/activitypub/send/shared/send-utils.ts+++ b/server/core/lib/activitypub/send/shared/send-utils.ts@@ -26,8 +26,9 @@ async function sendVideoRelatedActivity (activityBuilder: (audience: ActivityAudcontextType: ContextTypeparallelizable?: booleantransaction?: Transaction+ skipPrivacyCheck?: boolean}) {- const { byActor, transaction, contextType, parallelizable } = options+ const { byActor, transaction, contextType, parallelizable, skipPrivacyCheck } = options// Send to originif (options.video.isLocal() === false) {@@ -37,8 +38,12 @@ async function sendVideoRelatedActivity (activityBuilder: (audience: ActivityAudconst video = await VideoModel.loadByUrlAndPopulateAccount(options.video.url, transaction)const actorsInvolvedInVideo = await getActorsInvolvedInVideo(video, transaction)- // Send to followers- const audience = getVideoAudience({ account: video.VideoChannel.Account, channel: video.VideoChannel, privacy: video.privacy })+ const audience = getVideoAudience({+ account: video.VideoChannel.Account,+ channel: video.VideoChannel,+ privacy: video.privacy,+ skipPrivacyCheck+ })const activity = activityBuilder(audience)const actorsException = [ byActor ]diff --git a/server/core/models/video/video.ts b/server/core/models/video/video.tsindex c6a34394d7..2cc4460b0b 100644--- a/server/core/models/video/video.ts+++ b/server/core/models/video/video.ts@@ -22,6 +22,7 @@ import {} from '@peertube/peertube-models'import { uuidToShort } from '@peertube/peertube-node-utils'import { getPrivaciesForFederation } from '@server/helpers/video.js'+import { isPrivacyForFederation } from '@server/lib/activitypub/videos/federate.js'import { InternalEventEmitter } from '@server/lib/internal-event-emitter.js'import { LiveManager } from '@server/lib/live/live-manager.js'import {@@ -830,6 +831,7 @@ export class VideoModel extends SequelizeModel<VideoModel> {@BeforeDestroystatic async sendDelete (instance: MVideoAccountLight, options: { transaction: Transaction }) {if (!instance.isLocal()) return undefined+ if (!isPrivacyForFederation(instance.privacy)) return undefined// Lazy load channelsif (!instance.VideoChannel?.Account?.Actor) {@@ -842,7 +844,7 @@ export class VideoModel extends SequelizeModel<VideoModel> {}) as MChannelAccountDefault}- return sendDeleteVideo(instance, options.transaction)+ return sendDeleteVideo({ video: instance, transaction: options.transaction })}@BeforeDestroy