From 7ae6e0c6f89b1fcfa537bfdd5add85f2e91c35d5 Mon Sep 17 00:00:00 2001
From: Dave Mateer <davemateer@gmail.com>
Date: Mon, 9 May 2022 11:38:08 +0100
Subject: [PATCH 1/3] fb cooke in ytd

---
 archivers/youtubedl_archiver.py | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/archivers/youtubedl_archiver.py b/archivers/youtubedl_archiver.py
index 6e626b5..b710393 100644
--- a/archivers/youtubedl_archiver.py
+++ b/archivers/youtubedl_archiver.py
@@ -5,17 +5,21 @@ import yt_dlp
 from loguru import logger
 
 from .base_archiver import Archiver, ArchiveResult
-
+from storages import Storage
 
 class YoutubeDLArchiver(Archiver):
     name = "youtube_dl"
     ydl_opts = {'outtmpl': 'tmp/%(id)s.%(ext)s', 'quiet': False}
 
+    def __init__(self, storage: Storage, driver, fb_cookie):
+        super().__init__(storage, driver)
+        self.fb_cookie = fb_cookie
+
     def download(self, url, check_if_exists=False):
         netloc = self.get_netloc(url)
-        if netloc in ['facebook.com', 'www.facebook.com'] and os.getenv('FB_COOKIE'):
-            logger.info('Using Facebook cookie')
-            yt_dlp.utils.std_headers['cookie'] = os.getenv('FB_COOKIE')
+        if netloc in ['facebook.com', 'www.facebook.com']:
+            logger.debug('Using Facebook cookie')
+            yt_dlp.utils.std_headers['cookie'] = self.fb_cookie
 
         ydl = yt_dlp.YoutubeDL(YoutubeDLArchiver.ydl_opts)
         cdn_url = None

From 51f635ce50895d9952ab2e7faff96be0f8216015 Mon Sep 17 00:00:00 2001
From: Dave Mateer <davemateer@gmail.com>
Date: Mon, 9 May 2022 11:44:25 +0100
Subject: [PATCH 2/3] get env variable FACEBOOK_COOKIE patch through from
 auto_archive

---
 auto_archive.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/auto_archive.py b/auto_archive.py
index d3db9a2..a7bde8b 100644
--- a/auto_archive.py
+++ b/auto_archive.py
@@ -108,7 +108,7 @@ def process_sheet(sheet, header=1, columns=GWorksheet.COLUMN_NAMES):
             archivers.TelethonArchiver(s3_client, driver, telegram_config),
             archivers.TelegramArchiver(s3_client, driver),
             archivers.TiktokArchiver(s3_client, driver),
-            archivers.YoutubeDLArchiver(s3_client, driver),
+            archivers.YoutubeDLArchiver(s3_client, driver, os.getenv('FACEBOOK_COOKIE')),
             archivers.TwitterArchiver(s3_client, driver),
             archivers.WaybackArchiver(s3_client, driver)
         ]

From 07b82f0e82862c109086001cc21fb7950c4b4289 Mon Sep 17 00:00:00 2001
From: Dave Mateer <davemateer@gmail.com>
Date: Mon, 9 May 2022 11:46:19 +0100
Subject: [PATCH 3/3] update .example.env

---
 .example.env | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.example.env b/.example.env
index deb01a2..4a200cf 100644
--- a/.example.env
+++ b/.example.env
@@ -5,4 +5,6 @@ DO_BUCKET=
 INTERNET_ARCHIVE_S3_KEY=
 INTERNET_ARCHIVE_S3_SECRET=
 TELEGRAM_API_ID=
-TELEGRAM_API_HASH=
\ No newline at end of file
+TELEGRAM_API_HASH=
+
+FACEBOOK_COOKIE=cookie: datr= xxxx
\ No newline at end of file