1 files changed, 0 insertions, 172 deletions
diff --git a/server/lib/activitypub/send/send-undo.ts b/server/lib/activitypub/send/send-undo.ts
deleted file mode 100644
index b0b48c9c4..000000000
--- a/server/lib/activitypub/send/send-undo.ts
+++ /dev/null
@@ -1,172 +0,0 @@
-import { Transaction } from 'sequelize'
-import { ActivityAudience, ActivityDislike, ActivityLike, ActivityUndo, ActivityUndoObject, ContextType } from '@shared/models'
-import { logger } from '../../../helpers/logger'
-import { VideoModel } from '../../../models/video/video'
-import {
-  MActor,
-  MActorAudience,
-  MActorFollowActors,
-  MActorLight,
-  MVideo,
-  MVideoAccountLight,
-  MVideoRedundancyVideo,
-  MVideoShare
-} 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, sendVideoActivityToOrigin, sendVideoRelatedActivity, unicastTo } from './shared/send-utils'
-function sendUndoFollow (actorFollow: MActorFollowActors, t: Transaction) {
-  const me = actorFollow.ActorFollower
-  const following = actorFollow.ActorFollowing
-  // Same server as ours
-  if (!following.serverId) return
-  logger.info('Creating job to send an unfollow request to %s.', following.url)
-  const undoUrl = getUndoActivityPubUrl(actorFollow.url)
-  const followActivity = buildFollowActivity(actorFollow.url, me, following)
-  const undoActivity = undoActivityData(undoUrl, me, followActivity)
-  t.afterCommit(() => {
-    return unicastTo({
-      data: undoActivity,
-      byActor: me,
-      toActorUrl: following.inboxUrl,
-      contextType: 'Follow'
-    })
-  })
-}
-// ---------------------------------------------------------------------------
-async function sendUndoAnnounce (byActor: MActorLight, videoShare: MVideoShare, video: MVideo, transaction: Transaction) {
-  logger.info('Creating job to undo announce %s.', videoShare.url)
-  const undoUrl = getUndoActivityPubUrl(videoShare.url)
-  const { activity: announce, actorsInvolvedInVideo } = await buildAnnounceWithVideoAudience(byActor, videoShare, video, transaction)
-  const undoActivity = undoActivityData(undoUrl, byActor, announce)
-  return broadcastToFollowers({
-    data: undoActivity,
-    byActor,
-    toFollowersOf: actorsInvolvedInVideo,
-    transaction,
-    actorsException: [ byActor ],
-    contextType: 'Announce'
-  })
-}
-async function sendUndoCacheFile (byActor: MActor, redundancyModel: MVideoRedundancyVideo, transaction: Transaction) {
-  logger.info('Creating job to undo cache file %s.', redundancyModel.url)
-  const associatedVideo = redundancyModel.getVideo()
-  if (!associatedVideo) {
-    logger.warn('Cannot send undo activity for redundancy %s: no video files associated.', redundancyModel.url)
-    return
-  }
-  const video = await VideoModel.loadFull(associatedVideo.id)
-  const createActivity = buildCreateActivity(redundancyModel.url, byActor, redundancyModel.toActivityPubObject())
-  return sendUndoVideoRelatedActivity({
-    byActor,
-    video,
-    url: redundancyModel.url,
-    activity: createActivity,
-    contextType: 'CacheFile',
-    transaction
-  })
-}
-// ---------------------------------------------------------------------------
-async function sendUndoLike (byActor: MActor, video: MVideoAccountLight, t: Transaction) {
-  logger.info('Creating job to undo a like of video %s.', video.url)
-  const likeUrl = getVideoLikeActivityPubUrlByLocalActor(byActor, video)
-  const likeActivity = buildLikeActivity(likeUrl, byActor, video)
-  return sendUndoVideoRateToOriginActivity({ 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 = getVideoDislikeActivityPubUrlByLocalActor(byActor, video)
-  const dislikeActivity = buildDislikeActivity(dislikeUrl, byActor, video)
-  return sendUndoVideoRateToOriginActivity({ byActor, video, url: dislikeUrl, activity: dislikeActivity, transaction: t })
-}
-// ---------------------------------------------------------------------------
-export {
-  sendUndoFollow,
-  sendUndoLike,
-  sendUndoDislike,
-  sendUndoAnnounce,
-  sendUndoCacheFile
-}
-// ---------------------------------------------------------------------------
-function undoActivityData <T extends ActivityUndoObject> (
-  url: string,
-  byActor: MActorAudience,
-  object: T,
-  audience?: ActivityAudience
-): ActivityUndo<T> {
-  if (!audience) audience = getAudience(byActor)
-  return audiencify(
-    {
-      type: 'Undo' as 'Undo',
-      id: url,
-      actor: byActor.url,
-      object
-    },
-    audience
-  )
-}
-async function sendUndoVideoRelatedActivity (options: {
-  byActor: MActor
-  video: MVideoAccountLight
-  url: string
-  activity: ActivityUndoObject
-  contextType: ContextType
-  transaction: Transaction
-}) {
-  const activityBuilder = (audience: ActivityAudience) => {
-    const undoUrl = getUndoActivityPubUrl(options.url)
-    return undoActivityData(undoUrl, options.byActor, options.activity, audience)
-  }
-  return sendVideoRelatedActivity(activityBuilder, options)
-}
-async function sendUndoVideoRateToOriginActivity (options: {
-  byActor: MActor
-  video: MVideoAccountLight
-  url: string
-  activity: ActivityLike | ActivityDislike
-  transaction: Transaction
-}) {
-  const activityBuilder = (audience: ActivityAudience) => {
-    const undoUrl = getUndoActivityPubUrl(options.url)
-    return undoActivityData(undoUrl, options.byActor, options.activity, audience)
-  }
-  return sendVideoActivityToOrigin(activityBuilder, { ...options, contextType: 'Rate' })
-}

diff --git a/server/lib/activitypub/send/send-undo.ts b/server/lib/activitypub/send/send-undo.ts deleted file mode 100644 index b0b48c9c4..000000000 --- a/server/lib/activitypub/send/send-undo.ts +++ /dev/null
@@ -1,172 +0,0 @@
1	import { Transaction } from 'sequelize'
2	import { ActivityAudience, ActivityDislike, ActivityLike, ActivityUndo, ActivityUndoObject, ContextType } from '@shared/models'
3	import { logger } from '../../../helpers/logger'
4	import { VideoModel } from '../../../models/video/video'
5	import {
6	MActor,
7	MActorAudience,
8	MActorFollowActors,
9	MActorLight,
10	MVideo,
11	MVideoAccountLight,
12	MVideoRedundancyVideo,
13	MVideoShare
14	} from '../../../types/models'
15	import { audiencify, getAudience } from '../audience'
16	import { getUndoActivityPubUrl, getVideoDislikeActivityPubUrlByLocalActor, getVideoLikeActivityPubUrlByLocalActor } from '../url'
17	import { buildAnnounceWithVideoAudience } from './send-announce'
18	import { buildCreateActivity } from './send-create'
19	import { buildDislikeActivity } from './send-dislike'
20	import { buildFollowActivity } from './send-follow'
21	import { buildLikeActivity } from './send-like'
22	import { broadcastToFollowers, sendVideoActivityToOrigin, sendVideoRelatedActivity, unicastTo } from './shared/send-utils'
23
24	function sendUndoFollow (actorFollow: MActorFollowActors, t: Transaction) {
25	const me = actorFollow.ActorFollower
26	const following = actorFollow.ActorFollowing
27
28	// Same server as ours
29	if (!following.serverId) return
30
31	logger.info('Creating job to send an unfollow request to %s.', following.url)
32
33	const undoUrl = getUndoActivityPubUrl(actorFollow.url)
34
35	const followActivity = buildFollowActivity(actorFollow.url, me, following)
36	const undoActivity = undoActivityData(undoUrl, me, followActivity)
37
38	t.afterCommit(() => {
39	return unicastTo({
40	data: undoActivity,
41	byActor: me,
42	toActorUrl: following.inboxUrl,
43	contextType: 'Follow'
44	})
45	})
46	}
47
48	// ---------------------------------------------------------------------------
49
50	async function sendUndoAnnounce (byActor: MActorLight, videoShare: MVideoShare, video: MVideo, transaction: Transaction) {
51	logger.info('Creating job to undo announce %s.', videoShare.url)
52
53	const undoUrl = getUndoActivityPubUrl(videoShare.url)
54
55	const { activity: announce, actorsInvolvedInVideo } = await buildAnnounceWithVideoAudience(byActor, videoShare, video, transaction)
56	const undoActivity = undoActivityData(undoUrl, byActor, announce)
57
58	return broadcastToFollowers({
59	data: undoActivity,
60	byActor,
61	toFollowersOf: actorsInvolvedInVideo,
62	transaction,
63	actorsException: [ byActor ],
64	contextType: 'Announce'
65	})
66	}
67
68	async function sendUndoCacheFile (byActor: MActor, redundancyModel: MVideoRedundancyVideo, transaction: Transaction) {
69	logger.info('Creating job to undo cache file %s.', redundancyModel.url)
70
71	const associatedVideo = redundancyModel.getVideo()
72	if (!associatedVideo) {
73	logger.warn('Cannot send undo activity for redundancy %s: no video files associated.', redundancyModel.url)
74	return
75	}
76
77	const video = await VideoModel.loadFull(associatedVideo.id)
78	const createActivity = buildCreateActivity(redundancyModel.url, byActor, redundancyModel.toActivityPubObject())
79
80	return sendUndoVideoRelatedActivity({
81	byActor,
82	video,
83	url: redundancyModel.url,
84	activity: createActivity,
85	contextType: 'CacheFile',
86	transaction
87	})
88	}
89
90	// ---------------------------------------------------------------------------
91
92	async function sendUndoLike (byActor: MActor, video: MVideoAccountLight, t: Transaction) {
93	logger.info('Creating job to undo a like of video %s.', video.url)
94
95	const likeUrl = getVideoLikeActivityPubUrlByLocalActor(byActor, video)
96	const likeActivity = buildLikeActivity(likeUrl, byActor, video)
97
98	return sendUndoVideoRateToOriginActivity({ byActor, video, url: likeUrl, activity: likeActivity, transaction: t })
99	}
100
101	async function sendUndoDislike (byActor: MActor, video: MVideoAccountLight, t: Transaction) {
102	logger.info('Creating job to undo a dislike of video %s.', video.url)
103
104	const dislikeUrl = getVideoDislikeActivityPubUrlByLocalActor(byActor, video)
105	const dislikeActivity = buildDislikeActivity(dislikeUrl, byActor, video)
106
107	return sendUndoVideoRateToOriginActivity({ byActor, video, url: dislikeUrl, activity: dislikeActivity, transaction: t })
108	}
109
110	// ---------------------------------------------------------------------------
111
112	export {
113	sendUndoFollow,
114	sendUndoLike,
115	sendUndoDislike,
116	sendUndoAnnounce,
117	sendUndoCacheFile
118	}
119
120	// ---------------------------------------------------------------------------
121
122	function undoActivityData <T extends ActivityUndoObject> (
123	url: string,
124	byActor: MActorAudience,
125	object: T,
126	audience?: ActivityAudience
127	): ActivityUndo<T> {
128	if (!audience) audience = getAudience(byActor)
129
130	return audiencify(
131	{
132	type: 'Undo' as 'Undo',
133	id: url,
134	actor: byActor.url,
135	object
136	},
137	audience
138	)
139	}
140
141	async function sendUndoVideoRelatedActivity (options: {
142	byActor: MActor
143	video: MVideoAccountLight
144	url: string
145	activity: ActivityUndoObject
146	contextType: ContextType
147	transaction: Transaction
148	}) {
149	const activityBuilder = (audience: ActivityAudience) => {
150	const undoUrl = getUndoActivityPubUrl(options.url)
151
152	return undoActivityData(undoUrl, options.byActor, options.activity, audience)
153	}
154
155	return sendVideoRelatedActivity(activityBuilder, options)
156	}
157
158	async function sendUndoVideoRateToOriginActivity (options: {
159	byActor: MActor
160	video: MVideoAccountLight
161	url: string
162	activity: ActivityLike \| ActivityDislike
163	transaction: Transaction
164	}) {
165	const activityBuilder = (audience: ActivityAudience) => {
166	const undoUrl = getUndoActivityPubUrl(options.url)
167
168	return undoActivityData(undoUrl, options.byActor, options.activity, audience)
169	}
170
171	return sendVideoActivityToOrigin(activityBuilder, { ...options, contextType: 'Rate' })
172	}