From 7acee6f18aac99e359360fc4f2362d5405135a79 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 26 Jan 2018 12:02:18 +0100 Subject: Fix announce activities --- server/lib/activitypub/send/send-announce.ts | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'server/lib/activitypub/send/send-announce.ts') diff --git a/server/lib/activitypub/send/send-announce.ts b/server/lib/activitypub/send/send-announce.ts index 93b5668d2..76cb3f80c 100644 --- a/server/lib/activitypub/send/send-announce.ts +++ b/server/lib/activitypub/send/send-announce.ts @@ -1,6 +1,5 @@ import { Transaction } from 'sequelize' -import { ActivityAnnounce, ActivityAudience, ActivityCreate } from '../../../../shared/models/activitypub' -import { VideoPrivacy } from '../../../../shared/models/videos' +import { ActivityAnnounce, ActivityAudience } from '../../../../shared/models/activitypub' import { ActorModel } from '../../../models/activitypub/actor' import { VideoModel } from '../../../models/video/video' import { getAnnounceActivityPubUrl } from '../url' @@ -16,14 +15,11 @@ import { createActivityData } from './send-create' async function buildVideoAnnounceToFollowers (byActor: ActorModel, video: VideoModel, t: Transaction) { const url = getAnnounceActivityPubUrl(video.url, byActor) - const videoObject = video.toActivityPubObject() - - const announcedAudience = await getAudience(byActor, t, video.privacy === VideoPrivacy.PUBLIC) - const announcedActivity = await createActivityData(url, video.VideoChannel.Account.Actor, videoObject, t, announcedAudience) + const announcedObject = video.url const accountsToForwardView = await getActorsInvolvedInVideo(video, t) const audience = getObjectFollowersAudience(accountsToForwardView) - return announceActivityData(url, byActor, announcedActivity, t, audience) + return announceActivityData(url, byActor, announcedObject, t, audience) } async function sendVideoAnnounceToFollowers (byActor: ActorModel, video: VideoModel, t: Transaction) { @@ -48,7 +44,7 @@ async function sendVideoAnnounceToOrigin (byActor: ActorModel, video: VideoModel async function announceActivityData ( url: string, byActor: ActorModel, - object: ActivityCreate, + object: string, t: Transaction, audience?: ActivityAudience ): Promise { -- cgit v1.2.3