From d60a822bc21ea45e3567e2028a6d2b53dea7c0c4 Mon Sep 17 00:00:00 2001
From: Damien Calesse <madeinjb@gmail.com>
Date: Sat, 30 Jul 2016 19:24:06 +0200
Subject: [PATCH] Update Flickr Bridge

Fix the bridge (Flickr update?)

I get the pictures titles with the API (slowing down the bridge). If you
have any suggestions to replace them, feel free to change it.
---
 bridges/FlickrExploreBridge.php | 31 ++++++++++++++++++++++---------
 1 file changed, 22 insertions(+), 9 deletions(-)

diff --git a/bridges/FlickrExploreBridge.php b/bridges/FlickrExploreBridge.php
index 9d83f27f..524d9d95 100644
--- a/bridges/FlickrExploreBridge.php
+++ b/bridges/FlickrExploreBridge.php
@@ -5,21 +5,34 @@ class FlickrExploreBridge extends BridgeAbstract{
 
 		$this->maintainer = "sebsauvage";
 		$this->name = "Flickr Explore";
-		$this->uri = "http://www.flickr.com/explore";
+		$this->uri = "https://www.flickr.com/explore";
 		$this->description = "Returns the latest interesting images from Flickr";
-		$this->update = "2014-05-25";
+		$this->update = "2016-07-30";
 
 	}
 
     public function collectData(array $param){
-        $html = $this->file_get_html('http://www.flickr.com/explore') or $this->returnError('Could not request Flickr.', 404);
-    
-        foreach($html->find('span.photo_container') as $element) {
+        $html = $this->file_get_html('https://www.flickr.com/explore') or $this->returnError('Could not request Flickr.', 404);
+
+        foreach($html->find('.photo-list-photo-view') as $element) {
+						// Get the styles
+						$style = explode(';', $element->style);
+						// Get the background-image style
+						$backgroundImage = explode(':', end($style));
+						// URI type : url(//cX.staticflickr.com/X/XXXXX/XXXXXXXXX.jpg)
+						$imageURI = trim(str_replace(['url(', ')'], '', end($backgroundImage)));
+						// Get the image ID
+						$imageURIs = explode('_', basename($imageURI));
+						$imageID = reset($imageURIs);
+
+						// Get the image JSON via Flickr API
+						$imageJSON = json_decode(file_get_contents('https://api.flickr.com/services/rest/?method=flickr.photos.getInfo&api_key=103b574d49bd51f0e18bfe907da44a0f&photo_id='.$imageID.'&format=json&nojsoncallback=1')) or $this->returnError('Could not request Flickr.', 404); // FIXME: Request time too long...
+
             $item = new \Item();
-            $item->uri = 'http://flickr.com'.$element->find('a',0)->href;
-            $item->thumbnailUri = $element->find('img',0)->getAttribute('data-defer-src');
+            $item->uri = 'https://flickr.com/photo.gne?id='.$imageID;
+            $item->thumbnailUri = $imageURI;
             $item->content = '<a href="' . $item->uri . '"><img src="' . $item->thumbnailUri . '" /></a>'; // FIXME: Filter javascript ?
-            $item->title = $element->find('a',0)->title;
+            $item->title = $imageJSON->photo->title->_content;
             $this->items[] = $item;
         }
     }
@@ -29,7 +42,7 @@ class FlickrExploreBridge extends BridgeAbstract{
     }
 
     public function getURI(){
-        return 'http://www.flickr.com/explore';
+        return 'https://www.flickr.com/explore';
     }
 
     public function getCacheDuration(){