Updated Comedy Central and Google Sheets

README.md

@@ -77,7 +77,7 @@ Media BB Codes for XenForo, imported from [s9e\TextFormatter](https://github.com
 		<tr>
 			<td><code>comedycentral</code></td>
 			<td>Comedy Central</td>
-			<td>http://www.cc.com/video-clips/uu5qz4/key-and-peele-dueling-hats<br/>http://www.comedycentral.com/video-clips/uu5qz4/key-and-peele-dueling-hats</td>
+			<td>http://www.cc.com/video-clips/uu5qz4/key-and-peele-dueling-hats<br/>http://www.comedycentral.com/video-clips/uu5qz4/key-and-peele-dueling-hats<br/>http://tosh.cc.com/video-clips/aet4lh/rc-car-crash</td>
 		</tr>
 		<tr>
 			<td><code>coub</code></td>

build/addon.xml

@@ -1,4 +1,4 @@
-<addon addon_id="s9e" title="s9e Media Pack" url="https://github.com/s9e/XenForoMediaBBCodes" version_id="201408190" version_string="20140819" install_callback_class="s9e_MediaBBCodes" install_callback_method="install">
+<addon addon_id="s9e" title="s9e Media Pack" url="https://github.com/s9e/XenForoMediaBBCodes" version_id="201408210" version_string="20140821" install_callback_class="s9e_MediaBBCodes" install_callback_method="install">
   <bb_code_media_sites>
     <site media_site_id="abcnews" site_title="ABC News" site_url="http://abcnews.go.com/" match_is_regex="1" supported="1">
       <match_urls>!abcnews\.go\.com/[^/]+/video/[^/]+-(?'id'\d+)!</match_urls>
@@ -122,7 +122,7 @@
       <embed_html><![CDATA[<iframe width="450" height="240" src="//s9e.github.io/iframe/googleplus.min.html#{$oid}/posts/{$pid}" onload="var a=Math.random();window.addEventListener('message',function(b){if(b.data.id==a)style.height=b.data.height+'px'});contentWindow.postMessage('s9e:'+a,src.substr(0,src.indexOf('/',8)))" allowfullscreen="" frameborder="0" scrolling="no"></iframe>]]></embed_html>
     </site>
     <site media_site_id="googlesheets" site_title="Google Sheets" site_url="http://www.google.com/sheets/about/" match_is_regex="1" supported="1" embed_html_callback_class="s9e_MediaBBCodes" embed_html_callback_method="embed" match_callback_class="s9e_MediaBBCodes" match_callback_method="matchGooglesheets">
-      <match_urls>!docs\.google\.com/spreadsheets?/(?:ccc\?key=|d/)(?'id'\w+)[^#]*(?:#gid=(?'gid'\d+))?!</match_urls>
+      <match_urls>!docs\.google\.com/spreadsheet(?:/ccc\?key=|s/d/)(?'id'\w+)[^#]*(?:#gid=(?'gid'\d+))?!</match_urls>
       <embed_html><![CDATA[<iframe width="100%" height="500" style="resize:both" src="https://docs.google.com/spreadsheets/d/{$id}?widget=true&amp;headers=false&amp;rm=minimal#gid={$gid}" allowfullscreen="" frameborder="0" scrolling="no"></iframe>]]></embed_html>
     </site>
     <site media_site_id="grooveshark" site_title="Grooveshark" site_url="http://grooveshark.com/" match_is_regex="1" supported="1" embed_html_callback_class="s9e_MediaBBCodes" embed_html_callback_method="embed" match_callback_class="s9e_MediaBBCodes" match_callback_method="matchGrooveshark">

build/upload/library/s9e/MediaBBCodes.php

@@ -414,7 +414,7 @@ public static function matchComedycentral($url)
 		$scrapes = array(
 			array(
 				'match'   => array('!c(?:c|omedycentral)\\.com/video-clips/!'),
-				'extract' => array('!(?\'id\'mgid:arc:video:comedycentral\\.com:[-\\w]+)!')
+				'extract' => array('!(?\'id\'mgid:arc:video:[.\\w]+:[-\\w]+)!')
 			)
 		);
 
@@ -542,7 +542,7 @@ public static function matchGoogleplus($url)
 
 	public static function matchGooglesheets($url)
 	{
-		$regexps = array('!docs\\.google\\.com/spreadsheets?/(?:ccc\\?key=|d/)(?\'id\'\\w+)[^#]*(?:#gid=(?\'gid\'\\d+))?!');
+		$regexps = array('!docs\\.google\\.com/spreadsheet(?:/ccc\\?key=|s/d/)(?\'id\'\\w+)[^#]*(?:#gid=(?\'gid\'\\d+))?!');
 		$scrapes = array();
 
 		return self::match($url, $regexps, $scrapes);