From e9902e2391a2dfe644e15ff9be6c6d0e3b329c56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20SAUVAGE?= <sebsauvage@sebsauvage.net>
Date: Wed, 14 May 2014 12:39:12 +0200
Subject: [PATCH] Updated from Mitsukarenai

---
 bridges/YoutubeBridge.php | 62 ++++++++++++++++++++++++++++++---------
 1 file changed, 48 insertions(+), 14 deletions(-)

diff --git a/bridges/YoutubeBridge.php b/bridges/YoutubeBridge.php
index 8d739251..c7d71118 100644
--- a/bridges/YoutubeBridge.php
+++ b/bridges/YoutubeBridge.php
@@ -4,8 +4,10 @@
 * Returns the newest videos
 *
 * @name Youtube Bridge
-* @description Returns the newest videos
+* @description Returns the newest videos by username or playlist
 * @use1(u="username")
+* @use2(p="playlist id")
+* @use3(s="search keyword",pa="page")
 */
 class YoutubeBridge extends BridgeAbstract{
     
@@ -16,20 +18,52 @@ class YoutubeBridge extends BridgeAbstract{
         if (isset($param['u'])) {   /* user timeline mode */
             $this->request = $param['u'];
             $html = file_get_html('https://www.youtube.com/user/'.urlencode($this->request).'/videos') or $this->returnError('Could not request Youtube.', 404);
+
+	        foreach($html->find('li.channels-content-item') as $element) {
+            	 $item = new \Item();
+           	 $item->uri = 'https://www.youtube.com'.$element->find('a',0)->href;
+           	 $item->thumbnailUri = 'https:'.$element->find('img',0)->src;
+           	 $item->title = trim($element->find('h3',0)->plaintext);
+           	 $item->content = '<a href="' . $item->uri . '"><img src="' . $item->thumbnailUri . '" /></a><br><a href="' . $item->uri . '">' . $item->title . '</a>';
+           	 $this->items[] = $item;
+        	}
+        }
+        else if (isset($param['p'])) {   /* playlist mode */
+            $this->request = $param['p'];
+            $html = file_get_html('https://www.youtube.com/playlist?list='.urlencode($this->request).'') or $this->returnError('Could not request Youtube.', 404);
+
+        	foreach($html->find('li.playlist-video-item') as $element) {
+           	 $item = new \Item();
+           	 $item->uri = 'https://www.youtube.com'.$element->find('a',0)->href;
+            	$item->thumbnailUri = 'https:'.$element->find('img',0)->src;
+            	$item->title = trim($element->find('h3',0)->plaintext);
+            	$item->content = '<a href="' . $item->uri . '"><img src="' . $item->thumbnailUri . '" /></a><br><a href="' . $item->uri . '">' . $item->title . '</a>';
+            	$this->items[] = $item;
+        	}
+		$this->request = 'Playlist '.str_replace(' - YouTube', '', $html->find('title', 0)->plaintext).', by '.$html->find('h1', 0)->plaintext;
+        }
+        else if (isset($param['s'])) {   /* search mode */
+            $this->request = $param['s']; $page = 1; if (isset($param['pa'])) $page = (int)preg_replace("/[^0-9]/",'', $param['pa']); 
+            $html = file_get_html('https://www.youtube.com/results?search_query='.urlencode($this->request).'&page='.$page.'&filters=video&search_sort=video_date_uploaded') or $this->returnError('Could not request Youtube.', 404);
+
+        	foreach($html->find('li.context-data-item') as $element) {
+           	 $item = new \Item();
+           	 $item->uri = 'https://www.youtube.com'.$element->find('a',0)->href;
+		$checkthumb = $element->find('img', 0)->getAttribute('data-thumb');
+		if($checkthumb !== FALSE)
+			$item->thumbnailUri = $checkthumb;
+		else
+            		$item->thumbnailUri = ''.$element->find('img',0)->src;
+            	$item->title = trim($element->find('h3',0)->plaintext);
+            	$item->content = '<a href="' . $item->uri . '"><img src="' . $item->thumbnailUri . '" /></a><br><a href="' . $item->uri . '">' . $item->title . '</a>';
+            	$this->items[] = $item;
+        	}
+		$this->request = 'Search: '.str_replace(' - YouTube', '', $html->find('title', 0)->plaintext);
         }
         else {
-            $this->returnError('You must specify a Youtbe username (?u=...).', 400);
-        }
-        
-    
-        foreach($html->find('li.channels-content-item') as $element) {
-            $item = new \Item();
-            $item->uri = 'https://www.youtube.com'.$element->find('a',0)->href;
-            $item->thumbnailUri = 'https:'.$element->find('img',0)->src;
-            $item->title = trim($element->find('h3',0)->plaintext);
-            $item->content = '<a href="' . $item->uri . '"><img src="' . $item->thumbnailUri . '" /></a><br><a href="' . $item->uri . '">' . $item->title . '</a>';
-            $this->items[] = $item;
-        }
+		$this->returnError('You must either specify a Youtube username (?u=...) or a playlist id (?p=...) or search (?s=...)', 400);
+	}
+   
     }
 
     public function getName(){
@@ -41,6 +75,6 @@ class YoutubeBridge extends BridgeAbstract{
     }
 
     public function getCacheDuration(){
-        return 21600; // 6 hours
+        return 10800; // 3 hours
     }
 }