diff options
author | Chocobozzz <me@florianbigard.com> | 2018-08-23 17:58:39 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2018-08-27 09:41:54 +0200 |
commit | f37dc0dd14d9ce0b59c454c2c1b935fcbe9727e9 (patch) | |
tree | 2050443febcdb2a3eec68b7bbf9687e26dcb24dc /server/lib/activitypub/videos.ts | |
parent | 240085d0056fd97ac3c7fa8fa4ce9bc32afc4d6e (diff) | |
download | PeerTube-f37dc0dd14d9ce0b59c454c2c1b935fcbe9727e9.tar.gz PeerTube-f37dc0dd14d9ce0b59c454c2c1b935fcbe9727e9.tar.zst PeerTube-f37dc0dd14d9ce0b59c454c2c1b935fcbe9727e9.zip |
Add ability to search video channels
Diffstat (limited to 'server/lib/activitypub/videos.ts')
-rw-r--r-- | server/lib/activitypub/videos.ts | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/server/lib/activitypub/videos.ts b/server/lib/activitypub/videos.ts index 388c31fe5..6c2095897 100644 --- a/server/lib/activitypub/videos.ts +++ b/server/lib/activitypub/videos.ts | |||
@@ -174,7 +174,7 @@ function videoFileActivityUrlToDBAttributes (videoCreated: VideoModel, videoObje | |||
174 | return attributes | 174 | return attributes |
175 | } | 175 | } |
176 | 176 | ||
177 | function getOrCreateVideoChannel (videoObject: VideoTorrentObject) { | 177 | function getOrCreateVideoChannelFromVideoObject (videoObject: VideoTorrentObject) { |
178 | const channel = videoObject.attributedTo.find(a => a.type === 'Group') | 178 | const channel = videoObject.attributedTo.find(a => a.type === 'Group') |
179 | if (!channel) throw new Error('Cannot find associated video channel to video ' + videoObject.url) | 179 | if (!channel) throw new Error('Cannot find associated video channel to video ' + videoObject.url) |
180 | 180 | ||
@@ -251,7 +251,7 @@ async function getOrCreateVideoAndAccountAndChannel ( | |||
251 | const { videoObject: fetchedVideo } = await fetchRemoteVideo(videoUrl) | 251 | const { videoObject: fetchedVideo } = await fetchRemoteVideo(videoUrl) |
252 | if (!fetchedVideo) throw new Error('Cannot fetch remote video with url: ' + videoUrl) | 252 | if (!fetchedVideo) throw new Error('Cannot fetch remote video with url: ' + videoUrl) |
253 | 253 | ||
254 | const channelActor = await getOrCreateVideoChannel(fetchedVideo) | 254 | const channelActor = await getOrCreateVideoChannelFromVideoObject(fetchedVideo) |
255 | const video = await retryTransactionWrapper(createVideo, fetchedVideo, channelActor, syncParam.thumbnail) | 255 | const video = await retryTransactionWrapper(createVideo, fetchedVideo, channelActor, syncParam.thumbnail) |
256 | 256 | ||
257 | // Process outside the transaction because we could fetch remote data | 257 | // Process outside the transaction because we could fetch remote data |
@@ -329,7 +329,7 @@ async function refreshVideoIfNeeded (video: VideoModel): Promise<VideoModel> { | |||
329 | return video | 329 | return video |
330 | } | 330 | } |
331 | 331 | ||
332 | const channelActor = await getOrCreateVideoChannel(videoObject) | 332 | const channelActor = await getOrCreateVideoChannelFromVideoObject(videoObject) |
333 | const account = await AccountModel.load(channelActor.VideoChannel.accountId) | 333 | const account = await AccountModel.load(channelActor.VideoChannel.accountId) |
334 | return updateVideoFromAP(video, videoObject, account.Actor, channelActor) | 334 | return updateVideoFromAP(video, videoObject, account.Actor, channelActor) |
335 | 335 | ||
@@ -440,7 +440,7 @@ export { | |||
440 | videoActivityObjectToDBAttributes, | 440 | videoActivityObjectToDBAttributes, |
441 | videoFileActivityUrlToDBAttributes, | 441 | videoFileActivityUrlToDBAttributes, |
442 | createVideo, | 442 | createVideo, |
443 | getOrCreateVideoChannel, | 443 | getOrCreateVideoChannelFromVideoObject, |
444 | addVideoShares, | 444 | addVideoShares, |
445 | createRates | 445 | createRates |
446 | } | 446 | } |