diff --git a/README.md b/README.md
index 5db2caf..c27830c 100644
--- a/README.md
+++ b/README.md
@@ -443,7 +443,7 @@ Media BB Codes for XenForo, imported from [s9e\TextFormatter](https://github.com
twitter |
- Twitter (via custom iframe) |
+ Twitter |
https://twitter.com/IJasonAlexander/statuses/526635414338023424
https://mobile.twitter.com/DerekTVShow/status/463372588690202624
https://twitter.com/#!/IJasonAlexander/status/526635414338023424 |
@@ -504,7 +504,7 @@ Media BB Codes for XenForo, imported from [s9e\TextFormatter](https://github.com
wsj |
The Wall Street Journal Online |
- http://live.wsj.com/#!09FB2B3B-583E-4284-99D8-FEF6C23BE4E2
http://live.wsj.com/video/seahawks-qb-russell-wilson-on-super-bowl-win/9B3DF790-9D20-442C-B564-51524B06FD26.html
http://live.wsj.com/video/seth-rogen-emotional-appeal-over-alzheimer/3885A1E1-D5DE-443A-AA45-6A8F6BB8FBD8.html?mod=trending_now_video_4#!3885A1E1-D5DE-443A-AA45-6A8F6BB8FBD8 |
+ http://www.wsj.com/video/nba-players-primp-with-pedicures/9E476D54-6A60-4F3F-ABC1-411014552DE6.html
http://live.wsj.com/#!09FB2B3B-583E-4284-99D8-FEF6C23BE4E2
http://live.wsj.com/video/seahawks-qb-russell-wilson-on-super-bowl-win/9B3DF790-9D20-442C-B564-51524B06FD26.html |
xboxclips |
diff --git a/build/addon-s9e.xml b/build/addon-s9e.xml
index 83d5fed..300e54b 100644
--- a/build/addon-s9e.xml
+++ b/build/addon-s9e.xml
@@ -1,4 +1,4 @@
-
+
s9e Media Pack
@@ -56,7 +56,7 @@
{xen:phrase extra_copyright}
- | <a class="concealed" href="https://xenforo.com/community/resources/s9e-media-bbcodes-pack.2476/" title="Media BBCodes provided by s9e Media Pack 20150605">Media embeds by s9e</a>$0
+ | <a class="concealed" href="https://xenforo.com/community/resources/s9e-media-bbcodes-pack.2476/" title="Media BBCodes provided by s9e Media Pack 20150611">Media embeds by s9e</a>$0
(^)
diff --git a/build/upload/library/s9e/MediaBBCodes.php b/build/upload/library/s9e/MediaBBCodes.php
index 0b22eba..cf09787 100755
--- a/build/upload/library/s9e/MediaBBCodes.php
+++ b/build/upload/library/s9e/MediaBBCodes.php
@@ -172,7 +172,7 @@ class s9e_MediaBBCodes
'traileraddict'=>array('Trailer Addict','http://www.traileraddict.com/',array('movies'=>1),'@(?\'id\')traileraddict\\.com/(?!tags/)[^/]+/.@',array(),true,array(array('extract'=>array('@v\\.traileraddict\\.com/(?\'id\'\\d+)@'),'match'=>array('@traileraddict\\.com/(?!tags/)[^/]+/.@'))),''),
'tumblr'=>array('Tumblr','https://www.tumblr.com/',array('social'=>1),'!(?\'name\'[-\\w]+)\\.tumblr\\.com/post/(?\'id\'\\d+)!',array('!(?\'name\'[-\\w]+)\\.tumblr\\.com/post/(?\'id\'\\d+)!'),true,array(array('extract'=>array('!"embed_did":"(?\'did\'[-\\w]+)!','!"embed_key":"(?\'key\'[-\\w]+)!'),'match'=>array('//'),'url'=>'http://{@name}.tumblr.com/post/{@id}/embed'))),
'twitch'=>array('Twitch','http://www.twitch.tv/',array('gaming'=>1),"#(?'id')twitch\\.tv/(?'channel'(?!m/)\\w+)(?:/b/(?'archive_id'\\d+)|/c/(?'chapter_id'\\d+)|/v/(?'video_id'\\d+))?#\n!(?'id')twitch\\.tv/m/\\d+!",array('#twitch\\.tv/(?\'channel\'(?!m/)\\w+)(?:/b/(?\'archive_id\'\\d+)|/c/(?\'chapter_id\'\\d+)|/v/(?\'video_id\'\\d+))?#'),true,array(array('extract'=>array('!channel=(?\'channel\'\\w+).*?videoId=a(?\'archive_id\'\\d+)!'),'match'=>array('!twitch\\.tv/m/\\d+!')))),
- 'twitter'=>array('Twitter (via custom iframe)','https://twitter.com/',array('social'=>1),'@twitter\\.com/(?:#!/)?\\w+/status(?:es)?/(?\'id\'\\d+)@',array('@twitter\\.com/(?:#!/)?\\w+/status(?:es)?/(?\'id\'\\d+)@'),7=>'',8=>true),
+ 'twitter'=>array('Twitter','https://twitter.com/',array('social'=>1),'@twitter\\.com/(?:#!/)?\\w+/status(?:es)?/(?\'id\'\\d+)@',array('@twitter\\.com/(?:#!/)?\\w+/status(?:es)?/(?\'id\'\\d+)@'),7=>'',8=>true),
'ustream'=>array('Ustream','http://www.ustream.tv/',array('gaming'=>1),"!(?'id')ustream\\.tv/recorded/(?'vid'\\d+)!\n#(?'id')ustream\\.tv/(?!explore/|platform/|recorded/|search\\?|upcoming$|user/)(?:channel/)?[-\\w]+#",array('!ustream\\.tv/recorded/(?\'vid\'\\d+)!'),true,array(array('extract'=>array('!embed/(?\'cid\'\\d+)!'),'match'=>array('#ustream\\.tv/(?!explore/|platform/|recorded/|search\\?|upcoming$|user/)(?:channel/)?[-\\w]+#')))),
'vbox7'=>array('VBOX7','http://vbox7.com/',array('.bg'=>1),'!vbox7\\.com/play:(?\'id\'[\\da-f]+)!',array('!vbox7\\.com/play:(?\'id\'[\\da-f]+)!'),7=>''),
'vevo'=>array('VEVO','http://vevo.com/',array('music'=>1),'!vevo\\.com/watch/([-\\w/]+/)?(?\'id\'[A-Z0-9]+)!',array('!vevo\\.com/watch/([-\\w/]+/)?(?\'id\'[A-Z0-9]+)!'),7=>''),
@@ -184,7 +184,7 @@ class s9e_MediaBBCodes
'vk'=>array('VK','https://vk.com/',array('.ru'=>1),"!(?'id')vk(?:\\.com|ontakte\\.ru)/(?:[\\w.]+\\?z=)?video(?'oid'-?\\d+)_(?'vid'\\d+)!\n!(?'id')vk(?:\\.com|ontakte\\.ru)/video_ext\\.php\\?oid=(?'oid'-?\\d+)&id=(?'vid'\\d+)&hash=(?'hash'[0-9a-f]+)!\n!(?'id')(?=.*?[./]vk(?>\\.com|ontakte\\.ru)[:/]).*?vk.*?video-?\\d+_\\d+!",array('!vk(?:\\.com|ontakte\\.ru)/(?:[\\w.]+\\?z=)?video(?\'oid\'-?\\d+)_(?\'vid\'\\d+)!','!vk(?:\\.com|ontakte\\.ru)/video_ext\\.php\\?oid=(?\'oid\'-?\\d+)&id=(?\'vid\'\\d+)&hash=(?\'hash\'[0-9a-f]+)!'),true,array(array('extract'=>array('!\\\\"hash2\\\\":\\\\"(?\'hash\'[0-9a-f]+)!'),'match'=>array('!vk.*?video-?\\d+_\\d+!'),'url'=>'http://vk.com/video{@oid}_{@vid}'))),
'vocaroo'=>array('Vocaroo','http://vocaroo.com/',array('misc'=>1),'!vocaroo\\.com/i/(?\'id\'\\w+)!',array('!vocaroo\\.com/i/(?\'id\'\\w+)!'),7=>''),
'wshh'=>array('WorldStarHipHop','http://www.worldstarhiphop.com/',array('videos'=>1),"!worldstarhiphop\\.com/featured/(?'id'\\d+)!\n!(?'id')worldstarhiphop\\.com/(?:\\w+/)?video\\.php\\?v=\\w+!",array('!worldstarhiphop\\.com/featured/(?\'id\'\\d+)!'),true,array(array('extract'=>array('!disqus_identifier[ =\']+(?\'id\'\\d+)!'),'match'=>array('!worldstarhiphop\\.com/(?:\\w+/)?video\\.php\\?v=\\w+!'))),''),
- 'wsj'=>array('The Wall Street Journal Online','http://live.wsj.com/',array('news'=>1),"@live\\.wsj\\.com/[^#]*#!(?'id'[-0-9A-F]{36})@\n@live\\.wsj\\.com/video/[^/]+/(?'id'[-0-9A-F]{36})@",array('@live\\.wsj\\.com/[^#]*#!(?\'id\'[-0-9A-F]{36})@','@live\\.wsj\\.com/video/[^/]+/(?\'id\'[-0-9A-F]{36})@')),
+ 'wsj'=>array('The Wall Street Journal Online','http://www.wsj.com/video/',array('news'=>1),"@wsj\\.com/[^#]*#!(?'id'[-0-9A-F]{36})@\n@wsj\\.com/video/[^/]+/(?'id'[-0-9A-F]{36})@\n@(?'id')on\\.wsj\\.com/\\w@",array('@wsj\\.com/[^#]*#!(?\'id\'[-0-9A-F]{36})@','@wsj\\.com/video/[^/]+/(?\'id\'[-0-9A-F]{36})@'),true,array(array('extract'=>array('@guid=(?\'id\'[-0-9A-F]{36})@'),'match'=>array('@on\\.wsj\\.com/\\w@'))),''),
'xboxclips'=>array('XboxClips','http://xboxclips.com/',array('gaming'=>1),'!xboxclips\\.com/(?\'user\'[^/]+)/(?\'id\'[-0-9a-f]+)!',array('!xboxclips\\.com/(?\'user\'[^/]+)/(?\'id\'[-0-9a-f]+)!'),true),
'xboxdvr'=>array('Xbox DVR','http://xboxdvr.com/',array('gaming'=>1),'!xboxdvr\\.com/(?\'user\'[^/]+)/(?\'id\'[-0-9a-f]+)!',array('!xboxdvr\\.com/(?\'user\'[^/]+)/(?\'id\'[-0-9a-f]+)!'),true),
'yahooscreen'=>array('Yahoo! Screen','https://screen.yahoo.com/',array('movies'=>1),'!screen\\.yahoo\\.com/(?:[-\\w]+/)?(?\'id\'[-\\w]+)\\.html!',array('!screen\\.yahoo\\.com/(?:[-\\w]+/)?(?\'id\'[-\\w]+)\\.html!'),7=>''),
@@ -1349,15 +1349,6 @@ public static function renderVk($vars)
return $html;
}
- public static function renderWsj($vars)
- {
- $vars += array('id' => null);
-
- $html='';
-
- return $html;
- }
-
public static function renderXboxclips($vars)
{
$vars += array('id' => null, 'user' => null);
diff --git a/tests/Test.php b/tests/Test.php
index bdf4d1b..66b3154 100644
--- a/tests/Test.php
+++ b/tests/Test.php
@@ -1322,12 +1322,6 @@ function ()
'',
''
),
- array(
- 'wsj',
- '09FB2B3B-583E-4284-99D8-FEF6C23BE4E2',
- '',
- ''
- ),
array(
'xboxclips',
'id=508269a4-6f05-4b3e-a66a-fe4e91e92000;user=Soulshifted',
diff --git a/vendor/s9e/TextFormatter b/vendor/s9e/TextFormatter
index 203c973..b7264e1 160000
--- a/vendor/s9e/TextFormatter
+++ b/vendor/s9e/TextFormatter
@@ -1 +1 @@
-Subproject commit 203c973c23c9b4b2c44b2f1784cd0a66bd2cadab
+Subproject commit b7264e17e05d8beb6f867b1ba068e20ff2105a3d
diff --git a/www/tags.html b/www/tags.html
index e1194f5..98b2a26 100644
--- a/www/tags.html
+++ b/www/tags.html
@@ -100,7 +100,7 @@
MSNBC
The New York Times Video
The Atlantic Video
- The Wall Street Journal Online
+ The Wall Street Journal Online
podcasts
audioBoom
Libsyn
@@ -118,7 +118,7 @@
Instagram
Reddit comment permalink
Tumblr
- Twitter (via custom iframe)
+ Twitter
Vine
sports
Bleacher Report videos