Compare commits

...

2 Commits

Author SHA1 Message Date
ringus1
0a8b675da9 Move getting cookies before making first request 2024-02-01 09:56:34 +01:00
ringus1
5143f916f3 PR fixes - clear up messages 2024-02-01 08:14:23 +01:00

View File

@ -481,24 +481,25 @@ class FacebookIE(InfoExtractor):
return return
def _extract_from_url(self, url, video_id): def _extract_from_url(self, url, video_id):
cookies = self._get_cookies(url) # Saving before making first request, as they might get discarded
webpage = self._download_webpage( webpage = self._download_webpage(
url.replace('://m.facebook.com/', '://www.facebook.com/'), video_id) url.replace('://m.facebook.com/', '://www.facebook.com/'), video_id)
sjs_data = [self._parse_json(j, video_id, fatal=False) for j in re.findall( sjs_data = [self._parse_json(j, video_id, fatal=False) for j in re.findall(
r'data-sjs>({.*?ScheduledServerJS.*?})</script>', webpage)] r'data-sjs>({.*?ScheduledServerJS.*?})</script>', webpage)]
cookies = self._get_cookies(url) if cookies.get('c_user') and cookies.get('xs'): # user passed logged-in cookies or attempted to login:
if all(k in cookies for k in ["c_user", "xs"]):
if get_first(sjs_data, ( if get_first(sjs_data, (
'require', ..., ..., ..., '__bbox', 'define', 'require', ..., ..., ..., '__bbox', 'define',
lambda _, v: 'CurrentUserInitialData' in v, ..., 'ACCOUNT_ID'), default="0") == "0": lambda _, v: 'CurrentUserInitialData' in v, ..., 'ACCOUNT_ID'), default='0') == '0':
raise ExtractorError('Failed to login with provided data.', expected=True) raise ExtractorError('Failed to login with provided data.', expected=True)
if any(content in webpage for content in ['180 days left to appeal', 'suspended your account']): if any(content in webpage for content in ['180 days left to appeal', 'suspended your account']):
raise ExtractorError('Login account is suspended.', expected=True) raise ExtractorError('Your account is suspended', expected=True)
if 'send a code to confirm the mobile number you give us' in webpage: if 'send a code to confirm the mobile number you give us' in webpage:
raise ExtractorError('Mobile number checkpoint for logged in user.', expected=True) raise ExtractorError('Facebook is requiring mobile number confirmation', expected=True)
if 'your account has been locked' in webpage: if 'your account has been locked' in webpage:
raise ExtractorError('Account is locked.', expected=True) raise ExtractorError('Your account has been locked', expected=True)
if props := get_first(sjs_data, ( if props := get_first(sjs_data, (
'require', ..., ..., ..., '__bbox', 'require', ..., ..., ..., 'rootView', 'require', ..., ..., ..., '__bbox', 'require', ..., ..., ..., 'rootView',