From: Tom-Oliver Heidel <redacted>
Date: Thu, 3 Sep 2020 15:05:58 +0000 (+0200)
Subject: Merge branch 'twitch-fix' of https://github.com/lel-amri/youtube-dl into lel-amri... 
X-Git-Tag: 2021.01.07~202^2
X-Git-Url: https://jfr.im/git/yt-dlp.git/commitdiff_plain/dac4ecf592b5a6ec307558fed1066df3a598e3b6

Merge branch 'twitch-fix' of https://github.com/lel-amri/youtube-dl into lel-amri-twitch-fix
---

dac4ecf592b5a6ec307558fed1066df3a598e3b6
diff --cc youtube_dlc/extractor/twitch.py
index 3f0f7e277,ef823220c..35e4dda37
--- a/youtube_dlc/extractor/twitch.py
+++ b/youtube_dlc/extractor/twitch.py
@@@ -468,9 -446,9 +472,9 @@@ class TwitchAllVideosIE(TwitchVideosBas
      _PLAYLIST_TYPE = 'all videos'
  
      _TESTS = [{
-         'url': 'https://www.twitch.tv/spamfish/videos/all',
+         'url': 'https://www.twitch.tv/spamfish/videos?filter=all&sort=time',
          'info_dict': {
 -            'id': 'spamfish',
 +            'id': '497952',
              'title': 'Spamfish',
          },
          'playlist_mincount': 869,
@@@ -487,9 -468,9 +494,9 @@@ class TwitchUploadsIE(TwitchVideosBaseI
      _PLAYLIST_TYPE = 'uploads'
  
      _TESTS = [{
-         'url': 'https://www.twitch.tv/spamfish/videos/uploads',
+         'url': 'https://www.twitch.tv/spamfish/videos?filter=uploads&sort=time',
          'info_dict': {
 -            'id': 'spamfish',
 +            'id': '497952',
              'title': 'Spamfish',
          },
          'playlist_mincount': 0,
@@@ -506,9 -487,9 +513,9 @@@ class TwitchPastBroadcastsIE(TwitchVide
      _PLAYLIST_TYPE = 'past broadcasts'
  
      _TESTS = [{
-         'url': 'https://www.twitch.tv/spamfish/videos/past-broadcasts',
+         'url': 'https://www.twitch.tv/spamfish/videos?filter=archives&sort=time',
          'info_dict': {
 -            'id': 'spamfish',
 +            'id': '497952',
              'title': 'Spamfish',
          },
          'playlist_mincount': 0,
@@@ -525,9 -506,9 +532,9 @@@ class TwitchHighlightsIE(TwitchVideosBa
      _PLAYLIST_TYPE = 'highlights'
  
      _TESTS = [{
-         'url': 'https://www.twitch.tv/spamfish/videos/highlights',
+         'url': 'https://www.twitch.tv/spamfish/videos?filter=highlights&sort=views',
          'info_dict': {
 -            'id': 'spamfish',
 +            'id': '497952',
              'title': 'Spamfish',
          },
          'playlist_mincount': 805,