From e0409585a744ab7b41869bc08bfb2b33febe3bba Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Wed, 18 Nov 2020 14:11:15 +0100
Subject: Fix youtube-dl ipv4 PR

---
 server/helpers/youtube-dl.ts  | 6 +++++-
 server/initializers/config.ts | 4 +---
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'server')

diff --git a/server/helpers/youtube-dl.ts b/server/helpers/youtube-dl.ts
index 8733fe6cf..302b2e206 100644
--- a/server/helpers/youtube-dl.ts
+++ b/server/helpers/youtube-dl.ts
@@ -34,7 +34,11 @@ const processOptions = {
 function getYoutubeDLInfo (url: string, opts?: string[]): Promise<YoutubeDLInfo> {
   return new Promise<YoutubeDLInfo>((res, rej) => {
     let args = opts || [ '-j', '--flat-playlist' ]
-    if (CONFIG.IMPORT.VIDEOS.HTTP.FORCEIPV4) args.push('--force-ipv4')
+
+    if (CONFIG.IMPORT.VIDEOS.HTTP.FORCE_IPV4) {
+      args.push('--force-ipv4')
+    }
+
     args = wrapWithProxyOptions(args)
 
     safeGetYoutubeDL()
diff --git a/server/initializers/config.ts b/server/initializers/config.ts
index d1bbbc9a7..705223b0a 100644
--- a/server/initializers/config.ts
+++ b/server/initializers/config.ts
@@ -229,9 +229,7 @@ const CONFIG = {
     VIDEOS: {
       HTTP: {
         get ENABLED () { return config.get<boolean>('import.videos.http.enabled') },
-        FORCEIPV4: {
-          get ENABLED () { return config.get<boolean>('import.videos.http.forceipv4.enabled') }
-        },
+        get FORCE_IPV4 () { return config.get<boolean>('import.videos.http.force_ipv4') },
         PROXY: {
           get ENABLED () { return config.get<boolean>('import.videos.http.proxy.enabled') },
           get URL () { return config.get<string>('import.videos.http.proxy.url') }
-- 
cgit v1.2.3