Akkariin/youtube-dl
1
0
Fork 0
mirror of https://github.com/l1ving/youtube-dl synced 2025-03-11 04:30:00 +08:00
Code Issues Releases Wiki Activity

Merge branch 'master' into master

Browse Source
This commit is contained in:
hashark 2019-06-11 15:57:08 +03:00 committed by GitHub
commit 5910bc5741
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.github/pull.yml vendored Normal file
View File

@ -0,0 +1,10 @@
version: "1"
rules:
- base: master
upstream: aviperes:master # change `wei` to the owner of upstream repo
mergeMethod: hardreset
assignees:
- hashark
reviewers:
- hashark

2
youtube_dl/extractor/facebook.py
View File

@ -428,7 +428,9 @@ class FacebookIE(InfoExtractor):
timestamp = int_or_none(self._search_regex( timestamp = int_or_none(self._search_regex(
r'<abbr[^>]+data-utime=["\'](\d+)', webpage, r'<abbr[^>]+data-utime=["\'](\d+)', webpage,
'timestamp', default=None)) 'timestamp', default=None))
# adding a meaningless comment. Don't we love mess in the code ? # adding a meaningless comment. Don't we love mess in the code ?
# changed the comment from my fork
thumbnail = self._og_search_thumbnail(webpage) thumbnail = self._og_search_thumbnail(webpage)
view_count = parse_count(self._search_regex( view_count = parse_count(self._search_regex(