yetangitu/Peertube
1
0
Fork 0
mirror of https://github.com/Chocobozzz/PeerTube.git synced 2025-10-05 02:39:33 +02:00
Code Issues Releases Wiki Activity

Fix delete activities

Browse source
This commit is contained in:
Chocobozzz 2018-01-04 16:56:36 +01:00
parent bb82394c0d
commit c3badc81fe
No known key found for this signature in database
GPG key ID: 583A612D890159BE
4 changed files with 21 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

17
server/lib/activitypub/send/send-delete.ts
View file

@ -4,12 +4,14 @@ import { ActorModel } from '../../../models/activitypub/actor'
import { VideoModel } from '../../../models/video/video'
import { VideoCommentModel } from '../../../models/video/video-comment'
import { VideoShareModel } from '../../../models/video/video-share'
import { getDeleteActivityPubUrl } from '../url'
import { broadcastToFollowers } from './misc'
async function sendDeleteVideo (video: VideoModel, t: Transaction) {
const url = getDeleteActivityPubUrl(video.url)
const byActor = video.VideoChannel.Account.Actor
const data = deleteActivityData(video.url, byActor)
const data = deleteActivityData(url, video.url, byActor)
const actorsInvolved = await VideoShareModel.loadActorsByShare(video.id, t)
actorsInvolved.push(byActor)
@ -18,15 +20,17 @@ async function sendDeleteVideo (video: VideoModel, t: Transaction) {
}
async function sendDeleteActor (byActor: ActorModel, t: Transaction) {
const data = deleteActivityData(byActor.url, byActor)
const url = getDeleteActivityPubUrl(byActor.url)
const data = deleteActivityData(url, byActor.url, byActor)
return broadcastToFollowers(data, byActor, [ byActor ], t)
}
async function sendDeleteVideoComment (videoComment: VideoCommentModel, t: Transaction) {
const byActor = videoComment.Account.Actor
const url = getDeleteActivityPubUrl(videoComment.url)
const data = deleteActivityData(videoComment.url, byActor)
const byActor = videoComment.Account.Actor
const data = deleteActivityData(url, videoComment.url, byActor)
const actorsInvolved = await VideoShareModel.loadActorsByShare(videoComment.Video.id, t)
actorsInvolved.push(videoComment.Video.VideoChannel.Account.Actor)
@ -45,10 +49,11 @@ export {
// ---------------------------------------------------------------------------
function deleteActivityData (url: string, byActor: ActorModel): ActivityDelete {
function deleteActivityData (url: string, object: string, byActor: ActorModel): ActivityDelete {
return {
type: 'Delete',
id: url,
actor: byActor.url
actor: byActor.url,
object
}
}