MediaEmbed: updated Rumble

Author: JoshyPHP

docs/Plugins/MediaEmbed/Sites.md

@@ -347,7 +347,7 @@
 	</tr>
 	<tr title="Rumble" id="rumble">
 		<td><code>rumble</code></td>
-		<td>https://rumble.com/vaxo02-i-cant-climb-.html</td>
+		<td>https://rumble.com/vaxo02-i-cant-climb-.html<br/>https://rumble.com/embed/v8bhte/</td>
 	</tr>
 	<tr title="Rutube" id="rutube">
 		<td><code>rutube</code></td>

docs/testdox.txt

@@ -8002,39 +8002,39 @@ Unparser (s9e\TextFormatter\Tests\Unparser)
  [x] Characters outside Unicode's BMP are decoded
 
 Cached (s9e\TextFormatter\Tests\Utils\Http\Clients\Cached)
- [x] Settings from the proxied client are copied
- [x] Settings from the caching client are copied to the proxied client
- [x] Can work without a cache dir
- [x] Works with a cache
- [x] Uses gzip by default if ext/zlib is availble
- [x] Sends custom headers
- [x] Resets custom headers between requests
- [x] post() sends the request body if set
- [x] post() sends no request body if not set
- [x] post() automatically sets Content-Length if a request body is set
- [x] get() returns the response error
- [x] get() returns headers if returnHeaders is true
+ [ ] Settings from the proxied client are copied
+ [ ] Settings from the caching client are copied to the proxied client
+ [ ] Can work without a cache dir
+ [ ] Works with a cache
+ [ ] Uses gzip by default if ext/zlib is availble
+ [ ] Sends custom headers
+ [ ] Resets custom headers between requests
+ [ ] post() sends the request body if set
+ [ ] post() sends no request body if not set
+ [ ] post() automatically sets Content-Length if a request body is set
+ [ ] get() returns the response error
+ [ ] get() returns headers if returnHeaders is true
 
 Curl (s9e\TextFormatter\Tests\Utils\Http\Clients\Curl)
- [x] Uses gzip by default if ext/zlib is availble
- [x] Sends custom headers
- [x] Resets custom headers between requests
- [x] post() sends the request body if set
- [x] post() sends no request body if not set
- [x] post() automatically sets Content-Length if a request body is set
- [x] get() returns the response error
- [x] get() returns headers if returnHeaders is true
+ [ ] Uses gzip by default if ext/zlib is availble
+ [ ] Sends custom headers
+ [ ] Resets custom headers between requests
+ [ ] post() sends the request body if set
+ [ ] post() sends no request body if not set
+ [ ] post() automatically sets Content-Length if a request body is set
+ [ ] get() returns the response error
+ [ ] get() returns headers if returnHeaders is true
 
 Native (s9e\TextFormatter\Tests\Utils\Http\Clients\Native)
- [x] Does not send "Accept-Encoding: gzip" if gzip is disabled
- [x] Uses gzip by default if ext/zlib is availble
- [x] Sends custom headers
- [x] Resets custom headers between requests
- [x] post() sends the request body if set
- [x] post() sends no request body if not set
- [x] post() automatically sets Content-Length if a request body is set
- [x] get() returns the response error
- [x] get() returns headers if returnHeaders is true
+ [ ] Does not send "Accept-Encoding: gzip" if gzip is disabled
+ [ ] Uses gzip by default if ext/zlib is availble
+ [ ] Sends custom headers
+ [ ] Resets custom headers between requests
+ [ ] post() sends the request body if set
+ [ ] post() sends no request body if not set
+ [ ] post() automatically sets Content-Length if a request body is set
+ [ ] get() returns the response error
+ [ ] get() returns headers if returnHeaders is true
 
 Http (s9e\TextFormatter\Tests\Utils\Http)
  [x] getClient() returns an instance of s9e\TextFormatter\Utils\Http\Client

src/Bundles/MediaPack.php

