Some fixed for embedds

GodMod · Jun 15, 2020 · 71d0f48 · 71d0f48
1 parent 5419b40
commit 71d0f48
Show file tree

Hide file tree

Showing 2 changed files with 74 additions and 37 deletions.
diff --git a/core/embedly.class.php b/core/embedly.class.php
@@ -39,8 +39,7 @@ public function __construct(){
 				),
 				'twitch' => array(
 					'regex' => ["https?://clips\.twitch\.tv/.*","https?://www\.twitch\.tv/.*","https?://twitch\.tv/.*"],
-					'format' => 'json',
-					'oembed' => 'https://api.twitch.tv/v5/oembed?url=URL',
+					'function' => 'embedTwitch',
 				),
 				'vidme' => array(
 					'regex' => ['https://vidd\.me/.*', 'https?://vid\.me/.*'],
@@ -99,9 +98,8 @@ public function parseLink($link){
 		if (strlen($link) == 0) return '';
 		$oembed = $this->getLinkDetails($link);
 
-
-		if ($oembed && is_array($oembed) && count($oembed)){
-			$out = $this->formatEmbedded($oembed[0], $link);
+		if ($oembed && (is_array($oembed) || is_object($oembed)) && count($oembed)){
+			$out = $this->formatEmbedded($oembed, $link);
 		}
 
 		return $out;
@@ -173,7 +171,7 @@ public function parseString($string, $maxwidth=false, $blnEncodeMediaTags=false)
 
 		//Now let's get the information from embedly
 		$oembeds = $this->getMeta($embedlyUrls);
-
+		
 		//And now let's replace the Links with the Videos or pictures
 		foreach ($oembeds as $key => $oembed){
 			if($oembed === false) continue;
@@ -184,7 +182,7 @@ public function parseString($string, $maxwidth=false, $blnEncodeMediaTags=false)
 
 				$string = str_replace('<a href="'.$arrDecodedLinks[$key].'">'.$arrDecodedLinks[$key].'</a>', $out, $string);
 
-				#$string = preg_replace("#([^\"':>])".preg_quote($arrDecodedLinks[$key], '#')."#i", "$1".$out, $string);
+				$string = preg_replace("~(^|\s)".preg_quote($arrDecodedLinks[$key], '~')."~", $out, $string);
 			}
 		}
 
@@ -194,10 +192,6 @@ public function parseString($string, $maxwidth=false, $blnEncodeMediaTags=false)
 
 	//Styling for Embedded Images/Objects
 	private function formatEmbedded($objEmbedly, $link){
-		#d($objEmbedly);
-
-
-
 		$out = '';
 		switch($objEmbedly->type) {
 				case 'photo':
@@ -336,33 +330,43 @@ private function getMeta($mixLink){
 			$mixResult = $this->checkLink($mixLink);
 			if($mixResult !== false){
 				$arrMyService = $this->getServices($mixResult);
-
-				$strUrl = str_replace('URL', urlencode($mixLink), $arrMyService['oembed']);
-
-				//Local cache
-				if(isset($this->arrCache[$strUrl])) return $this->arrCache[$strUrl];
-
-				//File cache
-				if(file_exists($this->strImageCacheFolder.md5($strUrl).'.txt') && (filemtime($this->strImageCacheFolder.md5($strUrl).'.txt') > (time()-86400)) ){
-					$strResult = file_get_contents($this->strImageCacheFolder.md5($strUrl).'.txt');
+
+				if(isset($arrMyService['function'])){
+					$function = $arrMyService['function'];
+					$arrResult = $this->{$function}($mixLink);
+					$this->arrCache[$mixLink] = ($arrResult) ? $arrResult : false;
+
+					return $this->arrCache[$mixLink];
+
 				} else {
-					$strResult = register('urlfetcher')->fetch($strUrl);
-				}
-
-				if($strResult){
-					$this->pfh->putContent($this->strImageCacheFolder.md5($strUrl).'.txt', $strResult);
-
-					if($arrMyService['format'] == 'xml'){
-						$arrResult = simplexml_load_string($strResult);
-					} else{
-						$arrResult = json_decode($strResult);
+					$strUrl = str_replace('URL', urlencode($mixLink), $arrMyService['oembed']);
+
+					//Local cache
+					if(isset($this->arrCache[$strUrl])) return $this->arrCache[$strUrl];
+
+					//File cache
+					if(file_exists($this->strImageCacheFolder.md5($strUrl).'.txt') && (filemtime($this->strImageCacheFolder.md5($strUrl).'.txt') > (time()-86400)) ){
+						$strResult = file_get_contents($this->strImageCacheFolder.md5($strUrl).'.txt');
+					} else {
+						$strResult = register('urlfetcher')->fetch($strUrl);
 					}
-
-					$this->arrCache[$strUrl] = ($arrResult) ? $arrResult : false;
-
-					return $this->arrCache[$strUrl];
-				} else {
-					return false;
+
+					if($strResult){
+						$this->pfh->putContent($this->strImageCacheFolder.md5($strUrl).'.txt', $strResult);
+
+						if($arrMyService['format'] == 'xml'){
+							$arrResult = simplexml_load_string($strResult);
+						} else{
+							$arrResult = json_decode($strResult);
+						}
+
+						$this->arrCache[$strUrl] = ($arrResult) ? $arrResult : false;
+
+						return $this->arrCache[$strUrl];
+					} else {
+						return false;
+					}
+
 				}
 			}
 		}
@@ -395,4 +399,36 @@ public function checkLink($strLink){
 		}
 		return false;
 	}
+
+	public function embedTwitch($url){
+		$arrRegex = array('https?://www.twitch.tv/(?<AUTHOR>[a-zA-Z0-9_]+)/clip/(?<CLIP>[a-zA-Z0-9_]+)', 'https?://www.twitch.tv/(?!videos)(?!.*/v/)(?<CHANNEL>[a-zA-Z0-9_]+)',
+'https?://www.twitch.tv/videos/(?<VIDEO>[0-9]+)', 'https?://www.twitch.tv/[a-zA-Z0-9]+/v/(?<VIDEO>[0-9]+)');
+
+		$arrMatches = array();
+		foreach($arrRegex as $val){
+			$a = preg_match('~'.$val.'~', $url, $arrMatches);
+			if($a > 0) break;
+		}
+
+		$src = '';
+		if (!empty($arrMatches['CLIP'])) {
+			$src = 'https://clips.twitch.tv/embed?clip=' . $arrMatches['CLIP'];
+		}
+
+		if (!empty($arrMatches['CHANNEL'])) {
+			$src = 'https://player.twitch.tv/?channel=' . $arrMatches['CHANNEL'];
+		}
+
+		if (!empty($arrMatches['VIDEO'])) {
+			$src = 'https://player.twitch.tv/?video=' . $arrMatches['VIDEO'];
+		}
+
+		if (!empty($src)) {
+			$parent = parse_url($this->env->buildlink());
+			$iframe = '<iframe src="' . $src . '&parent=' . $parent['host'] . '&autoplay=false" height="270" width="" allowfullscreen></iframe>';	
+
+			return (object)array('html' => $iframe, 'width'=> 400, 'height'=> 270, 'type'=>'video', 'provider_url' => 'https://twitch.tv', 'provider_name' => 'Twitch');			
+		}
+		return false;
+	}
 }
diff --git a/libraries/bbcode/bbcode.class.php b/libraries/bbcode/bbcode.class.php
@@ -534,7 +534,8 @@ public function remove_shorttags($text, $blnDisplayItemnames = false){
 		public function remove_embeddedMedia($text){
 			$text = preg_replace('{<object[^>]*>(.*?)</object>}', '', $text);
 			$text = preg_replace('{<embed[^>]*>(.*?)</embed>}', '', $text);
-
+			$text = preg_replace('{<iframe[^>]*>(.*?)</iframe>}', '', $text);
+
 			return $text;
 		}