} from '../../models'
import { httpRequestJobScheduler } from '../jobs'
import { signObject, activityPubContextify } from '../../helpers'
-import { Activity } from '../../../shared'
+import { Activity, VideoAbuseObject } from '../../../shared'
import { VideoAbuseInstance } from '../../models/video/video-abuse-interface'
import { getActivityPubUrl } from '../../helpers/activitypub'
import { logger } from '../../helpers/logger'
const videoChannelObject = videoChannel.toActivityPubObject()
const data = await updateActivityData(videoChannel.url, videoChannel.Account, videoChannelObject)
- return broadcastToFollowers(data, [ videoChannel.Account ], t)
+ const accountsInvolved = await db.VideoChannelShare.loadAccountsByShare(videoChannel.id)
+ accountsInvolved.push(videoChannel.Account)
+
+ return broadcastToFollowers(data, accountsInvolved, t)
}
async function sendDeleteVideoChannel (videoChannel: VideoChannelInstance, t: Sequelize.Transaction) {
const data = await deleteActivityData(videoChannel.url, videoChannel.Account)
- return broadcastToFollowers(data, [ videoChannel.Account ], t)
+ const accountsInvolved = await db.VideoChannelShare.loadAccountsByShare(videoChannel.id)
+ accountsInvolved.push(videoChannel.Account)
+
+ return broadcastToFollowers(data, accountsInvolved, t)
}
async function sendAddVideo (video: VideoInstance, t: Sequelize.Transaction) {
const videoObject = video.toActivityPubObject()
const data = await updateActivityData(video.url, video.VideoChannel.Account, videoObject)
- return broadcastToFollowers(data, [ video.VideoChannel.Account ], t)
+ const accountsInvolved = await db.VideoShare.loadAccountsByShare(video.id)
+ accountsInvolved.push(video.VideoChannel.Account)
+
+ return broadcastToFollowers(data, accountsInvolved, t)
}
async function sendDeleteVideo (video: VideoInstance, t: Sequelize.Transaction) {
const data = await deleteActivityData(video.url, video.VideoChannel.Account)
- return broadcastToFollowers(data, [ video.VideoChannel.Account ], t)
+ const accountsInvolved = await db.VideoShare.loadAccountsByShare(video.id)
+ accountsInvolved.push(video.VideoChannel.Account)
+
+ return broadcastToFollowers(data, accountsInvolved, t)
}
async function sendDeleteAccount (account: AccountInstance, t: Sequelize.Transaction) {
return broadcastToFollowers(data, [ account ], t)
}
-async function sendAnnounce (byAccount: AccountInstance, instance: VideoInstance | VideoChannelInstance, t: Sequelize.Transaction) {
- const object = instance.toActivityPubObject()
+async function sendVideoChannelAnnounce (byAccount: AccountInstance, videoChannel: VideoChannelInstance, t: Sequelize.Transaction) {
+ const url = getActivityPubUrl('videoChannel', videoChannel.uuid) + '#announce'
+ const announcedActivity = await createActivityData(url, videoChannel.Account, videoChannel.toActivityPubObject(), true)
- let url = ''
- let objectActorUrl: string
- if ((instance as any).VideoChannel !== undefined) {
- objectActorUrl = (instance as VideoInstance).VideoChannel.Account.url
- url = getActivityPubUrl('video', instance.uuid) + '#announce'
- } else {
- objectActorUrl = (instance as VideoChannelInstance).Account.url
- url = getActivityPubUrl('videoChannel', instance.uuid) + '#announce'
- }
+ const data = await announceActivityData(url, byAccount, announcedActivity)
+ return broadcastToFollowers(data, [ byAccount ], t)
+}
- const objectWithActor = Object.assign(object, {
- actor: objectActorUrl
- })
+async function sendVideoAnnounce (byAccount: AccountInstance, video: VideoInstance, t: Sequelize.Transaction) {
+ const url = getActivityPubUrl('video', video.uuid) + '#announce'
- const data = await announceActivityData(url, byAccount, objectWithActor)
+ const videoChannel = video.VideoChannel
+ const announcedActivity = await addActivityData(url, videoChannel.Account, videoChannel.url, video.toActivityPubObject(), true)
+
+ const data = await announceActivityData(url, byAccount, announcedActivity)
return broadcastToFollowers(data, [ byAccount ], t)
}
t: Sequelize.Transaction
) {
const url = getActivityPubUrl('videoAbuse', videoAbuse.id.toString())
- const data = await createActivityData(url, fromAccount, video.url)
+ const data = await createActivityData(url, fromAccount, videoAbuse.toActivityPubObject())
return unicastTo(data, video.VideoChannel.Account.sharedInboxUrl, t)
}
sendAccept,
sendFollow,
sendVideoAbuse,
- sendAnnounce
+ sendVideoChannelAnnounce,
+ sendVideoAnnounce
}
// ---------------------------------------------------------------------------
return inboxUrls.concat('https://www.w3.org/ns/activitystreams#Public')
}
-async function createActivityData (url: string, byAccount: AccountInstance, object: any) {
+async function createActivityData (url: string, byAccount: AccountInstance, object: any, raw = false) {
const to = await getPublicActivityTo(byAccount)
const base = {
type: 'Create',
object
}
+ if (raw === true) return base
+
return buildSignedActivity(byAccount, base)
}
return buildSignedActivity(byAccount, base)
}
-async function addActivityData (url: string, byAccount: AccountInstance, target: string, object: any) {
+async function addActivityData (url: string, byAccount: AccountInstance, target: string, object: any, raw = false) {
const to = await getPublicActivityTo(byAccount)
const base = {
type: 'Add',
target
}
+ if (raw === true) return base
+
return buildSignedActivity(byAccount, base)
}