MediaEmbed: updated Threads

Author: JoshyPHP

docs/Plugins/MediaEmbed/Sites.md

@@ -423,7 +423,7 @@
 	</tr>
 	<tr title="Threads" id="threads">
 		<td><code>threads</code></td>
-		<td>https://www.threads.net/t/CuY2OYEAbJw</td>
+		<td>https://www.threads.com/t/CuY2OYEAbJw</td>
 	</tr>
 	<tr title="TikTok" id="tiktok">
 		<td><code>tiktok</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

@@ -115,7 +115,7 @@ class CachedDefinitionCollection extends SiteDefinitionCollection
 		'theatlantic'=>['attributes'=>[],'example'=>'https://www.theatlantic.com/video/index/358928/computer-vision-syndrome-and-you/','extract'=>['!theatlantic\\.com/video/index/(?\'id\'\\d+)!'],'homepage'=>'https://www.theatlantic.com/video/','host'=>['theatlantic.com'],'iframe'=>['src'=>'//www.theatlantic.com/video/iframe/{@id}/'],'name'=>'The Atlantic Video','scrape'=>[],'tags'=>['news']],
 		'theguardian'=>['attributes'=>[],'example'=>'https://www.theguardian.com/world/video/2016/apr/07/tokyos-hedgehog-cafe-encourages-you-to-embrace-prickly-pets-video','extract'=>['!theguardian\\.com/(?\'id\'\\w+/video/20(?:0[0-9]|1[0-7])[-/\\w]+)!'],'homepage'=>'https://www.theguardian.com/video','host'=>['theguardian.com'],'iframe'=>['src'=>'//embed.theguardian.com/embed/video/{@id}'],'name'=>'The Guardian (obsolete)','scrape'=>[],'tags'=>['news']],
 		'theonion'=>['attributes'=>[],'example'=>['https://www.theonion.com/video/nation-successfully-completes-mothers-day-by-918-a,35998/','https://www.theonion.com/video/the-onion-reviews-avengers-age-of-ultron-38524'],'extract'=>['!theonion\\.com/video/[-\\w]+[-,](?\'id\'\\d+)!'],'homepage'=>'https://www.theonion.com/video/','host'=>['theonion.com'],'iframe'=>['src'=>'//www.theonion.com/video_embed/?id={@id}'],'name'=>'The Onion','scrape'=>[],'tags'=>['entertainment']],
-		'threads'=>['attributes'=>[],'example'=>'https://www.threads.net/t/CuY2OYEAbJw','extract'=>['!threads\\.net/(?:@[-\\w.]+/pos)?t/(?\'id\'[-\\w]+)!'],'homepage'=>'https://www.threads.net/','host'=>['threads.net'],'iframe'=>['data-s9e-livepreview-ignore-attrs'=>'style','height'=>300,'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/threads.min.html#{@id}','width'=>550],'name'=>'Threads','scrape'=>[],'tags'=>['social']],
+		'threads'=>['attributes'=>[],'example'=>'https://www.threads.com/t/CuY2OYEAbJw','extract'=>['!threads\\.(?:com|net)/(?:@[-\\w.]+/pos)?t/(?\'id\'[-\\w]+)!'],'homepage'=>'https://www.threads.com/','host'=>['threads.com','threads.net'],'iframe'=>['data-s9e-livepreview-ignore-attrs'=>'style','height'=>300,'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/threads.min.html#{@id}','width'=>550],'name'=>'Threads','scrape'=>[],'tags'=>['social']],
 		'tiktok'=>['attributes'=>[],'example'=>'https://www.tiktok.com/@lauren.feagans/video/6789430799839104261','extract'=>['#tiktok\\.com/(?:@[.\\w]+/video|v|(?:i18n/)?share/video)/(?\'id\'\\d+)#'],'homepage'=>'https://www.tiktok.com','host'=>['tiktok.com'],'iframe'=>['data-s9e-livepreview-ignore-attrs'=>'style','height'=>740,'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/tiktok.min.html#{@id}','width'=>325],'name'=>'TikTok','oembed'=>['endpoint'=>'https://www.tiktok.com/oembed','scheme'=>'https://www.tiktok.com/video/{@id}'],'scrape'=>[['extract'=>['#tiktok\\.com/(?:@[.\\w]+/video|v|(?:i18n/)?/share/video)/(?\'id\'\\d+)#'],'match'=>['#//v[mt]\\.tiktok\\.com/(?\'short_id\'\\w+)#','#tiktok\\.com/t/(?\'short_id\'\\w+)#'],'url'=>'https://www.tiktok.com/t/{@short_id}']],'tags'=>['videos']],
 		'tmz'=>['attributes'=>[],'example'=>'https://www.tmz.com/videos/0_2pr9x3rb/','extract'=>['@tmz\\.com/videos/(?\'id\'\\w+)@'],'homepage'=>'https://www.tmz.com/videos','host'=>['tmz.com'],'iframe'=>['src'=>'//www.kaltura.com/index.php/kwidget/cache_st/133592691/wid/_591531/partner_id/591531/uiconf_id/9071262/entry_id/{@id}'],'name'=>'TMZ','scrape'=>[],'tags'=>['gossip']],
 		'tradingview'=>['attributes'=>[],'example'=>['https://www.tradingview.com/symbols/NASDAQ-AAPL/','https://www.tradingview.com/chart/US30/Yro4JNSD-us30/'],'extract'=>['!tradingview\\.com/(?:chart/[^/]+|i)/(?\'chart\'\\w+)!','!tradingview\\.com/symbols/(?\'symbol\'[-:\\w]+)!'],'homepage'=>'https://www.tradingview.com/','host'=>['tradingview.com'],'iframe'=>['height'=>400,'src'=>'https://s.tradingview.com/<xsl:choose><xsl:when test="@symbol">widgetembed/?interval=D&amp;symbol=<xsl:value-of select="translate(@symbol,\'-\',\':\')"/></xsl:when><xsl:otherwise>embed/<xsl:value-of select="@chart"/></xsl:otherwise></xsl:choose>','width'=>'100%'],'name'=>'TradingView','scrape'=>[],'tags'=>['finance']],

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

@@ -1,9 +1,10 @@
-<site name="Threads" homepage="https://www.threads.net/">
-	<example>https://www.threads.net/t/CuY2OYEAbJw</example>
+<site name="Threads" homepage="https://www.threads.com/">
+	<example>https://www.threads.com/t/CuY2OYEAbJw</example>
 
 	<tags><tag>social</tag></tags>
 
+	<host>threads.com</host>
 	<host>threads.net</host>
-	<extract>!threads\.net/(?:@[-\w.]+/pos)?t/(?'id'[-\w]+)!</extract>
+	<extract>!threads\.(?:com|net)/(?:@[-\w.]+/pos)?t/(?'id'[-\w]+)!</extract>
 	<iframe width="550" height="300" src="https://s9e.github.io/iframe/2/threads.min.html#{@id}" onload="let c=new MessageChannel;c.port1.onmessage=e=>this.style.height=e.data+'px';this.contentWindow.postMessage('s9e:init','*',[c.port2])" data-s9e-livepreview-ignore-attrs="style"/>
 </site>