diff options
Diffstat (limited to 'server/lib/activitypub/process/process-undo.ts')
-rw-r--r-- | server/lib/activitypub/process/process-undo.ts | 44 |
1 files changed, 39 insertions, 5 deletions
diff --git a/server/lib/activitypub/process/process-undo.ts b/server/lib/activitypub/process/process-undo.ts index 1c1de8827..0eb5fa392 100644 --- a/server/lib/activitypub/process/process-undo.ts +++ b/server/lib/activitypub/process/process-undo.ts | |||
@@ -1,4 +1,4 @@ | |||
1 | import { ActivityAnnounce, ActivityFollow, ActivityLike, ActivityUndo } from '../../../../shared/models/activitypub' | 1 | import { ActivityAnnounce, ActivityFollow, ActivityLike, ActivityUndo, CacheFileObject } from '../../../../shared/models/activitypub' |
2 | import { DislikeObject } from '../../../../shared/models/activitypub/objects' | 2 | import { DislikeObject } from '../../../../shared/models/activitypub/objects' |
3 | import { getActorUrl } from '../../../helpers/activitypub' | 3 | import { getActorUrl } from '../../../helpers/activitypub' |
4 | import { retryTransactionWrapper } from '../../../helpers/database-utils' | 4 | import { retryTransactionWrapper } from '../../../helpers/database-utils' |
@@ -11,6 +11,7 @@ import { ActorFollowModel } from '../../../models/activitypub/actor-follow' | |||
11 | import { forwardVideoRelatedActivity } from '../send/utils' | 11 | import { forwardVideoRelatedActivity } from '../send/utils' |
12 | import { getOrCreateVideoAndAccountAndChannel } from '../videos' | 12 | import { getOrCreateVideoAndAccountAndChannel } from '../videos' |
13 | import { VideoShareModel } from '../../../models/video/video-share' | 13 | import { VideoShareModel } from '../../../models/video/video-share' |
14 | import { VideoRedundancyModel } from '../../../models/redundancy/video-redundancy' | ||
14 | 15 | ||
15 | async function processUndoActivity (activity: ActivityUndo) { | 16 | async function processUndoActivity (activity: ActivityUndo) { |
16 | const activityToUndo = activity.object | 17 | const activityToUndo = activity.object |
@@ -19,11 +20,21 @@ async function processUndoActivity (activity: ActivityUndo) { | |||
19 | 20 | ||
20 | if (activityToUndo.type === 'Like') { | 21 | if (activityToUndo.type === 'Like') { |
21 | return retryTransactionWrapper(processUndoLike, actorUrl, activity) | 22 | return retryTransactionWrapper(processUndoLike, actorUrl, activity) |
22 | } else if (activityToUndo.type === 'Create' && activityToUndo.object.type === 'Dislike') { | 23 | } |
23 | return retryTransactionWrapper(processUndoDislike, actorUrl, activity) | 24 | |
24 | } else if (activityToUndo.type === 'Follow') { | 25 | if (activityToUndo.type === 'Create') { |
26 | if (activityToUndo.object.type === 'Dislike') { | ||
27 | return retryTransactionWrapper(processUndoDislike, actorUrl, activity) | ||
28 | } else if (activityToUndo.object.type === 'CacheFile') { | ||
29 | return retryTransactionWrapper(processUndoCacheFile, actorUrl, activity) | ||
30 | } | ||
31 | } | ||
32 | |||
33 | if (activityToUndo.type === 'Follow') { | ||
25 | return retryTransactionWrapper(processUndoFollow, actorUrl, activityToUndo) | 34 | return retryTransactionWrapper(processUndoFollow, actorUrl, activityToUndo) |
26 | } else if (activityToUndo.type === 'Announce') { | 35 | } |
36 | |||
37 | if (activityToUndo.type === 'Announce') { | ||
27 | return retryTransactionWrapper(processUndoAnnounce, actorUrl, activityToUndo) | 38 | return retryTransactionWrapper(processUndoAnnounce, actorUrl, activityToUndo) |
28 | } | 39 | } |
29 | 40 | ||
@@ -88,6 +99,29 @@ async function processUndoDislike (actorUrl: string, activity: ActivityUndo) { | |||
88 | }) | 99 | }) |
89 | } | 100 | } |
90 | 101 | ||
102 | async function processUndoCacheFile (actorUrl: string, activity: ActivityUndo) { | ||
103 | const cacheFileObject = activity.object.object as CacheFileObject | ||
104 | |||
105 | const { video } = await getOrCreateVideoAndAccountAndChannel(cacheFileObject.object) | ||
106 | |||
107 | return sequelizeTypescript.transaction(async t => { | ||
108 | const byActor = await ActorModel.loadByUrl(actorUrl) | ||
109 | if (!byActor) throw new Error('Unknown actor ' + actorUrl) | ||
110 | |||
111 | const cacheFile = await VideoRedundancyModel.loadByUrl(cacheFileObject.id) | ||
112 | if (!cacheFile) throw new Error('Unknown video cache ' + cacheFile.url) | ||
113 | |||
114 | await cacheFile.destroy() | ||
115 | |||
116 | if (video.isOwned()) { | ||
117 | // Don't resend the activity to the sender | ||
118 | const exceptions = [ byActor ] | ||
119 | |||
120 | await forwardVideoRelatedActivity(activity, t, exceptions, video) | ||
121 | } | ||
122 | }) | ||
123 | } | ||
124 | |||
91 | function processUndoFollow (actorUrl: string, followActivity: ActivityFollow) { | 125 | function processUndoFollow (actorUrl: string, followActivity: ActivityFollow) { |
92 | return sequelizeTypescript.transaction(async t => { | 126 | return sequelizeTypescript.transaction(async t => { |
93 | const follower = await ActorModel.loadByUrl(actorUrl, t) | 127 | const follower = await ActorModel.loadByUrl(actorUrl, t) |