From: Yen Chi Hsuan <yan12125@gmail.com>
Date: Fri, 7 Oct 2016 12:04:49 +0000 (+0800)
Subject: [facebook] Fix for new handleServerJS syntax (closes #10846)
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=38588ab9770813cb92013b870edc15def4f9ac1c;p=youtube-dl

[facebook] Fix for new handleServerJS syntax (closes #10846)

According to the dump file in #10846, handleServerJS() now accepts
an optional second argument. It's a string from available dump files.
---

diff --git a/ChangeLog b/ChangeLog
index 3aa4d67f5..7aa0787ca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 version <unreleased>
 
 Extractors
+* [facebook] Fix video extraction (#10846)
 + [commonprotocols] Support direct MMS links (#10838)
 
 
diff --git a/youtube_dl/extractor/facebook.py b/youtube_dl/extractor/facebook.py
index 3a220e995..801573459 100644
--- a/youtube_dl/extractor/facebook.py
+++ b/youtube_dl/extractor/facebook.py
@@ -258,7 +258,7 @@ class FacebookIE(InfoExtractor):
 
         if not video_data:
             server_js_data = self._parse_json(self._search_regex(
-                r'handleServerJS\(({.+})\);', webpage, 'server js data', default='{}'), video_id)
+                r'handleServerJS\(({.+})(?:\);|,")', webpage, 'server js data', default='{}'), video_id)
             for item in server_js_data.get('instances', []):
                 if item[1][0] == 'VideoConfig':
                     video_data = video_data_list2dict(item[2][0]['videoData'])