diff --git a/bridges/TwitterBridge.php b/bridges/TwitterBridge.php index b3b7bed4..d36581ef 100644 --- a/bridges/TwitterBridge.php +++ b/bridges/TwitterBridge.php @@ -245,22 +245,26 @@ EOD; // 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 = <<getInput('noimgscaling') ? $image : $image . ':orig'; + $image_thumb = $this->getInput('noimgscaling') ? $image : $image . ':thumb'; + + // add enclosures + $item['enclosures'][] = $image_orig; + + $image_html .= << EOD; + } } // add content @@ -291,22 +295,27 @@ EOD; // 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)) { - $quotedImage_html = << + foreach ($quotedImages as $image) { + + // 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; + + $quotedImage_html .= << + src="{$image_thumb}" /> EOD; + } } $item['content'] = <<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; @@ -370,9 +388,18 @@ EOD; 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;