Merge 107bed866f into 4b5eec0aaa

Fix bug in 720b3dc453

Closes #11623
Authored by: jkruse

yt_dlp/extractor/_extractors.py

@@ -1593,6 +1593,21 @@
 from .premiershiprugby import PremiershipRugbyIE
 from .presstv import PressTVIE
 from .projectveritas import ProjectVeritasIE
+from .promodj import (
+    PromoDJPageIE,
+    PromoDJUserIE,
+    PromoDJUserMediaIE,
+    PromoDJUserPagesIE,
+    PromoDJUserPageIE,
+    PromoDJBlogPageIE,
+    PromoDJPlaylistIE,
+    PromoDJMusicPlaylistIE,
+    PromoDJVideoPlaylistIE,
+    PromoDJIE,
+    PromoDJEmbedIE,
+    PromoDJShortIE,
+    PromoDJRadioIE,
+)
 from .prosiebensat1 import ProSiebenSat1IE
 from .prx import (
     PRXAccountIE,

yt_dlp/extractor/chaturbate.py

@@ -59,16 +59,15 @@ def _extract_from_api(self, video_id, tld):
                 'Accept': 'application/json',
             }, fatal=False, impersonate=True) or {}
 
-        status = response.get('room_status')
-        if status != 'public':
-            if error := self._ERROR_MAP.get(status):
-                raise ExtractorError(error, expected=True)
-            self.report_warning('Falling back to webpage extraction')
-            return None
-
         m3u8_url = response.get('url')
         if not m3u8_url:
-            self.raise_geo_restricted()
+            status = response.get('room_status')
+            if error := self._ERROR_MAP.get(status):
+                raise ExtractorError(error, expected=True)
+            if status == 'public':
+                self.raise_geo_restricted()
+            self.report_warning(f'Got status "{status}" from API; falling back to webpage extraction')
+            return None
 
         return {
             'id': video_id,