[TwitterBridge] Display all images from a tweet (#1160)

RSS-Bridge · Jun 9, 2019 · d344111 · d344111
1 parent 7054268
commit d344111
Showing 1 changed file with 47 additions and 20 deletions.
diff --git a/bridges/TwitterBridge.php b/bridges/TwitterBridge.php
@@ -245,22 +245,26 @@ public function collectData(){
 
 			// Add embeded image to content
 			$image_html = '';
-			$image = $this->getImageURI($tweet);
-			if(!$this->getInput('noimg') && !is_null($image)) {
-				// Set image scaling
-				$image_orig = $this->getInput('noimgscaling') ? $image : $image . ':orig';
-				$image_thumb = $this->getInput('noimgscaling') ? $image : $image . ':thumb';
+			$images = $this->getImageURI($tweet);
+			if(!$this->getInput('noimg') && !is_null($images)) {
 
-				// add enclosures
-				$item['enclosures'] = array($image_orig);
+				foreach ($images as $image) {
 
-				$image_html = <<<EOD
+					// Set image scaling
+					$image_orig = $this->getInput('noimgscaling') ? $image : $image . ':orig';
+					$image_thumb = $this->getInput('noimgscaling') ? $image : $image . ':thumb';
+
+					// add enclosures
+					$item['enclosures'][] = $image_orig;
+
+					$image_html .= <<<EOD
 <a href="{$image_orig}">
 <img
 	style="align:top; max-width:558px; border:1px solid black;"
 	src="{$image_thumb}" />
 </a>
 EOD;
+				}
 			}
 
 			// add content
@@ -291,22 +295,27 @@ public function collectData(){
 
 				// Add embeded image to content
 				$quotedImage_html = '';
-				$quotedImage = $this->getQuotedImageURI($tweet);
-				if(!$this->getInput('noimg') && !is_null($quotedImage)) {
-					// Set image scaling
-					$quotedImage_orig = $this->getInput('noimgscaling') ? $quotedImage : $quotedImage . ':orig';
-					$quotedImage_thumb = $this->getInput('noimgscaling') ? $quotedImage : $quotedImage . ':thumb';
+				$quotedImages = $this->getQuotedImageURI($tweet);
 
-					// add enclosures
-					$item['enclosures'] = array($quotedImage_orig);
+				if(!$this->getInput('noimg') && !is_null($quotedImages)) {
+
+					foreach ($quotedImages as $image) {
+
+						// Set image scaling
+						$image_orig = $this->getInput('noimgscaling') ? $image : $image . ':orig';
+						$image_thumb = $this->getInput('noimgscaling') ? $image : $image . ':thumb';
 
-					$quotedImage_html = <<<EOD
-<a href="{$quotedImage_orig}">
+						// add enclosures
+						$item['enclosures'][] = $image_orig;
+
+						$quotedImage_html .= <<<EOD
+<a href="{$image_orig}">
 <img
 	style="align:top; max-width:558px; border:1px solid black;"
-	src="{$quotedImage_thumb}" />
+	src="{$image_thumb}" />
 </a>
 EOD;
+					}
 				}
 
 				$item['content'] = <<<EOD
@@ -360,19 +369,37 @@ private function fixAnchorSpacing($content){
 
 	private function getImageURI($tweet){
 		// Find media in tweet
+		$images = array();
+
 		$container = $tweet->find('div.AdaptiveMedia-container', 0);
+
 		if($container && $container->find('img', 0)) {
-			return $container->find('img', 0)->src;
+			foreach ($container->find('img') as $img) {
+				$images[] = $img->src;
+			}
+		}
+
+		if (!empty($images)) {
+			return $images;
 		}
 
 		return null;
 	}
 
 	private function getQuotedImageURI($tweet){
 		// Find media in tweet
+		$images = array();
+
 		$container = $tweet->find('div.QuoteMedia-container', 0);
+
 		if($container && $container->find('img', 0)) {
-			return $container->find('img', 0)->src;
+			foreach ($container->find('img') as $img) {
+				$images[] = $img->src;
+			}
+		}
+
+		if (!empty($images)) {
+			return $images;
 		}
 
 		return null;