From 2d5703c4938fe6a24ec499a40b674e05f0ea0863 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= Date: Thu, 12 Mar 2020 22:02:12 +0100 Subject: [PATCH] [twitter] use a simpler data structure to store cookies in cache Use a dict with name-value pairs instead of an entire RequestsCookieJar object. --- gallery_dl/extractor/twitter.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/gallery_dl/extractor/twitter.py b/gallery_dl/extractor/twitter.py index 650f5789..2a04463d 100644 --- a/gallery_dl/extractor/twitter.py +++ b/gallery_dl/extractor/twitter.py @@ -21,6 +21,7 @@ class TwitterExtractor(Extractor): directory_fmt = ("{category}", "{user[name]}") filename_fmt = "{tweet_id}_{num}.{extension}" archive_fmt = "{tweet_id}_{retweet_id}_{num}" + cookiedomain = ".twitter.com" root = "https://twitter.com" sizes = (":orig", ":large", ":medium", ":small") user_agent = ("Mozilla/5.0 (Windows NT 6.1; WOW64; " @@ -135,10 +136,14 @@ class TwitterExtractor(Extractor): "remember_me" : "1", } response = self.request(url, method="POST", headers=headers, data=data) - if "/error" in response.url: raise exception.AuthenticationError() - return self.session.cookies + + return { + cookie.name: cookie.value + for cookie in self.session.cookies + if cookie.domain and "twitter.com" in cookie.domain + } def _data_from_tweet(self, tweet): extr = text.extract_from(tweet)