@@ -96,7 +96,7 @@ class CachedDefinitionCollection extends SiteDefinitionCollection
 		'podbean'=>['attributes'=>[],'example'=>['https://dialhforheroclix.podbean.com/e/dial-h-for-heroclix-episode-46-all-ya-need-is-love/','https://www.podbean.com/ew/pb-gmyyz-d6e065'],'extract'=>['!podbean\\.com/(?:[-\\w]+/)*(?:player[-\\w]*/|\\w+/pb-)(?\'id\'[-\\w]+)!'],'homepage'=>'https://www.podbean.com/','host'=>['podbean.com'],'iframe'=>['height'=>150,'max-width'=>900,'src'=>'https://www.podbean.com/player-v2/?i={@id}','width'=>'100%'],'name'=>'Podbean','scrape'=>[['extract'=>['!podbean\\.com/player[^/]*/\\?i=(?\'id\'[-\\w]+)!'],'header'=>'User-agent: PHP (not Mozilla)','match'=>['@podbean\\.com/(?:media/shar)?e/(?!pb-)@']]],'tags'=>['podcasts']],
 		'prezi'=>['attributes'=>[],'example'=>'https://prezi.com/5ye8po_hmikp/10-most-common-rookie-presentation-mistakes/','extract'=>['#//prezi\\.com/(?!(?:a(?:bout|mbassadors)|c(?:o(?:llaborate|mmunity|ntact)|reate)|exp(?:erts|lore)|ip(?:ad|hone)|jobs|l(?:ear|ogi)n|m(?:ac|obility)|pr(?:es(?:s|ent)|icing)|recommend|support|user|windows|your)/)(?\'id\'\\w+)/#'],'homepage'=>'https://prezi.com/','host'=>['prezi.com'],'iframe'=>['height'=>400,'src'=>'//prezi.com/embed/{@id}/','width'=>550],'name'=>'Prezi','scrape'=>[],'tags'=>['presentations']],
 		'reddit'=>['amp'=>['custom-element'=>'amp-reddit','src'=>'https://cdn.ampproject.org/v0/amp-reddit-0.1.js','template'=>'<amp-reddit layout="responsive" width="450" height="300" data-embedtype="post" data-src="https://www.reddit.com/r/{@id}/"/>'],'attributes'=>[],'example'=>['https://www.reddit.com/r/pics/comments/9wp1qg/my_mom_recently_started_watercolor_painting_and/','https://www.reddit.com/r/pics/comments/9wp1qg/my_mom_recently_started_watercolor_painting_and/e9m6pn9/'],'extract'=>['!(?\'id\'\\w+/comments/\\w+(?:/\\w+/\\w+)?)!'],'homepage'=>'https://www.reddit.com/','host'=>['reddit.com'],'iframe'=>['data-s9e-livepreview-ignore-attrs'=>'style','height'=>165,'onload'=>'let c=new MessageChannel;c.port1.onmessage=e=>this.style.height=e.data+\'px\';this.contentWindow.postMessage(\'s9e:init\',\'*\',[c.port2])','src'=>'https://s9e.github.io/iframe/2/reddit.min.html#{@id}{@path}#theme={$MEDIAEMBED_THEME}','width'=>800],'name'=>'Reddit threads and comments','scrape'=>[['extract'=>['!(?\'id\'\\w+/comments/\\w+(?:/\\w+/\\w+)?)!'],'header'=>'User-agent: FreeBSD/11.0 Lynx/56','match'=>['!reddit\\.com/r/[^/]+/s/\\w!']]],'source'=>'https://www.reddit.com/wiki/embeds','tags'=>['social']],
