' . $question . '
' . $answer . '
' . $visual . '
'; - // Fix relative links without breaking // scheme used by YouTube stuff - $content = preg_replace('#href="\/(?!\/)#', 'href="' . self::URI, $content); - $item['content'] = $content; + $item['content'] = '' . $question + . '
' . $answer + . '
' . $visual . '
'; + $this->items[] = $item; } } @@ -66,7 +66,7 @@ class AskfmBridge extends BridgeAbstract { public function getURI(){ if(!is_null($this->getInput('u'))) { - return self::URI . urlencode($this->getInput('u')) . '/answers/more?page=0'; + return self::URI . urlencode($this->getInput('u')); } return parent::getURI(); diff --git a/bridges/AutoJMBridge.php b/bridges/AutoJMBridge.php index b48a22a5..598f0431 100644 --- a/bridges/AutoJMBridge.php +++ b/bridges/AutoJMBridge.php @@ -19,6 +19,10 @@ class AutoJMBridge extends BridgeAbstract { ); const CACHE_TIMEOUT = 3600; + public function getIcon() { + return self::URI . 'assets/images/favicon.ico'; + } + public function collectData() { $html = getSimpleHTMLDOM(self::URI . $this->getInput('url')) or returnServerError('Could not request AutoJM.'); @@ -43,7 +47,7 @@ class AutoJMBridge extends BridgeAbstract { $item = array(); $item['uri'] = $url; $item['title'] = $serie; - $item['content'] = ''. $serie . '
' . $serie . '
Series: ' . $objTitle->innertext . '
'; + } + + $objVolume = $cols[2]; + if ($objVolume && !empty($objVolume->plaintext)) + $title[] = 'Vol.' . $objVolume->plaintext; + + $objChapter = $cols[3]; + if ($objChapter && !empty($objChapter->plaintext)) + $title[] = 'Chp.' . $objChapter->plaintext; + + $objAuthor = $cols[4]; + if ($objAuthor && !empty($objAuthor->plaintext)) { + $item['author'] = html_entity_decode($objAuthor->plaintext); + $item['content'] .= 'Groups: ' . $objAuthor->innertext . '
'; + } + + $item['title'] = implode(' ', $title); + $item['uri'] = $this->getURI() . '#' . hash('sha1', $item['title']); + + $this->items[] = $item; + + if(count($this->items) >= $limit) { + break; + } + } + } + + public function getURI(){ + $series_id = $this->getInput('series_id'); + if (!empty($series_id)) { + return self::URI . 'releases.html?search=' . $series_id . '&stype=series'; + } + return self::URI; + } + + public function getName(){ + if(!empty($this->feedName)) { + return $this->feedName . ' - ' . self::NAME; + } + return parent::getName(); + } +} diff --git a/bridges/BandcampBridge.php b/bridges/BandcampBridge.php index 0527da03..9c8d436e 100644 --- a/bridges/BandcampBridge.php +++ b/bridges/BandcampBridge.php @@ -14,6 +14,10 @@ class BandcampBridge extends BridgeAbstract { ) )); + public function getIcon() { + return 'https://s4.bcbits.com/img/bc_favicon.ico'; + } + public function collectData(){ $html = getSimpleHTMLDOM($this->getURI()) or returnServerError('No results for this query.'); diff --git a/bridges/BlaguesDeMerdeBridge.php b/bridges/BlaguesDeMerdeBridge.php index 78deda0e..cae8f4f5 100644 --- a/bridges/BlaguesDeMerdeBridge.php +++ b/bridges/BlaguesDeMerdeBridge.php @@ -7,6 +7,10 @@ class BlaguesDeMerdeBridge extends BridgeAbstract { const CACHE_TIMEOUT = 7200; // 2h const DESCRIPTION = 'Blagues De Merde'; + public function getIcon() { + return self::URI . 'assets/img/favicon.ico'; + } + public function collectData(){ $html = getSimpleHTMLDOM(self::URI) @@ -39,5 +43,4 @@ class BlaguesDeMerdeBridge extends BridgeAbstract { } } - } diff --git a/bridges/BloombergBridge.php b/bridges/BloombergBridge.php index 8aff0ec7..9eb12191 100644 --- a/bridges/BloombergBridge.php +++ b/bridges/BloombergBridge.php @@ -31,6 +31,10 @@ class BloombergBridge extends BridgeAbstract return parent::getName(); } + public function getIcon() { + return 'https://assets.bwbx.io/s3/javelin/public/hub/images/favicon-black-63fe5249d3.png'; + } + public function collectData() { switch($this->queriedContext) { diff --git a/bridges/BundesbankBridge.php b/bridges/BundesbankBridge.php index 972290bd..d21f22b6 100644 --- a/bridges/BundesbankBridge.php +++ b/bridges/BundesbankBridge.php @@ -27,6 +27,10 @@ class BundesbankBridge extends BridgeAbstract { ) ); + public function getIcon() { + return self::URI . 'resource/crblob/1890/a7f48ee0ae35348748121770ba3ca009/mL/favicon-ico-data.ico'; + } + public function getURI() { switch($this->getInput(self::PARAM_LANG)) { case self::LANG_EN: return self::URI . 'en/publications/reports/studies'; @@ -79,5 +83,4 @@ class BundesbankBridge extends BridgeAbstract { } } - } diff --git a/bridges/CNETBridge.php b/bridges/CNETBridge.php index bd41febc..564b817a 100644 --- a/bridges/CNETBridge.php +++ b/bridges/CNETBridge.php @@ -52,9 +52,9 @@ class CNETBridge extends BridgeAbstract { returnClientError('Invalid topic: ' . $topic); // Retrieve webpage - $pageUrl = self::URI . (empty($topic) ? 'news/' : $topic.'/'); + $pageUrl = self::URI . (empty($topic) ? 'news/' : $topic . '/'); $html = getSimpleHTMLDOM($pageUrl) - or returnServerError('Could not request CNET: '.$pageUrl); + or returnServerError('Could not request CNET: ' . $pageUrl); // Process articles foreach($html->find('div.assetBody, div.riverPost') as $element) { diff --git a/bridges/ChristianDailyReporterBridge.php b/bridges/ChristianDailyReporterBridge.php index b8cbf3c8..85f664df 100644 --- a/bridges/ChristianDailyReporterBridge.php +++ b/bridges/ChristianDailyReporterBridge.php @@ -7,6 +7,9 @@ class ChristianDailyReporterBridge extends BridgeAbstract { const DESCRIPTION = 'The Unofficial Christian Daily Reporter RSS'; // const CACHE_TIMEOUT = 86400; // 1 day + public function getIcon() { + return self::URI . 'images/cdrfavicon.png'; + } public function collectData() { $uri = 'https://www.christiandailyreporter.com/'; diff --git a/bridges/CommonDreamsBridge.php b/bridges/CommonDreamsBridge.php index e4dcb63f..22b9238d 100644 --- a/bridges/CommonDreamsBridge.php +++ b/bridges/CommonDreamsBridge.php @@ -3,7 +3,7 @@ class CommonDreamsBridge extends FeedExpander { const MAINTAINER = 'nyutag'; const NAME = 'CommonDreams Bridge'; - const URI = 'http://www.commondreams.org/'; + const URI = 'https://www.commondreams.org/'; const DESCRIPTION = 'Returns the newest articles.'; public function collectData(){ diff --git a/bridges/ContainerLinuxReleasesBridge.php b/bridges/ContainerLinuxReleasesBridge.php index a82ba7e2..ae438885 100644 --- a/bridges/ContainerLinuxReleasesBridge.php +++ b/bridges/ContainerLinuxReleasesBridge.php @@ -32,6 +32,10 @@ class ContainerLinuxReleasesBridge extends BridgeAbstract { return json_decode($json, true); } + public function getIcon() { + return 'https://coreos.com/assets/ico/favicon.png'; + } + public function collectData() { $data = $this->getReleaseFeed($this->getJsonUri()); diff --git a/bridges/CrewbayBridge.php b/bridges/CrewbayBridge.php new file mode 100644 index 00000000..a3c52b9a --- /dev/null +++ b/bridges/CrewbayBridge.php @@ -0,0 +1,227 @@ + array( + 'name' => 'Filter by keyword', + 'title' => 'Enter the keyword to filter here' + ), + 'type' => array( + 'name' => 'Type of search', + 'title' => 'Choose between finding a boat or a crew', + 'type' => 'list', + 'values' => array( + 'Find a boat' => 'boats', + 'Find a crew' => 'crew' + ) + ), + 'status' => array( + 'name' => 'Status on the boat', + 'title' => 'Choose between recreational or professional classified ads', + 'type' => 'list', + 'values' => array( + 'Recreational' => 'recreational', + 'Professional' => 'professional' + ) + ), + 'recreational_position' => array( + 'name' => 'Recreational position wanted', + 'title' => 'Filter by recreational position you wanted aboard', + 'required' => false, + 'type' => 'list', + 'values' => array( + '' => '', + 'Amateur Crew' => 'Amateur Crew', + 'Friendship' => 'Friendship', + 'Competent Crew' => 'Competent Crew', + 'Racing' => 'Racing', + 'Voluntary work' => 'Voluntary work', + 'Mile building' => 'Mile building' + ) + ), + 'professional_position' => array( + 'name' => 'Professional position wanted', + 'title' => 'Filter by professional position you wanted aboard', + 'required' => false, + 'type' => 'list', + 'values' => array( + '' => '', + '1st Engineer' => '1st Engineer', + '1st Mate' => '1st Mate', + 'Beautician' => 'Beautician', + 'Bosun' => 'Bosun', + 'Captain' => 'Captain', + 'Chef' => 'Chef', + 'Steward(ess)' => 'Steward(ess)', + 'Deckhand' => 'Deckhand', + 'Delivery Crew' => 'Delivery Crew', + 'Dive Instructor' => 'Dive Instructor', + 'Masseur' => 'Masseur', + 'Medical Staff' => 'Medical Staff', + 'Nanny' => 'Nanny', + 'Navigator' => 'Navigator', + 'Racing Crew' => 'Racing Crew', + 'Teacher' => 'Teacher', + 'Electrical Engineer' => 'Electrical Engineer', + 'Fitter' => 'Fitter', + '2nd Engineer' => '2nd Engineer', + '3rd Engineer' => '3rd Engineer', + 'Lead Deckhand' => 'Lead Deckhand', + 'Security Officer' => 'Security Officer', + 'O.O.W' => 'O.O.W', + '1st Officer' => '1st Officer', + '2nd Officer' => '2nd Officer', + '3rd Officer' => '3rd Officer', + 'Captain/Engineer' => 'Captain/Engineer', + 'Hairdresser' => 'Hairdresser', + 'Fitness Trainer' => 'Fitness Trainer', + 'Laundry' => 'Laundry', + 'Solo Steward/ess' => 'Solo Steward/ess', + 'Stew/Deck' => 'Stew/Deck', + '2nd Steward/ess' => '2nd Steward/ess', + '3rd Steward/ess' => '3rd Steward/ess', + 'Chief Steward/ess' => 'Chief Steward/ess', + 'Head Housekeeper' => 'Head Housekeeper', + 'Purser' => 'Purser', + 'Cook' => 'Cook', + 'Cook/Stew' => 'Cook/Stew', + '2nd Chef' => '2nd Chef', + 'Head Chef' => 'Head Chef', + 'Administrator' => 'Administrator', + 'P.A' => 'P.A', + 'Villa staff' => 'Villa staff', + 'Housekeeping/Stew' => 'Housekeeping/Stew', + 'Stew/Beautician' => 'Stew/Beautician', + 'Stew/Masseuse' => 'Stew/Masseuse', + 'Manager' => 'Manager', + 'Sailing instructor' => 'Sailing instructor' + ) + ) + ) + ); + + public function collectData() { + $url = $this->getURI(); + $html = getSimpleHTMLDOM($url) or returnClientError('No results for this query.'); + + $annonces = $html->find('#SearchResults div.result'); + $limit = 0; + + foreach ($annonces as $annonce) { + $detail = $annonce->find('.btn--profile', 0); + $htmlDetail = getSimpleHTMLDOMCached($detail->href); + + if (!empty($this->getInput('recreational_position')) || !empty($this->getInput('professional_position'))) { + if ($this->getInput('type') == 'boats') { + if ($this->getInput('status') == 'professional') { + $positions = array($annonce->find('.title .position', 0)->plaintext); + } else { + $positions = array(str_replace('Wanted:', '', $annonce->find('.content li', 0)->plaintext)); + } + } else { + $list = $htmlDetail->find('.viewer-details .viewer-list'); + $positions = explode("\r\n", end($list)->find('span.value', 0)->plaintext); + } + + $found = false; + $keyword = $this->getInput('status') == 'professional' ? 'professional_position' : 'recreational_position'; + foreach ($positions as $position) { + if (strpos(trim($position), $this->getInput($keyword)) !== false) { + $found = true; + break; + } + } + + if (!$found) { + continue; + } + } + + $item = array(); + + if ($this->getInput('type') == 'boats') { + $titleSelector = '.title h2'; + } else { + $titleSelector = '.layout__item h2'; + } + $userName = $annonce->find('.result--description a', 0)->plaintext; + $annonceTitle = trim($annonce->find($titleSelector, 0)->plaintext); + if (empty($annonceTitle)) { + $item['title'] = $userName; + } else { + $item['title'] = $userName . ' - ' . $annonceTitle; + } + + $item['uri'] = $detail->href; + $images = $annonce->find('.avatar img'); + $item['enclosures'] = array(end($images)->getAttribute('src')); + + $content = $htmlDetail->find('.viewer-intro--info', 0)->innertext; + + $sections = $htmlDetail->find('.viewer-container .viewer-section'); + foreach ($sections as $section) { + if ($section->find('.viewer-section-title', 0)) { + $class = str_replace('viewer-', '', explode(' ', $section->getAttribute('class'))[0]); + if (!in_array($class, array('apply', 'photos', 'reviews', 'contact', 'experience', 'qa'))) { + // Basic sections + $content .= $section->find('.viewer-section-title h3', 0)->outertext; + $content .= $section->find('.viewer-section-content', 0)->innertext; + } + } else { + // Info section + $content .= $section->find('.viewer-section-content h3', 0)->outertext; + $content .= $section->find('.viewer-section-content p', 0)->outertext; + } + } + + if (!empty($this->getInput('keyword'))) { + $keyword = strtolower($this->getInput('keyword')); + if (strpos(strtolower($item['title']), $keyword) === false) { + if (strpos(strtolower($content), $keyword) === false) { + continue; + } + } + } + + $item['content'] = $content; + + $tags = $htmlDetail->find('li.viewer-tags--tag'); + foreach ($tags as $tag) { + if (!isset($item['categories'])) { + $item['categories'] = array(); + } + $text = trim($tag->plaintext); + if (!in_array($text, $item['categories'])) { + $item['categories'][] = $text; + } + } + + $this->items[] = $item; + $limit += 1; + + if ($limit == 10) break; + } + } + + public function getURI() { + $uri = parent::getURI(); + + if ($this->getInput('type') == 'boats') { + $uri .= '/boats'; + } else { + $uri .= '/crew'; + } + + if ($this->getInput('status') == 'professional') { + $uri .= '/professional'; + } else { + $uri .= '/recreational'; + } + + return $uri; + } +} diff --git a/bridges/DailymotionBridge.php b/bridges/DailymotionBridge.php index d075041c..ff8d4828 100644 --- a/bridges/DailymotionBridge.php +++ b/bridges/DailymotionBridge.php @@ -48,6 +48,10 @@ class DailymotionBridge extends BridgeAbstract { return $metadata; } + public function getIcon() { + return 'https://static1-ssl.dmcdn.net/images/neon/favicons/android-icon-36x36.png.vf806ca4ed0deed812'; + } + public function collectData(){ $html = ''; $limit = 5; diff --git a/bridges/DealabsBridge.php b/bridges/DealabsBridge.php index b9b05ed9..89183edb 100644 --- a/bridges/DealabsBridge.php +++ b/bridges/DealabsBridge.php @@ -15,27 +15,25 @@ class DealabsBridge extends PepperBridgeAbstract { 'hide_expired' => array( 'name' => 'Masquer les éléments expirés', 'type' => 'checkbox', - 'required' => 'true' + 'required' => true ), 'hide_local' => array( 'name' => 'Masquer les deals locaux', 'type' => 'checkbox', 'title' => 'Masquer les deals en magasins physiques', - 'required' => 'true' + 'required' => true ), 'priceFrom' => array( 'name' => 'Prix minimum', 'type' => 'text', 'title' => 'Prix mnimum en euros', - 'required' => 'false', - 'defaultValue' => '' + 'required' => false ), 'priceTo' => array( 'name' => 'Prix maximum', 'type' => 'text', 'title' => 'Prix maximum en euros', - 'required' => 'false', - 'defaultValue' => '' + 'required' => false ), ), @@ -43,7 +41,7 @@ class DealabsBridge extends PepperBridgeAbstract { 'group' => array( 'name' => 'Groupe', 'type' => 'list', - 'required' => 'true', + 'required' => true, 'title' => 'Groupe dont il faut afficher les deals', 'values' => array( 'Abonnements internet' => 'abonnements-internet', @@ -959,7 +957,7 @@ class DealabsBridge extends PepperBridgeAbstract { 'order' => array( 'name' => 'Trier par', 'type' => 'list', - 'required' => 'true', + 'required' => true, 'title' => 'Ordre de tri des deals', 'values' => array( 'Du deal le plus Hot au moins Hot' => '', @@ -1074,10 +1072,10 @@ class PepperBridgeAbstract extends BridgeAbstract { $url = $this->i8n('bridge-uri') . '/search/advanced?q=' . urlencode($q) - . '&hide_expired='. $hide_expired - . '&hide_local='. $hide_local - . '&priceFrom='. $priceFrom - . '&priceTo='. $priceTo + . '&hide_expired=' . $hide_expired + . '&hide_local=' . $hide_local + . '&priceFrom=' . $priceFrom + . '&priceTo=' . $priceTo /* Some default parameters * search_fields : Search in Titres & Descriptions & Codes * sort_by : Sort the search by new deals @@ -1152,30 +1150,30 @@ class PepperBridgeAbstract extends BridgeAbstract { foreach ($list as $deal) { $item = array(); $item['uri'] = $deal->find('div[class=threadGrid-title]', 0)->find('a', 0)->href; - $item['title'] = $deal->find('a[class*='. $selectorLink .']', 0 + $item['title'] = $deal->find('a[class*=' . $selectorLink . ']', 0 )->plaintext; $item['author'] = $deal->find('span.thread-username', 0)->plaintext; $item['content'] = '' - . $deal->find('a[class*='. $selectorLink .']', 0)->innertext + . $deal->find('a[class*=' . $selectorLink . ']', 0)->innertext . '' . $this->getPrice($deal) . $this->getDiscount($deal) . $this->getShipsFrom($deal) . $this->getShippingCost($deal) . $this->GetSource($deal) - . $deal->find('div[class*='. $selectorDescription .']', 0)->innertext + . $deal->find('div[class*=' . $selectorDescription . ']', 0)->innertext . ' | ' - . $deal->find('div[class*='. $selectorHot .']', 0) + . $deal->find('div[class*=' . $selectorHot . ']', 0) ->find('span', 1)->outertext . ' |
' // description + . $post->description + . '
Size: ' // image size
+ . $post->width
+ . 'x'
+ . $post->height
+ . '
Source: '
+ . $post->source_url
+ . '
' - . $result->find('div.card-price', 0)->plaintext + . $result->find('span.currency-value', 0)->plaintext . ' ' + . $result->find('span.currency-symbol', 0)->plaintext . '
' - . $result->find('div.card-title', 0)->plaintext + . $result->find('a', 0)->title . '
'; - $image = $result->find('img.placeholder', 0)->src; + $image = $result->find('img.display-block', 0)->src; if($this->getInput('showimage')) { $item['content'] .= '' . $subject->innertext . '
'; + } + + // Change title tag for embedded media from anchor to paragraph + foreach($content->find('._3n1k a') as $anchor) { + $anchor->outertext = '' . $anchor->innertext . '
'; + } $content = preg_replace( '/(?i)>' . $comment->children(1)->innertext . '
'; - $item['uri'] = $uri . '#' . $comment->children(1)->getAttribute('id'); - $items[] = $item; - } - return $items; + $author = $comment->find('.author', 0)->plaintext; + + $title .= ' / ' . trim($comment->plaintext); + + $content = $title; + if (null !== $comment->nextSibling()) { + $content = $comment->nextSibling()->innertext; + if ($comment->nextSibling()->nodeName() === 'span') { + $content = $comment->nextSibling()->nextSibling()->innertext; } - $content = $comment->parent()->innertext; - } else { - $title .= ' / ' . trim($comment->firstChild()->plaintext); - $content = '' . $comment->find('.comment-body', 0)->innertext . '';
}
$item = array();
$item['author'] = $author;
- $item['uri'] = $uri . '#' . $comment->getAttribute('id');
+ $item['uri'] = $uri;
$item['title'] = html_entity_decode($title, ENT_QUOTES, 'UTF-8');
- $item['timestamp'] = strtotime($comment->find('relative-time', 0)->getAttribute('datetime'));
+ $item['timestamp'] = strtotime(
+ $comment->find('relative-time', 0)->getAttribute('datetime')
+ );
+ $item['content'] = $content;
+ return $item;
+ }
+
+ protected function extractIssueComment($issueNbr, $title, $comment){
+ $uri = static::URI . $this->getInput('u') . '/'
+ . $this->getInput('p') . '/issues/' . $issueNbr;
+
+ $author = $comment->find('.author', 0)->plaintext;
+
+ $title .= ' / ' . trim(
+ $comment->find('.comment .timeline-comment-header-text', 0)->plaintext
+ );
+
+ $content = $comment->find('.comment-body', 0)->innertext;
+
+ $item = array();
+ $item['author'] = $author;
+ $item['uri'] = $uri
+ . '#' . $comment->firstChild()->nextSibling()->getAttribute('id');
+ $item['title'] = html_entity_decode($title, ENT_QUOTES, 'UTF-8');
+ $item['timestamp'] = strtotime(
+ $comment->find('relative-time', 0)->getAttribute('datetime')
+ );
$item['content'] = $content;
return $item;
}
@@ -121,17 +121,29 @@ class GithubIssueBridge extends BridgeAbstract {
protected function extractIssueComments($issue){
$items = array();
$title = $issue->find('.gh-header-title', 0)->plaintext;
- $issueNbr = trim(substr($issue->find('.gh-header-number', 0)->plaintext, 1));
+ $issueNbr = trim(
+ substr($issue->find('.gh-header-number', 0)->plaintext, 1)
+ );
$comments = $issue->find('.js-discussion', 0);
foreach($comments->children() as $comment) {
+ if (!$comment->hasChildNodes()) {
+ continue;
+ }
+ $comment = $comment->firstChild();
$classes = explode(' ', $comment->getAttribute('class'));
- if(in_array('discussion-item', $classes)
- || in_array('timeline-comment-wrapper', $classes)) {
+ if (in_array('timeline-comment-wrapper', $classes)) {
$item = $this->extractIssueComment($issueNbr, $title, $comment);
- if(array_keys($item) !== range(0, count($item) - 1)) {
- $item = array($item);
+ $items[] = $item;
+ continue;
+ }
+ while (in_array('discussion-item', $classes)) {
+ $item = $this->extractIssueEvent($issueNbr, $title, $comment);
+ $items[] = $item;
+ $comment = $comment->nextSibling();
+ if (null == $comment) {
+ break;
}
- $items = array_merge($items, $item);
+ $classes = explode(' ', $comment->getAttribute('class'));
}
}
return $items;
@@ -139,7 +151,9 @@ class GithubIssueBridge extends BridgeAbstract {
public function collectData(){
$html = getSimpleHTMLDOM($this->getURI())
- or returnServerError('No results for Github Issue ' . $this->getURI());
+ or returnServerError(
+ 'No results for Github Issue ' . $this->getURI()
+ );
switch($this->queriedContext) {
case 'Issue comments':
@@ -148,31 +162,40 @@ class GithubIssueBridge extends BridgeAbstract {
case 'Project Issues':
foreach($html->find('.js-active-navigation-container .js-navigation-item') as $issue) {
$info = $issue->find('.opened-by', 0);
- $issueNbr = substr(trim($info->plaintext), 1, strpos(trim($info->plaintext), ' '));
+ $issueNbr = substr(
+ trim($info->plaintext), 1, strpos(trim($info->plaintext), ' ')
+ );
$item = array();
$item['content'] = '';
if($this->getInput('c')) {
- $uri = static::URI . $this->getInput('u') . '/' . $this->getInput('p') . '/issues/' . $issueNbr;
+ $uri = static::URI . $this->getInput('u')
+ . '/' . $this->getInput('p') . '/issues/' . $issueNbr;
$issue = getSimpleHTMLDOMCached($uri, static::CACHE_TIMEOUT);
if($issue) {
- $this->items = array_merge($this->items, $this->extractIssueComments($issue));
+ $this->items = array_merge(
+ $this->items,
+ $this->extractIssueComments($issue)
+ );
continue;
}
$item['content'] = 'Can not extract comments from ' . $uri;
}
$item['author'] = $info->find('a', 0)->plaintext;
- $item['timestamp'] = strtotime($info->find('relative-time', 0)->getAttribute('datetime'));
+ $item['timestamp'] = strtotime(
+ $info->find('relative-time', 0)->getAttribute('datetime')
+ );
$item['title'] = html_entity_decode(
$issue->find('.js-navigation-open', 0)->plaintext,
ENT_QUOTES,
'UTF-8'
);
- $comments = $issue->find('.col-5', 0)->plaintext;
+ $comments = trim($issue->find('.col-5', 0)->plaintext);
$item['content'] .= "\n" . 'Comments: ' . ($comments ? $comments : '0');
- $item['uri'] = self::URI . $issue->find('.js-navigation-open', 0)->getAttribute('href');
+ $item['uri'] = self::URI
+ . $issue->find('.js-navigation-open', 0)->getAttribute('href');
$this->items[] = $item;
}
break;
@@ -180,7 +203,11 @@ class GithubIssueBridge extends BridgeAbstract {
array_walk($this->items, function(&$item){
$item['content'] = preg_replace('/\s+/', ' ', $item['content']);
- $item['content'] = str_replace('href="/', 'href="' . static::URI, $item['content']);
+ $item['content'] = str_replace(
+ 'href="/',
+ 'href="' . static::URI,
+ $item['content']
+ );
$item['content'] = str_replace(
'href="#',
'href="' . substr($item['uri'], 0, strpos($item['uri'], '#') + 1),
diff --git a/bridges/GlassdoorBridge.php b/bridges/GlassdoorBridge.php
old mode 100755
new mode 100644
index 72b7a16c..68b6a137
--- a/bridges/GlassdoorBridge.php
+++ b/bridges/GlassdoorBridge.php
@@ -117,7 +117,7 @@ class GlassdoorBridge extends BridgeAbstract {
$item['title'] = $post->find('header', 0)->plaintext;
$item['content'] = $post->find('div[class="excerpt-content"]', 0)->plaintext;
$item['enclosures'] = array(
- $this->getFullSizeImageURI($post->find('div[class="post-thumb"]', 0)->{'data-original'})
+ $this->getFullSizeImageURI($post->find('div[class*="post-thumb"]', 0)->{'data-original'})
);
// optionally load full articles
@@ -186,8 +186,7 @@ class GlassdoorBridge extends BridgeAbstract {
* redirection and strange naming conventions.
*/
if(!filter_var($uri,
- FILTER_VALIDATE_URL,
- FILTER_FLAG_SCHEME_REQUIRED | FILTER_FLAG_HOST_REQUIRED | FILTER_FLAG_PATH_REQUIRED)) {
+ FILTER_VALIDATE_URL, FILTER_FLAG_PATH_REQUIRED)) {
returnClientError('The specified URL is invalid!');
}
diff --git a/bridges/GooglePlusPostBridge.php b/bridges/GooglePlusPostBridge.php
index 48949b23..7911eaf4 100644
--- a/bridges/GooglePlusPostBridge.php
+++ b/bridges/GooglePlusPostBridge.php
@@ -22,6 +22,10 @@ class GooglePlusPostBridge extends BridgeAbstract{
)
));
+ public function getIcon() {
+ return 'https://ssl.gstatic.com/images/branding/product/ico/google_plus_alldp.ico';
+ }
+
public function collectData(){
$username = $this->getInput('username');
@@ -201,5 +205,4 @@ class GooglePlusPostBridge extends BridgeAbstract{
return implode('', [$scheme, $user, $pass, $host, $port, $path, $query, $fragment]);
}
-
}
diff --git a/bridges/GoogleSearchBridge.php b/bridges/GoogleSearchBridge.php
index 2eb58411..c3d9561f 100644
--- a/bridges/GoogleSearchBridge.php
+++ b/bridges/GoogleSearchBridge.php
@@ -28,7 +28,7 @@ class GoogleSearchBridge extends BridgeAbstract {
$html = getSimpleHTMLDOM(self::URI
. 'search?q='
. urlencode($this->getInput('q'))
- .'&num=100&complete=0&tbs=qdr:y,sbd:1')
+ . '&num=100&complete=0&tbs=qdr:y,sbd:1')
or returnServerError('No results for this query.');
$emIsRes = $html->find('div[id=ires]', 0);
diff --git a/bridges/HotUKDealsBridge.php b/bridges/HotUKDealsBridge.php
index a7eebf61..8c1b3bd1 100644
--- a/bridges/HotUKDealsBridge.php
+++ b/bridges/HotUKDealsBridge.php
@@ -17,27 +17,25 @@ class HotUKDealsBridge extends PepperBridgeAbstract {
'hide_expired' => array(
'name' => 'Hide expired deals',
'type' => 'checkbox',
- 'required' => 'true'
+ 'required' => true
),
'hide_local' => array(
'name' => 'Hide local deals',
'type' => 'checkbox',
'title' => 'Hide deals in physical store',
- 'required' => 'true'
+ 'required' => true
),
'priceFrom' => array(
'name' => 'Minimal Price',
'type' => 'text',
'title' => 'Minmal Price in Pounds',
- 'required' => 'false',
- 'defaultValue' => ''
+ 'required' => false
),
'priceTo' => array(
'name' => 'Maximum Price',
'type' => 'text',
'title' => 'Maximum Price in Pounds',
- 'required' => 'false',
- 'defaultValue' => ''
+ 'required' => false
),
),
@@ -45,7 +43,7 @@ class HotUKDealsBridge extends PepperBridgeAbstract {
'group' => array(
'name' => 'Group',
'type' => 'list',
- 'required' => 'true',
+ 'required' => true,
'title' => 'Group whose deals must be displayed',
'values' => array(
'2DS' => '2ds',
@@ -1319,7 +1317,7 @@ class HotUKDealsBridge extends PepperBridgeAbstract {
'order' => array(
'name' => 'Order by',
'type' => 'list',
- 'required' => 'true',
+ 'required' => true,
'title' => 'Sort order of deals',
'values' => array(
'From the most to the least hot deal' => '-hot',
diff --git a/bridges/InstagramBridge.php b/bridges/InstagramBridge.php
index 2539da25..317fb12e 100644
--- a/bridges/InstagramBridge.php
+++ b/bridges/InstagramBridge.php
@@ -3,22 +3,28 @@ class InstagramBridge extends BridgeAbstract {
const MAINTAINER = 'pauder';
const NAME = 'Instagram Bridge';
- const URI = 'https://instagram.com/';
+ const URI = 'https://www.instagram.com/';
const DESCRIPTION = 'Returns the newest images';
const PARAMETERS = array(
- array(
+ 'Username' => array(
'u' => array(
'name' => 'username',
'required' => true
)
),
- array(
+ 'Hashtag' => array(
'h' => array(
'name' => 'hashtag',
'required' => true
)
),
+ 'Location' => array(
+ 'l' => array(
+ 'name' => 'location',
+ 'required' => true
+ )
+ ),
'global' => array(
'media_type' => array(
'name' => 'Media type',
@@ -38,16 +44,18 @@ class InstagramBridge extends BridgeAbstract {
public function collectData(){
- if(!is_null($this->getInput('h')) && $this->getInput('media_type') == 'story') {
- returnClientError('Stories are not supported for hashtags!');
+ if(is_null($this->getInput('u')) && $this->getInput('media_type') == 'story') {
+ returnClientError('Stories are not supported for hashtags nor locations!');
}
$data = $this->getInstagramJSON($this->getURI());
if(!is_null($this->getInput('u'))) {
$userMedia = $data->entry_data->ProfilePage[0]->graphql->user->edge_owner_to_timeline_media->edges;
- } else {
+ } elseif(!is_null($this->getInput('h'))) {
$userMedia = $data->entry_data->TagPage[0]->graphql->hashtag->edge_hashtag_to_media->edges;
+ } elseif(!is_null($this->getInput('l'))) {
+ $userMedia = $data->entry_data->LocationsPage[0]->graphql->location->edge_location_to_media->edges;
}
foreach($userMedia as $media) {
@@ -74,10 +82,20 @@ class InstagramBridge extends BridgeAbstract {
$item = array();
$item['uri'] = self::URI . 'p/' . $media->shortcode . '/';
+ if (isset($media->owner->username)) {
+ $item['author'] = $media->owner->username;
+ }
+
if (isset($media->edge_media_to_caption->edges[0]->node->text)) {
- $item['title'] = $media->edge_media_to_caption->edges[0]->node->text;
+ $textContent = $media->edge_media_to_caption->edges[0]->node->text;
} else {
- $item['title'] = basename($media->display_url);
+ $textContent = basename($media->display_url);
+ }
+
+ $item['title'] = ($media->is_video ? '▶ ' : '') . trim($textContent);
+ $titleLinePos = strpos(wordwrap($item['title'], 120), "\n");
+ if ($titleLinePos != false) {
+ $item['title'] = substr($item['title'], 0, $titleLinePos) . '...';
}
if(!is_null($this->getInput('u')) && $media->__typename == 'GraphSidecar') {
@@ -85,7 +103,9 @@ class InstagramBridge extends BridgeAbstract {
$item['content'] = $data[0];
$item['enclosures'] = $data[1];
} else {
- $item['content'] = '