Skip to content

Commit

Permalink
Added Oddshot
Browse files Browse the repository at this point in the history
  • Loading branch information
@JoshyPHP
JoshyPHP committed Aug 28, 2015
1 parent 711a2dc commit 215f88c
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 4 deletions.
4 changes: 2 additions & 2 deletions build/addon-s9e.xml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<addon addon_id="s9e" title="s9e Media Pack" url="https://xenforo.com/community/resources/s9e-media-bbcodes-pack.2476/" version_id="201508250" version_string="20150825" install_callback_class="s9e_MediaBBCodes" install_callback_method="install" uninstall_callback_class="s9e_MediaBBCodes" uninstall_callback_method="uninstall">
<addon addon_id="s9e" title="s9e Media Pack" url="https://xenforo.com/community/resources/s9e-media-bbcodes-pack.2476/" version_id="201508280" version_string="20150828" install_callback_class="s9e_MediaBBCodes" install_callback_method="install" uninstall_callback_class="s9e_MediaBBCodes" uninstall_callback_method="uninstall">
<bb_code_media_sites/>
<phrases>
<phrase title="option_group_s9e" version_id="1" version_string="1">s9e Media Pack</phrase>
Expand Down Expand Up @@ -56,7 +56,7 @@
</modification>
<modification action="str_replace" description="Adds a link back to s9e Media Pack" enabled="1" execution_order="10" modification_key="s9e_footer" template="footer">
<find>{xen:phrase extra_copyright}</find>
<replace> | &lt;a class="concealed" href="https://xenforo.com/community/resources/s9e-media-bbcodes-pack.2476/" title="Media BBCodes provided by s9e Media Pack 20150825"&gt;Media embeds by s9e&lt;/a&gt;$0</replace>
<replace> | &lt;a class="concealed" href="https://xenforo.com/community/resources/s9e-media-bbcodes-pack.2476/" title="Media BBCodes provided by s9e Media Pack 20150828"&gt;Media embeds by s9e&lt;/a&gt;$0</replace>
</modification>
<modification action="preg_replace" description="Defers the loading of embedded content" enabled="0" execution_order="10" modification_key="s9e_lazy_loading" template="ad_thread_view_below_messages">
<find>(^)</find>
Expand Down
3 changes: 2 additions & 1 deletion build/upload/library/s9e/MediaBBCodes.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ class s9e_MediaBBCodes
'instagram'=>array('Instagram','http://instagram.com/',array('social'=>1),'!instagram\\.com/p/(?\'id\'[-_\\w]+)!',array('!instagram\\.com/p/(?\'id\'[-_\\w]+)!'),7=>'<iframe width="612" height="710" src="//instagram.com/p/{$id}/embed/" allowfullscreen="" frameborder="0" scrolling="no" data-s9e=""></iframe>'),
'internetarchive'=>array('Internet Archive','https://archive.org/',array('misc'=>1),'!(?\'id\')archive\\.org/details/!',array(),true,array(array('extract'=>array('!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'=>array('!archive\\.org/details/!')))),
'izlesene'=>array('İzlesene','http://www.izlesene.com/',array('.tr'=>1),'!izlesene\\.com/video/[-\\w]+/(?\'id\'\\d+)!',array('!izlesene\\.com/video/[-\\w]+/(?\'id\'\\d+)!'),7=>'<iframe width="560" height="315" src="//www.izlesene.com/embedplayer/{$id}" allowfullscreen="" frameborder="0" scrolling="no" data-s9e=""></iframe>'),
'khl'=>array('Kontinental Hockey League (КХЛ)','http://www.khl.ru/',array('.ru'=>1,'sports'=>1),'!(?\'id\')video\\.khl\\.ru/(?:event|quote)s/\\d!',array(),true,array(array('extract'=>array('!//video\\.khl\\.ru/iframe/feed/start/(?\'id\'[\\w/]+)!'),'match'=>array('!video\\.khl\\.ru/(?:event|quote)s/\\d!'))),'<iframe width="560" height="315" src="//video.khl.ru/iframe/feed/start/{$id}?type_id=18&amp;width=560&amp;height=315" allowfullscreen="" frameborder="0" scrolling="no" data-s9e=""></iframe>'),
'khl'=>array('Kontinental Hockey League (КХЛ)','http://www.khl.ru/',array('.ru'=>1,'sports'=>1),'!(?\'id\')video\\.khl\\.ru/(?:event|quote)s/\\d!',array(),true,array(array('extract'=>array('!/feed/start/(?\'id\'[\\w/]+)!'),'match'=>array('!video\\.khl\\.ru/(?:event|quote)s/\\d!'))),'<iframe width="560" height="315" src="//video.khl.ru/iframe/feed/start/{$id}?type_id=18&amp;width=560&amp;height=315" allowfullscreen="" frameborder="0" scrolling="no" data-s9e=""></iframe>'),
'kickstarter'=>array('Kickstarter','http://www.kickstarter.com/',array('fundraising'=>1),'!kickstarter\\.com/projects/(?\'id\'[^/]+/[^/?]+)(?:/widget/(?:(?\'card\'card)|(?\'video\'video)))?!',array('!kickstarter\\.com/projects/(?\'id\'[^/]+/[^/?]+)(?:/widget/(?:(?\'card\'card)|(?\'video\'video)))?!'),true),
'kissvideo'=>array('Kiss Video','http://www.kissvideo.click/index.html',array('videos'=>1),'!kissvideo\\.click/[^_]*_(?\'id\'[0-9a-f]+)!',array('!kissvideo\\.click/[^_]*_(?\'id\'[0-9a-f]+)!'),7=>'<iframe width="640" height="360" src="//www.kissvideo.click/embed.php?vid={$id}" allowfullscreen="" frameborder="0" scrolling="no" data-s9e=""></iframe>'),
'libsyn'=>array('Libsyn','http://www.libsyn.com/',array('podcasts'=>1),'@(?\'id\')(?=.*?[./]libsyn\\.com[:/]).*?(?!\\.mp3)....$@',array(),true,array(array('extract'=>array('!embed/episode/id/(?\'id\'\\d+)!'),'match'=>array('@(?!\\.mp3)....$@'))),'<iframe width="100%" height="45" style="max-width:900px" src="//html5-player.libsyn.com/embed/episode/id/{$id}/height/45/width/900/theme/standard/direction/no/autoplay/no/autonext/no/thumbnail/no/preload/no/no_addthis/no/" allowfullscreen="" frameborder="0" scrolling="no" data-s9e=""></iframe>'),
Expand All @@ -146,6 +146,7 @@ class s9e_MediaBBCodes
'nhl'=>array('NHL VideoCenter','http://video.nhl.com/videocenter/',array('sports'=>1),'!nhl\\.com/videocenter/.*?\\Wid=(?\'id\'[-\\w]+)!',array('!nhl\\.com/videocenter/.*?\\Wid=(?\'id\'[-\\w]+)!'),7=>'<iframe width="640" height="395" src="//video.nhl.com/videocenter/embed?playlist={$id}" allowfullscreen="" frameborder="0" scrolling="no" data-s9e=""></iframe>'),
'npr'=>array('NPR','http://www.npr.org/',array('podcasts'=>1),"!(?'id')npr\\.org/[\\w/]+/\\d+!\n!(?'id')n\\.pr/\\w!",array(),true,array(array('extract'=>array('!openPlayer\\((?\'i\'\\d+), (?\'m\'\\d+)!'),'match'=>array('!npr\\.org/[\\w/]+/\\d+!','!n\\.pr/\\w!')))),
'nytimes'=>array('The New York Times Video','http://www.nytimes.com/video/',array('news'=>1),"!nytimes\\.com/video/[a-z]+/(?:[a-z]+/)?(?'id'\\d+)!\n!nytimes\\.com/video/\\d+/\\d+/\\d+/[a-z]+/(?'id'\\d+)!",array('!nytimes\\.com/video/[a-z]+/(?:[a-z]+/)?(?\'id\'\\d+)!','!nytimes\\.com/video/\\d+/\\d+/\\d+/[a-z]+/(?\'id\'\\d+)!'),7=>'<iframe width="480" height="373" src="http://graphics8.nytimes.com/bcvideo/1.0/iframe/embed.html?videoId={$id}&amp;playerType=embed" allowfullscreen="" frameborder="0" scrolling="no" data-s9e=""></iframe>'),
'oddshot'=>array('Oddshot','http://oddshot.tv/',array('gaming'=>1),'!(?=.*?[./]oddshot\\.tv[:/]).*?oddshot.tv/shot/(?\'id\'[-\\w]+)!',array('!(?=.*?[./]oddshot\\.tv[:/]).*?oddshot.tv/shot/(?\'id\'[-\\w]+)!'),7=>'<iframe width="560" height="315" src="//oddshot.tv/shot/{$id}/embed" allowfullscreen="" frameborder="0" scrolling="no" data-s9e=""></iframe>'),
'pastebin'=>array('Pastebin','http://pastebin.com/',array('misc'=>1),'!pastebin\\.com/(?:\\w+\\.php\\?i=)?(?\'id\'\\w+)!',array('!pastebin\\.com/(?:\\w+\\.php\\?i=)?(?\'id\'\\w+)!'),7=>'<iframe width="100%" height="300" src="//pastebin.com/embed_iframe.php?i={$id}" scrolling="" style="resize:both" allowfullscreen="" frameborder="0" data-s9e=""></iframe>',8=>true),
'podbean'=>array('Podbean','http://www.podbean.com/',array('podcasts'=>1),"!podbean\\.com/site/player/index/pid/\\d+/eid/(?'id'\\d+)!\n!(?'id')podbean\\.com/e/!",array('!podbean\\.com/site/player/index/pid/\\d+/eid/(?\'id\'\\d+)!'),true,array(array('extract'=>array('!embed/postId/(?\'id\'\\d+)!'),'match'=>array('!podbean\\.com/e/!'))),'<iframe width="100%" height="100" style="max-width:900px" src="//www.podbean.com/media/player/audio/postId/{$id}" allowfullscreen="" frameborder="0" scrolling="no" data-s9e=""></iframe>',true),
'prezi'=>array('Prezi','http://prezi.com/',array('presentations'=>1),'#//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+)/#',array('#//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+)/#'),7=>'<iframe width="550" height="400" src="//prezi.com/embed/{$id}/" allowfullscreen="" frameborder="0" scrolling="no" data-s9e=""></iframe>'),
Expand Down
2 changes: 1 addition & 1 deletion vendor/s9e/TextFormatter
Submodule TextFormatter updated 25 files
+11 −0 CHANGELOG.md
+1 −0 NEWS.md
+1 −1 composer.json
+5 −0 docs/Plugins/MediaEmbed/Sites.md
+12 −4 docs/testdox.txt
+1 −0 phpunit.xml
+66 −0 scripts/build/generateChangelog.php
+39 −0 scripts/build/patchComposerVersion.php
+28 −0 scripts/build/release.sh
+1 −1 src/Bundles/MediaPack.php
+4 −4 src/Bundles/MediaPack/Renderer.php
+28 −24 src/Configurator/JavaScript.php
+93 −44 src/Configurator/JavaScript/ConfigOptimizer.php
+131 −0 src/Configurator/JavaScript/ConfigValue.php
+16 −3 src/Configurator/JavaScript/Encoder.php
+0 −3 src/Configurator/RendererGenerators/PHP.php
+24 −4 src/Parser.js
+2 −1 src/Plugins/MediaEmbed/Configurator/CachedSiteDefinitionProvider.php
+1 −1 src/Plugins/MediaEmbed/Configurator/sites/khl.xml
+10 −0 src/Plugins/MediaEmbed/Configurator/sites/oddshot.xml
+19 −20 tests/Configurator/JavaScript/ConfigOptimizerTest.php
+130 −0 tests/Configurator/JavaScript/ConfigValueTest.php
+19 −1 tests/Configurator/JavaScript/EncoderTest.php
+6 −51 tests/Configurator/JavaScriptTest.php
+18 −0 tests/Plugins/MediaEmbed/ParserTest.php
1 change: 1 addition & 0 deletions www/tags.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
<dd><a href='http://www.gamespot.com/'>Gamespot</a></dd>
<dd><a href='http://www.gametrailers.com/'>GameTrailers</a></dd>
<dd><a href='http://www.ign.com/videos/'>IGN</a></dd>
<dd><a href='http://oddshot.tv/'>Oddshot</a></dd>
<dd><a href='http://www.twitch.tv/'>Twitch</a></dd>
<dd><a href='http://www.ustream.tv/'>Ustream</a></dd>
<dd><a href='http://www.viagame.com/'>Viagame</a></dd>
Expand Down

0 comments on commit 215f88c

Please sign in to comment.