diff options
author | Chocobozzz <me@florianbigard.com> | 2018-10-02 14:39:35 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2018-10-02 14:40:03 +0200 |
commit | b88a459664957d6ab9c417a6749b611e6cc6c0e2 (patch) | |
tree | 182ff8c00155cbdaba3f0c054ae944b2f282b7ab /server/lib/activitypub/process/process-update.ts | |
parent | 278711b595aaaa6c3f77c160cc41b1b48c997e9a (diff) | |
download | PeerTube-b88a459664957d6ab9c417a6749b611e6cc6c0e2.tar.gz PeerTube-b88a459664957d6ab9c417a6749b611e6cc6c0e2.tar.zst PeerTube-b88a459664957d6ab9c417a6749b611e6cc6c0e2.zip |
Upsert cache file on create activity
Diffstat (limited to 'server/lib/activitypub/process/process-update.ts')
-rw-r--r-- | server/lib/activitypub/process/process-update.ts | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/server/lib/activitypub/process/process-update.ts b/server/lib/activitypub/process/process-update.ts index e092a6729..bd4013555 100644 --- a/server/lib/activitypub/process/process-update.ts +++ b/server/lib/activitypub/process/process-update.ts | |||
@@ -10,8 +10,7 @@ import { fetchAvatarIfExists, updateActorAvatarInstance, updateActorInstance } f | |||
10 | import { getOrCreateVideoAndAccountAndChannel, getOrCreateVideoChannelFromVideoObject, updateVideoFromAP } from '../videos' | 10 | import { getOrCreateVideoAndAccountAndChannel, getOrCreateVideoChannelFromVideoObject, updateVideoFromAP } from '../videos' |
11 | import { sanitizeAndCheckVideoTorrentObject } from '../../../helpers/custom-validators/activitypub/videos' | 11 | import { sanitizeAndCheckVideoTorrentObject } from '../../../helpers/custom-validators/activitypub/videos' |
12 | import { isCacheFileObjectValid } from '../../../helpers/custom-validators/activitypub/cache-file' | 12 | import { isCacheFileObjectValid } from '../../../helpers/custom-validators/activitypub/cache-file' |
13 | import { VideoRedundancyModel } from '../../../models/redundancy/video-redundancy' | 13 | import { createOrUpdateCacheFile } from '../cache-file' |
14 | import { createCacheFile, updateCacheFile } from '../cache-file' | ||
15 | import { forwardVideoRelatedActivity } from '../send/utils' | 14 | import { forwardVideoRelatedActivity } from '../send/utils' |
16 | 15 | ||
17 | async function processUpdateActivity (activity: ActivityUpdate, byActor: ActorModel) { | 16 | async function processUpdateActivity (activity: ActivityUpdate, byActor: ActorModel) { |
@@ -77,13 +76,7 @@ async function processUpdateCacheFile (byActor: ActorModel, activity: ActivityUp | |||
77 | const { video } = await getOrCreateVideoAndAccountAndChannel({ videoObject: cacheFileObject.object }) | 76 | const { video } = await getOrCreateVideoAndAccountAndChannel({ videoObject: cacheFileObject.object }) |
78 | 77 | ||
79 | await sequelizeTypescript.transaction(async t => { | 78 | await sequelizeTypescript.transaction(async t => { |
80 | const redundancyModel = await VideoRedundancyModel.loadByUrl(cacheFileObject.id, t) | 79 | await createOrUpdateCacheFile(cacheFileObject, video, byActor, t) |
81 | |||
82 | if (!redundancyModel) { | ||
83 | await createCacheFile(cacheFileObject, video, byActor, t) | ||
84 | } else { | ||
85 | await updateCacheFile(cacheFileObject, redundancyModel, video, byActor, t) | ||
86 | } | ||
87 | }) | 80 | }) |
88 | 81 | ||
89 | if (video.isOwned()) { | 82 | if (video.isOwned()) { |