From 42b6c82753127407e7c5ccd5f39ffa4e78040e9e Mon Sep 17 00:00:00 2001 From: logmanoriginal Date: Tue, 9 Aug 2016 15:50:25 +0200 Subject: [PATCH] bridges: Cleanup occurrences of $item->thumbnailUri This is a subsequent change to f3eefab --- bridges/AnimeUltimeBridge.php | 4 +--- bridges/ArstechnicaBridge.php | 3 +-- bridges/Arte7Bridge.php | 5 ++--- bridges/BooruprojectBridge.php | 5 ++--- bridges/CNETBridge.php | 13 +------------ bridges/CpasbienBridge.php | 1 - bridges/DailymotionBridge.php | 5 ++--- bridges/DanbooruBridge.php | 6 +++--- bridges/DilbertBridge.php | 3 +-- bridges/DollbooruBridge.php | 6 +++--- bridges/EstCeQuonMetEnProdBridge.php | 10 +--------- bridges/FacebookBridge.php | 9 +-------- bridges/FlickrExploreBridge.php | 5 ++--- bridges/FlickrTagBridge.php | 6 +++--- bridges/FuturaSciencesBridge.php | 3 +-- bridges/GBAtempBridge.php | 15 ++++++--------- bridges/GelbooruBridge.php | 6 +++--- bridges/HDWallpapersBridge.php | 5 ++--- bridges/HentaiHavenBridge.php | 6 +++--- bridges/JapanExpoBridge.php | 3 +-- bridges/KonachanBridge.php | 5 ++--- bridges/LeMondeInformatiqueBridge.php | 4 +--- bridges/LinkedInCompany.php | 3 +-- bridges/LolibooruBridge.php | 5 ++--- bridges/MangareaderBridge.php | 8 ++++---- bridges/MilbooruBridge.php | 6 +++--- bridges/MspabooruBridge.php | 6 +++--- bridges/NakedSecurityBridge.php | 3 +-- bridges/NeuviemeArtBridge.php | 3 +-- bridges/NextInpactBridge.php | 3 +-- bridges/NextgovBridge.php | 6 +----- bridges/PickyWallpapersBridge.php | 3 +-- bridges/RTBFBridge.php | 5 +++-- bridges/Releases3DSBridge.php | 3 +-- bridges/Rule34Bridge.php | 6 +++--- bridges/Rule34pahealBridge.php | 6 +++--- bridges/SafebooruBridge.php | 6 +++--- bridges/SakugabooruBridge.php | 5 ++--- bridges/SiliconBridge.php | 3 +-- bridges/SuperbWallpapersBridge.php | 3 +-- bridges/T411Bridge.php | 12 +----------- bridges/TagBoardBridge.php | 8 ++++---- bridges/TbibBridge.php | 6 +++--- bridges/TheHackerNewsBridge.php | 4 +--- bridges/TwitchApiBridge.php | 5 ++--- bridges/UnsplashBridge.php | 5 ++--- bridges/ViadeoCompany.php | 5 ++--- bridges/WallpaperStopBridge.php | 5 ++--- bridges/WeLiveSecurityBridge.php | 3 +-- bridges/XbooruBridge.php | 6 +++--- bridges/YandereBridge.php | 5 ++--- bridges/YoutubeBridge.php | 6 +++--- bridges/ZDNetBridge.php | 6 +----- 53 files changed, 104 insertions(+), 183 deletions(-) diff --git a/bridges/AnimeUltimeBridge.php b/bridges/AnimeUltimeBridge.php index 20f0bfd..224f664 100644 --- a/bridges/AnimeUltimeBridge.php +++ b/bridges/AnimeUltimeBridge.php @@ -9,7 +9,7 @@ class AnimeUltimeBridge extends BridgeAbstract { $this->name = 'Anime-Ultime'; $this->uri = 'http://www.anime-ultime.net/'; $this->description = 'Returns the 10 newest releases posted on Anime-Ultime'; - $this->update = '2015-10-30'; + $this->update = '2016-08-09'; $this->parameters[] = '[ @@ -86,7 +86,6 @@ class AnimeUltimeBridge extends BridgeAbstract { $item_link_element = $release->find('td', 0)->find('a', 0); $item_uri = $website.$item_link_element->href; $item_name = html_entity_decode($item_link_element->plaintext); - $item_image = $website.substr($item_link_element->onmouseover, 37, strpos($item_link_element->onmouseover, ' ', 37) - 37); $item_episode = html_entity_decode(str_pad($release->find('td', 1)->plaintext, 2, '0', STR_PAD_LEFT)); $item_fansub = $release->find('td', 2)->plaintext; $item_type = $release->find('td', 4)->plaintext; @@ -108,7 +107,6 @@ class AnimeUltimeBridge extends BridgeAbstract { $item->title = $item_name.' '.$item_type.' '.$item_episode; $item->author = $item_fansub; $item->timestamp = $item_date; - $item->thumbnailUri = $item_image; $item->content = $item_description; $this->items[] = $item; $processedOK++; diff --git a/bridges/ArstechnicaBridge.php b/bridges/ArstechnicaBridge.php index de26ee1..3e0b3c4 100644 --- a/bridges/ArstechnicaBridge.php +++ b/bridges/ArstechnicaBridge.php @@ -9,7 +9,7 @@ class ArstechnicaBridge extends BridgeAbstract { $this->name = "ArstechnicaBridge"; $this->uri = "http://arstechnica.com"; $this->description = "The PC enthusiast's resource. Power users and the tools they love, without computing religion"; - $this->update = "01/08/2016"; + $this->update = "2016-08-09"; } @@ -51,7 +51,6 @@ class ArstechnicaBridge extends BridgeAbstract { $item = new \Item(); $item->title = StripCDATA($element->find('title', 0)->innertext); $item->uri = StripCDATA($element->find('guid', 0)->plaintext); - $item->thumbnailUri = StripCDATA($element->find('enclosure', 0)->url); $item->author = StripCDATA($element->find('author', 0)->innertext); $item->timestamp = strtotime($element->find('pubDate', 0)->plaintext); $item->content = ExtractContent($item->uri); diff --git a/bridges/Arte7Bridge.php b/bridges/Arte7Bridge.php index 07de0a4..2c2e2f6 100644 --- a/bridges/Arte7Bridge.php +++ b/bridges/Arte7Bridge.php @@ -7,7 +7,7 @@ class Arte7Bridge extends BridgeAbstract{ $this->name = "Arte +7"; $this->uri = "http://www.arte.tv/"; $this->description = "Returns newest videos from ARTE +7"; - $this->update = "2015-10-31"; + $this->update = "2016-08-09"; $this->parameters["Catégorie (Français)"] = '[ { @@ -147,12 +147,11 @@ class Arte7Bridge extends BridgeAbstract{ $hack_broadcast_time = strtok($hack_broadcast_time, 'T'); $hack_broadcast_time = strtok('T'); $item->timestamp = strtotime($element['scheduled_on'].'T'.$hack_broadcast_time); - $item->thumbnailUri = $element['thumbnail_url']; $item->title = $element['title']; if (!empty($element['subtitle'])) $item->title = $element['title'].' | '.$element['subtitle']; $item->duration = round((int)$element['duration']/60); - $item->content = $element['teaser'].'

'.$item->duration.'min
'; + $item->content = $element['teaser'].'

'.$item->duration.'min
'; $this->items[] = $item; } } diff --git a/bridges/BooruprojectBridge.php b/bridges/BooruprojectBridge.php index 9f9546a..3ed40f2 100644 --- a/bridges/BooruprojectBridge.php +++ b/bridges/BooruprojectBridge.php @@ -7,7 +7,7 @@ class BooruprojectBridge extends BridgeAbstract{ $this->name = "Booruproject"; $this->uri = "http://booru.org/"; $this->description = "Returns images from given page and booruproject instance (****.booru.org)"; - $this->update = "2015-09-12"; + $this->update = "2016-08-09"; $this->parameters[] = '[ @@ -51,10 +51,9 @@ class BooruprojectBridge extends BridgeAbstract{ $item->uri = 'http://'.$param['i'].'.booru.org/'.$element->find('a', 0)->href; $item->postid = (int)preg_replace("/[^0-9]/",'', $element->find('a', 0)->getAttribute('id')); $item->timestamp = time(); - $item->thumbnailUri = $element->find('img', 0)->src; $item->tags = $element->find('img', 0)->getAttribute('title'); $item->title = 'Booruproject '.$param['i'].' | '.$item->postid; - $item->content = '
Tags: '.$item->tags; + $item->content = '
Tags: '.$item->tags; $this->items[] = $item; } } diff --git a/bridges/CNETBridge.php b/bridges/CNETBridge.php index 5b0a8d5..e73027c 100644 --- a/bridges/CNETBridge.php +++ b/bridges/CNETBridge.php @@ -9,7 +9,7 @@ class CNETBridge extends BridgeAbstract { $this->name = 'CNET News'; $this->uri = 'http://www.cnet.com/'; $this->description = 'Returns the newest articles.
You may specify a topic found in some section URLs, else all topics are selected.'; - $this->update = '2016-08-06'; + $this->update = '2016-08-09'; $this->parameters[] = '[ @@ -59,7 +59,6 @@ class CNETBridge extends BridgeAbstract { $article_title = trim($element->find('h2', 0)->plaintext); $article_uri = 'http://www.cnet.com'.($element->find('a', 0)->href); - $article_thumbnail = $element->parent()->find('img', 0)->src; $article_timestamp = strtotime($element->find('time.assetTime', 0)->plaintext); $article_author = trim($element->find('a[rel=author]', 0)->plaintext); @@ -67,20 +66,10 @@ class CNETBridge extends BridgeAbstract { $article_html = $this->file_get_html($article_uri) or $this->returnError('Could not request CNET: '.$article_uri, 500); - if (is_null($article_thumbnail)) - $article_thumbnail = $article_html->find('div.originalImage', 0); - - if (is_null($article_thumbnail)) - $article_thumbnail = $article_html->find('span.imageContainer', 0); - - if (is_object($article_thumbnail)) - $article_thumbnail = $article_thumbnail->find('img', 0)->src; - $article_content = trim(CleanArticle(ExtractFromDelimiters($article_html, '
uri = "https://www.dailymotion.com/"; $this->description = "Returns the 5 newest videos by username/playlist or search"; - $this->update = "2016-08-02"; + $this->update = "2016-08-09"; $this->parameters["By username"] = '[ @@ -83,10 +83,9 @@ class DailymotionBridge extends BridgeAbstract{ $item->id = str_replace('/video/', '', strtok($element->href, '_')); $metadata = getMetadata($item->id); $item->uri = $metadata['uri']; - $item->thumbnailUri = $metadata['thumbnailUri']; $item->title = $metadata['title']; $item->timestamp = $metadata['timestamp']; - $item->content = '
' . $item->title . ''; + $item->content = '
' . $item->title . ''; $this->items[] = $item; $count++; } diff --git a/bridges/DanbooruBridge.php b/bridges/DanbooruBridge.php index ac4bef6..91befb1 100644 --- a/bridges/DanbooruBridge.php +++ b/bridges/DanbooruBridge.php @@ -7,7 +7,7 @@ class DanbooruBridge extends BridgeAbstract{ $this->name = "Danbooru"; $this->uri = "http://donmai.us/"; $this->description = "Returns images from given page"; - $this->update = "2014-05-25"; + $this->update = "2016-08-09"; $this->parameters[] = '[ @@ -37,10 +37,10 @@ class DanbooruBridge extends BridgeAbstract{ $item->uri = 'http://donmai.us'.$element->find('a', 0)->href; $item->postid = (int)preg_replace("/[^0-9]/",'', $element->getAttribute('data-id')); $item->timestamp = time(); - $item->thumbnailUri = 'http://donmai.us'.$element->find('img', 0)->src; + $thumbnailUri = 'http://donmai.us'.$element->find('img', 0)->src; $item->tags = $element->find('img', 0)->getAttribute('alt'); $item->title = 'Danbooru | '.$item->postid; - $item->content = '
Tags: '.$item->tags; + $item->content = '
Tags: '.$item->tags; $this->items[] = $item; } } diff --git a/bridges/DilbertBridge.php b/bridges/DilbertBridge.php index e4f2c9c..8cb7c80 100644 --- a/bridges/DilbertBridge.php +++ b/bridges/DilbertBridge.php @@ -7,7 +7,7 @@ class DilbertBridge extends BridgeAbstract { $this->name = 'Dilbert Daily Strip'; $this->uri = 'http://dilbert.com'; $this->description = 'The Unofficial Dilbert Daily Comic Strip'; - $this->update = "2016-08-06"; + $this->update = "2016-08-09"; } @@ -29,7 +29,6 @@ class DilbertBridge extends BridgeAbstract { $item = new \Item(); $item->uri = $url; - $item->thumbnailUri = $comic; $item->title = $title; $item->author = 'Scott Adams'; $item->timestamp = $date; diff --git a/bridges/DollbooruBridge.php b/bridges/DollbooruBridge.php index 958fce5..fe6d6fb 100644 --- a/bridges/DollbooruBridge.php +++ b/bridges/DollbooruBridge.php @@ -7,7 +7,7 @@ class DollbooruBridge extends BridgeAbstract{ $this->name = "Dollbooru"; $this->uri = "http://dollbooru.org/"; $this->description = "Returns images from given page"; - $this->update = "2015-01-20"; + $this->update = "2016-08-09"; $this->parameters[] = @@ -40,10 +40,10 @@ class DollbooruBridge extends BridgeAbstract{ $item->uri = 'http://dollbooru.org'.$element->href; $item->postid = (int)preg_replace("/[^0-9]/",'', $element->getAttribute('data-post-id')); $item->timestamp = time(); - $item->thumbnailUri = 'http://dollbooru.org'.$element->find('img', 0)->src; + $thumbnailUri = 'http://dollbooru.org'.$element->find('img', 0)->src; $item->tags = $element->getAttribute('data-tags'); $item->title = 'Dollbooru | '.$item->postid; - $item->content = '
Tags: '.$item->tags; + $item->content = '
Tags: '.$item->tags; $this->items[] = $item; } } diff --git a/bridges/EstCeQuonMetEnProdBridge.php b/bridges/EstCeQuonMetEnProdBridge.php index 5e5d8b4..f0636b8 100644 --- a/bridges/EstCeQuonMetEnProdBridge.php +++ b/bridges/EstCeQuonMetEnProdBridge.php @@ -6,7 +6,7 @@ class EstCeQuonMetEnProdBridge extends BridgeAbstract { $this->name = 'Est-ce qu\'on met en prod aujourd\'hui ?'; $this->uri = 'https://www.estcequonmetenprodaujourdhui.info/'; $this->description = 'Should we put a website in production today? (French)'; - $this->update = "2016-08-06"; + $this->update = "2016-08-09"; } public function collectData(array $param) { @@ -20,16 +20,8 @@ class EstCeQuonMetEnProdBridge extends BridgeAbstract { $html = $this->file_get_html($this->getURI()) or $this->returnError('Could not request EstCeQuonMetEnProd: '.$this->getURI(), 500); - $img = $html->find('img', 0); - if (is_object($img)) { - $img = $img->src; - if ($img[0] == '/') - $img = substr($this->getURI(), 0, strlen($this->getURI()) - 1).$img; - } - $item = new \Item(); $item->uri = $this->getURI().'#'.date('Y-m-d'); - $item->thumbnailUri = $img; $item->title = $this->getName(); $item->author = 'Nicolas Hoffmann'; $item->timestamp = strtotime('today midnight'); diff --git a/bridges/FacebookBridge.php b/bridges/FacebookBridge.php index f1c9406..96974fc 100644 --- a/bridges/FacebookBridge.php +++ b/bridges/FacebookBridge.php @@ -7,7 +7,7 @@ class FacebookBridge extends BridgeAbstract{ $this->name = "Facebook"; $this->uri = "http://www.facebook.com/"; $this->description = "Input a page title or a profile log. For a profile log, please insert the parameter as follow : myExamplePage/132621766841117"; - $this->update = "2016-08-06"; + $this->update = "2016-08-09"; $this->parameters[] = '[ @@ -197,15 +197,8 @@ class FacebookBridge extends BridgeAbstract{ if (strlen($title) > 64) $title = substr($title, 0, strpos(wordwrap($title, 64), "\n")).'...'; - //Use first image as thumbnail if available, or profile pic fallback - $thumbnail = $post->find('img', 1); - if (is_object($thumbnail)) - $thumbnail = $thumbnail->src; - else $thumbnail = $profilePic; - //Build and add final item $item->uri = 'https://facebook.com'.$post->find('abbr')[0]->parent()->getAttribute('href'); - $item->thumbnailUri = $thumbnail; $item->content = $content; $item->title = $title; $item->author = $author; diff --git a/bridges/FlickrExploreBridge.php b/bridges/FlickrExploreBridge.php index 524d9d9..8e859b1 100644 --- a/bridges/FlickrExploreBridge.php +++ b/bridges/FlickrExploreBridge.php @@ -7,7 +7,7 @@ class FlickrExploreBridge extends BridgeAbstract{ $this->name = "Flickr Explore"; $this->uri = "https://www.flickr.com/explore"; $this->description = "Returns the latest interesting images from Flickr"; - $this->update = "2016-07-30"; + $this->update = "2016-08-09"; } @@ -30,8 +30,7 @@ class FlickrExploreBridge extends BridgeAbstract{ $item = new \Item(); $item->uri = 'https://flickr.com/photo.gne?id='.$imageID; - $item->thumbnailUri = $imageURI; - $item->content = ''; // FIXME: Filter javascript ? + $item->content = ''; // FIXME: Filter javascript ? $item->title = $imageJSON->photo->title->_content; $this->items[] = $item; } diff --git a/bridges/FlickrTagBridge.php b/bridges/FlickrTagBridge.php index 918c765..61f59a2 100644 --- a/bridges/FlickrTagBridge.php +++ b/bridges/FlickrTagBridge.php @@ -7,7 +7,7 @@ class FlickrTagBridge extends BridgeAbstract{ $this->name = "Flickr TagUser"; $this->uri = "http://www.flickr.com/"; $this->description = "Returns the tagged or user images from Flickr"; - $this->update = "2014-05-26"; + $this->update = "2016-08-09"; $this->parameters["By keyword"] = '[ @@ -44,8 +44,8 @@ class FlickrTagBridge extends BridgeAbstract{ foreach($html->find('span.photo_container') as $element) { $item = new \Item(); $item->uri = 'http://flickr.com'.$element->find('a',0)->href; - $item->thumbnailUri = $element->find('img',0)->getAttribute('data-defer-src'); - $item->content = ''; // FIXME: Filter javascript ? + $thumbnailUri = $element->find('img',0)->getAttribute('data-defer-src'); + $item->content = ''; // FIXME: Filter javascript ? $item->title = $element->find('a',0)->title; $this->items[] = $item; } diff --git a/bridges/FuturaSciencesBridge.php b/bridges/FuturaSciencesBridge.php index f22c610..2886249 100644 --- a/bridges/FuturaSciencesBridge.php +++ b/bridges/FuturaSciencesBridge.php @@ -7,7 +7,7 @@ class FuturaSciencesBridge extends BridgeAbstract { $this->name = 'Futura-Sciences Bridge'; $this->uri = 'http://www.futura-sciences.com/'; $this->description = 'Returns the newest articles.'; - $this->update = '2016-08-06'; + $this->update = '2016-08-09'; $this->parameters[] = '[ @@ -209,7 +209,6 @@ class FuturaSciencesBridge extends BridgeAbstract { $item->author = ExtractAuthor($article, $element); $item->uri = $article_url; $item->title = StripCDATA($element->find('title', 0)->innertext); - $item->thumbnailUri = StripCDATA($element->find('enclosure', 0)->url); $item->timestamp = strtotime(StripCDATA($element->find('pubDate', 0)->plaintext)); $item->content = trim($contents); $this->items[] = $item; diff --git a/bridges/GBAtempBridge.php b/bridges/GBAtempBridge.php index 75217b0..b1ac17d 100644 --- a/bridges/GBAtempBridge.php +++ b/bridges/GBAtempBridge.php @@ -9,7 +9,7 @@ class GBAtempBridge extends BridgeAbstract { $this->name = 'GBAtemp'; $this->uri = $this->getURI(); $this->description = 'GBAtemp is a user friendly underground video game community.'; - $this->update = '2016-08-06'; + $this->update = '2016-08-09'; $this->parameters[] = '[ @@ -56,13 +56,12 @@ class GBAtempBridge extends BridgeAbstract { } return $string; } - private function build_item($uri, $title, $author, $timestamp, $thumnail, $content) { + private function build_item($uri, $title, $author, $timestamp, $content) { $item = new \Item(); $item->uri = $uri; $item->title = $title; $item->author = $author; $item->timestamp = $timestamp; - $item->thumbnailUri = $thumnail; $item->content = $content; return $item; } @@ -97,17 +96,15 @@ class GBAtempBridge extends BridgeAbstract { if ($typeFilter == 'N') { foreach ($html->find('li[class=news_item full]') as $newsItem) { $url = $this->getURI().$newsItem->find('a', 0)->href; - $img = $this->getURI().$newsItem->find('img', 0)->src; $time = intval($this->ExtractFromDelimiters($newsItem->find('abbr.DateTime', 0)->outertext, 'data-time="', '"')); $author = $newsItem->find('a.username', 0)->plaintext; $title = $newsItem->find('a', 1)->plaintext; $content = $this->fetch_post_content($url, $this->getURI()); - $this->items[] = $this->build_item($url, $title, $author, $time, $img, $content); + $this->items[] = $this->build_item($url, $title, $author, $time, $content); } } else if ($typeFilter == 'R') { foreach ($html->find('li.portal_review') as $reviewItem) { $url = $this->getURI().$reviewItem->find('a', 0)->href; - $img = $this->getURI().$this->ExtractFromDelimiters($reviewItem->find('a', 0)->style, 'image:url(', ')'); $title = $reviewItem->find('span.review_title', 0)->plaintext; $content = $this->file_get_html($url) or $this->returnError('Could not request GBAtemp: '.$uri, 500); $author = $content->find('a.username', 0)->plaintext; @@ -118,7 +115,7 @@ class GBAtempBridge extends BridgeAbstract { $procons = $content->find('table.review_procons', 0)->outertext; $scores = $content->find('table.reviewscores', 0)->outertext; $content = $this->cleanup_post_content($intro.$review.$subheader.$procons.$scores, $this->getURI()); - $this->items[] = $this->build_item($url, $title, $author, $time, $img, $content); + $this->items[] = $this->build_item($url, $title, $author, $time, $content); } } else if ($typeFilter == 'T') { foreach ($html->find('li.portal-tutorial') as $tutorialItem) { @@ -127,7 +124,7 @@ class GBAtempBridge extends BridgeAbstract { $time = intval($this->ExtractFromDelimiters($tutorialItem->find('abbr.DateTime', 0)->outertext, 'data-time="', '"')); $author = $tutorialItem->find('a.username', 0)->plaintext; $content = $this->fetch_post_content($url, $this->getURI()); - $this->items[] = $this->build_item($url, $title, $author, $time, '', $content); + $this->items[] = $this->build_item($url, $title, $author, $time, $content); } } else if ($typeFilter == 'F') { foreach ($html->find('li.rc_item') as $postItem) { @@ -136,7 +133,7 @@ class GBAtempBridge extends BridgeAbstract { $time = intval($this->ExtractFromDelimiters($postItem->find('abbr.DateTime', 0)->outertext, 'data-time="', '"')); $author = $postItem->find('a.username', 0)->plaintext; $content = $this->fetch_post_content($url, $this->getURI()); - $this->items[] = $this->build_item($url, $title, $author, $time, '', $content); + $this->items[] = $this->build_item($url, $title, $author, $time, $content); } } } diff --git a/bridges/GelbooruBridge.php b/bridges/GelbooruBridge.php index 16968b8..e4cd2b5 100644 --- a/bridges/GelbooruBridge.php +++ b/bridges/GelbooruBridge.php @@ -7,7 +7,7 @@ class GelbooruBridge extends BridgeAbstract{ $this->name = "Gelbooru"; $this->uri = "http://gelbooru.com/"; $this->description = "Returns images from given page"; - $this->update = "2014-05-25"; + $this->update = "2016-08-09"; $this->parameters[] = '[ @@ -42,10 +42,10 @@ class GelbooruBridge extends BridgeAbstract{ $item->uri = 'http://gelbooru.com/'.$element->find('a', 0)->href; $item->postid = (int)preg_replace("/[^0-9]/",'', $element->getAttribute('id')); $item->timestamp = time(); - $item->thumbnailUri = $element->find('img', 0)->src; + $thumbnailUri = $element->find('img', 0)->src; $item->tags = $element->find('img', 0)->getAttribute('alt'); $item->title = 'Gelbooru | '.$item->postid; - $item->content = '
Tags: '.$item->tags; + $item->content = '
Tags: '.$item->tags; $this->items[] = $item; } } diff --git a/bridges/HDWallpapersBridge.php b/bridges/HDWallpapersBridge.php index 45a6deb..99161a3 100644 --- a/bridges/HDWallpapersBridge.php +++ b/bridges/HDWallpapersBridge.php @@ -10,7 +10,7 @@ class HDWallpapersBridge extends BridgeAbstract { $this->name = "HD Wallpapers Bridge"; $this->uri = "http://www.hdwallpapers.in/"; $this->description = "Returns the latests wallpapers from HDWallpapers"; - $this->update = "2015-04-08"; + $this->update = "2016-08-09"; $this->parameters[] = '[ @@ -63,8 +63,7 @@ class HDWallpapersBridge extends BridgeAbstract { $item->uri = $baseUri.'/download'.str_replace('wallpapers.html', $this->resolution.'.jpg', $element->href); $item->timestamp = time(); $item->title = $element->find('p', 0)->text(); - $item->thumbnailUri = $baseUri.$thumbnail->src; - $item->content = $item->title.'
'; + $item->content = $item->title.'
'; $this->items[] = $item; $num++; diff --git a/bridges/HentaiHavenBridge.php b/bridges/HentaiHavenBridge.php index c5ef263..ccd1f08 100644 --- a/bridges/HentaiHavenBridge.php +++ b/bridges/HentaiHavenBridge.php @@ -7,7 +7,7 @@ class HentaiHavenBridge extends BridgeAbstract{ $this->name = "Hentai Haven"; $this->uri = "http://hentaihaven.org/"; $this->description = "Returns releases from Hentai Haven"; - $this->update = "2016-08-06"; + $this->update = "2016-08-09"; } @@ -16,10 +16,10 @@ class HentaiHavenBridge extends BridgeAbstract{ foreach($html->find('div.zoe-grid') as $element) { $item = new \Item(); $item->uri = $this->getURI().$element->find('div.brick-content h3 a', 0)->href; - $item->thumbnailUri = $element->find('a.thumbnail-image img', 0)->getAttribute('data-src'); + $thumbnailUri = $element->find('a.thumbnail-image img', 0)->getAttribute('data-src'); $item->title = mb_convert_encoding(trim($element->find('div.brick-content h3 a', 0)->innertext), 'UTF-8', 'HTML-ENTITIES'); $item->tags = $element->find('div.oFlyout_bg div.oFlyout div.flyoutContent span.tags', 0)->plaintext; - $item->content = 'Tags: ' . $item->tags.'


' . $element->find('div.oFlyout_bg div.oFlyout div.flyoutContent p.description', 0)->innertext; + $item->content = 'Tags: ' . $item->tags.'


' . $element->find('div.oFlyout_bg div.oFlyout div.flyoutContent p.description', 0)->innertext; $this->items[] = $item; } } diff --git a/bridges/JapanExpoBridge.php b/bridges/JapanExpoBridge.php index 2d38726..1c7afa7 100644 --- a/bridges/JapanExpoBridge.php +++ b/bridges/JapanExpoBridge.php @@ -6,7 +6,7 @@ class JapanExpoBridge extends BridgeAbstract{ $this->name = 'JapanExpo'; $this->uri = 'http://www.japan-expo-paris.com/fr/actualites'; $this->description = 'Returns most recent entries from Japan Expo actualités.'; - $this->update = '2016-06-12'; + $this->update = '2016-08-09'; $this->parameters[] = '[ { @@ -96,7 +96,6 @@ class JapanExpoBridge extends BridgeAbstract{ $item->uri = $url; $item->title = $title; $item->timestamp = $timestamp; - $item->thumbnailUri = $thumbnail; $item->content = $content; $this->items[] = $item; $count++; diff --git a/bridges/KonachanBridge.php b/bridges/KonachanBridge.php index 00de438..1b3a378 100644 --- a/bridges/KonachanBridge.php +++ b/bridges/KonachanBridge.php @@ -7,7 +7,7 @@ class KonachanBridge extends BridgeAbstract{ $this->name = "Konachan"; $this->uri = "http://konachan.com/"; $this->description = "Returns images from given page"; - $this->update = "2014-05-25"; + $this->update = "2016-08-09"; $this->parameters[] = '[ @@ -44,9 +44,8 @@ class KonachanBridge extends BridgeAbstract{ $item->postid = $json['id']; $item->timestamp = $json['created_at']; $item->imageUri = $json['file_url']; - $item->thumbnailUri = $json['preview_url']; $item->title = 'Konachan | '.$json['id']; - $item->content = '
Tags: '.$json['tags']; + $item->content = '
Tags: '.$json['tags']; $this->items[] = $item; } } diff --git a/bridges/LeMondeInformatiqueBridge.php b/bridges/LeMondeInformatiqueBridge.php index f373938..df81b66 100644 --- a/bridges/LeMondeInformatiqueBridge.php +++ b/bridges/LeMondeInformatiqueBridge.php @@ -7,7 +7,7 @@ class LeMondeInformatiqueBridge extends BridgeAbstract { $this->name = "Le Monde Informatique"; $this->uri = "http://www.lemondeinformatique.fr/"; $this->description = "Returns the newest articles."; - $this->update = "2016-01-28"; + $this->update = "2016-08-09"; } @@ -45,14 +45,12 @@ class LeMondeInformatiqueBridge extends BridgeAbstract { $article_uri = substr($article_uri, strpos($article_uri, '') + 6); $article_uri = substr($article_uri, 0, strpos($article_uri, '')); $article_html = $this->file_get_html($article_uri) or $this->returnError('Could not request LeMondeInformatique: '.$article_uri, 500); - $thumbnailUri = $article_html->find('div#article', 0)->find('img#illustration', 0)->src; $article_content = CleanArticle($article_html->find('div#article', 0)->innertext); $article_title = $article_html->find('h1.cleanprint-title', 0)->plaintext; //Build and add final item $item = new \Item(); $item->uri = $article_uri; - $item->thumbnailUri = $thumbnailUri; $item->title = $article_title; $item->author = StripCDATA($element->find('dc:creator', 0)->innertext); $item->timestamp = strtotime($element->find('dc:date', 0)->plaintext); diff --git a/bridges/LinkedInCompany.php b/bridges/LinkedInCompany.php index b7a49bd..243f70c 100644 --- a/bridges/LinkedInCompany.php +++ b/bridges/LinkedInCompany.php @@ -7,7 +7,7 @@ class LinkedInCompany extends BridgeAbstract{ $this->name = "LinkedIn Company"; $this->uri = "https://www.linkedin.com/"; $this->description = "Returns most recent actus from Company on LinkedIn. (https://www.linkedin.com/company/apple)"; - $this->update = "2015-12-22"; + $this->update = "2016-08-09"; $this->parameters[] = '[ @@ -31,7 +31,6 @@ class LinkedInCompany extends BridgeAbstract{ $item->uri = $link; $item->title = mb_substr(strip_tags($element->find('span.share-body', 0)->innertext), 0 ,100); $item->content = strip_tags($element->find('span.share-body', 0)->innertext); - $item->thumbnailUri = htmlspecialchars_decode($element->find('img', 0)->attr['data-li-lazy-load-src']); $this->items[] = $item; $i++; } diff --git a/bridges/LolibooruBridge.php b/bridges/LolibooruBridge.php index 37e06f3..74fe9ab 100644 --- a/bridges/LolibooruBridge.php +++ b/bridges/LolibooruBridge.php @@ -7,7 +7,7 @@ class LolibooruBridge extends BridgeAbstract{ $this->name = "Lolibooru"; $this->uri = "http://lolibooru.moe/"; $this->description = "Returns images from given page and tags"; - $this->update = "2015-03-21"; + $this->update = "2016-08-09"; $this->parameters[] = '[ @@ -45,9 +45,8 @@ class LolibooruBridge extends BridgeAbstract{ $item->postid = $json['id']; $item->timestamp = $json['created_at']; $item->imageUri = $json['file_url']; - $item->thumbnailUri = $json['preview_url']; $item->title = 'Lolibooru | '.$json['id']; - $item->content = '
Tags: '.$json['tags']; + $item->content = '
Tags: '.$json['tags']; $this->items[] = $item; } } diff --git a/bridges/MangareaderBridge.php b/bridges/MangareaderBridge.php index 3d92682..568eb23 100644 --- a/bridges/MangareaderBridge.php +++ b/bridges/MangareaderBridge.php @@ -8,7 +8,7 @@ class MangareaderBridge extends BridgeAbstract{ $this->name = "Mangareader Bridge"; $this->uri = "http://www.mangareader.net"; $this->description = "Returns the latest updates, popular mangas or manga updates (new chapters)"; - $this->update = "2016-01-22"; + $this->update = "2016-08-09"; $this->parameters["Get latest updates"] = '[]'; $this->parameters["Get popular mangas"] = @@ -281,15 +281,15 @@ class MangareaderBridge extends BridgeAbstract{ // The thumbnail is encrypted in a css-style... // format: "background-image:url('')" $mangaimgelement = $xpath->query(".//*[@class='imgsearchresults']", $manga)->item(0)->getAttribute('style'); - + $thumbnail = substr($mangaimgelement, 22, strlen($mangaimgelement) - 24); + $item = new \Item(); $item->title = htmlspecialchars($xpath->query(".//*[@class='manga_name']//a", $manga)->item(0)->nodeValue); $item->uri = 'http://www.mangareader.net' . $xpath->query(".//*[@class='manga_name']//a", $manga)->item(0)->getAttribute('href'); $item->author = htmlspecialchars($xpath->query("//*[@class='author_name']", $manga)->item(0)->nodeValue); $item->chaptercount = $xpath->query(".//*[@class='chapter_count']", $manga)->item(0)->nodeValue; $item->genre = htmlspecialchars($xpath->query(".//*[@class='manga_genre']", $manga)->item(0)->nodeValue); - $item->thumbnailUri = substr($mangaimgelement, 22, strlen($mangaimgelement) - 24); - $item->content = '' . $item->title . '

' . $item->genre . '

' . $item->chaptercount . '

'; + $item->content = '' . $item->title . '

' . $item->genre . '

' . $item->chaptercount . '

'; $this->items[] = $item; } } diff --git a/bridges/MilbooruBridge.php b/bridges/MilbooruBridge.php index eb1e133..946a132 100644 --- a/bridges/MilbooruBridge.php +++ b/bridges/MilbooruBridge.php @@ -7,7 +7,7 @@ class MilbooruBridge extends BridgeAbstract{ $this->name = "Milbooru"; $this->uri = "http://sheslostcontrol.net/moe/shimmie/"; $this->description = "Returns images from given page"; - $this->update = "2014-05-25"; + $this->update = "2016-08-09"; $this->parameters[] = '[ @@ -39,10 +39,10 @@ class MilbooruBridge extends BridgeAbstract{ $item->uri = 'http://sheslostcontrol.net/moe/shimmie/'.$element->find('a', 0)->href; $item->postid = (int)preg_replace("/[^0-9]/",'', $element->find('a', 0)->getAttribute('data-post-id')); $item->timestamp = time(); - $item->thumbnailUri = 'http://sheslostcontrol.net/moe/shimmie/'.$element->find('img', 0)->src; + $thumbnailUri = 'http://sheslostcontrol.net/moe/shimmie/'.$element->find('img', 0)->src; $item->tags = $element->find('a', 0)->getAttribute('data-tags'); $item->title = 'Milbooru | '.$item->postid; - $item->content = '
Tags: '.$item->tags; + $item->content = '
Tags: '.$item->tags; $this->items[] = $item; } } diff --git a/bridges/MspabooruBridge.php b/bridges/MspabooruBridge.php index caac095..2ad84d6 100644 --- a/bridges/MspabooruBridge.php +++ b/bridges/MspabooruBridge.php @@ -7,7 +7,7 @@ class MspabooruBridge extends BridgeAbstract{ $this->name = "Mspabooru"; $this->uri = "http://mspabooru.com/"; $this->description = "Returns images from given page"; - $this->update = "2014-05-25"; + $this->update = "2016-08-09"; $this->parameters[] = '[ @@ -42,10 +42,10 @@ class MspabooruBridge extends BridgeAbstract{ $item->uri = 'http://mspabooru.com/'.$element->find('a', 0)->href; $item->postid = (int)preg_replace("/[^0-9]/",'', $element->getAttribute('id')); $item->timestamp = time(); - $item->thumbnailUri = $element->find('img', 0)->src; + $thumbnailUri = $element->find('img', 0)->src; $item->tags = $element->find('img', 0)->getAttribute('alt'); $item->title = 'Mspabooru | '.$item->postid; - $item->content = '
Tags: '.$item->tags; + $item->content = '
Tags: '.$item->tags; $this->items[] = $item; } } diff --git a/bridges/NakedSecurityBridge.php b/bridges/NakedSecurityBridge.php index fc3d73a..5b0eab0 100644 --- a/bridges/NakedSecurityBridge.php +++ b/bridges/NakedSecurityBridge.php @@ -6,7 +6,7 @@ class NakedSecurityBridge extends BridgeAbstract { $this->name = 'Naked Security'; $this->uri = 'https://nakedsecurity.sophos.com/'; $this->description = 'Returns the newest articles.'; - $this->update = '2016-08-06'; + $this->update = '2016-08-09'; } public function collectData(array $param) { @@ -60,7 +60,6 @@ class NakedSecurityBridge extends BridgeAbstract { $item = new \Item(); $item->uri = $article_uri; $item->title = $article_title; - $item->thumbnailUri = $article_image; $item->author = $article_html->find('a[rel=author]', 0)->plaintext; $item->timestamp = strtotime($element->find('pubDate', 0)->plaintext); $item->content = $article_content; diff --git a/bridges/NeuviemeArtBridge.php b/bridges/NeuviemeArtBridge.php index 5ee207a..b772f5d 100644 --- a/bridges/NeuviemeArtBridge.php +++ b/bridges/NeuviemeArtBridge.php @@ -6,7 +6,7 @@ class NeuviemeArtBridge extends BridgeAbstract { $this->name = "9ème Art"; $this->uri = "http://www.9emeart.fr/"; $this->description = "Returns the newest articles."; - $this->update = "2016-08-06"; + $this->update = "2016-08-09"; } public function collectData(array $param) { @@ -46,7 +46,6 @@ class NeuviemeArtBridge extends BridgeAbstract { $item = new \Item(); $item->uri = $article_uri; $item->title = $article_title; - $item->thumbnailUri = $element->find('enclosure', 0)->url; $item->author = $article_html->find('a[class=upp transition_fast upp]', 0)->plaintext; $item->timestamp = strtotime($element->find('pubDate', 0)->plaintext); $item->content = $article_content; diff --git a/bridges/NextInpactBridge.php b/bridges/NextInpactBridge.php index ee89ab1..52bc908 100644 --- a/bridges/NextInpactBridge.php +++ b/bridges/NextInpactBridge.php @@ -6,7 +6,7 @@ class NextInpactBridge extends BridgeAbstract { $this->name = "NextInpact Bridge"; $this->uri = "http://www.nextinpact.com/"; $this->description = "Returns the newest articles."; - $this->update = "2016-08-06"; + $this->update = "2016-08-09"; } private function StripCDATA($string) { @@ -35,7 +35,6 @@ class NextInpactBridge extends BridgeAbstract { $item = new \Item(); $item->title = $this->StripCDATA($element->find('title', 0)->innertext); $item->uri = $this->StripCDATA($element->find('guid', 0)->plaintext); - $item->thumbnailUri = $this->StripCDATA($element->find('enclosure', 0)->url); $item->author = $this->StripCDATA($element->find('creator', 0)->innertext); $item->timestamp = strtotime($element->find('pubDate', 0)->plaintext); $item->content = $this->ExtractContent($item->uri); diff --git a/bridges/NextgovBridge.php b/bridges/NextgovBridge.php index 35ca1fc..1ead4fa 100644 --- a/bridges/NextgovBridge.php +++ b/bridges/NextgovBridge.php @@ -7,7 +7,7 @@ class NextgovBridge extends BridgeAbstract { $this->name = 'Nextgov Bridge'; $this->uri = 'https://www.nextgov.com/'; $this->description = 'USA Federal technology news, best practices, and web 2.0 tools.'; - $this->update = '2016-08-06'; + $this->update = '2016-08-09'; $this->parameters[] = '[ @@ -79,14 +79,10 @@ class NextgovBridge extends BridgeAbstract { .'

'.$article_subtitle.'

' .trim($contents); - if ($article_thumbnail == '') - $article_thumbnail = 'http://cdn.nextgov.com/nextgov/images/logo.png'; - $item = new \Item(); $item->uri = $article_url; $item->title = $article_title; $item->author = $article_author; - $item->thumbnailUri = $article_thumbnail; $item->timestamp = $article_timestamp; $item->content = $contents; $this->items[] = $item; diff --git a/bridges/PickyWallpapersBridge.php b/bridges/PickyWallpapersBridge.php index 18d1d35..b45a61b 100644 --- a/bridges/PickyWallpapersBridge.php +++ b/bridges/PickyWallpapersBridge.php @@ -11,7 +11,7 @@ class PickyWallpapersBridge extends BridgeAbstract { $this->name = "PickyWallpapers Bridge"; $this->uri = "http://www.pickywallpapers.com/"; $this->description = "Returns the latests wallpapers from PickyWallpapers"; - $this->update = "2014-03-31"; + $this->update = "2016-08-09"; $this->parameters[] = '[ @@ -68,7 +68,6 @@ class PickyWallpapersBridge extends BridgeAbstract { $item->uri = str_replace('www', 'wallpaper', $baseUri).'/'.$this->resolution.'/'.basename($element->src); $item->timestamp = time(); $item->title = $element->alt; - $item->thumbnailUri = $element->src; $item->content = $item->title.'
'.$element.''; $this->items[] = $item; diff --git a/bridges/RTBFBridge.php b/bridges/RTBFBridge.php index 3b2a890..2eb2d98 100644 --- a/bridges/RTBFBridge.php +++ b/bridges/RTBFBridge.php @@ -5,6 +5,7 @@ class RTBFBridge extends BridgeAbstract { $this->uri = "http://www.rtbf.be/auvio/emissions"; $this->description = "Returns the newest RTBF videos by series ID"; $this->maintainer = "Frenzie"; + $this->update = "2016-08-09"; $this->parameters[] = '[ @@ -33,10 +34,10 @@ class RTBFBridge extends BridgeAbstract { $item->uri = 'http://www.rtbf.be/auvio/detail?id='.$item->id; $thumbnailUriSrcSet = explode(',', $element->find('figure .www-img-16by9 img', 0)->getAttribute('data-srcset')); $thumbnailUriLastSrc = end($thumbnailUriSrcSet); - $item->thumbnailUri = explode(' ', $thumbnailUriLastSrc)[0]; + $thumbnailUri = explode(' ', $thumbnailUriLastSrc)[0]; $item->title = trim($element->find('h3',0)->plaintext) . ' - ' . trim($element->find('h4',0)->plaintext); $item->timestamp = strtotime($element->find('time', 0)->getAttribute('datetime')); - $item->content = ''; + $item->content = ''; $this->items[] = $item; $count++; } diff --git a/bridges/Releases3DSBridge.php b/bridges/Releases3DSBridge.php index abd35ad..54a5a81 100644 --- a/bridges/Releases3DSBridge.php +++ b/bridges/Releases3DSBridge.php @@ -7,7 +7,7 @@ class Releases3DSBridge extends BridgeAbstract { $this->name = "3DS Scene Releases"; $this->uri = "http://www.3dsdb.com/"; $this->description = "Returns the newest scene releases."; - $this->update = "2015-09-17"; + $this->update = "2016-08-09"; } @@ -108,7 +108,6 @@ class Releases3DSBridge extends BridgeAbstract { $item->title = $name; $item->author = $publisher; $item->timestamp = $ignDate; - $item->thumbnailUri = $ignCoverArt; $item->uri = empty($ignLink) ? $searchLinkDuckDuckGo : $ignLink; $item->content = $ignDescription.$releaseDescription.$releaseSearchLinks; $this->items[] = $item; diff --git a/bridges/Rule34Bridge.php b/bridges/Rule34Bridge.php index b4c30dd..d9ca066 100644 --- a/bridges/Rule34Bridge.php +++ b/bridges/Rule34Bridge.php @@ -7,7 +7,7 @@ class Rule34Bridge extends BridgeAbstract{ $this->name = "Rule34"; $this->uri = "http://rule34.xxx/"; $this->description = "Returns images from given page"; - $this->update = "2014-05-25"; + $this->update = "2016-08-09"; $this->parameters[] = '[ @@ -41,10 +41,10 @@ class Rule34Bridge extends BridgeAbstract{ $item->uri = 'http://rule34.xxx/'.$element->find('a', 0)->href; $item->postid = (int)preg_replace("/[^0-9]/",'', $element->getAttribute('id')); $item->timestamp = time(); - $item->thumbnailUri = $element->find('img', 0)->src; + $thumbnailUri = $element->find('img', 0)->src; $item->tags = $element->find('img', 0)->getAttribute('alt'); $item->title = 'Rule34 | '.$item->postid; - $item->content = '
Tags: '.$item->tags; + $item->content = '
Tags: '.$item->tags; $this->items[] = $item; } } diff --git a/bridges/Rule34pahealBridge.php b/bridges/Rule34pahealBridge.php index 3371640..ecffcc5 100644 --- a/bridges/Rule34pahealBridge.php +++ b/bridges/Rule34pahealBridge.php @@ -7,7 +7,7 @@ class Rule34pahealBridge extends BridgeAbstract{ $this->name = "Rule34paheal"; $this->uri = "http://rule34.paheal.net/"; $this->description = "Returns images from given page"; - $this->update = "2014-05-25"; + $this->update = "2016-08-09"; $this->parameters[] = '[ @@ -40,10 +40,10 @@ class Rule34pahealBridge extends BridgeAbstract{ $item->uri = 'http://rule34.paheal.net'.$element->find('a', 0)->href; $item->postid = (int)preg_replace("/[^0-9]/",'', $element->find('img', 0)->getAttribute('id')); $item->timestamp = time(); - $item->thumbnailUri = $element->find('img', 0)->src; + $thumbnailUri = $element->find('img', 0)->src; $item->tags = $element->getAttribute('data-tags'); $item->title = 'Rule34paheal | '.$item->postid; - $item->content = '
Tags: '.$item->tags; + $item->content = '
Tags: '.$item->tags; $this->items[] = $item; } } diff --git a/bridges/SafebooruBridge.php b/bridges/SafebooruBridge.php index 63ffd1a..b9d2ee1 100644 --- a/bridges/SafebooruBridge.php +++ b/bridges/SafebooruBridge.php @@ -7,7 +7,7 @@ class SafebooruBridge extends BridgeAbstract{ $this->name = "Safebooru"; $this->uri = "http://safebooru.org/"; $this->description = "Returns images from given page"; - $this->update = "2014-05-25"; + $this->update = "2016-08-09"; $this->parameters[] = '[ @@ -42,10 +42,10 @@ class SafebooruBridge extends BridgeAbstract{ $item->uri = 'http://safebooru.org/'.$element->find('a', 0)->href; $item->postid = (int)preg_replace("/[^0-9]/",'', $element->getAttribute('id')); $item->timestamp = time(); - $item->thumbnailUri = $element->find('img', 0)->src; + $thumbnailUri = $element->find('img', 0)->src; $item->tags = $element->find('img', 0)->getAttribute('alt'); $item->title = 'Safebooru | '.$item->postid; - $item->content = '
Tags: '.$item->tags; + $item->content = '
Tags: '.$item->tags; $this->items[] = $item; } } diff --git a/bridges/SakugabooruBridge.php b/bridges/SakugabooruBridge.php index d35da26..ac6d58d 100644 --- a/bridges/SakugabooruBridge.php +++ b/bridges/SakugabooruBridge.php @@ -7,7 +7,7 @@ class SakugabooruBridge extends BridgeAbstract{ $this->name = "Sakugabooru"; $this->uri = "http://sakuga.yshi.org/"; $this->description = "Returns images from given page"; - $this->update = "2014-05-25"; + $this->update = "2016-08-09"; $this->parameters[] = '[ @@ -44,9 +44,8 @@ class SakugabooruBridge extends BridgeAbstract{ $item->postid = $json['id']; $item->timestamp = $json['created_at']; $item->imageUri = $json['file_url']; - $item->thumbnailUri = $json['preview_url']; $item->title = 'Sakugabooru | '.$json['id']; - $item->content = '
Tags: '.$json['tags']; + $item->content = '
Tags: '.$json['tags']; $this->items[] = $item; } } diff --git a/bridges/SiliconBridge.php b/bridges/SiliconBridge.php index b715ba7..4cd7388 100644 --- a/bridges/SiliconBridge.php +++ b/bridges/SiliconBridge.php @@ -7,7 +7,7 @@ class SiliconBridge extends BridgeAbstract { $this->name = "Silicon.fr"; $this->uri = "http://www.silicon.fr/"; $this->description = "Returns the newest articles."; - $this->update = "2015-09-08"; + $this->update = "2016-08-09"; } @@ -48,7 +48,6 @@ class SiliconBridge extends BridgeAbstract { //Build and add final item $item = new \Item(); $item->uri = $article_uri; - $item->thumbnailUri = $thumbnailUri; $item->title = StripCDATA($element->find('title', 0)->innertext); $item->author = StripCDATA($element->find('dc:creator', 0)->innertext); $item->timestamp = strtotime($element->find('pubDate', 0)->plaintext); diff --git a/bridges/SuperbWallpapersBridge.php b/bridges/SuperbWallpapersBridge.php index f9b0a5c..ed9d78f 100644 --- a/bridges/SuperbWallpapersBridge.php +++ b/bridges/SuperbWallpapersBridge.php @@ -10,7 +10,7 @@ class SuperbWallpapersBridge extends BridgeAbstract { $this->name = "Superb Wallpapers Bridge"; $this->uri = "http://www.superbwallpapers.com/"; $this->description = "Returns the latests wallpapers from SuperbWallpapers"; - $this->update = "2015-04-08"; + $this->update = "2016-08-09"; $this->parameters[] = '[ @@ -61,7 +61,6 @@ class SuperbWallpapersBridge extends BridgeAbstract { $item->uri = str_replace('200x125', $this->resolution, $thumbnail->src); $item->timestamp = time(); $item->title = $element->title; - $item->thumbnailUri = $thumbnail->src; $item->content = $item->title.'
'.$thumbnail.''; $this->items[] = $item; diff --git a/bridges/T411Bridge.php b/bridges/T411Bridge.php index 76d7f4a..5a7e2bc 100644 --- a/bridges/T411Bridge.php +++ b/bridges/T411Bridge.php @@ -7,7 +7,7 @@ class T411Bridge extends BridgeAbstract { $this->name = 'T411'; $this->uri = $this->getURI(); $this->description = 'Returns the 10 newest torrents with specified search terms
Use url part after "?" mark when using their search engine.'; - $this->update = '2016-08-06'; + $this->update = '2016-08-09'; $this->parameters[] = '[ @@ -63,15 +63,6 @@ class T411Bridge extends BridgeAbstract { $item_desc = $item_html->find('div.description', 0); $item_author = $item_html->find('a.profile', 0)->innertext; - //Retrieve image for thumbnail or generic logo fallback - $item_image = $this->getURI().'themes/blue/images/logo.png'; - foreach ($item_desc->find('img') as $img) { - if (strpos($img->src, 'prez') === false && strpos($img->src, '/ad/') === false) { - $item_image = $img->src; - break; - } - } - //Cleanup advertisments $divs = explode('
', $item_desc->innertext); $item_desc = ''; @@ -86,7 +77,6 @@ class T411Bridge extends BridgeAbstract { $item->title = $item_title; $item->author = $item_author; $item->timestamp = $item_date; - $item->thumbnailUri = $item_image; $item->content = $item_desc; $this->items[] = $item; $limit++; diff --git a/bridges/TagBoardBridge.php b/bridges/TagBoardBridge.php index 30a950b..406f64f 100644 --- a/bridges/TagBoardBridge.php +++ b/bridges/TagBoardBridge.php @@ -7,7 +7,7 @@ class TagBoardBridge extends BridgeAbstract{ $this->name = "TagBoard"; $this->uri = "http://www.TagBoard.com"; $this->description = "Returns most recent results from TagBoard."; - $this->update = "2014-09-10"; + $this->update = "2016-08-09"; $this->parameters[] = '[ @@ -31,9 +31,9 @@ class TagBoardBridge extends BridgeAbstract{ $item = new Item(); $item->uri = $element->{'permalink'}; $item->title = $element->{'text'}; - $item->thumbnailUri = $element->{'photos'}[0]->{'m'}; - if (isset($item->thumbnailUri)) { - $item->content = ''; + $thumbnailUri = $element->{'photos'}[0]->{'m'}; + if (isset($thumbnailUri)) { + $item->content = ''; }else{ $item->content = $element->{'html'}; } diff --git a/bridges/TbibBridge.php b/bridges/TbibBridge.php index 7490c86..f0c91c7 100644 --- a/bridges/TbibBridge.php +++ b/bridges/TbibBridge.php @@ -7,7 +7,7 @@ class TbibBridge extends BridgeAbstract{ $this->name = "Tbib"; $this->uri = "http://tbib.org/"; $this->description = "Returns images from given page"; - $this->update = "2014-05-25"; + $this->update = "2016-08-09"; $this->parameters[] = '[ @@ -41,10 +41,10 @@ class TbibBridge extends BridgeAbstract{ $item->uri = 'http://tbib.org/'.$element->find('a', 0)->href; $item->postid = (int)preg_replace("/[^0-9]/",'', $element->getAttribute('id')); $item->timestamp = time(); - $item->thumbnailUri = $element->find('img', 0)->src; + $thumbnailUri = $element->find('img', 0)->src; $item->tags = $element->find('img', 0)->getAttribute('alt'); $item->title = 'Tbib | '.$item->postid; - $item->content = '
Tags: '.$item->tags; + $item->content = '
Tags: '.$item->tags; $this->items[] = $item; } } diff --git a/bridges/TheHackerNewsBridge.php b/bridges/TheHackerNewsBridge.php index 2fb6a1a..ab43fad 100644 --- a/bridges/TheHackerNewsBridge.php +++ b/bridges/TheHackerNewsBridge.php @@ -7,7 +7,7 @@ class TheHackerNewsBridge extends BridgeAbstract { $this->name = 'The Hacker News Bridge'; $this->uri = 'https://thehackernews.com/'; $this->description = 'Cyber Security, Hacking, Technology News.'; - $this->update = '2016-08-06'; + $this->update = '2016-08-09'; } @@ -55,7 +55,6 @@ class TheHackerNewsBridge extends BridgeAbstract { $article_author = trim($element->find('span.vcard', 0)->plaintext); $article_title = $element->find('a.entry-title', 0)->plaintext; $article_timestamp = strtotime($element->find('span.updated', 0)->plaintext); - $article_thumbnail = $element->find('img', 0)->src; $article = $this->file_get_html($article_url) or $this->returnError('Could not request TheHackerNews: '.$article_url, 500); $contents = $article->find('div.articlebodyonly', 0)->innertext; @@ -66,7 +65,6 @@ class TheHackerNewsBridge extends BridgeAbstract { $item->uri = $article_url; $item->title = $article_title; $item->author = $article_author; - $item->thumbnailUri = $article_thumbnail; $item->timestamp = $article_timestamp; $item->content = trim($contents); $this->items[] = $item; diff --git a/bridges/TwitchApiBridge.php b/bridges/TwitchApiBridge.php index c3dbdef..adebd05 100644 --- a/bridges/TwitchApiBridge.php +++ b/bridges/TwitchApiBridge.php @@ -13,7 +13,7 @@ class TwitchApiBridge extends BridgeAbstract{ $this->name = "Twitch API Bridge"; $this->uri = "http://www.twitch.tv"; $this->description = "Returns the newest broadcasts or highlights by channel name using the Twitch API (v3)"; - $this->update = "2016-01-09"; + $this->update = "2016-08-09"; $this->parameters["Get channel without limit"] = '[ @@ -140,10 +140,9 @@ class TwitchApiBridge extends BridgeAbstract{ $item = new \Item(); $item->id = $video->_id; $item->uri = $video->url; - $item->thumbnailUri = $video->preview; $item->title = htmlspecialchars($video->title); $item->timestamp = strtotime($video->recorded_at); - $item->content = '
' . $item->title . ''; + $item->content = '
' . $item->title . ''; $this->items[] = $item; // Stop once the number of requested items is reached diff --git a/bridges/UnsplashBridge.php b/bridges/UnsplashBridge.php index 2ac8ef2..6fa5c3c 100644 --- a/bridges/UnsplashBridge.php +++ b/bridges/UnsplashBridge.php @@ -7,7 +7,7 @@ class UnsplashBridge extends BridgeAbstract { $this->name = "Unsplash Bridge"; $this->uri = "http://unsplash.com/"; $this->description = "Returns the latests photos from Unsplash"; - $this->update = "2015-03-02"; + $this->update = "2016-08-09"; $this->parameters[] = '[ @@ -61,8 +61,7 @@ class UnsplashBridge extends BridgeAbstract { $thumbnail->src).'.jpg'; // '.jpg' only for format hint $item->timestamp = time(); $item->title = $thumbnail->alt; - $item->thumbnailUri = $thumbnail->src; - $item->content = $item->title.'
'; + $item->content = $item->title.'
'; $this->items[] = $item; $num++; diff --git a/bridges/ViadeoCompany.php b/bridges/ViadeoCompany.php index 325cf1a..d5369a5 100644 --- a/bridges/ViadeoCompany.php +++ b/bridges/ViadeoCompany.php @@ -7,7 +7,7 @@ class ViadeoCompany extends BridgeAbstract{ $this->name = "Viadeo Company"; $this->uri = "https://www.viadeo.com/"; $this->description = "Returns most recent actus from Company on Viadeo. (http://www.viadeo.com/fr/company/apple)"; - $this->update = "2015-12-22"; + $this->update = "2016-08-09"; $this->parameters[] = '[ @@ -30,8 +30,7 @@ class ViadeoCompany extends BridgeAbstract{ $item = new \Item(); $item->uri = $link; $item->title = mb_substr($element->find('p', 0)->innertext, 0 ,100); - $item->content = $element->find('p', 0)->innertext; - $item->thumbnailUri = str_replace('//', 'http://', $element->find('img.usage-article__image_only', 0)->src); + $item->content = $element->find('p', 0)->innertext;; $this->items[] = $item; $i++; } diff --git a/bridges/WallpaperStopBridge.php b/bridges/WallpaperStopBridge.php index 3379e82..2cd3d2d 100644 --- a/bridges/WallpaperStopBridge.php +++ b/bridges/WallpaperStopBridge.php @@ -11,7 +11,7 @@ class WallpaperStopBridge extends BridgeAbstract { $this->name = "WallpaperStop Bridge"; $this->uri = "http://www.wallpaperstop.com/"; $this->description = "Returns the latests wallpapers from WallpaperStop"; - $this->update = "2014-11-05"; + $this->update = "2016-08-09"; $this->parameters[] = '[ @@ -73,8 +73,7 @@ class WallpaperStopBridge extends BridgeAbstract { $item->id = $matches[3]; $item->timestamp = time(); $item->title = $thumbnail->title; - $item->thumbnailUri = $baseUri.$thumbnail->src; - $item->content = $item->title.'
'; + $item->content = $item->title.'
'; $this->items[] = $item; $num++; diff --git a/bridges/WeLiveSecurityBridge.php b/bridges/WeLiveSecurityBridge.php index 4fd23ea..9fdf87b 100644 --- a/bridges/WeLiveSecurityBridge.php +++ b/bridges/WeLiveSecurityBridge.php @@ -6,7 +6,7 @@ class WeLiveSecurityBridge extends BridgeAbstract { $this->name = 'We Live Security'; $this->uri = 'http://www.welivesecurity.com/'; $this->description = 'Returns the newest articles.'; - $this->update = '2016-08-06'; + $this->update = '2016-08-09'; } public function collectData(array $param) { @@ -49,7 +49,6 @@ class WeLiveSecurityBridge extends BridgeAbstract { $item = new \Item(); $item->uri = $article_url; - $item->thumbnailUri = $article_image; $item->title = $element->find('title', 0)->plaintext; $item->author = $article_html->find('a[rel=author]', 0)->plaintext; $item->timestamp = strtotime($element->find('pubDate', 0)->plaintext); diff --git a/bridges/XbooruBridge.php b/bridges/XbooruBridge.php index b867987..74fe4ab 100644 --- a/bridges/XbooruBridge.php +++ b/bridges/XbooruBridge.php @@ -7,7 +7,7 @@ class XbooruBridge extends BridgeAbstract{ $this->name = "Xbooru"; $this->uri = "http://xbooru.com/"; $this->description = "Returns images from given page"; - $this->update = "2014-05-25"; + $this->update = "2016-08-09"; $this->parameters[] = '[ @@ -41,10 +41,10 @@ class XbooruBridge extends BridgeAbstract{ $item->uri = 'http://xbooru.com/'.$element->find('a', 0)->href; $item->postid = (int)preg_replace("/[^0-9]/",'', $element->getAttribute('id')); $item->timestamp = time(); - $item->thumbnailUri = $element->find('img', 0)->src; + $thumbnailUri = $element->find('img', 0)->src; $item->tags = $element->find('img', 0)->getAttribute('alt'); $item->title = 'Xbooru | '.$item->postid; - $item->content = '
Tags: '.$item->tags; + $item->content = '
Tags: '.$item->tags; $this->items[] = $item; } } diff --git a/bridges/YandereBridge.php b/bridges/YandereBridge.php index 83245e2..088599f 100644 --- a/bridges/YandereBridge.php +++ b/bridges/YandereBridge.php @@ -7,7 +7,7 @@ class YandereBridge extends BridgeAbstract{ $this->name = "Yande.re"; $this->uri = "https://yande.re/"; $this->description = "Returns images from given page and tags"; - $this->update = "2014-05-25"; + $this->update = "2016-08-09"; $this->parameters[] = '[ @@ -44,9 +44,8 @@ class YandereBridge extends BridgeAbstract{ $item->postid = $json['id']; $item->timestamp = $json['created_at']; $item->imageUri = $json['file_url']; - $item->thumbnailUri = $json['preview_url']; $item->title = 'Yandere | '.$json['id']; - $item->content = '
Tags: '.$json['tags']; + $item->content = '
Tags: '.$json['tags']; $this->items[] = $item; } } diff --git a/bridges/YoutubeBridge.php b/bridges/YoutubeBridge.php index 971b133..bd6baae 100644 --- a/bridges/YoutubeBridge.php +++ b/bridges/YoutubeBridge.php @@ -14,7 +14,7 @@ class YoutubeBridge extends BridgeAbstract { $this->homepage = $this->getURI(); $this->description = 'Returns the 10 newest videos by username/channel/playlist or search'; $this->maintainer = 'mitsukarenai'; - $this->update = '02/05/2016'; + $this->update = '2016-08-09'; $this->parameters['By username'] = '[ @@ -83,8 +83,8 @@ class YoutubeBridge extends BridgeAbstract { $item->author = $author; $item->timestamp = $time; $item->uri = $this->getURI().'watch?v='.$vid; - $item->thumbnailUri = str_replace('/www.', '/img.', $this->getURI()).'vi/'.$vid.'/0.jpg'; - $item->content = '
'.$desc; + $thumbnailUri = str_replace('/www.', '/img.', $this->getURI()).'vi/'.$vid.'/0.jpg'; + $item->content = '
'.$desc; $this->items[] = $item; } diff --git a/bridges/ZDNetBridge.php b/bridges/ZDNetBridge.php index 1b2b4df..5859adc 100644 --- a/bridges/ZDNetBridge.php +++ b/bridges/ZDNetBridge.php @@ -7,7 +7,7 @@ class ZDNetBridge extends BridgeAbstract { $this->name = 'ZDNet Bridge'; $this->uri = 'http://www.zdnet.com/'; $this->description = 'Technology News, Analysis, Comments and Product Reviews for IT Professionals.'; - $this->update = '2016-08-06'; + $this->update = '2016-08-09'; $this->parameters[] = // http://www.zdnet.com/zdnet.opml @@ -286,14 +286,10 @@ class ZDNetBridge extends BridgeAbstract { .'

'.$article_subtitle.'

' .$contents; - if ($thumbnail == '') - $thumbnail = 'http://zdnet1.cbsistatic.com/fly/bundles/zdnetcss/images/logos/logo-192x192.png'; - $item = new \Item(); $item->author = $author; $item->uri = $article_url; $item->title = $article_title; - $item->thumbnailUri = $thumbnail; $item->timestamp = $article_timestamp; $item->content = $contents; $this->items[] = $item;