-		'rumble'=>['attributes'=>[],'example'=>'https://rumble.com/vaxo02-i-cant-climb-.html','extract'=>['!rumble\\.com/embed/(?\'id\'\\w+)!'],'homepage'=>'https://rumble.com/','host'=>['rumble.com'],'iframe'=>['src'=>'https://rumble.com/embed/{@id}/'],'name'=>'Rumble','oembed'=>['endpoint'=>'https://rumble.com/api/Media/oembed.json','scheme'=>'https://rumble.com/embed/{@id}/'],'scrape'=>[['extract'=>['!video"?:"(?\'id\'\\w+)!'],'match'=>['#rumble\\.com/(?!embed/).#']]],'tags'=>['videos']],
+		'rumble'=>['attributes'=>[],'example'=>['https://rumble.com/vaxo02-i-cant-climb-.html','https://rumble.com/embed/v8bhte/'],'extract'=>['!rumble\\.com/embed/(?\'id\'\\w+)!'],'homepage'=>'https://rumble.com/','host'=>['rumble.com'],'iframe'=>['src'=>'https://rumble.com/embed/{@id}/'],'name'=>'Rumble','oembed'=>['endpoint'=>'https://rumble.com/api/Media/oembed.json','scheme'=>'https://rumble.com/embed/{@id}/'],'scrape'=>[['extract'=>['!(?:/|%2F)embed(?:/|%2F)(?\'id\'\\w+)!'],'match'=>['#rumble\\.com/(?!embed/).#']]],'tags'=>['videos']],
 		'rutube'=>['attributes'=>[],'example'=>'https://rutube.ru/video/0771e73d1d10eee9c43ce31decc1dfce/','extract'=>['!rutube\\.ru/(?:play/embed/|tracks/.*?v=|video/)(?\'id\'\\w+)!'],'homepage'=>'https://rutube.ru/','host'=>['rutube.ru'],'iframe'=>['src'=>'//rutube.ru/play/embed/{@id}'],'name'=>'Rutube','oembed'=>['endpoint'=>'https://rutube.ru/api/oembed/','scheme'=>'https://rutube.ru/video/{@id}/'],'scrape'=>[],'tags'=>['.ru']],
 		'scribd'=>['attributes'=>[],'example'=>['https://www.scribd.com/doc/237147661/Calculus-2-Test-1-Review','https://www.scribd.com/presentation/324333881/600-1450-World-History-Jeopardy'],'extract'=>['!scribd\\.com/(?:mobile/)?(?:doc(?:ument)?|presentation)/(?\'id\'\\d+)!'],'homepage'=>'https://www.scribd.com/','host'=>['scribd.com'],'iframe'=>['height'=>500,'src'=>'https://www.scribd.com/embeds/{@id}/content?view_mode=scroll&show_recommendations=false','style'=>['resize'=>'vertical'],'width'=>'100%'],'name'=>'Scribd','scrape'=>[],'tags'=>['documents','presentations']],
 		'sendvid'=>['attributes'=>[],'example'=>'https://sendvid.com/w99u3jjp','extract'=>['!sendvid\\.com/(?\'id\'\\w+)!'],'homepage'=>'https://www.sendvid.com/','host'=>['sendvid.com'],'iframe'=>['src'=>'//sendvid.com/embed/{@id}'],'name'=>'Sendvid','scrape'=>[],'tags'=>['videos']],

src/Plugins/MediaEmbed/Configurator/Collections/CachedDefinitionCollection.php

@@ -1,5 +1,6 @@
 <site name="Rumble" homepage="https://rumble.com/">
 	<example>https://rumble.com/vaxo02-i-cant-climb-.html</example>
+	<example>https://rumble.com/embed/v8bhte/</example>
 
 	<oembed endpoint="https://rumble.com/api/Media/oembed.json"
 	          scheme="https://rumble.com/embed/{@id}/"/>
@@ -10,7 +11,7 @@
 	<extract>!rumble\.com/embed/(?'id'\w+)!</extract>
 	<scrape>
 		<match>#rumble\.com/(?!embed/).#</match>
-		<extract>!video"?:"(?'id'\w+)!</extract>
+		<extract>!(?:/|%2F)embed(?:/|%2F)(?'id'\w+)!</extract>
 	</scrape>
 	<iframe src="https://rumble.com/embed/{@id}/"/>
 </site>