ActivityLike,
ActivityUndo
} from '../../../../shared/models/activitypub'
-import { VideoModel } from '../../../models/video/video'
-import { getActorFollowActivityPubUrl, getUndoActivityPubUrl, getVideoDislikeActivityPubUrl, getVideoLikeActivityPubUrl } from '../url'
-import { broadcastToFollowers, sendVideoRelatedActivity, unicastTo } from './utils'
-import { audiencify, getAudience } from '../audience'
-import { buildCreateActivity } from './send-create'
-import { buildFollowActivity } from './send-follow'
-import { buildLikeActivity } from './send-like'
-import { buildAnnounceWithVideoAudience } from './send-announce'
import { logger } from '../../../helpers/logger'
-import { buildDislikeActivity } from './send-dislike'
+import { VideoModel } from '../../../models/video/video'
import {
- MActor, MActorAudience,
+ MActor,
+ MActorAudience,
MActorFollowActors,
MActorLight,
MVideo,
MVideoAccountLight,
MVideoRedundancyVideo,
MVideoShare
-} from '../../../typings/models'
+} from '../../../types/models'
+import { audiencify, getAudience } from '../audience'
+import { getUndoActivityPubUrl, getVideoDislikeActivityPubUrlByLocalActor, getVideoLikeActivityPubUrlByLocalActor } from '../url'
+import { buildAnnounceWithVideoAudience } from './send-announce'
+import { buildCreateActivity } from './send-create'
+import { buildDislikeActivity } from './send-dislike'
+import { buildFollowActivity } from './send-follow'
+import { buildLikeActivity } from './send-like'
+import { broadcastToFollowers, sendVideoRelatedActivity, unicastTo } from './utils'
function sendUndoFollow (actorFollow: MActorFollowActors, t: Transaction) {
const me = actorFollow.ActorFollower
logger.info('Creating job to send an unfollow request to %s.', following.url)
- const followUrl = getActorFollowActivityPubUrl(me, following)
- const undoUrl = getUndoActivityPubUrl(followUrl)
+ const undoUrl = getUndoActivityPubUrl(actorFollow.url)
- const followActivity = buildFollowActivity(followUrl, me, following)
+ const followActivity = buildFollowActivity(actorFollow.url, me, following)
const undoActivity = undoActivityData(undoUrl, me, followActivity)
t.afterCommit(() => unicastTo(undoActivity, me, following.inboxUrl))
async function sendUndoLike (byActor: MActor, video: MVideoAccountLight, t: Transaction) {
logger.info('Creating job to undo a like of video %s.', video.url)
- const likeUrl = getVideoLikeActivityPubUrl(byActor, video)
+ const likeUrl = getVideoLikeActivityPubUrlByLocalActor(byActor, video)
const likeActivity = buildLikeActivity(likeUrl, byActor, video)
return sendUndoVideoRelatedActivity({ byActor, video, url: likeUrl, activity: likeActivity, transaction: t })
async function sendUndoDislike (byActor: MActor, video: MVideoAccountLight, t: Transaction) {
logger.info('Creating job to undo a dislike of video %s.', video.url)
- const dislikeUrl = getVideoDislikeActivityPubUrl(byActor, video)
+ const dislikeUrl = getVideoDislikeActivityPubUrlByLocalActor(byActor, video)
const dislikeActivity = buildDislikeActivity(dislikeUrl, byActor, video)
return sendUndoVideoRelatedActivity({ byActor, video, url: dislikeUrl, activity: dislikeActivity, transaction: t })