Merge e69128a1b4 into 4b5eec0aaa

Fix bug in 720b3dc453

Closes #11623
Authored by: jkruse

yt_dlp/extractor/chaturbate.py

@@ -59,16 +59,15 @@ class ChaturbateIE(InfoExtractor):
                 '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,

yt_dlp/extractor/elonet.py

@@ -42,6 +42,21 @@ class ElonetIE(InfoExtractor):
         video_id = self._match_id(url)
         webpage = self._download_webpage(url, video_id)
 
+        icareus_iframe_vod_id = self._search_regex(
+            r'src="https://players.icareus.com/elonet/embed/vod/(\d+)"',
+            webpage,
+            'icareus iframe',
+            default=None,
+            fatal=False,
+            group=1,
+        )
+
+        if icareus_iframe_vod_id:
+            return self.url_result(
+                f'https://suite.icareus.com/fi/web/elonet/player/vod/?assetId={icareus_iframe_vod_id}',
+                ie='Icareus',
+            )
+
         src = self._parse_json(self._html_search_regex(
             r'id=\'video-data\'[^>]+data-video-sources="([^"]+)"', webpage, 'json'), video_id)[0]['src']
         ext = determine_ext(src)