From 79989fd0bfd963bfc0abf38161477cf1cc510301 Mon Sep 17 00:00:00 2001 From: s9e Date: Tue, 3 Dec 2013 11:45:31 +0100 Subject: [PATCH] Updated TeamCoco --- README.md | 2 +- build/addon.xml | 5 +++-- build/upload/library/s9e/MediaBBCodes.php | 2 +- tests/Test.php | 4 ++-- vendor/s9e/TextFormatter | 2 +- www/configure.html | 4 ++-- 6 files changed, 10 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 76b9625..5bd83e2 100644 --- a/README.md +++ b/README.md @@ -154,7 +154,7 @@ Media BB Codes for XenForo, imported from [s9e\TextFormatter](https://github.com teamcoco Team Coco - http://teamcoco.com/video/conan-highlight-gigolos-mug-hunt + http://teamcoco.com/video/serious-jibber-jabber-a-scott-berg-full-episode
http://teamcoco.com/video/73784/historian-a-scott-berg-serious-jibber-jabber-with-conan-obrien ted diff --git a/build/addon.xml b/build/addon.xml index 0f2953e..db10caf 100644 --- a/build/addon.xml +++ b/build/addon.xml @@ -1,5 +1,5 @@ - + !(?'id')bandcamp\.com/album/.! @@ -122,7 +122,8 @@ ]]> - !(?'id')teamcoco\.com/video/.! + !teamcoco\.com/video/(?'id'\d+)! +!(?'id')teamcoco\.com/video/.! ]]> diff --git a/build/upload/library/s9e/MediaBBCodes.php b/build/upload/library/s9e/MediaBBCodes.php index 09fdfa1..788e0b0 100644 --- a/build/upload/library/s9e/MediaBBCodes.php +++ b/build/upload/library/s9e/MediaBBCodes.php @@ -432,7 +432,7 @@ public static function matchSpotify($url) public static function matchTeamcoco($url) { - $regexps = array(); + $regexps = array('!teamcoco\\.com/video/(?\'id\'\\d+)!'); $scrapes = array( array( 'match' => array('!teamcoco\\.com/video/.!'), diff --git a/tests/Test.php b/tests/Test.php index 2a72e44..c3067aa 100644 --- a/tests/Test.php +++ b/tests/Test.php @@ -172,8 +172,8 @@ public function getMatchCallbackTests() ), array( 'teamcoco', - 'http://teamcoco.com/video/conan-highlight-gigolos-mug-hunt', - '54003' + 'http://teamcoco.com/video/serious-jibber-jabber-a-scott-berg-full-episode', + '73784' ), array( 'traileraddict', diff --git a/vendor/s9e/TextFormatter b/vendor/s9e/TextFormatter index 0ae5652..6b16752 160000 --- a/vendor/s9e/TextFormatter +++ b/vendor/s9e/TextFormatter @@ -1 +1 @@ -Subproject commit 0ae5652174e2e1b84ecf641a77eff130e7ea1891 +Subproject commit 6b1675200461d6896dba2d4a286acaa939949f4a diff --git a/www/configure.html b/www/configure.html index a524fdd..e5f9bdb 100644 --- a/www/configure.html +++ b/www/configure.html @@ -197,7 +197,7 @@ teamcoco Team Coco - http://teamcoco.com/video/conan-highlight-gigolos-mug-hunt + http://teamcoco.com/video/serious-jibber-jabber-a-scott-berg-full-episode
http://teamcoco.com/video/73784/historian-a-scott-berg-serious-jibber-jabber-with-conan-obrien @@ -256,7 +256,7 @@