aboutsummaryrefslogtreecommitdiffhomepage
path: root/server
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2020-10-29 15:03:31 +0100
committerChocobozzz <chocobozzz@cpy.re>2020-11-09 15:33:04 +0100
commitd988e9a2f83dd2f85d1afa0b98614b29a66dddf4 (patch)
tree1b7c3f44368d204734290adc655b9121b2dc349c /server
parent284ef529113ad61de30ff30a28c699b97d9ca02f (diff)
downloadPeerTube-d988e9a2f83dd2f85d1afa0b98614b29a66dddf4.tar.gz
PeerTube-d988e9a2f83dd2f85d1afa0b98614b29a66dddf4.tar.zst
PeerTube-d988e9a2f83dd2f85d1afa0b98614b29a66dddf4.zip
Fix live infohash block
Diffstat (limited to 'server')
-rw-r--r--server/controllers/tracker.ts2
-rw-r--r--server/helpers/ffmpeg-utils.ts1
2 files changed, 1 insertions, 2 deletions
diff --git a/server/controllers/tracker.ts b/server/controllers/tracker.ts
index c962fada5..d09b19cae 100644
--- a/server/controllers/tracker.ts
+++ b/server/controllers/tracker.ts
@@ -51,7 +51,7 @@ const trackerServer = new TrackerServer({
51 const videoFileExists = await VideoFileModel.doesInfohashExistCached(infoHash) 51 const videoFileExists = await VideoFileModel.doesInfohashExistCached(infoHash)
52 if (videoFileExists === true) return cb() 52 if (videoFileExists === true) return cb()
53 53
54 const playlistExists = await VideoStreamingPlaylistModel.doesInfohashExist(infoHash) 54 const playlistExists = await VideoStreamingPlaylistModel.doesInfohashExistCached(infoHash)
55 if (playlistExists === true) return cb() 55 if (playlistExists === true) return cb()
56 56
57 cb(new Error(`Unknown infoHash ${infoHash} requested by ip ${ip}`)) 57 cb(new Error(`Unknown infoHash ${infoHash} requested by ip ${ip}`))
diff --git a/server/helpers/ffmpeg-utils.ts b/server/helpers/ffmpeg-utils.ts
index b063cedcb..b985988d3 100644
--- a/server/helpers/ffmpeg-utils.ts
+++ b/server/helpers/ffmpeg-utils.ts
@@ -8,7 +8,6 @@ import { CONFIG } from '../initializers/config'
8import { FFMPEG_NICE, VIDEO_LIVE, VIDEO_TRANSCODING_FPS } from '../initializers/constants' 8import { FFMPEG_NICE, VIDEO_LIVE, VIDEO_TRANSCODING_FPS } from '../initializers/constants'
9import { processImage } from './image-utils' 9import { processImage } from './image-utils'
10import { logger } from './logger' 10import { logger } from './logger'
11import { concat } from 'lodash'
12 11
13/** 12/**
14 * A toolbox to play with audio 13 * A toolbox to play with audio