forks
/
peertube
1
0
Fork 0
Code Releases Activity

Fix undo like/dislike forwarding

This commit is contained in:
Chocobozzz 2017-11-28 08:45:03 +01:00
parent a2431b7dcb
commit 5e3bb76cb6
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
server/lib/activitypub/send/send-undo.ts
View File

@ -10,7 +10,14 @@ import { AccountInstance } from '../../../models'
import { AccountFollowInstance } from '../../../models/account/account-follow-interface'
import { VideoInstance } from '../../../models/video/video-interface'
import { getAccountFollowActivityPubUrl, getUndoActivityPubUrl, getVideoDislikeActivityPubUrl, getVideoLikeActivityPubUrl } from '../url'
import { broadcastToFollowers, getAccountsInvolvedInVideo, getAudience, getObjectFollowersAudience, unicastTo } from './misc'
import {
broadcastToFollowers,
getAccountsInvolvedInVideo,
getAudience,
getObjectFollowersAudience,
getOriginVideoAudience,
unicastTo
} from './misc'
import { createActivityData, createDislikeActivityData } from './send-create'
import { followActivityData } from './send-follow'
import { likeActivityData } from './send-like'
@ -32,8 +39,10 @@ async function sendUndoLikeToOrigin (byAccount: AccountInstance, video: VideoIns
const likeUrl = getVideoLikeActivityPubUrl(byAccount, video)
const undoUrl = getUndoActivityPubUrl(likeUrl)
const accountsInvolvedInVideo = await getAccountsInvolvedInVideo(video)
const audience = getOriginVideoAudience(video, accountsInvolvedInVideo)
const object = await likeActivityData(likeUrl, byAccount, video)
const data = await undoActivityData(undoUrl, byAccount, object)
const data = await undoActivityData(undoUrl, byAccount, object, audience)
return unicastTo(data, byAccount, video.VideoChannel.Account.sharedInboxUrl, t)
}
@ -55,8 +64,10 @@ async function sendUndoDislikeToOrigin (byAccount: AccountInstance, video: Video
const dislikeUrl = getVideoDislikeActivityPubUrl(byAccount, video)
const undoUrl = getUndoActivityPubUrl(dislikeUrl)
const accountsInvolvedInVideo = await getAccountsInvolvedInVideo(video)
const audience = getOriginVideoAudience(video, accountsInvolvedInVideo)
const dislikeActivity = createDislikeActivityData(byAccount, video)
const object = await createActivityData(undoUrl, byAccount, dislikeActivity)
const object = await createActivityData(undoUrl, byAccount, dislikeActivity, audience)
const data = await undoActivityData(undoUrl, byAccount, object)

2
server/tests/api/video-transcoder.ts
View File

@ -67,7 +67,7 @@ describe('Test video transcoding', function () {
}
await uploadVideo(servers[1].url, servers[1].accessToken, videoAttributes)
await wait(10000)
await wait(20000)
const res = await getVideosList(servers[1].url)