diff --git a/CREATE_BRIDGE.md b/CREATE_BRIDGE.md index efe4286501b..fded1770ba4 100644 --- a/CREATE_BRIDGE.md +++ b/CREATE_BRIDGE.md @@ -112,9 +112,7 @@ The `Item` class is used to store parameter that are collected in the [`collectD ```PHP $item->uri // URI to reach the subject ("http://...") -$item->thumbnailUri // URI for the thumbnail ("http://...") $item->title // Title of the item -$item->name // Name of the item $item->timestamp // Timestamp of the item in numeric format (use strtotime) $item->author // Name of the author $item->content // Content in HTML format @@ -138,9 +136,7 @@ The following list provides an overview of the parameters used by the other form Parameter | ATOM | HTML | (M)RSS ----------|------|------|------- `uri`|X|X|X -`thumbnailUri`||X `title`|X|X|X -`name`|X|| `timestamp`|X|X|X `author`|X|X|X `content`|X|X|X diff --git a/bridges/ABCTabsBridge.php b/bridges/ABCTabsBridge.php index 9ab3e9c8ab7..29b41e02fd9 100644 --- a/bridges/ABCTabsBridge.php +++ b/bridges/ABCTabsBridge.php @@ -9,7 +9,7 @@ public function loadMetadatas() { $this->name = "ABC Tabs Bridge"; $this->uri = "http://www.abc-tabs.com/"; $this->description = "Returns 22 newest tabs"; - $this->update = "2016-08-06"; + $this->update = "2016-08-09"; } @@ -21,7 +21,7 @@ public function collectData(array $param){ foreach ($table->find('tr') as $tab) { $item = new \Item(); - $item->name = $tab->find('td', 1)->plaintext . ' - ' . $tab->find('td', 2)->plaintext; + $item->author = $tab->find('td', 1)->plaintext . ' - ' . $tab->find('td', 2)->plaintext; $item->title = $tab->find('td', 1)->plaintext . ' - ' . $tab->find('td', 2)->plaintext; $item->content = 'Le ' . $tab->find('td', 0)->plaintext . '
Par: ' . $tab->find('td', 5)->plaintext . '
Type: ' . $tab->find('td', 3)->plaintext; $item->id = 'http://www.abc-tabs.com' . $tab->find('td', 2)->find('a', 0)->getAttribute('href'); diff --git a/bridges/AnimeUltimeBridge.php b/bridges/AnimeUltimeBridge.php index 20f0bfd1241..224f6644d2a 100644 --- a/bridges/AnimeUltimeBridge.php +++ b/bridges/AnimeUltimeBridge.php @@ -9,7 +9,7 @@ public function loadMetadatas() { $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 @@ public function collectData(array $param) { $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 @@ public function collectData(array $param) { $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 de26ee11c40..3e0b3c4236f 100644 --- a/bridges/ArstechnicaBridge.php +++ b/bridges/ArstechnicaBridge.php @@ -9,7 +9,7 @@ public function loadMetadatas() { $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 @@ function ExtractContent($url) { $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 07de0a4d28f..2c2e2f6f85e 100644 --- a/bridges/Arte7Bridge.php +++ b/bridges/Arte7Bridge.php @@ -7,7 +7,7 @@ public function loadMetadatas() { $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 @@ function extractVideoset($category='toutes-les-videos', $lang='fr') $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/BandcampBridge.php b/bridges/BandcampBridge.php index ce0c65cbe85..80e3deeadb3 100644 --- a/bridges/BandcampBridge.php +++ b/bridges/BandcampBridge.php @@ -9,7 +9,7 @@ public function loadMetadatas() { $this->name = "Bandcamp Tag"; $this->uri = "http://bandcamp.com/"; $this->description = "New bandcamp release by tag"; - $this->update = "2014-05-25"; + $this->update = "2016-08-09"; $this->parameters[] = '[ @@ -38,7 +38,7 @@ public function collectData(array $param){ $uri = rtrim($uri, "')"); $item = new \Item(); - $item->name = $release->find('div.itemsubtext',0)->plaintext . ' - ' . $release->find('div.itemtext',0)->plaintext; + $item->author = $release->find('div.itemsubtext',0)->plaintext . ' - ' . $release->find('div.itemtext',0)->plaintext; $item->title = $release->find('div.itemsubtext',0)->plaintext . ' - ' . $release->find('div.itemtext',0)->plaintext; $item->content = '
' . $release->find('div.itemsubtext',0)->plaintext . ' - ' . $release->find('div.itemtext',0)->plaintext; $item->id = $release->find('a',0)->getAttribute('href'); diff --git a/bridges/BlaguesDeMerdeBridge.php b/bridges/BlaguesDeMerdeBridge.php index 126ca82087d..d977caef93e 100644 --- a/bridges/BlaguesDeMerdeBridge.php +++ b/bridges/BlaguesDeMerdeBridge.php @@ -7,7 +7,7 @@ public function loadMetadatas() { $this->name = "Blagues De Merde"; $this->uri = "http://www.blaguesdemerde.fr/"; $this->description = "Blagues De Merde"; - $this->update = "2016-08-06"; + $this->update = "2016-08-09"; } @@ -26,7 +26,7 @@ public function collectData(array $param){ $date = $element->find("li.bdm_date",0)->innertext; $time = mktime(0, 0, 0, substr($date, 3, 2), substr($date, 0, 2), substr($date, 6, 4)); $item->timestamp = $time; - $item->name = $element->find("li.bdm_pseudo",0)->innertext;; + $item->author = $element->find("li.bdm_pseudo",0)->innertext;; $this->items[] = $item; } } diff --git a/bridges/BooruprojectBridge.php b/bridges/BooruprojectBridge.php index 9f9546a37fd..3ed40f296af 100644 --- a/bridges/BooruprojectBridge.php +++ b/bridges/BooruprojectBridge.php @@ -7,7 +7,7 @@ public function loadMetadatas() { $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 @@ public function collectData(array $param){ $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 5b0a8d583f6..e73027c1da4 100644 --- a/bridges/CNETBridge.php +++ b/bridges/CNETBridge.php @@ -9,7 +9,7 @@ public function loadMetadatas() { $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 @@ function CleanArticle($article_html) { $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 @@ function CleanArticle($article_html) { $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 = "http://www.cpasbien.io"; $this->description = "Returns latest torrents from a request query"; - $this->update = "2016-08-06"; + $this->update = "2016-08-09"; $this->parameters[] = '[ @@ -57,7 +57,7 @@ public function collectData(array $param){ $htmlepisode=content_get_html($this->get_cached($episode->find('a', 0)->getAttribute('href'))); $item = new \Item(); - $item->name = $episode->find('a', 0)->text(); + $item->author = $episode->find('a', 0)->text(); $item->title = $episode->find('a', 0)->text(); $item->timestamp = $this->get_cached_time($episode->find('a', 0)->getAttribute('href')); $textefiche=$htmlepisode->find('#textefiche', 0)->find('p',1); @@ -70,7 +70,6 @@ public function collectData(array $param){ $item->id = $episode->find('a', 0)->getAttribute('href'); $item->uri = $this->uri . $htmlepisode->find('#telecharger',0)->getAttribute('href'); - $item->thumbnailUri = $htmlepisode->find('#bigcover', 0)->find('img',0)->getAttribute('src'); $this->items[] = $item; } } diff --git a/bridges/DailymotionBridge.php b/bridges/DailymotionBridge.php index 2e834abab22..b9d422734fe 100644 --- a/bridges/DailymotionBridge.php +++ b/bridges/DailymotionBridge.php @@ -9,7 +9,7 @@ public function loadMetadatas() { $this->name = "Dailymotion Bridge"; $this->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 @@ function getMetadata($id) { $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 ac4bef6ae10..91befb1bf8d 100644 --- a/bridges/DanbooruBridge.php +++ b/bridges/DanbooruBridge.php @@ -7,7 +7,7 @@ public function loadMetadatas() { $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 @@ public function collectData(array $param){ $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/DemoBridge.php b/bridges/DemoBridge.php index b1d8515ec56..2e576c62160 100644 --- a/bridges/DemoBridge.php +++ b/bridges/DemoBridge.php @@ -7,7 +7,7 @@ public function loadMetadatas() { $this->name = "DemoBridge"; $this->uri = "http://github.com/sebsauvage/rss-bridge"; $this->description = "Bridge used for demos"; - $this->update = "2015-11-03"; + $this->update = "2016-08-09"; $this->parameters['testCheckbox'] = '[ @@ -54,12 +54,11 @@ public function loadMetadatas() { public function collectData(array $param){ $item = new \Item(); - $item->name = "TestElement"; + $item->author = "Me!"; $item->title = "Test"; $item->content = "Awesome content !"; $item->id = "Lalala"; $item->uri = "http://test.test/test"; - $item->enclosures[] = "http://www.ardmediathek.de/ard/servlet/image/00/32/68/18/38/1135274624/16x9/960"; $this->items[] = $item; diff --git a/bridges/DilbertBridge.php b/bridges/DilbertBridge.php index e4f2c9c5ed7..8cb7c800073 100644 --- a/bridges/DilbertBridge.php +++ b/bridges/DilbertBridge.php @@ -7,7 +7,7 @@ public function loadMetadatas() { $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 @@ public function collectData(array $param) { $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 958fce5f862..fe6d6fb7f8c 100644 --- a/bridges/DollbooruBridge.php +++ b/bridges/DollbooruBridge.php @@ -7,7 +7,7 @@ public function loadMetadatas() { $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 @@ public function collectData(array $param){ $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/ElsevierBridge.php b/bridges/ElsevierBridge.php index bd35925f0c9..cca3d853370 100644 --- a/bridges/ElsevierBridge.php +++ b/bridges/ElsevierBridge.php @@ -6,7 +6,7 @@ public function loadMetadatas() { $this->name = 'Elsevier journals recent articles'; $this->uri = 'http://www.journals.elsevier.com'; $this->description = 'Returns the recent articles published in Elsevier journals'; - $this->update = '2016-08-06'; + $this->update = '2016-08-09'; $this->parameters[] = '[ @@ -69,7 +69,7 @@ public function collectData(array $param){ $item = new \Item(); $item->uri = $article->find('.pod-listing-header>a',0)->getAttribute('href').'?np=y'; $item->title = $article->find('.pod-listing-header>a',0)->plaintext; - $item->name = $this->ExtractArticleName($article); + $item->author = $this->ExtractArticleName($article); $item->timestamp = $this->ExtractArticleTimestamp($article); $item->content = $this->ExtractArticleContent($article); $this->items[] = $item; diff --git a/bridges/EstCeQuonMetEnProdBridge.php b/bridges/EstCeQuonMetEnProdBridge.php index 5e5d8b4ca83..f0636b8f4f4 100644 --- a/bridges/EstCeQuonMetEnProdBridge.php +++ b/bridges/EstCeQuonMetEnProdBridge.php @@ -6,7 +6,7 @@ public function loadMetadatas() { $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 @@ function ExtractFromDelimiters($string, $start, $end) { $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 f1c9406c66c..96974fcf24c 100644 --- a/bridges/FacebookBridge.php +++ b/bridges/FacebookBridge.php @@ -7,7 +7,7 @@ public function loadMetadatas() { $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 @@ function ExtractFromDelimiters($string, $start, $end) { 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 524d9d95941..8e859b16033 100644 --- a/bridges/FlickrExploreBridge.php +++ b/bridges/FlickrExploreBridge.php @@ -7,7 +7,7 @@ public function loadMetadatas() { $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 @@ public function collectData(array $param){ $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 918c76556bc..61f59a266ea 100644 --- a/bridges/FlickrTagBridge.php +++ b/bridges/FlickrTagBridge.php @@ -7,7 +7,7 @@ public function loadMetadatas() { $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 @@ public function collectData(array $param){ 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/FootitoBridge.php b/bridges/FootitoBridge.php index a66dd8253ed..ffcba2f758d 100644 --- a/bridges/FootitoBridge.php +++ b/bridges/FootitoBridge.php @@ -7,7 +7,7 @@ public function loadMetadatas() { $this->name = "Footito"; $this->uri = "http://www.footito.fr/"; $this->description = "Footito"; - $this->update = "2016-08-06"; + $this->update = "2016-08-09"; } @@ -36,7 +36,7 @@ public function collectData(array $param){ $info = $element->find('div.infos', 0); $item->timestamp = strtotime($info->find('time', 0)->datetime); - $item->name = $info->find('a.auteur', 0)->plaintext; + $item->author = $info->find('a.auteur', 0)->plaintext; $this->items[] = $item; } diff --git a/bridges/Freenews.php b/bridges/Freenews.php index b2e27c9cd91..9cc0bafdec7 100644 --- a/bridges/Freenews.php +++ b/bridges/Freenews.php @@ -8,7 +8,7 @@ public function loadMetadatas() { $this->name = "Freenews"; $this->uri = "http://freenews.fr"; $this->description = "Un site d'actualité pour les freenautes (mais ne parlant pas que de la freebox). Ne rentrez pas d'id si vous voulez accéder aux actualités générales."; - $this->update = "26/03/2014"; + $this->update = "2016-08-09"; $this->parameters[] = '[ @@ -38,7 +38,7 @@ protected function parseRSSItem($newsItem) { $content = $articlePage->find('.post-container', 0); $item->content = $content->innertext; - $item->name = $articlePage->find('a[rel=author]', 0)->innertext; + $item->author = $articlePage->find('a[rel=author]', 0)->innertext; // format should parse 2014-03-25T16:21:20Z. But, according to http://stackoverflow.com/a/10478469, it is not that simple $item->timestamp = $this->RSS_2_0_time_to_timestamp($newsItem); return $item; diff --git a/bridges/FuturaSciencesBridge.php b/bridges/FuturaSciencesBridge.php index f22c6107319..2886249c1ed 100644 --- a/bridges/FuturaSciencesBridge.php +++ b/bridges/FuturaSciencesBridge.php @@ -7,7 +7,7 @@ public function loadMetadatas() { $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 @@ function ExtractAuthor($article, $element){ $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 75217b079db..b1ac17dd677 100644 --- a/bridges/GBAtempBridge.php +++ b/bridges/GBAtempBridge.php @@ -9,7 +9,7 @@ public function loadMetadatas() { $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 @@ private function StripWithDelimiters($string, $start, $end) { } 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 @@ public function collectData(array $param) { 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 @@ public function collectData(array $param) { $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 @@ public function collectData(array $param) { $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 @@ public function collectData(array $param) { $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/Gawker.php b/bridges/Gawker.php index 624e66db0ef..71bba277c56 100644 --- a/bridges/Gawker.php +++ b/bridges/Gawker.php @@ -10,7 +10,7 @@ public function loadMetadatas() { $this->name = "Gawker media"; $this->uri = "http://feeds.gawker.com/"; $this->description = "A bridge allowing access to any of the numerous Gawker media blogs (Lifehacker, deadspin, Kotaku, Jezebel, and so on. Notice you have to give its id to find the RSS stream in gawker maze"; - $this->update = "27/03/2014"; + $this->update = "2016-08-09"; $this->parameters[] = '[ @@ -53,7 +53,7 @@ protected function parseRSSItem($newsItem) { $vcard = $articlePage->find('.vcard', 0); if(is_object($vcard)) { $authorLink = $vcard->find('a', 0); - $item->name = $authorLink->innertext; + $item->author = $authorLink->innertext; // TODO use author link href to fill the feed info } // $this->message("item quite loaded : ".var_export($item, true)); diff --git a/bridges/GelbooruBridge.php b/bridges/GelbooruBridge.php index 16968b8d4e2..e4cd2b5631a 100644 --- a/bridges/GelbooruBridge.php +++ b/bridges/GelbooruBridge.php @@ -7,7 +7,7 @@ public function loadMetadatas() { $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 @@ public function collectData(array $param){ $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/GithubIssueBridge.php b/bridges/GithubIssueBridge.php index 4c56cf0a144..84b1f56c184 100644 --- a/bridges/GithubIssueBridge.php +++ b/bridges/GithubIssueBridge.php @@ -12,7 +12,7 @@ public function loadMetadatas() { $this->name = 'Github Issue'; $this->uri = ''; $this->description = 'Returns the comments of a github project issue'; - $this->update = '2016-06-25'; + $this->update = '2016-08-09'; $this->parameters[]= '[ @@ -40,7 +40,7 @@ public function collectData(array $param){ foreach($html->find('.js-comment-container') as $comment){ $item = new \Item(); - $item->name=$comment->find('img',0)->getAttribute('alt'); + $item->author=$comment->find('img',0)->getAttribute('alt'); $comment=$comment->firstChild()->nextSibling(); diff --git a/bridges/GitlabCommitsBridge.php b/bridges/GitlabCommitsBridge.php index 030c74bc353..ba1b0020b07 100644 --- a/bridges/GitlabCommitsBridge.php +++ b/bridges/GitlabCommitsBridge.php @@ -12,7 +12,7 @@ public function loadMetadatas() { $this->name = 'Gitlab Commits'; $this->uri = ''; $this->description = 'Returns the commits of a project hosted on a gitlab instance'; - $this->update = '2016-08-06'; + $this->update = '2016-08-09'; $this->parameters[] = '[ @@ -64,7 +64,7 @@ public function collectData(array $param){ $item->title=$a->plaintext; } if(in_array('commit-author-link',$classes)){ - $item->name=trim($a->plaintext); + $item->author=trim($a->plaintext); } } diff --git a/bridges/HDWallpapersBridge.php b/bridges/HDWallpapersBridge.php index 45a6deb945e..99161a3c8a2 100644 --- a/bridges/HDWallpapersBridge.php +++ b/bridges/HDWallpapersBridge.php @@ -10,7 +10,7 @@ public function loadMetadatas() { $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 @@ public function collectData(array $param){ $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 c5ef2637263..ccd1f089acb 100644 --- a/bridges/HentaiHavenBridge.php +++ b/bridges/HentaiHavenBridge.php @@ -7,7 +7,7 @@ public function loadMetadatas() { $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 @@ public function collectData(array $param){ 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 2d38726ab77..1c7afa7a2da 100644 --- a/bridges/JapanExpoBridge.php +++ b/bridges/JapanExpoBridge.php @@ -6,7 +6,7 @@ public function loadMetadatas() { $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 @@ function french_pubdate_to_timestamp($date_to_parse) { $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 00de4385ff7..1b3a378c9a6 100644 --- a/bridges/KonachanBridge.php +++ b/bridges/KonachanBridge.php @@ -7,7 +7,7 @@ public function loadMetadatas() { $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 @@ public function collectData(array $param){ $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/LWNprevBridge.php b/bridges/LWNprevBridge.php index 9772799f6f5..15bc1f2ef88 100644 --- a/bridges/LWNprevBridge.php +++ b/bridges/LWNprevBridge.php @@ -12,7 +12,7 @@ public function loadMetadatas() { $this->name = 'LWN Free Weekly Edition'; $this->uri = 'https://lwn.net/free/bigpage'; $this->description = 'LWN Free Weekly Edition available one week late'; - $this->update = '2016-19-01'; + $this->update = '2016-08-09'; } @@ -88,14 +88,14 @@ public function collectData(array $param){ switch($h2NextSibling->getAttribute('class')){ case 'FeatureByline': - $item->name=$h2NextSibling->getElementsByTagName('b')->item(0)->textContent; + $item->author=$h2NextSibling->getElementsByTagName('b')->item(0)->textContent; break; case 'GAByline': $text=$h2NextSibling->textContent; - $item->name=substr($text,strpos($text,'by ')); + $item->author=substr($text,strpos($text,'by ')); break; default: - $item->name='LWN'; + $item->author='LWN'; break; }; diff --git a/bridges/LeMondeInformatiqueBridge.php b/bridges/LeMondeInformatiqueBridge.php index f3739380076..df81b667922 100644 --- a/bridges/LeMondeInformatiqueBridge.php +++ b/bridges/LeMondeInformatiqueBridge.php @@ -7,7 +7,7 @@ public function loadMetadatas() { $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 @@ function CleanArticle($article_html) { $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/Les400Culs.php b/bridges/Les400Culs.php index c8b89c8ead6..65bd5a61162 100644 --- a/bridges/Les400Culs.php +++ b/bridges/Les400Culs.php @@ -10,7 +10,7 @@ public function loadMetadatas() { $this->name = "Les 400 Culs"; $this->uri = "http://sexes.blogs.liberation.fr"; $this->description = "La planete sexe vue par Agnes Girard via rss-bridge"; - $this->update = "20/02/2014"; + $this->update = "2016-08-09"; } @@ -34,7 +34,7 @@ protected function parseRSSItem($newsItem) { // $content = $articlePage->find('.post-container', 0); $item->content = (string) $newsItem->description; - $item->name = (string) $newsItem->author; + $item->author = (string) $newsItem->author; $item->timestamp = $this->RSS_2_0_time_to_timestamp($newsItem); return $item; } diff --git a/bridges/LesJoiesDuCodeBridge.php b/bridges/LesJoiesDuCodeBridge.php index ab759dd9514..4ff8e2c167e 100644 --- a/bridges/LesJoiesDuCodeBridge.php +++ b/bridges/LesJoiesDuCodeBridge.php @@ -7,7 +7,7 @@ public function loadMetadatas() { $this->name = "Les Joies Du Code"; $this->uri = "http://lesjoiesducode.fr/"; $this->description = "LesJoiesDuCode"; - $this->update = "2016-08-06"; + $this->update = "2016-08-09"; } @@ -36,7 +36,7 @@ public function collectData(array $param){ if($pos > 0) { $auteur = trim(str_replace("*/", "", substr($auteur->innertext, ($pos + 2)))); - $item->name = $auteur; + $item->author = $auteur; } diff --git a/bridges/LinkedInCompany.php b/bridges/LinkedInCompany.php index b7a49bd6614..243f70c8fba 100644 --- a/bridges/LinkedInCompany.php +++ b/bridges/LinkedInCompany.php @@ -7,7 +7,7 @@ public function loadMetadatas() { $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 @@ public function collectData(array $param){ $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 37e06f32f3d..74fe9ab6475 100644 --- a/bridges/LolibooruBridge.php +++ b/bridges/LolibooruBridge.php @@ -7,7 +7,7 @@ public function loadMetadatas() { $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 @@ public function collectData(array $param){ $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 3d92682ebb7..568eb23752a 100644 --- a/bridges/MangareaderBridge.php +++ b/bridges/MangareaderBridge.php @@ -8,7 +8,7 @@ public function loadMetadatas() { $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 @@ public function collectData(array $param){ // 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 eb1e133ae42..946a1327bd8 100644 --- a/bridges/MilbooruBridge.php +++ b/bridges/MilbooruBridge.php @@ -7,7 +7,7 @@ public function loadMetadatas() { $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 @@ public function collectData(array $param){ $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 caac0955ea1..2ad84d6e118 100644 --- a/bridges/MspabooruBridge.php +++ b/bridges/MspabooruBridge.php @@ -7,7 +7,7 @@ public function loadMetadatas() { $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 @@ public function collectData(array $param){ $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 fc3d73ad6ba..5b0eab0bdef 100644 --- a/bridges/NakedSecurityBridge.php +++ b/bridges/NakedSecurityBridge.php @@ -6,7 +6,7 @@ public function loadMetadatas() { $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 @@ function StripRecursiveHTMLSection($string, $tag_name, $tag_start) { $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 5ee207a9824..b772f5d01ba 100644 --- a/bridges/NeuviemeArtBridge.php +++ b/bridges/NeuviemeArtBridge.php @@ -6,7 +6,7 @@ public function loadMetadatas() { $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 @@ function StripWithDelimiters($string, $start, $end) { $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 ee89ab14709..52bc9086594 100644 --- a/bridges/NextInpactBridge.php +++ b/bridges/NextInpactBridge.php @@ -6,7 +6,7 @@ public function loadMetadatas() { $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 @@ public function collectData(array $param) { $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 35ca1fc3007..1ead4faeb46 100644 --- a/bridges/NextgovBridge.php +++ b/bridges/NextgovBridge.php @@ -7,7 +7,7 @@ public function loadMetadatas() { $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 @@ function StripWithDelimiters($string, $start, $end) { .'

'.$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 18d1d356dc3..b45a61b4d07 100644 --- a/bridges/PickyWallpapersBridge.php +++ b/bridges/PickyWallpapersBridge.php @@ -11,7 +11,7 @@ public function loadMetadatas() { $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 @@ public function collectData(array $param){ $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 3b2a8905b51..2eb2d98407a 100644 --- a/bridges/RTBFBridge.php +++ b/bridges/RTBFBridge.php @@ -5,6 +5,7 @@ public function loadMetadatas() { $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 @@ public function collectData(array $param) { $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 abd35ad9241..54a5a816cf3 100644 --- a/bridges/Releases3DSBridge.php +++ b/bridges/Releases3DSBridge.php @@ -7,7 +7,7 @@ public function loadMetadatas() { $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 @@ function CardToString($card) { $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 b4c30dd93a9..d9ca0669b7c 100644 --- a/bridges/Rule34Bridge.php +++ b/bridges/Rule34Bridge.php @@ -7,7 +7,7 @@ public function loadMetadatas() { $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 @@ public function collectData(array $param){ $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 33716408c72..ecffcc580fe 100644 --- a/bridges/Rule34pahealBridge.php +++ b/bridges/Rule34pahealBridge.php @@ -7,7 +7,7 @@ public function loadMetadatas() { $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 @@ public function collectData(array $param){ $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 63ffd1a4025..b9d2ee1ef88 100644 --- a/bridges/SafebooruBridge.php +++ b/bridges/SafebooruBridge.php @@ -7,7 +7,7 @@ public function loadMetadatas() { $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 @@ public function collectData(array $param){ $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 d35da26400b..ac6d58dd00f 100644 --- a/bridges/SakugabooruBridge.php +++ b/bridges/SakugabooruBridge.php @@ -7,7 +7,7 @@ public function loadMetadatas() { $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 @@ public function collectData(array $param){ $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/SensCritiqueBridge.php b/bridges/SensCritiqueBridge.php index f471602c78b..fc2093219d2 100644 --- a/bridges/SensCritiqueBridge.php +++ b/bridges/SensCritiqueBridge.php @@ -8,7 +8,7 @@ public function loadMetadatas() { $this->name = "Sens Critique"; $this->uri = "http://www.senscritique.com"; $this->description = "Sens Critique news"; - $this->update = "2016-08-06"; + $this->update = "2016-08-09"; $this->parameters[] = '[ @@ -118,7 +118,7 @@ private function extractDataFromList($list) { foreach ($list->find('li') as $movie) { $item = new \Item(); - $item->name = htmlspecialchars_decode($movie->find('.elco-title a', 0)->plaintext, ENT_QUOTES) . ' ' . $movie->find('.elco-date', 0)->plaintext; + $item->author = htmlspecialchars_decode($movie->find('.elco-title a', 0)->plaintext, ENT_QUOTES) . ' ' . $movie->find('.elco-date', 0)->plaintext; $item->title = $movie->find('.elco-title a', 0)->plaintext . ' ' . $movie->find('.elco-date', 0)->plaintext; $item->content = '' . $movie->find('.elco-original-title', 0)->plaintext . '

' . $movie->find('.elco-baseline', 0)->plaintext . '
' . diff --git a/bridges/Sexactu.php b/bridges/Sexactu.php index cfa97a700a6..c5480e4bdfa 100644 --- a/bridges/Sexactu.php +++ b/bridges/Sexactu.php @@ -8,7 +8,7 @@ public function loadMetadatas() { $this->name = "Sexactu"; $this->uri = "http://www.gqmagazine.fr"; $this->description = "Sexactu via rss-bridge"; - $this->update = "2016-08-06"; + $this->update = "2016-08-09"; } @@ -42,7 +42,7 @@ public function collectData(array $param){ $date = strtotime($dateText); $item->timestamp = $date; - $item->name = "Maïa Mazaurette"; + $item->author = "Maïa Mazaurette"; $elementText = $element->find('.text-container', 0); // don't forget to replace images server url with gq one foreach($elementText->find('img') as $image) { diff --git a/bridges/SiliconBridge.php b/bridges/SiliconBridge.php index b715ba7f418..4cd7388466e 100644 --- a/bridges/SiliconBridge.php +++ b/bridges/SiliconBridge.php @@ -7,7 +7,7 @@ public function loadMetadatas() { $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 @@ function StripCDATA($string) { //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/SoundcloudBridge.php b/bridges/SoundcloudBridge.php index ebc3f8eabfa..40836d51788 100644 --- a/bridges/SoundcloudBridge.php +++ b/bridges/SoundcloudBridge.php @@ -10,7 +10,7 @@ public function loadMetadatas() { $this->name = "Soundcloud Bridge"; $this->uri = "http://www.soundcloud.com/"; $this->description = "Returns 10 newest music from user profile"; - $this->update = "2016-08-06"; + $this->update = "2016-08-09"; $this->parameters[] = '[ @@ -40,7 +40,7 @@ public function collectData(array $param){ for ($i=0; $i < 10; $i++) { $item = new \Item(); - $item->name = $tracks[$i]->user->username .' - '. $tracks[$i]->title; + $item->author = $tracks[$i]->user->username .' - '. $tracks[$i]->title; $item->title = $tracks[$i]->user->username .' - '. $tracks[$i]->title; $item->content = '