MediaEmbed: updated Imgur

Author: JoshyPHP

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)
- [ ] 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
+ [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
 
 Curl (s9e\TextFormatter\Tests\Utils\Http\Clients\Curl)
- [ ] 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
+ [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
 
 Native (s9e\TextFormatter\Tests\Utils\Http\Clients\Native)
- [ ] 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
+ [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
 
 Http (s9e\TextFormatter\Tests\Utils\Http)
  [x] getClient() returns an instance of s9e\TextFormatter\Utils\Http\Client

src/Bundles/MediaPack.php

@@ -58,7 +58,7 @@ class CachedDefinitionCollection extends SiteDefinitionCollection
 		'hulu'=>['attributes'=>[],'example'=>'https://www.hulu.com/watch/484180','extract'=>[],'homepage'=>'https://www.hulu.com/','host'=>['hulu.com'],'iframe'=>['src'=>'https://secure.hulu.com/embed/{@id}'],'name'=>'Hulu','scrape'=>[['extract'=>['!eid=(?\'id\'[-\\w]+)!'],'match'=>['!hulu\\.com/watch/!']]]],
 		'ign'=>['attributes'=>[],'example'=>'https://www.ign.com/videos/2013/07/12/pokemon-x-version-pokemon-y-version-battle-trailer','extract'=>['!(?\'id\'https?://.*?ign\\.com/videos/.+)!i'],'homepage'=>'https://www.ign.com/videos/','host'=>['ign.com'],'iframe'=>['height'=>263,'src'=>'//widgets.ign.com/video/embed/content.html?url={@id}','width'=>468],'name'=>'IGN','scrape'=>[],'tags'=>['gaming']],
 		'imdb'=>['attributes'=>[],'example'=>['https://www.imdb.com/video/imdb/vi2482677785/','https://www.imdb.com/title/tt2294629/videoplayer/vi2482677785'],'extract'=>[],'homepage'=>'https://www.imdb.com/trailers/','host'=>['imdb.com'],'iframe'=>['src'=>'https://www.imdb.com/video/embed/vi{@id}/?autoplay=false&width=640'],'name'=>'IMDb trailers','scrape'=>[['extract'=>['!imdb\\.com/[/\\w]+?/vi(?\'id\'\\d+)!'],'match'=>['!imdb\\.com/[/\\w]+?/vi(?\'id\'\\d+)!'],'url'=>'https://www.imdb.com/video/embed/vi{@id}/']],'tags'=>['movies']],
-		'imgur'=>['amp'=>['custom-element'=>'amp-imgur','src'=>'https://cdn.ampproject.org/v0/amp-imgur-0.1.js','template'=>'<amp-imgur layout="responsive" width="542" height="400" data-imgur-id="{@id}"/>'],'attributes'=>[],'example'=>['https://imgur.com/AsQ0K3P','https://imgur.com/a/9UGCL','https://imgur.com/gallery/9UGCL','https://i.imgur.com/u7Yo0Vy.gifv','https://i.imgur.com/UO1UrIx.mp4'],'extract'=>['@imgur\\.com/(?\'id\'a/\\w+)@','@i\\.imgur\\.com/(?\'id\'\\w{5,7})[lms]?\\.@','@imgur\\.com/(?!upload\\b)(?\'id\'\\w+)(?![\\w./])@'],'homepage'=>'https://imgur.com/','host'=>['imgur.com'],'iframe'=>['data-s9e-livepreview-ignore-attrs'=>'style','height'=>400,'onload'=>'let c=new MessageChannel;c.port1.onmessage=e=>{{let s=this.style,d=e.data.split(\' \');s.height=d[0]+\'px\';s.width=d[1]+\'px\'}};this.contentWindow.postMessage(\'s9e:init\',\'*\',[c.port2])','src'=>'https://s9e.github.io/iframe/2/imgur.min.html#<xsl:if test="@type=\'album\'">a/</xsl:if><xsl:value-of select="@id"/>','width'=>542],'name'=>'Imgur','oembed'=>['endpoint'=>'https://api.imgur.com/oembed.json','scheme'=>'https://imgur.com/{@id}'],'scrape'=>[['extract'=>['@data-id="(?\'id\'[\\w/]+)"@'],'match'=>['@imgur\\.com/(?![art]/|user/)(?\'path\'(?:gallery/)?\\w+)(?![\\w.])@'],'url'=>'https://api.imgur.com/oembed.xml?url=/{@path}']],'tags'=>['images']],
+		'imgur'=>['amp'=>['custom-element'=>'amp-imgur','src'=>'https://cdn.ampproject.org/v0/amp-imgur-0.1.js','template'=>'<amp-imgur layout="responsive" width="542" height="400" data-imgur-id="{@id}"/>'],'attributes'=>[],'example'=>['https://imgur.com/AsQ0K3P','https://imgur.com/a/9UGCL','https://imgur.com/gallery/9UGCL','https://i.imgur.com/u7Yo0Vy.gifv','https://i.imgur.com/UO1UrIx.mp4'],'extract'=>['@imgur\\.com/(?\'id\'(?:a|gallery)/\\w+)@','@i\\.imgur\\.com/(?\'id\'\\w{5,7})[lms]?\\.@','@imgur\\.com/(?!upload\\b)(?\'id\'\\w+)(?![\\w./])@'],'homepage'=>'https://imgur.com/','host'=>['imgur.com'],'iframe'=>['data-s9e-livepreview-ignore-attrs'=>'style','height'=>400,'onload'=>'let c=new MessageChannel;c.port1.onmessage=e=>{{let s=this.style,d=e.data.split(\' \');s.height=d[0]+\'px\';s.width=d[1]+\'px\'}};this.contentWindow.postMessage(\'s9e:init\',\'*\',[c.port2])','src'=>'https://s9e.github.io/iframe/2/imgur.min.html#<xsl:if test="@type=\'album\'">a/</xsl:if><xsl:value-of select="@id"/>','width'=>542],'name'=>'Imgur','oembed'=>['endpoint'=>'https://api.imgur.com/oembed.json','scheme'=>'https://imgur.com/{@id}'],'scrape'=>[['extract'=>['@data-id="(?\'id\'[\\w/]+)"@'],'match'=>['@imgur\\.com/(?![art]/|user/)(?\'path\'(?:gallery/)?\\w+)(?![\\w.])@'],'url'=>'https://api.imgur.com/oembed.xml?url=/{@path}']],'tags'=>['images']],
 		'indiegogo'=>['attributes'=>[],'example'=>'https://www.indiegogo.com/projects/gameheart-redesigned','extract'=>['!indiegogo\\.com/projects/(?\'id\'[-\\w]+)!'],'homepage'=>'https://www.indiegogo.com/','host'=>['indiegogo.com'],'iframe'=>['height'=>445,'src'=>'//www.indiegogo.com/project/{@id}/embedded','width'=>222],'name'=>'Indiegogo','scrape'=>[],'tags'=>['fundraising']],
 		'instagram'=>['amp'=>['custom-element'=>'amp-instagram','src'=>'https://cdn.ampproject.org/v0/amp-instagram-0.1.js','template'=>'<amp-instagram layout="responsive" width="540" height="540" data-captioned="" data-shortcode="{@id}"/>'],'attributes'=>[],'example'=>['https://instagram.com/p/gbGaIXBQbn/','https://www.instagram.com/tv/BkQjCfsBIzi/'],'extract'=>['#instagram\\.com/(?!share/)(?:[.\\w]+/)?(?:p|reel|tv)/(?\'id\'[-\\w]+)#'],'homepage'=>'https://instagram.com/','host'=>['instagram.com'],'iframe'=>['data-s9e-livepreview-ignore-attrs'=>'style','height'=>542,'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/instagram.min.html#<xsl:value-of select="@id"/><xsl:if test="$MEDIAEMBED_THEME">#theme=<xsl:value-of select="$MEDIAEMBED_THEME"/></xsl:if>','width'=>542],'name'=>'Instagram','scrape'=>[['extract'=>['#instagram\\.com/(?:p|reel|tv)/(?\'id\'[-\\w]+)#'],'header'=>'User-agent: PHP','match'=>['#instagram.com/share/\\w+/\\w#']]],'source'=>'http://help.instagram.com/513918941996087','tags'=>['social'],'tracking_policy'=>'https://help.instagram.com/1896641480634370'],
 		'internetarchive'=>['attributes'=>['height'=>['defaultValue'=>360,'filterChain'=>['#uint']],'id'=>['filterChain'=>['htmlspecialchars_decode']],'width'=>['defaultValue'=>640,'filterChain'=>['#uint']]],'choose'=>['otherwise'=>['iframe'=>['height'=>'{@height}','src'=>'https://archive.org/embed/{@id}','width'=>'{@width}']],'when'=>['iframe'=>['height'=>170,'max-width'=>640,'src'=>'https://archive.org/embed/{@id}&list_height=150','width'=>'100%'],'test'=>'contains(@id,\'playlist=1\')']],'example'=>['https://archive.org/details/BillGate99','https://archive.org/details/DFTS2014-05-30'],'extract'=>[],'homepage'=>'https://archive.org/','host'=>['archive.org'],'name'=>'Internet Archive','scrape'=>[['extract'=>['!meta property="twitter:player" content="https://archive.org/embed/(?\'id\'[^/"]+)!','!meta property="og:video:width" content="(?\'width\'\\d+)!','!meta property="og:video:height" content="(?\'height\'\\d+)!'],'match'=>['!archive\\.org/(?:details|embed)/!']]]],

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

@@ -11,7 +11,7 @@
 	<tags><tag>images</tag></tags>
 
 	<host>imgur.com</host>
-	<extract>@imgur\.com/(?'id'a/\w+)@</extract>
+	<extract>@imgur\.com/(?'id'(?:a|gallery)/\w+)@</extract>
 	<extract>@i\.imgur\.com/(?'id'\w{5,7})[lms]?\.@</extract>
 	<extract>@imgur\.com/(?!upload\b)(?'id'\w+)(?![\w./])@</extract>
 	<scrape url="https://api.imgur.com/oembed.xml?url=/{@path}">