[Configuration] Bump version to 2019-07-06

* [TwitterBridge] Enable cookies with curl

Enable cookies in curl, or fall back to `file_get_contents` if in CLI mode with no curl root certificates.

.gitattributes

@@ -22,18 +22,24 @@
 *.RTF   diff=astextplain
 
 # Ignore files in git archive (i.e. GitHub release builds)
+
 ## Docker
 Dockerfile                              export-ignore
 .dockerignore                           export-ignore
+
 ## Travis
 .travis.yml                             export-ignore
+
 ## GitHub
 .github/                                export-ignore
+
 ## Git
 .gitattributes                          export-ignore
 .gitignore                              export-ignore
+
 ## Scalingo
 scalingo.json                           export-ignore
+
 ## RSS-Bridge
 phpunit.xml                             export-ignore
 phpcs.xml                               export-ignore
@@ -42,8 +48,22 @@ tests/                                  export-ignore
 cache/.gitkeep                          export-ignore
 bridges/DemoBridge.php                  export-ignore
 bridges/FeedExpanderExampleBridge.php   export-ignore
+
 ## Composer
-composer.json                           export-ignore
-composer.lock                           export-ignore
+#
+# Keep the following lines commented out. Heroku does
+# not function if the composer files are ignored during
+# export. For more information see
+# https://github.com/rss-bridge/rss-bridge/issues/1165
+#
+# composer.json                         export-ignore
+# composer.lock                         export-ignore
+
 ## Heroku
-app.json                                export-ignore
+#
+# Keep the following line commented out. Heroku does
+# not function if app.json is ignored during export.
+# For more information see
+# https://github.com/rss-bridge/rss-bridge/issues/1165
+#
+# app.json                              export-ignore

README.md

@@ -1,6 +1,6 @@
-rss-bridge
+![RSS-Bridge](static/logo_600px.png)
 ===
-[![LICENSE](https://img.shields.io/badge/license-UNLICENSE-blue.svg)](UNLICENSE) [![GitHub release](https://img.shields.io/github/release/rss-bridge/rss-bridge.svg)](https://github.com/rss-bridge/rss-bridge/releases/latest) [![Debian Release](https://img.shields.io/badge/dynamic/json.svg?label=debian%20release&url=https%3A%2F%2Fsources.debian.org%2Fapi%2Fsrc%2Frss-bridge%2F&query=%24.versions%5B0%5D.version&colorB=blue)](https://tracker.debian.org/pkg/rss-bridge) [![Guix Release](https://img.shields.io/badge/guix%20release-unknown-light--gray.svg)](https://www.gnu.org/software/guix/packages/R/) [![Build Status](https://travis-ci.org/RSS-Bridge/rss-bridge.svg?branch=master)](https://travis-ci.org/RSS-Bridge/rss-bridge) [![Docker Build Status](https://img.shields.io/docker/build/rssbridge/rss-bridge.svg)](https://hub.docker.com/r/rssbridge/rss-bridge/)
+[![LICENSE](https://img.shields.io/badge/license-UNLICENSE-blue.svg)](UNLICENSE) [![GitHub release](https://img.shields.io/github/release/rss-bridge/rss-bridge.svg?logo=github)](https://github.com/rss-bridge/rss-bridge/releases/latest) [![Debian Release](https://img.shields.io/badge/dynamic/json.svg?logo=debian&label=debian%20release&url=https%3A%2F%2Fsources.debian.org%2Fapi%2Fsrc%2Frss-bridge%2F&query=%24.versions%5B0%5D.version&colorB=blue)](https://tracker.debian.org/pkg/rss-bridge) [![Guix Release](https://img.shields.io/badge/guix%20release-unknown-blue.svg)](https://www.gnu.org/software/guix/packages/R/) [![Build Status](https://travis-ci.org/RSS-Bridge/rss-bridge.svg?branch=master)](https://travis-ci.org/RSS-Bridge/rss-bridge) [![Docker Build Status](https://img.shields.io/docker/build/rssbridge/rss-bridge.svg?logo=docker)](https://hub.docker.com/r/rssbridge/rss-bridge/)
 
 RSS-Bridge is a PHP project capable of generating RSS and Atom feeds for websites which don't have one. It can be used on webservers or as stand alone application in CLI mode.
 
@@ -15,7 +15,6 @@ Supported sites/pages (examples)
 * `DuckDuckGo`: Most recent results from [DuckDuckGo.com](https://duckduckgo.com/)
 * `Facebook` : Returns the latest posts on a page or profile on [Facebook](https://facebook.com/)
 * `FlickrExplore` : [Latest interesting images](http://www.flickr.com/explore) from Flickr
-* `GooglePlus` : Most recent posts of user timeline
 * `GoogleSearch` : Most recent results from Google Search
 * `Identi.ca` : Identica user timeline (Should be compatible with other Pump.io instances)
 * `Instagram`: Most recent photos from an Instagram user
@@ -111,110 +110,117 @@ Use this script to generate the list automatically (using the GitHub API):
 https://gist.github.com/LogMANOriginal/da00cd1e5f0ca31cef8e193509b17fd8
 -->
 
-  * [16mhz](https://github.com/16mhz)
-  * [adamchainz](https://github.com/adamchainz)
-  * [Ahiles3005](https://github.com/Ahiles3005)
-  * [Albirew](https://github.com/Albirew)
-  * [aledeg](https://github.com/aledeg)
-  * [alex73](https://github.com/alex73)
-  * [alexAubin](https://github.com/alexAubin)
-  * [AmauryCarrade](https://github.com/AmauryCarrade)
-  * [ArthurHoaro](https://github.com/ArthurHoaro)
-  * [Astalaseven](https://github.com/Astalaseven)
-  * [Astyan-42](https://github.com/Astyan-42)
-  * [az5he6ch](https://github.com/az5he6ch)
-  * [azdkj532](https://github.com/azdkj532)
-  * [b1nj](https://github.com/b1nj)
-  * [benasse](https://github.com/benasse)
-  * [captn3m0](https://github.com/captn3m0)
-  * [chemel](https://github.com/chemel)
-  * [ckiw](https://github.com/ckiw)
-  * [cnlpete](https://github.com/cnlpete)
-  * [corenting](https://github.com/corenting)
-  * [couraudt](https://github.com/couraudt)
-  * [da2x](https://github.com/da2x)
-  * [Daiyousei](https://github.com/Daiyousei)
-  * [disk0x](https://github.com/disk0x)
-  * [DJCrashdummy](https://github.com/DJCrashdummy)
-  * [Djuuu](https://github.com/Djuuu)
-  * [DnAp](https://github.com/DnAp)
-  * [Draeli](https://github.com/Draeli)
-  * [Dreckiger-Dan](https://github.com/Dreckiger-Dan)
-  * [em92](https://github.com/em92)
-  * [eMerzh](https://github.com/eMerzh)
-  * [EtienneM](https://github.com/EtienneM)
-  * [fluffy-critter](https://github.com/fluffy-critter)
-  * [Frenzie](https://github.com/Frenzie)
-  * [fulmeek](https://github.com/fulmeek)
-  * [Ginko-Aloe](https://github.com/Ginko-Aloe)
-  * [Glandos](https://github.com/Glandos)
-  * [GregThib](https://github.com/GregThib)
-  * [griffaurel](https://github.com/griffaurel)
-  * [Grummfy](https://github.com/Grummfy)
-  * [hunhejj](https://github.com/hunhejj)
-  * [j0k3r](https://github.com/j0k3r)
-  * [JackNUMBER](https://github.com/JackNUMBER)
-  * [jdigilio](https://github.com/jdigilio)
-  * [JeremyRand](https://github.com/JeremyRand)
-  * [Jocker666z](https://github.com/Jocker666z)
-  * [killruana](https://github.com/killruana)
-  * [klimplant](https://github.com/klimplant)
-  * [kranack](https://github.com/kranack)
-  * [kraoc](https://github.com/kraoc)
-  * [l1n](https://github.com/l1n)
-  * [laBecasse](https://github.com/laBecasse)
-  * [lagaisse](https://github.com/lagaisse)
-  * [lalannev](https://github.com/lalannev)
-  * [ldidry](https://github.com/ldidry)
-  * [Limero](https://github.com/Limero)
-  * [LogMANOriginal](https://github.com/LogMANOriginal)
-  * [lorenzos](https://github.com/lorenzos)
-  * [m0zes](https://github.com/m0zes)
-  * [matthewseal](https://github.com/matthewseal)
-  * [mcbyte-it](https://github.com/mcbyte-it)
-  * [mdemoss](https://github.com/mdemoss)
-  * [melangue](https://github.com/melangue)
-  * [metaMMA](https://github.com/metaMMA)
-  * [mitsukarenai](https://github.com/mitsukarenai)
-  * [MonsieurPoutounours](https://github.com/MonsieurPoutounours)
-  * [mr-flibble](https://github.com/mr-flibble)
-  * [mro](https://github.com/mro)
-  * [mxmehl](https://github.com/mxmehl)
-  * [nel50n](https://github.com/nel50n)
-  * [niawag](https://github.com/niawag)
-  * [Nono-m0le](https://github.com/Nono-m0le)
-  * [ObsidianWitch](https://github.com/ObsidianWitch)
-  * [ORelio](https://github.com/ORelio)
-  * [PaulVayssiere](https://github.com/PaulVayssiere)
-  * [pellaeon](https://github.com/pellaeon)
-  * [Piranhaplant](https://github.com/Piranhaplant)
-  * [pit-fgfjiudghdf](https://github.com/pit-fgfjiudghdf)
-  * [pitchoule](https://github.com/pitchoule)
-  * [pmaziere](https://github.com/pmaziere)
-  * [Pofilo](https://github.com/Pofilo)
-  * [prysme01](https://github.com/prysme01)
-  * [quentinus95](https://github.com/quentinus95)
-  * [regisenguehard](https://github.com/regisenguehard)
-  * [Riduidel](https://github.com/Riduidel)
-  * [rogerdc](https://github.com/rogerdc)
-  * [Roliga](https://github.com/Roliga)
-  * [sebsauvage](https://github.com/sebsauvage)
-  * [somini](https://github.com/somini)
-  * [squeek502](https://github.com/squeek502)
-  * [Strubbl](https://github.com/Strubbl)
-  * [sublimz](https://github.com/sublimz)
-  * [sysadminstory](https://github.com/sysadminstory)
-  * [tameroski](https://github.com/tameroski)
-  * [teromene](https://github.com/teromene)
-  * [thefranke](https://github.com/thefranke)
-  * [TheRadialActive](https://github.com/TheRadialActive)
-  * [triatic](https://github.com/triatic)
-  * [VerifiedJoseph](https://github.com/VerifiedJoseph)
-  * [WalterBarrett](https://github.com/WalterBarrett)
-  * [wtuuju](https://github.com/wtuuju)
-  * [xurxof](https://github.com/xurxof)
-  * [yardenac](https://github.com/yardenac)
-  * [ZeNairolf](https://github.com/ZeNairolf)
+* [16mhz](https://github.com/16mhz)
+* [adamchainz](https://github.com/adamchainz)
+* [Ahiles3005](https://github.com/Ahiles3005)
+* [Albirew](https://github.com/Albirew)
+* [aledeg](https://github.com/aledeg)
+* [alex73](https://github.com/alex73)
+* [alexAubin](https://github.com/alexAubin)
+* [AmauryCarrade](https://github.com/AmauryCarrade)
+* [ArthurHoaro](https://github.com/ArthurHoaro)
+* [Astalaseven](https://github.com/Astalaseven)
+* [Astyan-42](https://github.com/Astyan-42)
+* [az5he6ch](https://github.com/az5he6ch)
+* [azdkj532](https://github.com/azdkj532)
+* [b1nj](https://github.com/b1nj)
+* [benasse](https://github.com/benasse)
+* [captn3m0](https://github.com/captn3m0)
+* [chemel](https://github.com/chemel)
+* [ckiw](https://github.com/ckiw)
+* [cnlpete](https://github.com/cnlpete)
+* [corenting](https://github.com/corenting)
+* [couraudt](https://github.com/couraudt)
+* [da2x](https://github.com/da2x)
+* [Daiyousei](https://github.com/Daiyousei)
+* [dawidsowa](https://github.com/dawidsowa)
+* [disk0x](https://github.com/disk0x)
+* [DJCrashdummy](https://github.com/DJCrashdummy)
+* [Djuuu](https://github.com/Djuuu)
+* [DnAp](https://github.com/DnAp)
+* [Draeli](https://github.com/Draeli)
+* [Dreckiger-Dan](https://github.com/Dreckiger-Dan)
+* [em92](https://github.com/em92)
+* [eMerzh](https://github.com/eMerzh)
+* [EtienneM](https://github.com/EtienneM)
+* [floviolleau](https://github.com/floviolleau)
+* [fluffy-critter](https://github.com/fluffy-critter)
+* [Frenzie](https://github.com/Frenzie)
+* [fulmeek](https://github.com/fulmeek)
+* [Ginko-Aloe](https://github.com/Ginko-Aloe)
+* [Glandos](https://github.com/Glandos)
+* [GregThib](https://github.com/GregThib)
+* [griffaurel](https://github.com/griffaurel)
+* [Grummfy](https://github.com/Grummfy)
+* [hunhejj](https://github.com/hunhejj)
+* [husim0](https://github.com/husim0)
+* [IceWreck](https://github.com/IceWreck)
+* [j0k3r](https://github.com/j0k3r)
+* [JackNUMBER](https://github.com/JackNUMBER)
+* [jdigilio](https://github.com/jdigilio)
+* [JeremyRand](https://github.com/JeremyRand)
+* [Jocker666z](https://github.com/Jocker666z)
+* [johnnygroovy](https://github.com/johnnygroovy)
+* [killruana](https://github.com/killruana)
+* [klimplant](https://github.com/klimplant)
+* [kranack](https://github.com/kranack)
+* [kraoc](https://github.com/kraoc)
+* [l1n](https://github.com/l1n)
+* [laBecasse](https://github.com/laBecasse)
+* [lagaisse](https://github.com/lagaisse)
+* [lalannev](https://github.com/lalannev)
+* [Leomaradan](https://github.com/Leomaradan)
+* [ldidry](https://github.com/ldidry)
+* [Limero](https://github.com/Limero)
+* [LogMANOriginal](https://github.com/LogMANOriginal)
+* [lorenzos](https://github.com/lorenzos)
+* [m0zes](https://github.com/m0zes)
+* [matthewseal](https://github.com/matthewseal)
+* [mcbyte-it](https://github.com/mcbyte-it)
+* [mdemoss](https://github.com/mdemoss)
+* [melangue](https://github.com/melangue)
+* [metaMMA](https://github.com/metaMMA)
+* [mitsukarenai](https://github.com/mitsukarenai)
+* [MonsieurPoutounours](https://github.com/MonsieurPoutounours)
+* [mr-flibble](https://github.com/mr-flibble)
+* [mro](https://github.com/mro)
+* [mxmehl](https://github.com/mxmehl)
+* [nel50n](https://github.com/nel50n)
+* [niawag](https://github.com/niawag)
+* [Nono-m0le](https://github.com/Nono-m0le)
+* [ObsidianWitch](https://github.com/ObsidianWitch)
+* [ORelio](https://github.com/ORelio)
+* [PaulVayssiere](https://github.com/PaulVayssiere)
+* [pellaeon](https://github.com/pellaeon)
+* [Piranhaplant](https://github.com/Piranhaplant)
+* [pit-fgfjiudghdf](https://github.com/pit-fgfjiudghdf)
+* [pitchoule](https://github.com/pitchoule)
+* [pmaziere](https://github.com/pmaziere)
+* [Pofilo](https://github.com/Pofilo)
+* [prysme01](https://github.com/prysme01)
+* [quentinus95](https://github.com/quentinus95)
+* [regisenguehard](https://github.com/regisenguehard)
+* [Riduidel](https://github.com/Riduidel)
+* [rogerdc](https://github.com/rogerdc)
+* [Roliga](https://github.com/Roliga)
+* [sebsauvage](https://github.com/sebsauvage)
+* [somini](https://github.com/somini)
+* [squeek502](https://github.com/squeek502)
+* [Strubbl](https://github.com/Strubbl)
+* [sublimz](https://github.com/sublimz)
+* [sysadminstory](https://github.com/sysadminstory)
+* [tameroski](https://github.com/tameroski)
+* [teromene](https://github.com/teromene)
+* [thefranke](https://github.com/thefranke)
+* [ThePadawan](https://github.com/ThePadawan)
+* [TheRadialActive](https://github.com/TheRadialActive)
+* [triatic](https://github.com/triatic)
+* [VerifiedJoseph](https://github.com/VerifiedJoseph)
+* [WalterBarrett](https://github.com/WalterBarrett)
+* [wtuuju](https://github.com/wtuuju)
+* [xurxof](https://github.com/xurxof)
+* [yardenac](https://github.com/yardenac)
+* [ZeNairolf](https://github.com/ZeNairolf)
 
 Licenses
 ===

actions/DetectAction.php

@@ -19,13 +19,16 @@ class DetectAction extends ActionAbstract {
 		$format = $this->userData['format']
 			or returnClientError('You must specify a format!');
 
-		foreach(Bridge::getBridgeNames() as $bridgeName) {
+		$bridgeFac = new \BridgeFactory();
+		$bridgeFac->setWorkingDir(PATH_LIB_BRIDGES);
 
-			if(!Bridge::isWhitelisted($bridgeName)) {
+		foreach($bridgeFac->getBridgeNames() as $bridgeName) {
+
+			if(!$bridgeFac->isWhitelisted($bridgeName)) {
 				continue;
 			}
 
-			$bridge = Bridge::create($bridgeName);
+			$bridge = $bridgeFac->create($bridgeName);
 
 			if($bridge === false) {
 				continue;

actions/DisplayAction.php

@@ -18,20 +18,17 @@ class DisplayAction extends ActionAbstract {
 		$format = $this->userData['format']
 			or returnClientError('You must specify a format!');
 
-		// DEPRECATED: 'nameFormat' scheme is replaced by 'name' in format parameter values
-		//             this is to keep compatibility until futher complete removal
-		if(($pos = strpos($format, 'Format')) === (strlen($format) - strlen('Format'))) {
-			$format = substr($format, 0, $pos);
-		}
+		$bridgeFac = new \BridgeFactory();
+		$bridgeFac->setWorkingDir(PATH_LIB_BRIDGES);
 
 		// whitelist control
-		if(!Bridge::isWhitelisted($bridge)) {
+		if(!$bridgeFac->isWhitelisted($bridge)) {
 			throw new \Exception('This bridge is not whitelisted', 401);
 			die;
 		}
 
 		// Data retrieval
-		$bridge = Bridge::create($bridge);
+		$bridge = $bridgeFac->create($bridge);
 
 		$noproxy = array_key_exists('_noproxy', $this->userData)
 			&& filter_var($this->userData['_noproxy'], FILTER_VALIDATE_BOOLEAN);
@@ -85,7 +82,9 @@ class DisplayAction extends ActionAbstract {
 		);
 
 		// Initialize cache
-		$cache = Cache::create(Configuration::getConfig('cache', 'type'));
+		$cacheFac = new CacheFactory();
+		$cacheFac->setWorkingDir(PATH_LIB_CACHES);
+		$cache = $cacheFac->create(Configuration::getConfig('cache', 'type'));
 		$cache->setScope('');
 		$cache->purgeCache(86400); // 24 hours
 		$cache->setKey($cache_params);
@@ -216,7 +215,9 @@ class DisplayAction extends ActionAbstract {
 
 		// Data transformation
 		try {
-			$format = Format::create($format);
+			$formatFac = new FormatFactory();
+			$formatFac->setWorkingDir(PATH_LIB_FORMATS);
+			$format = $formatFac->create($format);
 			$format->setItems($items);
 			$format->setExtraInfos($infos);
 			$format->setLastModified($cache->getTime());

actions/ListAction.php

@@ -17,9 +17,12 @@ class ListAction extends ActionAbstract {
 		$list->bridges = array();
 		$list->total = 0;
 
-		foreach(Bridge::getBridgeNames() as $bridgeName) {
+		$bridgeFac = new \BridgeFactory();
+		$bridgeFac->setWorkingDir(PATH_LIB_BRIDGES);
 
-			$bridge = Bridge::create($bridgeName);
+		foreach($bridgeFac->getBridgeNames() as $bridgeName) {
+
+			$bridge = $bridgeFac->create($bridgeName);
 
 			if($bridge === false) { // Broken bridge, show as inactive
 
@@ -31,7 +34,7 @@ class ListAction extends ActionAbstract {
 
 			}
 
-			$status = Bridge::isWhitelisted($bridgeName) ? 'active' : 'inactive';
+			$status = $bridgeFac->isWhitelisted($bridgeName) ? 'active' : 'inactive';
 
 			$list->bridges[$bridgeName] = array(
 				'status' => $status,

bridges/AutoJMBridge.php

@@ -15,16 +15,6 @@ class AutoJMBridge extends BridgeAbstract {
 				'title' => 'URL d\'une recherche avec filtre de véhicules sans le http://www.autojm.fr/',
 				'exampleValue' => 'achat-voitures-neuves-peugeot-nouvelle-308-5p'
 			),
-			'isDispo' => array(
-				'name' => 'Disponibilité',
-				'type' => 'list',
-				'values' => array(
-					'-' => '',
-					'En stock' => 1,
-					'Sur commande' => 0
-				),
-				'title' => 'Critère de disponibilité'
-			),
 			'energy' => array(
 				'name' => 'Carburant',
 				'type' => 'list',
@@ -92,7 +82,6 @@ class AutoJMBridge extends BridgeAbstract {
 
 		// Build the form
 		$post_data = array(
-			'form[isDispo]' => $this->getInput('isDispo'),
 			'form[energy]' => $this->getInput('energy'),
 			'form[transmission]' => $this->getInput('transmission'),
 			'form[priceMin]' => $this->getInput('priceMin'),
@@ -121,7 +110,7 @@ class AutoJMBridge extends BridgeAbstract {
 		$html = str_get_html($data->content);
 
 		// Go through every finisha of the model
-		$list = $html->find('h2');
+		$list = $html->find('h3');
 		foreach ($list as $finish) {
 			$finish_name = $finish->plaintext;
 			$motorizations = $finish->next_sibling()->find('li');

bridges/BAEBridge.php

@@ -55,9 +55,7 @@ class BAEBridge extends BridgeAbstract {
 
 			$content .= '<hr>';
 			$content .= $htmlDetail->find('section', 0)->innertext;
-			$content = str_replace('src="/', 'src="' . parent::getURI() . '/', $content);
-			$content = str_replace('href="/', 'href="' . parent::getURI() . '/', $content);
-			$item['content'] = $content;
+			$item['content'] = defaultLinkTo($content, parent::getURI());
 			$image = $htmlDetail->find('#zoom', 0);
 			if ($image) {
 				$item['enclosures'] = array(parent::getURI() . $image->getAttribute('src'));

bridges/BrutBridge.php

@@ -92,6 +92,21 @@ class BrutBridge extends BridgeAbstract {
 		return parent::getURI();
 	}
 
+	public function getName() {
+
+		if (!is_null($this->getInput('edition')) && !is_null($this->getInput('category'))) {
+			$parameters = $this->getParameters();
+
+			$editionValues = array_flip($parameters[0]['edition']['values']);
+			$categoryValues = array_flip($parameters[0]['category']['values']);
+
+			return $categoryValues[$this->getInput('category')] . ' - ' .
+				$editionValues[$this->getInput('edition')] . ' - Brut.';
+		}
+
+		return parent::getName();
+	}
+
 	private function processDate($description) {
 
 		if ($this->getInput('edition') === 'uk') {

bridges/CNETFranceBridge.php

@@ -0,0 +1,63 @@
+<?php
+class CNETFranceBridge extends FeedExpander
+{
+	const MAINTAINER = 'leomaradan';
+	const NAME = 'CNET France';
+	const URI = 'https://www.cnetfrance.fr/';
+	const CACHE_TIMEOUT = 3600; // 1h
+	const DESCRIPTION = 'CNET France RSS with filters';
+	const PARAMETERS = array(
+		'filters' => array(
+			'title' => array(
+				'name' => 'Exclude by title',
+				'required' => false,
+				'title' => 'Title term, separated by semicolon (;)',
+				'defaultValue' => 'bon plan;bons plans;au meilleur prix;des meilleures offres;Amazon Prime Day;RED by SFR ou B&You'
+			),
+			'url' => array(
+				'name' => 'Exclude by url',
+				'required' => false,
+				'title' => 'URL term, separated by semicolon (;)',
+				'defaultValue' => 'bon-plan;bons-plans'
+			)
+		)
+	);
+
+	private $bannedTitle = [];
+	private $bannedURL = [];
+
+	public function collectData()
+	{
+		$title = $this->getInput('title');
+		$url = $this->getInput('url');
+
+		if ($title !== null) {
+			$this->bannedTitle = explode(';', $title);
+		}
+
+		if ($url !== null) {
+			$this->bannedURL = explode(';', $url);
+		}
+
+		$this->collectExpandableDatas('https://www.cnetfrance.fr/feeds/rss/news/');
+	}
+
+	protected function parseItem($feedItem)
+	{
+		$item = parent::parseItem($feedItem);
+
+		foreach ($this->bannedTitle as $term) {
+			if (preg_match('/' . $term . '/mi', $item['title']) === 1) {
+				return null;
+			}
+		}
+
+		foreach ($this->bannedURL as $term) {
+			if (preg_match('/' . $term . '/mi', $item['uri']) === 1) {
+				return null;
+			}
+		}
+
+		return $item;
+	}
+}

bridges/CastorusBridge.php

@@ -83,7 +83,7 @@ class CastorusBridge extends BridgeAbstract {
 		if(!$html)
 			returnServerError('Could not load data from ' . self::URI . '!');
 
-		$activities = $html->find('div#activite/li');
+		$activities = $html->find('div#activite > li');
 
 		if(!$activities)
 			returnServerError('Failed to find activities!');

bridges/CuriousCatBridge.php

@@ -0,0 +1,109 @@
+<?php
+class CuriousCatBridge extends BridgeAbstract {
+	const NAME = 'Curious Cat Bridge';
+	const URI = 'https://curiouscat.me';
+	const DESCRIPTION = 'Returns list of newest questions and answers for a user profile';
+	const MAINTAINER = 'VerifiedJoseph';
+	const PARAMETERS = array(array(
+		'username' => array(
+			'name' => 'Username',
+			'type' => 'text',
+			'required' => true,
+			'exampleValue' => 'koethekoethe',
+		)
+	));
+
+	const CACHE_TIMEOUT = 3600;
+
+	public function collectData() {
+
+		$url = self::URI . '/api/v2/profile?username=' . urlencode($this->getInput('username'));
+
+		$apiJson = getContents($url)
+			or returnServerError('Could not request: ' . $url);
+
+		$apiData = json_decode($apiJson, true);
+
+		foreach($apiData['posts'] as $post) {
+			$item = array();
+
+			$item['author'] = 'Anonymous';
+
+			if ($post['senderData']['id'] !== false) {
+				$item['author'] = $post['senderData']['username'];
+			}
+
+			$item['uri'] = $this->getURI() . '/post/' . $post['id'];
+			$item['title'] = $this->ellipsisTitle($post['comment']);
+
+			$item['content'] = $this->processContent($post);
+			$item['timestamp'] = $post['timestamp'];
+
+			$this->items[] = $item;
+		}
+	}
+
+	public function getURI() {
+
+		if (!is_null($this->getInput('username'))) {
+			return self::URI . '/' . $this->getInput('username');
+		}
+
+		return parent::getURI();
+	}
+
+	public function getName() {
+
+		if (!is_null($this->getInput('username'))) {
+			return $this->getInput('username') . ' - Curious Cat';
+		}
+
+		return parent::getName();
+	}
+
+	private function processContent($post) {
+
+		$author = 'Anonymous';
+
+		if ($post['senderData']['id'] !== false) {
+			$authorUrl = self::URI . '/' . $post['senderData']['username'];
+
+			$author = <<<EOD
+<a href="{$authorUrl}">{$post['senderData']['username']}</a>
+EOD;
+		}
+
+		$question = $this->formatUrls($post['comment']);
+		$answer = $this->formatUrls($post['reply']);
+
+		$content = <<<EOD
+<p>{$author} asked:</p>
+<blockquote>{$question}</blockquote><br/>
+<p>{$post['addresseeData']['username']} answered:</p>
+<blockquote>{$answer}</blockquote>
+EOD;
+
+		return $content;
+	}
+
+	private function ellipsisTitle($text) {
+		$length = 150;
+
+		if (strlen($text) > $length) {
+			$text = explode('<br>', wordwrap($text, $length, '<br>'));
+			return $text[0] . '...';
+		}
+
+		return $text;
+	}
+
+	private function formatUrls($content) {
+
+		return preg_replace(
+			'/(http[s]{0,1}\:\/\/[a-zA-Z0-9.\/\?\&=\-_]{4,})/ims',
+			'<a target="_blank" href="$1" target="_blank">$1</a> ',
+			$content
+		);
+
+	}
+}

bridges/DailymotionBridge.php

@@ -4,7 +4,7 @@ class DailymotionBridge extends BridgeAbstract {
 	const MAINTAINER = 'mitsukarenai';
 	const NAME = 'Dailymotion Bridge';
 	const URI = 'https://www.dailymotion.com/';
-	const CACHE_TIMEOUT = 10800; // 3h
+	const CACHE_TIMEOUT = 3600; // 1h
 	const DESCRIPTION = 'Returns the 5 newest videos by username/playlist or search';
 
 	const PARAMETERS = array (
@@ -27,74 +27,99 @@ class DailymotionBridge extends BridgeAbstract {
 			),
 			'pa' => array(
 				'name' => 'Page',
-				'type' => 'number'
+				'type' => 'number',
+				'defaultValue' => 1,
 			)
 		)
 	);
 
-	protected function getMetadata($id){
-		$metadata = array();
-		$html2 = getSimpleHTMLDOM(self::URI . 'video/' . $id);
-		if(!$html2) {
-			return $metadata;
-		}
+	private $feedName = '';
 
-		$metadata['title'] = $html2->find('meta[property=og:title]', 0)->getAttribute('content');
-		$metadata['timestamp'] = strtotime(
-			$html2->find('meta[property=video:release_date]', 0)->getAttribute('content')
-		);
-		$metadata['thumbnailUri'] = $html2->find('meta[property=og:image]', 0)->getAttribute('content');
-		$metadata['uri'] = $html2->find('meta[property=og:url]', 0)->getAttribute('content');
-		return $metadata;
-	}
+	private $apiUrl = 'https://api.dailymotion.com';
+	private $apiFields = 'created_time,description,id,owner.screenname,tags,thumbnail_url,title,url';
 
 	public function getIcon() {
 		return 'https://static1-ssl.dmcdn.net/images/neon/favicons/android-icon-36x36.png.vf806ca4ed0deed812';
 	}
 
-	public function collectData(){
-		$html = '';
-		$limit = 5;
-		$count = 0;
+	public function collectData() {
 
-		$html = getSimpleHTMLDOM($this->getURI())
-			or returnServerError('Could not request Dailymotion.');
+		if ($this->queriedContext === 'By username' || $this->queriedContext === 'By playlist id') {
 
-		foreach($html->find('div.media a.preview_link') as $element) {
-			if($count < $limit) {
+			$apiJson = getContents($this->getApiUrl())
+				or returnServerError('Could not request: ' . $this->getApiUrl());
+
+			$apiData = json_decode($apiJson, true);
+
+			$this->feedName = $this->getPlaylistTitle($this->getInput('p'));
+
+			foreach ($apiData['list'] as $apiItem) {
 				$item = array();
+
+				$item['uri'] = $apiItem['url'];
+				$item['uid'] = $apiItem['id'];
+				$item['title'] = $apiItem['title'];
+				$item['timestamp'] = $apiItem['created_time'];
+				$item['author'] = $apiItem['owner.screenname'];
+				$item['content'] = '<p><a href="' . $apiItem['url'] . '">
+					<img src="' . $apiItem['thumbnail_url'] . '"></a></p><p>' . $apiItem['description'] . '</p>';
+				$item['categories'] = $apiItem['tags'];
+				$item['enclosures'][] = $apiItem['thumbnail_url'];
+
+				$this->items[] = $item;
+			}
+		}
+
+		if ($this->queriedContext === 'From search results') {
+
+			$html = getSimpleHTMLDOM($this->getURI())
+				or returnServerError('Could not request Dailymotion.');
+
+			foreach($html->find('div.media a.preview_link') as $element) {
+				$item = array();
+
 				$item['id'] = str_replace('/video/', '', strtok($element->href, '_'));
 				$metadata = $this->getMetadata($item['id']);
+
 				if(empty($metadata)) {
 					continue;
 				}
+
 				$item['uri'] = $metadata['uri'];
 				$item['title'] = $metadata['title'];
 				$item['timestamp'] = $metadata['timestamp'];
 
 				$item['content'] = '<a href="'
-				. $item['uri']
-				. '"><img src="'
-				. $metadata['thumbnailUri']
-				. '" /></a><br><a href="'
-				. $item['uri']
-				. '">'
-				. $item['title']
-				. '</a>';
+					. $item['uri']
+					. '"><img src="'
+					. $metadata['thumbnailUri']
+					. '" /></a><br><a href="'
+					. $item['uri']
+					. '">'
+					. $item['title']
+					. '</a>';
 
 				$this->items[] = $item;
-				$count++;
+
+				if (count($this->items) >= 5) {
+					break;
+				}
 			}
 		}
 	}
 
-	public function getName(){
+	public function getName() {
 		switch($this->queriedContext) {
 		case 'By username':
 			$specific = $this->getInput('u');
 			break;
 		case 'By playlist id':
 			$specific = strtok($this->getInput('p'), '_');
+
+			if ($this->feedName) {
+				$specific = $this->feedName;
+			}
+
 			break;
 		case 'From search results':
 			$specific = $this->getInput('s');
@@ -102,26 +127,77 @@ class DailymotionBridge extends BridgeAbstract {
 		default: return parent::getName();
 		}
 
-		return $specific . ' : Dailymotion Bridge';
+		return $specific . ' : Dailymotion';
 	}
 
 	public function getURI(){
 		$uri = self::URI;
 		switch($this->queriedContext) {
 		case 'By username':
-			$uri .= 'user/' . urlencode($this->getInput('u')) . '/1';
+			$uri .= 'user/' . urlencode($this->getInput('u'));
 			break;
 		case 'By playlist id':
 			$uri .= 'playlist/' . urlencode(strtok($this->getInput('p'), '_'));
 			break;
 		case 'From search results':
 			$uri .= 'search/' . urlencode($this->getInput('s'));
-			if($this->getInput('pa')) {
-				$uri .= '/' . $this->getInput('pa');
+
+			if(!is_null($this->getInput('pa'))) {
+				$pa = $this->getInput('pa');
+
+				if ($this->getInput('pa') < 1) {
+					$pa = 1;
+				}
+
+				$uri .= '/' . $pa;
 			}
 			break;
 		default: return parent::getURI();
 		}
 		return $uri;
 	}
+
+	private function getMetadata($id) {
+		$metadata = array();
+
+		$html = getSimpleHTMLDOM(self::URI . 'video/' . $id);
+
+		if(!$html) {
+			return $metadata;
+		}
+
+		$metadata['title'] = $html->find('meta[property=og:title]', 0)->getAttribute('content');
+		$metadata['timestamp'] = strtotime(
+			$html->find('meta[property=video:release_date]', 0)->getAttribute('content')
+		);
+		$metadata['thumbnailUri'] = $html->find('meta[property=og:image]', 0)->getAttribute('content');
+		$metadata['uri'] = $html->find('meta[property=og:url]', 0)->getAttribute('content');
+		return $metadata;
+	}
+
+	private function getPlaylistTitle($id) {
+		$title = '';
+
+		$url = self::URI . 'playlist/' . $id;
+
+		$html = getSimpleHTMLDOM($url)
+			or returnServerError('Could not request: ' . $url);
+
+		$title = $html->find('meta[property=og:title]', 0)->getAttribute('content');
+		return $title;
+	}
+
+	private function getApiUrl() {
+
+		switch($this->queriedContext) {
+			case 'By username':
+				return $this->apiUrl . '/user/' . $this->getInput('u')
+					. '/videos?fields=' . urlencode($this->apiFields) . '&availability=1&sort=recent&limit=5';
+				break;
+			case 'By playlist id':
+				return $this->apiUrl . '/playlist/' . $this->getInput('p')
+					. '/videos?fields=' . urlencode($this->apiFields) . '&limit=5';
+				break;
+		}
+	}
 }

bridges/DanbooruBridge.php

@@ -40,7 +40,7 @@ class DanbooruBridge extends BridgeAbstract {
 		defaultLinkTo($element, $this->getURI());
 
 		$item = array();
-		$item['uri'] = $element->find('a', 0)->href;
+		$item['uri'] = html_entity_decode($element->find('a', 0)->href);
 		$item['postid'] = (int)preg_replace('/[^0-9]/', '', $element->getAttribute(static::IDATTRIBUTE));
 		$item['timestamp'] = time();
 		$thumbnailUri = $element->find('img', 0)->src;

bridges/DavesTrailerPageBridge.php

@@ -0,0 +1,27 @@
+<?php
+class DavesTrailerPageBridge extends BridgeAbstract {
+	const MAINTAINER = 'johnnygroovy';
+	const NAME = 'Daves Trailer Page Bridge';
+	const URI = 'https://www.davestrailerpage.co.uk/';
+	const DESCRIPTION = 'Last trailers in HD thanks to Dave.';
+
+	public function collectData(){
+	$html = getSimpleHTMLDOM(static::URI)
+	or returnClientError('No results for this query.');
+
+	foreach ($html->find('tr[!align]') as $tr) {
+		$item = array();
+
+		// title
+		$item['title'] = $tr->find('td', 0)->find('b', 0)->plaintext;
+
+		// content
+		$item['content'] = $tr->find('ul', 1);
+
+		// uri
+		$item['uri'] = $tr->find('a', 3)->getAttribute('href');
+
+		$this->items[] = $item;
+		}
+	}
+}

bridges/DealabsBridge.php

@@ -1145,7 +1145,7 @@ class PepperBridgeAbstract extends BridgeAbstract {
 		} else {
 			foreach ($list as $deal) {
 				$item = array();
-				$item['uri'] = $deal->find('div[class=threadGrid-title]', 0)->find('a', 0)->href;
+				$item['uri'] = $deal->find('div[class*=threadGrid-title]', 0)->find('a', 0)->href;
 				$item['title'] = $deal->find('a[class*=' . $selectorLink . ']', 0
 				)->plaintext;
 				$item['author'] = $deal->find('span.thread-username', 0)->plaintext;

bridges/DemonoidBridge.php

@@ -1,169 +0,0 @@
-<?php
-class DemonoidBridge extends BridgeAbstract {
-
-	const MAINTAINER = 'metaMMA';
-	const NAME = 'Demonoid';
-	const URI = 'https://www.demonoid.pw/';
-	const DESCRIPTION = 'Returns results from search';
-
-	const PARAMETERS = array(
-		'Keywords' => array(
-			'q' => array(
-				'name' => 'keywords',
-				'exampleValue' => 'keyword1 keyword2…',
-				'required' => true,
-				),
-			'category' => array(
-				'name' => 'Category',
-				'type' => 'list',
-				'values' => array(
-					'All' => 0,
-					'Movies' => 1,
-					'Music' => 2,
-					'TV' => 3,
-					'Games' => 4,
-					'Applications' => 5,
-					'Pictures' => 8,
-					'Anime' => 9,
-					'Comics' => 10,
-					'Books' => 11,
-					'Audiobooks' => 17
-					)
-				)
-			),
-		'Category Only' => array(
-			'catOnly' => array(
-				'name' => 'Category',
-				'type' => 'list',
-				'values' => array(
-					'All' => 0,
-					'Movies' => 1,
-					'Music' => 2,
-					'TV' => 3,
-					'Games' => 4,
-					'Applications' => 5,
-					'Pictures' => 8,
-					'Anime' => 9,
-					'Comics' => 10,
-					'Books' => 11,
-					'Audiobooks' => 17
-					)
-				)
-			),
-		'User ID' => array(
-			'userid' => array(
-				'name' => 'user id',
-				'exampleValue' => '00000',
-				'required' => true,
-				'type' => 'number'
-				),
-			'category' => array(
-				'name' => 'Category',
-				'type' => 'list',
-				'values' => array(
-					'All' => 0,
-					'Movies' => 1,
-					'Music' => 2,
-					'TV' => 3,
-					'Games' => 4,
-					'Applications' => 5,
-					'Pictures' => 8,
-					'Anime' => 9,
-					'Comics' => 10,
-					'Books' => 11,
-					'Audiobooks' => 17
-					)
-				)
-			)
-	);
-
-	public function collectData() {
-
-		if(!empty($this->getInput('q'))) {
-
-			$html = getSimpleHTMLDOM(
-				self::URI .
-				'files/?category=' .
-				rawurlencode($this->getInput('category')) .
-				'&subcategory=All&quality=All&seeded=2&external=2&query=' .
-				urlencode($this->getInput('q')) .
-				'&uid=0&sort='
-				) or returnServerError('Could not request Demonoid.');
-
-		} elseif(!empty($this->getInput('catOnly'))) {
-
-			$html = getSimpleHTMLDOM(
-				self::URI .
-				'files/?uid=0&category=' .
-				rawurlencode($this->getInput('catOnly')) .
-				'&subcategory=0&language=0&seeded=2&quality=0&query=&sort='
-				) or returnServerError('Could not request Demonoid.');
-
-		} elseif(!empty($this->getInput('userid'))) {
-
-			$html = getSimpleHTMLDOM(
-				self::URI .
-				'files/?uid=' .
-				rawurlencode($this->getInput('userid')) .
-				'&seeded=2'
-				) or returnServerError('Could not request Demonoid.');
-
-		} else {
-			returnServerError('Invalid parameters !');
-		}
-
-		if(preg_match('~No torrents found~', $html)) {
-			return;
-		}
-
-		$table = $html->find('td[class=ctable_content_no_pad]', 0);
-		$cursorCount = 4;
-		$elementCount = 0;
-		while($elementCount != 40) {
-			$elementCount++;
-			$currentElement = $table->find('tr', $cursorCount);
-			if(preg_match('~items total~', $currentElement)) {
-				break;
-			}
-			$item = array();
-			//Do we have a date ?
-			if(preg_match('~Added.*?(.*)~', $currentElement->plaintext, $dateStr)) {
-				if(preg_match('~today~', $dateStr[0])) {
-					date_default_timezone_set('UTC');
-					$timestamp = mktime(0, 0, 0, gmdate('n'), gmdate('j'), gmdate('Y'));
-				} else {
-					preg_match('~(?<=ed on ).*\d+~', $currentElement->plaintext, $fullDateStr);
-					date_default_timezone_set('UTC');
-					$dateObj = strptime($fullDateStr[0], '%A, %b %d, %Y');
-					$timestamp = mktime(0, 0, 0, $dateObj['tm_mon'] + 1, $dateObj['tm_mday'], 1900 + $dateObj['tm_year']);
-				}
-				$cursorCount++;
-			}
-
-			$content = $table->find('tr', $cursorCount)->find('a', 1);
-			$cursorCount++;
-			$torrentInfo = $table->find('tr', $cursorCount);
-			$item['timestamp'] = $timestamp;
-			$item['title'] = $content->plaintext;
-			$item['id'] = self::URI . $content->href;
-			$item['uri'] = self::URI . $content->href;
-			$item['author'] = $torrentInfo->find('a[class=user]', 0)->plaintext;
-			$item['seeders'] = $torrentInfo->find('font[class=green]', 0)->plaintext;
-			$item['leechers'] = $torrentInfo->find('font[class=red]', 0)->plaintext;
-			$item['size'] = $torrentInfo->find('td', 3)->plaintext;
-			$item['content'] = 'Uploaded by ' . $item['author']
-				. ' , Size ' . $item['size']
-				. '<br>seeders: '
-				. $item['seeders']
-				. ' | leechers: '
-				. $item['leechers']
-				. '<br><a href="'
-				. $item['id']
-				. '">info page</a>';
-
-			$this->items[] = $item;
-
-			$cursorCount++;
-		}
-	}
-}

bridges/DesoutterBridge.php

@@ -159,13 +159,13 @@ class DesoutterBridge extends BridgeAbstract {
 		foreach($html->find('article') as $article) {
 			$item = array();
 
-			$item['uri'] = $article->find('[itemprop="name"]', 0)->href;
-			$item['title'] = $article->find('[itemprop="name"]', 0)->title;
+			$item['uri'] = $article->find('a', 0)->href;
+			$item['title'] = $article->find('a[title]', 0)->title;
 
 			if($this->getInput('full')) {
 				$item['content'] = $this->getFullNewsArticle($item['uri']);
 			} else {
-				$item['content'] = $article->find('[itemprop="description"]', 0)->plaintext;
+				$item['content'] = $article->find('div.tile-body p', 0)->plaintext;
 			}
 
 			$this->items[] = $item;

bridges/DollbooruBridge.php

@@ -1,9 +0,0 @@
-<?php
-require_once('Shimmie2Bridge.php');
-
-class DollbooruBridge extends Shimmie2Bridge {
-	const MAINTAINER = 'mitsukarenai';
-	const NAME = 'Dollbooru';
-	const URI = 'http://dollbooru.org/';
-	const DESCRIPTION = 'Returns images from given page';
-}

bridges/EliteDangerousGalnetBridge.php

@@ -47,5 +47,8 @@ class EliteDangerousGalnetBridge extends BridgeAbstract {
 
 			$this->items[] = $item;
 		}
+
+		//Remove duplicates that sometimes show up on the website
+		$this->items = array_unique($this->items, SORT_REGULAR);
 	}
 }

bridges/ElloBridge.php

@@ -120,7 +120,9 @@ class ElloBridge extends BridgeAbstract {
 	}
 
 	private function getAPIKey() {
-		$cache = Cache::create(Configuration::getConfig('cache', 'type'));
+		$cacheFac = new CacheFactory();
+		$cacheFac->setWorkingDir(PATH_LIB_CACHES);
+		$cache = $cacheFac->create(Configuration::getConfig('cache', 'type'));
 		$cache->setScope(get_called_class());
 		$cache->setKey(['key']);
 		$key = $cache->loadData();

bridges/EngadgetBridge.php

@@ -0,0 +1,26 @@
+<?php
+class EngadgetBridge extends FeedExpander {
+
+	const MAINTAINER = 'IceWreck';
+	const NAME = 'Engadget Bridge';
+	const URI = 'https://www.engadget.com/';
+	const CACHE_TIMEOUT = 3600;
+	const DESCRIPTION = 'Article content for Engadget.';
+
+	public function collectData(){
+		$this->collectExpandableDatas(static::URI . 'rss.xml', 15);
+	}
+
+	protected function parseItem($newsItem){
+		$item = parent::parseItem($newsItem);
+		// $articlePage gets the entire page's contents
+		$articlePage = getSimpleHTMLDOM($newsItem->link);
+		// figure contain's the main article image
+		$article = $articlePage->find('figure', 0);
+		// .article-text has the actual article
+		foreach($articlePage->find('.article-text') as $element)
+			$article = $article . $element;
+		$item['content'] = $article;
+		return $item;
+	}
+}

bridges/FabriceBellardBridge.php

@@ -0,0 +1,36 @@
+<?php
+class FabriceBellardBridge extends BridgeAbstract {
+	const NAME = 'Fabrice Bellard';
+	const URI = 'https://bellard.org/';
+	const DESCRIPTION = "Fabrice Bellard's Home Page";
+	const MAINTAINER = 'somini';
+
+	public function collectData() {
+		$html = getSimpleHTMLDOM(self::URI)
+			or returnServerError('Could not load content');
+
+		foreach ($html->find('p') as $obj) {
+			$item = array();
+
+			$html = defaultLinkTo($html, $this->getURI());
+
+			$links = $obj->find('a');
+			if (count($links) > 0) {
+				$link_uri = $links[0]->href;
+			} else {
+				$link_uri = $this->getURI();
+			}
+
+			/* try to make sure the link is valid */
+			if ($link_uri[-1] !== '/' && strpos($link_uri, '/') === false) {
+				$link_uri = $link_uri . '/';
+			}
+
+			$item['title'] = strip_tags($obj->innertext);
+			$item['uri'] = $link_uri;
+			$item['content'] = $obj->innertext;
+
+			$this->items[] = $item;
+		}
+	}
+}

bridges/FacebookBridge.php

@@ -142,7 +142,11 @@ class FacebookBridge extends BridgeAbstract {
 
 	private function collectGroupData() {
 
-		$header = array('Accept-Language: ' . getEnv('HTTP_ACCEPT_LANGUAGE') . "\r\n");
+		if(getEnv('HTTP_ACCEPT_LANGUAGE')) {
+			$header = array('Accept-Language: ' . getEnv('HTTP_ACCEPT_LANGUAGE'));
+		} else {
+			$header = array();
+		}
 
 		$html = getSimpleHTMLDOM($this->getURI(), $header)
 			or returnServerError('Failed loading facebook page: ' . $this->getURI());
@@ -505,7 +509,11 @@ EOD;
 		// Retrieve page contents
 		if(is_null($html)) {
 
-			$header = array('Accept-Language: ' . getEnv('HTTP_ACCEPT_LANGUAGE'));
+			if(getEnv('HTTP_ACCEPT_LANGUAGE')) {
+				$header = array('Accept-Language: ' . getEnv('HTTP_ACCEPT_LANGUAGE'));
+			} else {
+				$header = array();
+			}
 
 			$html = getSimpleHTMLDOM($this->getURI(), $header)
 				or returnServerError('No results for this query.');
@@ -580,6 +588,8 @@ EOD;
 							'._5mly', // Remove embedded videos (the preview image remains)
 							'._2ezg', // Remove "Views ..."
 							'.hidden_elem', // Remove hidden elements (they are hidden anyway)
+							'.timestampContent', // Remove relative timestamp
+							'._6spk', // Remove redundant separator
 						);
 
 						foreach($content_filters as $filter) {

bridges/FicbookBridge.php

@@ -0,0 +1,164 @@
+<?php
+class FicbookBridge extends BridgeAbstract {
+
+	const NAME = 'Ficbook Bridge';
+	const URI = 'https://ficbook.net/';
+	const DESCRIPTION = 'No description provided';
+	const MAINTAINER = 'logmanoriginal';
+
+	const PARAMETERS = array(
+		'Site News' => array(),
+		'Fiction Updates' => array(
+			'fiction_id' => array(
+				'name' => 'Fanfiction ID',
+				'type' => 'text',
+				'pattern' => '[0-9]+',
+				'required' => true,
+				'title' => 'Insert fanfiction ID',
+				'exampleValue' => '5783919',
+			),
+			'include_contents' => array(
+				'name' => 'Include contents',
+				'type' => 'checkbox',
+				'title' => 'Activate to include contents in the feed',
+			),
+		),
+		'Fiction Comments' => array(
+			'fiction_id' => array(
+				'name' => 'Fanfiction ID',
+				'type' => 'text',
+				'pattern' => '[0-9]+',
+				'required' => true,
+				'title' => 'Insert fanfiction ID',
+				'exampleValue' => '5783919',
+			),
+		),
+	);
+
+	public function getURI() {
+		switch($this->queriedContext) {
+			case 'Site News': {
+				// For some reason this is not HTTPS
+				return 'http://ficbook.net/sitenews';
+			}
+			case 'Fiction Updates': {
+				return self::URI
+				. 'readfic/'
+				. urlencode($this->getInput('fiction_id'));
+			}
+			case 'Fiction Comments': {
+				return self::URI
+				. 'readfic/'
+				. urlencode($this->getInput('fiction_id'))
+				. '/comments#content';
+			}
+			default: return parent::getURI();
+		}
+	}
+
+	public function collectData() {
+
+		$header = array('Accept-Language: en-US');
+
+		$html = getSimpleHTMLDOM($this->getURI(), $header)
+			or returnServerError('Could not request ' . $this->getURI());
+
+		$html = defaultLinkTo($html, self::URI);
+
+		switch($this->queriedContext) {
+			case 'Site News': return $this->collectSiteNews($html);
+			case 'Fiction Updates': return $this->collectUpdatesData($html);
+			case 'Fiction Comments': return $this->collectCommentsData($html);
+		}
+
+	}
+
+	private function collectSiteNews($html) {
+		foreach($html->find('.news_view') as $news) {
+			$this->items[] = array(
+				'title' => $news->find('h1.title', 0)->plaintext,
+				'timestamp' => strtotime($this->fixDate($news->find('span[title]', 0)->title)),
+				'content' => $news->find('.news_text', 0),
+			);
+		}
+	}
+
+	private function collectCommentsData($html) {
+		foreach($html->find('article.post') as $article) {
+			$this->items[] = array(
+				'uri' => $article->find('.comment_link_to_fic > a', 0)->href,
+				'title' => $article->find('.comment_author', 0)->plaintext,
+				'author' => $article->find('.comment_author', 0)->plaintext,
+				'timestamp' => strtotime($this->fixDate($article->find('time[datetime]', 0)->datetime)),
+				'content' => $article->find('.comment_message', 0),
+				'enclosures' => array($article->find('img', 0)->src),
+			);
+		}
+	}
+
+	private function collectUpdatesData($html) {
+		foreach($html->find('ul.table-of-contents > li') as $chapter) {
+			$item = array(
+				'uri' => $chapter->find('a', 0)->href,
+				'title' => $chapter->find('a', 0)->plaintext,
+				'timestamp' => strtotime($this->fixDate($chapter->find('span[title]', 0)->title)),
+			);
+
+			if($this->getInput('include_contents')) {
+				$content = getSimpleHTMLDOMCached($item['uri']);
+				$item['content'] = $content->find('#content', 0);
+			}
+
+			$this->items[] = $item;
+
+			// Sort by time, descending
+			usort($this->items, function($a, $b){ return $b['timestamp'] - $a['timestamp']; });
+		}
+	}
+
+	private function fixDate($date) {
+
+		// FIXME: This list was generated using Google tranlator. Someone who
+		// actually knows russian should check this list! Please keep in mind
+		// that month names must match exactly the names returned by Ficbook.
+		$ru_month = array(
+			'января',
+			'февраля',
+			'марта',
+			'апреля',
+			'мая',
+			'июня',
+			'июля',
+			'августа',
+			'Сентября',
+			'октября',
+			'Ноября',
+			'Декабря',
+		);
+
+		$en_month = array(
+			'January',
+			'February',
+			'March',
+			'April',
+			'May',
+			'June',
+			'July',
+			'August',
+			'September',
+			'October',
+			'November',
+			'December',
+		);
+
+		$fixed_date = str_replace($ru_month, $en_month, $date);
+
+		if($fixed_date === $date) {
+			Debug::log('Unable to fix date: ' . $date);
+			return null;
+		}
+
+		return $fixed_date;
+
+	}
+}

bridges/FindACrewBridge.php

@@ -62,11 +62,16 @@ class FindACrewBridge extends BridgeAbstract {
 		foreach ($annonces as $annonce) {
 			$item = array();
 
-			$img = parent::getURI() . $annonce->find('.lst-pic img', 0)->getAttribute('src');
+			$link = parent::getURI() . $annonce->find('.lst-ctrls a', 0)->href;
+			$htmlDetail = getSimpleHTMLDOMCached($link . '?mdl=2'); // add ?mdl=2 for xhr content not full html page
+
+			$img = parent::getURI() . $htmlDetail->find('img.img-responsive', 0)->getAttribute('src');
 			$item['title'] = $annonce->find('.lst-tags span', 0)->plaintext;
-			$item['uri'] = parent::getURI() . $annonce->find('.lst-ctrls a', 0)->href;
-			$content = $annonce->find('.lst-dtl', 0)->innertext;
-			$item['content'] = "<img src='$img' /><br>$content";
+			$item['uri'] = $link;
+			$content = $htmlDetail->find('.panel-body div.clearfix.row > div', 1)->innertext;
+			$content .= $htmlDetail->find('.panel-body > div', 1)->innertext;
+			$content = defaultLinkTo($content, parent::getURI());
+			$item['content'] = $content;
 			$item['enclosures'] = array($img);
 			$item['categories'] = array($annonce->find('.css_AccLocCur', 0)->plaintext);
 			$this->items[] = $item;

bridges/FurAffinityBridge.php

@@ -0,0 +1,918 @@
+<?php
+class FurAffinityBridge extends BridgeAbstract {
+	const NAME = 'FurAffinity Bridge';
+	const URI = 'https://www.furaffinity.net';
+	const CACHE_TIMEOUT = 300; // 5min
+	const DESCRIPTION = 'Returns posts from various sections of FurAffinity';
+	const MAINTAINER = 'Roliga';
+	const PARAMETERS = array(
+		'Search' => array(
+			'q' => array(
+				'name' => 'Query',
+				'required' => true
+			),
+			'rating-general' => array(
+				'name' => 'General',
+				'type' => 'checkbox',
+				'defaultValue' => 'checked'
+			),
+			'rating-mature' => array(
+				'name' => 'Mature',
+				'type' => 'checkbox',
+			),
+			'rating-adult' => array(
+				'name' => 'Adult',
+				'type' => 'checkbox',
+			),
+			'range' => array(
+				'name' => 'Time range',
+				'type' => 'list',
+				'values' => array(
+					'A Day' => 'day',
+					'3 Days' => '3days',
+					'A Week' => 'week',
+					'A Month' => 'month',
+					'All time' => 'all'
+				),
+				'defaultValue' => 'all'
+			),
+			'type-art' => array(
+				'name' => 'Art',
+				'type' => 'checkbox',
+				'defaultValue' => 'checked'
+			),
+			'type-flash' => array(
+				'name' => 'Flash',
+				'type' => 'checkbox',
+				'defaultValue' => 'checked'
+			),
+			'type-photo' => array(
+				'name' => 'Photography',
+				'type' => 'checkbox',
+				'defaultValue' => 'checked'
+			),
+			'type-music' => array(
+				'name' => 'Music',
+				'type' => 'checkbox',
+				'defaultValue' => 'checked'
+			),
+			'type-story' => array(
+				'name' => 'Story',
+				'type' => 'checkbox',
+				'defaultValue' => 'checked'
+			),
+			'type-poetry' => array(
+				'name' => 'Poetry',
+				'type' => 'checkbox',
+				'defaultValue' => 'checked'
+			),
+			'mode' => array(
+				'name' => 'Match mode',
+				'type' => 'list',
+				'values' => array(
+					'All of the words' => 'all',
+					'Any of the words' => 'any',
+					'Extended' => 'extended'
+				),
+				'defaultValue' => 'extended'
+			),
+			'limit' => array(
+				'name' => 'Limit',
+				'type' => 'number',
+				'defaultValue' => 10,
+				'title' => 'Limit number of submissions to return. -1 for unlimited.'
+			),
+			'full' => array(
+				'name' => 'Full view',
+				'title' => 'Include description, tags, date and larger image in article. Uses more bandwidth.',
+				'type' => 'checkbox',
+				'defaultValue' => 'checked'
+			),
+			'cache' => array(
+				'name' => 'Cache submission pages',
+				'title' => 'Reduces requests to FA when Full view is enabled. Changes to submission details may be delayed.',
+				'type' => 'checkbox',
+				'defaultValue' => 'checked'
+			)
+		),
+		'Browse' => array(
+			'cat' => array(
+				'name' => 'Category',
+				'type' => 'list',
+				'values' => array(
+					'Visual Art' => array(
+						'All' => 1,
+						'Artwork (Digital)' => 2,
+						'Artwork (Traditional)' => 3,
+						'Cellshading' => 4,
+						'Crafting' => 5,
+						'Designs' => 6,
+						'Flash' => 7,
+						'Fursuiting' => 8,
+						'Icons' => 9,
+						'Mosaics' => 10,
+						'Photography' => 11,
+						'Sculpting' => 12
+					),
+					'Readable Art' => array(
+						'Story' => 13,
+						'Poetry' => 14,
+						'Prose' => 15
+					),
+					'Audio Art' => array(
+						'Music' => 16,
+						'Podcasts' => 17
+					),
+					'Downloadable' => array(
+						'Skins' => 18,
+						'Handhelds' => 19,
+						'Resources' => 20
+					),
+					'Other Stuff' => array(
+						'Adoptables' => 21,
+						'Auctions' => 22,
+						'Contests' => 23,
+						'Current Events' => 24,
+						'Desktops' => 25,
+						'Stockart' => 26,
+						'Screenshots' => 27,
+						'Scraps' => 28,
+						'Wallpaper' => 29,
+						'YCH / Sale' => 30,
+						'Other' => 31
+					)
+				),
+				'defaultValue' => 1
+			),
+			'atype' => array(
+				'name' => 'Type',
+				'type' => 'list',
+				'values' => array(
+					'General Things' => array(
+						'All' => 1,
+						'Abstract' => 2,
+						'Animal related (non-anthro)' => 3,
+						'Anime' => 4,
+						'Comics' => 5,
+						'Doodle' => 6,
+						'Fanart' => 7,
+						'Fantasy' => 8,
+						'Human' => 9,
+						'Portraits' => 10,
+						'Scenery' => 11,
+						'Still Life' => 12,
+						'Tutorials' => 13,
+						'Miscellaneous' => 14
+					),
+					'Fetish / Furry specialty' => array(
+						'Baby fur' => 101,
+						'Bondage' => 102,
+						'Digimon' => 103,
+						'Fat Furs' => 104,
+						'Fetish Other' => 105,
+						'Fursuit' => 106,
+						'Gore / Macabre Art' => 119,
+						'Hyper' => 107,
+						'Inflation' => 108,
+						'Macro / Micro' => 109,
+						'Muscle' => 110,
+						'My Little Pony / Brony' => 111,
+						'Paw' => 112,
+						'Pokemon' => 113,
+						'Pregnancy' => 114,
+						'Sonic' => 115,
+						'Transformation' => 116,
+						'Vore' => 117,
+						'Water Sports' => 118,
+						'General Furry Art' => 100
+					),
+					'Music' => array(
+						'Techno' => 201,
+						'Trance' => 202,
+						'House' => 203,
+						'90s' => 204,
+						'80s' => 205,
+						'70s' => 206,
+						'60s' => 207,
+						'Pre-60s' => 208,
+						'Classical' => 209,
+						'Game Music' => 210,
+						'Rock' => 211,
+						'Pop' => 212,
+						'Rap' => 213,
+						'Industrial' => 214,
+						'Other Music' => 200
+					)
+				),
+				'defaultValue' => 1
+			),
+			'species' => array(
+				'name' => 'Species',
+				'type' => 'list',
+				'values' => array(
+					'Unspecified / Any' => 1,
+					'Amphibian' => array(
+						'Frog' => 1001,
+						'Newt' => 1002,
+						'Salamander' => 1003,
+						'Amphibian (Other)' => 1000
+					),
+					'Aquatic' => array(
+						'Cephalopod' => 2001,
+						'Dolphin' => 2002,
+						'Fish' => 2005,
+						'Porpoise' => 2004,
+						'Seal' => 6068,
+						'Shark' => 2006,
+						'Whale' => 2003,
+						'Aquatic (Other)' => 2000
+					),
+					'Avian' => array(
+						'Corvid' => 3001,
+						'Crow' => 3002,
+						'Duck' => 3003,
+						'Eagle' => 3004,
+						'Falcon' => 3005,
+						'Goose' => 3006,
+						'Gryphon' => 3007,
+						'Hawk' => 3008,
+						'Owl' => 3009,
+						'Phoenix' => 3010,
+						'Swan' => 3011,
+						'Avian (Other)' => 3000
+					),
+					'Bears &amp; Ursines' => array(
+						'Bear' => 6002
+					),
+					'Camelids' => array(
+						'Camel' => 6074,
+						'Llama' => 6036
+					),
+					'Canines &amp; Lupines' => array(
+						'Coyote' => 6008,
+						'Doberman' => 6009,
+						'Dog' => 6010,
+						'Dingo' => 6011,
+						'German Shepherd' => 6012,
+						'Jackal' => 6013,
+						'Husky' => 6014,
+						'Wolf' => 6016,
+						'Canine (Other)' => 6017
+					),
+					'Cervines' => array(
+						'Cervine (Other)' => 6018
+					),
+					'Cows &amp; Bovines' => array(
+						'Antelope' => 6004,
+						'Cows' => 6003,
+						'Gazelle' => 6005,
+						'Goat' => 6006,
+						'Bovines (General)' => 6007
+					),
+					'Dragons' => array(
+						'Eastern Dragon' => 4001,
+						'Hydra' => 4002,
+						'Serpent' => 4003,
+						'Western Dragon' => 4004,
+						'Wyvern' => 4005,
+						'Dragon (Other)' => 4000
+					),
+					'Equestrians' => array(
+						'Donkey' => 6019,
+						'Horse' => 6034,
+						'Pony' => 6073,
+						'Zebra' => 6071
+					),
+					'Exotic &amp; Mythicals' => array(
+						'Argonian' => 5002,
+						'Chakat' => 5003,
+						'Chocobo' => 5004,
+						'Citra' => 5005,
+						'Crux' => 5006,
+						'Daemon' => 5007,
+						'Digimon' => 5008,
+						'Dracat' => 5009,
+						'Draenei' => 5010,
+						'Elf' => 5011,
+						'Gargoyle' => 5012,
+						'Iksar' => 5013,
+						'Kaiju/Monster' => 5015,
+						'Langurhali' => 5014,
+						'Moogle' => 5017,
+						'Naga' => 5016,
+						'Orc' => 5018,
+						'Pokemon' => 5019,
+						'Satyr' => 5020,
+						'Sergal' => 5021,
+						'Tanuki' => 5022,
+						'Unicorn' => 5023,
+						'Xenomorph' => 5024,
+						'Alien (Other)' => 5001,
+						'Exotic (Other)' => 5000
+					),
+					'Felines' => array(
+						'Domestic Cat' => 6020,
+						'Cheetah' => 6021,
+						'Cougar' => 6022,
+						'Jaguar' => 6023,
+						'Leopard' => 6024,
+						'Lion' => 6025,
+						'Lynx' => 6026,
+						'Ocelot' => 6027,
+						'Panther' => 6028,
+						'Tiger' => 6029,
+						'Feline (Other)' => 6030
+					),
+					'Insects' => array(
+						'Arachnid' => 8000,
+						'Mantid' => 8004,
+						'Scorpion' => 8005,
+						'Insect (Other)' => 8003
+					),
+					'Mammals (Other)' => array(
+						'Bat' => 6001,
+						'Giraffe' => 6031,
+						'Hedgehog' => 6032,
+						'Hippopotamus' => 6033,
+						'Hyena' => 6035,
+						'Panda' => 6052,
+						'Pig/Swine' => 6053,
+						'Rabbit/Hare' => 6059,
+						'Raccoon' => 6060,
+						'Red Panda' => 6062,
+						'Meerkat' => 6043,
+						'Mongoose' => 6044,
+						'Rhinoceros' => 6063,
+						'Mammals (Other)' => 6000
+					),
+					'Marsupials' => array(
+						'Opossum' => 6037,
+						'Kangaroo' => 6038,
+						'Koala' => 6039,
+						'Quoll' => 6040,
+						'Wallaby' => 6041,
+						'Marsupial (Other)' => 6042
+					),
+					'Mustelids' => array(
+						'Badger' => 6045,
+						'Ferret' => 6046,
+						'Mink' => 6048,
+						'Otter' => 6047,
+						'Skunk' => 6069,
+						'Weasel' => 6049,
+						'Mustelid (Other)' => 6051
+					),
+					'Primates' => array(
+						'Gorilla' => 6054,
+						'Human' => 6055,
+						'Lemur' => 6056,
+						'Monkey' => 6057,
+						'Primate (Other)' => 6058
+					),
+					'Reptillian' => array(
+						'Alligator &amp; Crocodile' => 7001,
+						'Gecko' => 7003,
+						'Iguana' => 7004,
+						'Lizard' => 7005,
+						'Snakes &amp; Serpents' => 7006,
+						'Turtle' => 7007,
+						'Reptilian (Other)' => 7000
+					),
+					'Rodents' => array(
+						'Beaver' => 6064,
+						'Mouse' => 6065,
+						'Rat' => 6061,
+						'Squirrel' => 6070,
+						'Rodent (Other)' => 6067
+					),
+					'Vulpines' => array(
+						'Fennec' => 6072,
+						'Fox' => 6075,
+						'Vulpine (Other)' => 6015
+					),
+					'Other' => array(
+						'Dinosaur' => 8001,
+						'Wolverine' => 6050
+					)
+				),
+				'defaultValue' => 1
+			),
+			'gender' => array(
+				'name' => 'Gender',
+				'type' => 'list',
+				'values' => array(
+					'Any' => 0,
+					'Male' => 2,
+					'Female' => 3,
+					'Herm' => 4,
+					'Transgender' => 5,
+					'Multiple characters' => 6,
+					'Other / Not Specified' => 7
+				),
+				'defaultValue' => 0
+			),
+			'rating_general' => array(
+				'name' => 'General',
+				'type' => 'checkbox',
+				'defaultValue' => 'checked'
+			),
+			'rating_mature' => array(
+				'name' => 'Mature',
+				'type' => 'checkbox',
+			),
+			'rating_adult' => array(
+				'name' => 'Adult',
+				'type' => 'checkbox',
+			),
+			'limit-browse' => array(
+				'name' => 'Limit',
+				'type' => 'number',
+				'required' => true,
+				'defaultValue' => 10,
+				'title' => 'Limit number of submissions to return. -1 for unlimited.'
+			),
+			'full' => array(
+				'name' => 'Full view',
+				'title' => 'Include description, tags, date and larger image in article. Uses more bandwidth.',
+				'type' => 'checkbox',
+				'defaultValue' => 'checked'
+			),
+			'cache' => array(
+				'name' => 'Cache submission pages',
+				'title' => 'Reduces requests to FA when Full view is enabled. Changes to submission details may be delayed.',
+				'type' => 'checkbox',
+				'defaultValue' => 'checked'
+			)
+
+		),
+		'Journals' => array(
+			'username-journals' => array(
+				'name' => 'Username',
+				'required' => true,
+				'title' => 'Lowercase username as seen in URLs'
+			),
+			'limit' => array(
+				'name' => 'Limit',
+				'type' => 'number',
+				'defaultValue' => -1,
+				'title' => 'Limit number of journals to return. -1 for unlimited.'
+			)
+
+		),
+		'Single Journal' => array(
+			'journal-id' => array(
+				'name' => 'Journal ID',
+				'required' => true,
+				'type' => 'number',
+				'title' => 'Number seen in journal URL'
+			)
+		),
+		'Gallery' => array(
+			'username-gallery' => array(
+				'name' => 'Username',
+				'required' => true,
+				'title' => 'Lowercase username as seen in URLs'
+			),
+			'limit' => array(
+				'name' => 'Limit',
+				'type' => 'number',
+				'defaultValue' => 10,
+				'title' => 'Limit number of submissions to return. -1 for unlimited.'
+			),
+			'full' => array(
+				'name' => 'Full view',
+				'title' => 'Include description, tags, date and larger image in article. Uses more bandwidth.',
+				'type' => 'checkbox',
+				'defaultValue' => 'checked'
+			),
+			'cache' => array(
+				'name' => 'Cache submission pages',
+				'title' => 'Reduces requests to FA when Full view is enabled. Changes to submission details may be delayed.',
+				'type' => 'checkbox',
+				'defaultValue' => 'checked'
+			)
+		),
+		'Scraps' => array(
+			'username-scraps' => array(
+				'name' => 'Username',
+				'required' => true,
+				'title' => 'Lowercase username as seen in URLs'
+			),
+			'limit' => array(
+				'name' => 'Limit',
+				'type' => 'number',
+				'defaultValue' => 10,
+				'title' => 'Limit number of submissions to return. -1 for unlimited.'
+			),
+			'full' => array(
+				'name' => 'Full view',
+				'title' => 'Include description, tags, date and larger image in article. Uses more bandwidth.',
+				'type' => 'checkbox',
+				'defaultValue' => 'checked'
+			),
+			'cache' => array(
+				'name' => 'Cache submission pages',
+				'title' => 'Reduces requests to FA when Full view is enabled. Changes to submission details may be delayed.',
+				'type' => 'checkbox',
+				'defaultValue' => 'checked'
+			)
+		),
+		'Favorites' => array(
+			'username-favorites' => array(
+				'name' => 'Username',
+				'required' => true,
+				'title' => 'Lowercase username as seen in URLs'
+			),
+			'limit' => array(
+				'name' => 'Limit',
+				'type' => 'number',
+				'defaultValue' => 10,
+				'title' => 'Limit number of submissions to return. -1 for unlimited.'
+			),
+			'full' => array(
+				'name' => 'Full view',
+				'title' => 'Include description, tags, date and larger image in article. Uses more bandwidth.',
+				'type' => 'checkbox',
+				'defaultValue' => 'checked'
+			),
+			'cache' => array(
+				'name' => 'Cache submission pages',
+				'title' => 'Reduces requests to FA when Full view is enabled. Changes to submission details may be delayed.',
+				'type' => 'checkbox',
+				'defaultValue' => 'checked'
+			)
+		),
+		'Gallery Folder' => array(
+			'username-folder' => array(
+				'name' => 'Username',
+				'required' => true,
+				'title' => 'Lowercase username as seen in URLs'
+			),
+			'folder-id' => array(
+				'name' => 'Folder ID',
+				'required' => true,
+				'type' => 'number',
+				'title' => 'Number seen in folder URL'
+			),
+			'limit' => array(
+				'name' => 'Limit',
+				'type' => 'number',
+				'defaultValue' => 10,
+				'title' => 'Limit number of submissions to return. -1 for unlimited.'
+			),
+			'full' => array(
+				'name' => 'Full view',
+				'title' => 'Include description, tags, date and larger image in article. Uses more bandwidth.',
+				'type' => 'checkbox',
+				'defaultValue' => 'checked'
+			),
+			'cache' => array(
+				'name' => 'Cache submission pages',
+				'title' => 'Reduces requests to FA when Full view is enabled. Changes to submission details may be delayed.',
+				'type' => 'checkbox',
+				'defaultValue' => 'checked'
+			)
+		)
+	);
+
+	/*
+	 * This was aquired by creating a new user on FA then
+	 * extracting the cookie from the browsers dev console.
+	 */
+	const FA_AUTH_COOKIE = 'b=4ce65691-b50f-4742-a990-bf28d6de16ee; a=ca6e4566-9d81-4263-9444-653b142e35f8';
+
+	public function detectParameters($url) {
+		$params = array();
+
+		// Single journal
+		$regex = '/^(https?:\/\/)?(www\.)?furaffinity.net\/journal\/(\d+)/';
+		if(preg_match($regex, $url, $matches) > 0) {
+			$params['journal-id'] = urldecode($matches[3]);
+			return $params;
+		}
+
+		// Journals
+		$regex = '/^(https?:\/\/)?(www\.)?furaffinity.net\/journals\/([^\/&?\n]+)/';
+		if(preg_match($regex, $url, $matches) > 0) {
+			$params['username-journals'] = urldecode($matches[3]);
+			return $params;
+		}
+
+		// Gallery folder
+		$regex = '/^(https?:\/\/)?(www\.)?furaffinity.net\/gallery\/([^\/&?\n]+)\/folder\/(\d+)/';
+		if(preg_match($regex, $url, $matches) > 0) {
+			$params['username-folder'] = urldecode($matches[3]);
+			$params['folder-id'] = urldecode($matches[4]);
+			$params['full'] = 'on';
+			return $params;
+		}
+
+		// Gallery (must be after gallery folder)
+		$regex = '/^(https?:\/\/)?(www\.)?furaffinity.net\/(gallery|scraps|favorites)\/([^\/&?\n]+)/';
+		if(preg_match($regex, $url, $matches) > 0) {
+			$params['username-' . $matches[3]] = urldecode($matches[4]);
+			$params['full'] = 'on';
+			return $params;
+		}
+
+		return null;
+	}
+
+	public function getName() {
+		switch($this->queriedContext) {
+		case 'Search':
+			return 'Search For '
+				. $this->getInput('q');
+		case 'Browse':
+			return 'Browse';
+		case 'Journals':
+			return $this->getInput('username-journals');
+		case 'Single Journal':
+			return 'Journal '
+				. $this->getInput('journal-id');
+		case 'Gallery':
+			return $this->getInput('username-gallery');
+		case 'Scraps':
+			return $this->getInput('username-scraps');
+		case 'Favorites':
+			return $this->getInput('username-favorites');
+		case 'Gallery Folder':
+			return $this->getInput('username-folder')
+				. '\'s Folder '
+				. $this->getInput('folder-id');
+		default: return parent::getName();
+		}
+	}
+
+	public function getDescription() {
+		switch($this->queriedContext) {
+		case 'Search':
+			return 'FurAffinity Search For '
+				. $this->getInput('q');
+		case 'Browse':
+			return 'FurAffinity Browse';
+		case 'Journals':
+			return 'FurAffinity Journals By '
+				. $this->getInput('username-journals');
+		case 'Single Journal':
+			return 'FurAffinity Journal '
+				. $this->getInput('journal-id');
+		case 'Gallery':
+			return 'FurAffinity Gallery By '
+				. $this->getInput('username-gallery');
+		case 'Scraps':
+			return 'FurAffinity Scraps By '
+				. $this->getInput('username-scraps');
+		case 'Favorites':
+			return 'FurAffinity Favorites By '
+				. $this->getInput('username-favorites');
+		case 'Gallery Folder':
+			return 'FurAffinity Gallery Folder '
+				. $this->getInput('folder-id')
+				. ' By '
+				. $this->getInput('username-folder');
+		default: return parent::getDescription();
+		}
+	}
+
+	public function getURI() {
+		switch($this->queriedContext) {
+		case 'Search':
+			return SELF::URI
+				. '/search';
+		case 'Browse':
+			return SELF::URI
+				. '/browse';
+		case 'Journals':
+			return SELF::URI
+				. '/journals/'
+				. $this->getInput('username-journals');
+		case 'Single Journal':
+			return SELF::URI
+				. '/journal/'
+				. $this->getInput('journal-id');
+		case 'Gallery':
+			return SELF::URI
+				. '/gallery/'
+				. $this->getInput('username-gallery');
+		case 'Scraps':
+			return SELF::URI
+				. '/scraps/'
+				. $this->getInput('username-scraps');
+		case 'Favorites':
+			return SELF::URI
+				. '/favorites/'
+				. $this->getInput('username-favorites');
+		case 'Gallery Folder':
+			return SELF::URI
+				. '/gallery/'
+				. $this->getInput('username-folder')
+				. '/folder/'
+				. $this->getInput('folder-id');
+		default: return parent::getURI();
+		}
+	}
+
+	public function collectData() {
+		switch($this->queriedContext) {
+		case 'Search':
+			$data = array(
+				'q' => $this->getInput('q'),
+				'perpage' => 72,
+				'rating-general' => ($this->getInput('rating-general') === true ? 'on' : 0),
+				'rating-mature' => ($this->getInput('rating-mature') === true ? 'on' : 0),
+				'rating-adult' => ($this->getInput('rating-adult') === true ? 'on' : 0),
+				'range' => $this->getInput('range'),
+				'type-art' => ($this->getInput('type-art') === true ? 'on' : 0),
+				'type-flash' => ($this->getInput('type-flash') === true ? 'on' : 0),
+				'type-photo' => ($this->getInput('type-photo') === true ? 'on' : 0),
+				'type-music' => ($this->getInput('type-music') === true ? 'on' : 0),
+				'type-story' => ($this->getInput('type-story') === true ? 'on' : 0),
+				'type-poetry' => ($this->getInput('type-poetry') === true ? 'on' : 0),
+				'mode' => $this->getInput('mode')
+			);
+			$html = $this->postFASimpleHTMLDOM($data);
+			$limit = (is_int($this->getInput('limit')) ? $this->getInput('limit') : 10);
+			$this->itemsFromSubmissionList($html, $limit);
+			break;
+		case 'Browse':
+			$data = array(
+				'cat' => $this->getInput('cat'),
+				'atype' => $this->getInput('atype'),
+				'species' => $this->getInput('species'),
+				'gender' => $this->getInput('gender'),
+				'perpage' => 72,
+				'rating_general' => ($this->getInput('rating_general') === true ? 'on' : 0),
+				'rating_mature' => ($this->getInput('rating_mature') === true ? 'on' : 0),
+				'rating_adult' => ($this->getInput('rating_adult') === true ? 'on' : 0)
+			);
+			$html = $this->postFASimpleHTMLDOM($data);
+			$limit = (is_int($this->getInput('limit-browse')) ? $this->getInput('limit-browse') : 10);
+			$this->itemsFromSubmissionList($html, $limit);
+			break;
+		case 'Journals':
+			$html = $this->getFASimpleHTMLDOM($this->getURI());
+			$limit = (is_int($this->getInput('limit')) ? $this->getInput('limit') : -1);
+			$this->itemsFromJournalList($html, $limit);
+			break;
+		case 'Single Journal':
+			$html = $this->getFASimpleHTMLDOM($this->getURI());
+			$this->itemsFromJournal($html);
+			break;
+		case 'Gallery':
+		case 'Scraps':
+		case 'Favorites':
+		case 'Gallery Folder':
+			$html = $this->getFASimpleHTMLDOM($this->getURI());
+			$limit = (is_int($this->getInput('limit')) ? $this->getInput('limit') : 10);
+			$this->itemsFromSubmissionList($html, $limit);
+			break;
+		}
+	}
+
+	private function postFASimpleHTMLDOM($data) {
+			$opts = array(
+				CURLOPT_CUSTOMREQUEST => 'POST',
+				CURLOPT_POSTFIELDS => http_build_query($data)
+			);
+			$header = array(
+				'Host: ' . parse_url(self::URI, PHP_URL_HOST),
+				'Content-Type: application/x-www-form-urlencoded',
+				'Cookie: ' . self::FA_AUTH_COOKIE
+			);
+
+			$html = getSimpleHTMLDOM($this->getURI(), $header, $opts);
+			$html = defaultLinkTo($html, $this->getURI());
+
+			return $html;
+	}
+
+	private function getFASimpleHTMLDOM($url, $cache = false) {
+			$header = array(
+				'Cookie: ' . self::FA_AUTH_COOKIE
+			);
+
+			if($cache) {
+				$html = getSimpleHTMLDOMCached($url, 86400, $header); // 24 hours
+			} else {
+				$html = getSimpleHTMLDOM($url, $header);
+			}
+
+			$html = defaultLinkTo($html, $url);
+
+			return $html;
+	}
+
+	private function itemsFromJournalList($html, $limit) {
+		foreach($html->find('table[id^=jid:]') as $journal) {
+			# allows limit = -1 to mean 'unlimited'
+			if($limit-- === 0) break;
+
+			$item = array();
+
+			$this->setReferrerPolicy($journal);
+
+			$item['uri'] = $journal->find('a', 0)->href;
+			$item['title'] = html_entity_decode($journal->find('a', 0)->plaintext);
+			$item['author'] = $this->getInput('username-journals');
+			$item['timestamp'] = strtotime(
+				$journal->find('span.popup_date', 0)->plaintext);
+			$item['content'] = $journal
+				->find('.alt1 table div.no_overflow', 0)
+				->innertext;
+
+			$this->items[] = $item;
+		}
+	}
+
+	private function itemsFromJournal($html) {
+		$this->setReferrerPolicy($html);
+		$item = array();
+
+		$item['uri'] = $this->getURI();
+
+		$title = $html->find('.journal-title-box .no_overflow', 0)->plaintext;
+		$title = html_entity_decode($title);
+		$title = trim($title, " \t\n\r\0\x0B" . chr(0xC2) . chr(0xA0));
+		$item['title'] = $title;
+
+		$item['author'] = $html->find('.journal-title-box a', 0)->plaintext;
+		$item['timestamp'] = strtotime(
+			$html->find('.journal-title-box span.popup_date', 0)->plaintext);
+		$item['content'] = $html->find('.journal-body', 0)->innertext;
+
+		$this->items[] = $item;
+	}
+
+	private function itemsFromSubmissionList($html, $limit) {
+		$cache = ($this->getInput('cache') === true);
+
+		foreach($html->find('section.gallery figure') as $figure) {
+			# allows limit = -1 to mean 'unlimited'
+			if($limit-- === 0) break;
+
+			$item = array();
+
+			$submissionURL = $figure->find('b u a', 0)->href;
+			$imgURL = 'https:' . $figure->find('b u a img', 0)->src;
+
+			$item['uri'] = $submissionURL;
+			$item['title'] = html_entity_decode(
+				$figure->find('figcaption p a[href*=/view/]', 0)->title);
+			$item['author'] = $figure->find('figcaption p a[href*=/user/]', 0)->title;
+
+			if($this->getInput('full') === true) {
+				$submissionHTML = $this->getFASimpleHTMLDOM($submissionURL, $cache);
+
+				$stats = $submissionHTML->find('.stats-container', 0);
+				$item['timestamp'] = strtotime($stats->find('.popup_date', 0)->title);
+				$item['enclosures'] = array(
+					$submissionHTML->find('.actions a[href^=https://d.facdn]', 0)->href
+				);
+				foreach($stats->find('#keywords a') as $keyword) {
+					$item['categories'][] = $keyword->plaintext;
+				}
+
+				$previewSrc = $submissionHTML->find('#submissionImg', 0)
+					->{'data-preview-src'};
+				if($previewSrc) {
+					$imgURL = 'https:' . $previewSrc;
+				}
+
+				$description = $submissionHTML
+					->find('.maintable .maintable tr td.alt1', -1);
+				$this->setReferrerPolicy($description);
+				$description = $description->innertext;
+
+				$item['content'] = <<<EOD
+<a href="$submissionURL">
+	<img src="{$imgURL}" referrerpolicy="no-referrer" />
+</a>
+<p>
+{$description}
+</p>
+EOD;
+			} else {
+				$item['content'] = <<<EOD
+<a href="$submissionURL">
+	<img src="$imgURL" referrerpolicy="no-referrer" />
+</a>
+EOD;
+			}
+
+			$this->items[] = $item;
+		}
+	}
+
+	private function setReferrerPolicy(&$html) {
+		foreach($html->find('img') as $img) {
+			/*
+			 * Note: Without the no-referrer policy their CDN sometimes denies requests.
+			 * We can't control this for enclosures sadly.
+			 * At least tt-rss adds the referrerpolicy on its own.
+			 * Alternatively we could not use https for images, but that's not ideal.
+			 */
+			$img->referrerpolicy = 'no-referrer';
+		}
+	}
+}

bridges/GQMagazineBridge.php

@@ -40,6 +40,11 @@ class GQMagazineBridge extends BridgeAbstract
 		'data-original' => 'src'
 	);
 
+	const POSSIBLE_TITLES = array(
+		'h2',
+		'h3'
+	);
+
 	private function getDomain() {
 		$domain = $this->getInput('domain');
 		if (empty($domain))
@@ -54,6 +59,17 @@ class GQMagazineBridge extends BridgeAbstract
 		return $this->getDomain() . '/' . $this->getInput('page');
 	}
 
+	private function findTitleOf($link) {
+		foreach (self::POSSIBLE_TITLES as $tag) {
+			$title = $link->parent()->find($tag, 0);
+			if($title !== null) {
+				if($title->plaintext !== null) {
+					return $title->plaintext;
+				}
+			}
+		}
+	}
+
 	public function collectData()
 	{
 		$html = getSimpleHTMLDOM($this->getURI()) or returnServerError('Could not request ' . $this->getURI());
@@ -61,31 +77,36 @@ class GQMagazineBridge extends BridgeAbstract
 		// Since GQ don't want simple class scrapping, let's do it the hard way and ... discover content !
 		$main = $html->find('main', 0);
 		foreach ($main->find('a') as $link) {
+			if(strpos($link, $this->getInput('page')))
+				continue;
 			$uri = $link->href;
-			$title = $link->find('h2', 0);
-			$date = $link->find('time', 0);
+			$date = $link->parent()->find('time', 0);
 
 			$item = array();
-			$author = $link->find('span[itemprop=name]', 0);
-			$item['author'] = $author->plaintext;
-			$item['title'] = $title->plaintext;
-			if(substr($uri, 0, 1) === 'h') { // absolute uri
-				$item['uri'] = $uri;
-			} else if(substr($uri, 0, 1) === '/') { // domain relative url
-				$item['uri'] = $this->getDomain() . $uri;
-			} else {
-				$item['uri'] = $this->getDomain() . '/' . $uri;
+			$author = $link->parent()->find('span[itemprop=name]', 0);
+			if($author !== null) {
+				$item['author'] = $author->plaintext;
+				$item['title'] = $this->findTitleOf($link);
+				switch(substr($uri, 0, 1)) {
+					case 'h': // absolute uri
+						$item['uri'] = $uri;
+						break;
+					case '/': // domain relative uri
+						$item['uri'] = $this->getDomain() . $uri;
+						break;
+					default:
+						$item['uri'] = $this->getDomain() . '/' . $uri;
+				}
+				$article = $this->loadFullArticle($item['uri']);
+				if($article) {
+					$item['content'] = $this->replaceUriInHtmlElement($article);
+				} else {
+					$item['content'] = "<strong>Article body couldn't be loaded</strong>. It must be a bug!";
+				}
+				$short_date = $date->datetime;
+				$item['timestamp'] = strtotime($short_date);
+				$this->items[] = $item;
 			}
-
-			$article = $this->loadFullArticle($item['uri']);
-			if($article) {
-				$item['content'] = $this->replaceUriInHtmlElement($article);
-			} else {
-				$item['content'] = "<strong>Article body couldn't be loaded</strong>. It must be a bug!";
-			}
-			$short_date = $date->datetime;
-			$item['timestamp'] = strtotime($short_date);
-			$this->items[] = $item;
 		}
 	}
 
@@ -96,16 +117,7 @@ class GQMagazineBridge extends BridgeAbstract
 	 */
 	private function loadFullArticle($uri){
 		$html = getSimpleHTMLDOMCached($uri);
-		// Once again, that generated css classes madness is an obstacle ... which i can go over easily
-		foreach($html->find('div') as $div) {
-			// List the CSS classes of that div
-			$classes = $div->class;
-			// I can't directly lookup that class since GQ since to generate random names like "ArticleBodySection-fkggUW"
-			if(strpos($classes, 'ArticleBodySection') !== false) {
-				return $div;
-			}
-		}
-		return null;
+		return $html->find('section[data-test-id=ArticleBodyContent]', 0);
 	}
 
 	/**

bridges/GiteaBridge.php

@@ -0,0 +1,27 @@
+<?php
+/**
+ * Gitea is a fork of Gogs which may diverge in the future.
+ * https://docs.gitea.io/en-us/
+ */
+require_once 'GogsBridge.php';
+
+class GiteaBridge extends GogsBridge {
+
+	const NAME = 'Gitea';
+	const URI = 'https://gitea.io';
+	const DESCRIPTION = 'Returns the latest issues, commits or releases';
+	const MAINTAINER = 'logmanoriginal';
+	const CACHE_TIMEOUT = 300; // 5 minutes
+
+	protected function collectReleasesData($html) {
+		$releases = $html->find('#release-list > li')
+			or returnServerError('Unable to find releases');
+
+		foreach($releases as $release) {
+			$this->items[] = array(
+				'uri' => $release->find('a', 0)->href,
+				'title' => 'Release ' . $release->find('h3', 0)->plaintext,
+			);
+		}
+	}
+}

bridges/GithubIssueBridge.php

@@ -66,10 +66,21 @@ class GithubIssueBridge extends BridgeAbstract {
 		return parent::getURI();
 	}
 
-	protected function extractIssueEvent($issueNbr, $title, $comment){
-		$comment = $comment->firstChild();
-		$uri = static::URI . $this->getInput('u') . '/' . $this->getInput('p')
-			. '/issues/' . $issueNbr . '#' . $comment->getAttribute('id');
+	private function buildGitHubIssueCommentUri($issue_number, $comment_id) {
+		// https://github.com/<user>/<project>/issues/<issue-number>#<id>
+		return static::URI
+		. $this->getInput('u')
+		. '/'
+		. $this->getInput('p')
+		. '/issues/'
+		. $issue_number
+		. '#'
+		. $comment_id;
+	}
+
+	private function extractIssueEvent($issueNbr, $title, $comment){
+
+		$uri = $this->buildGitHubIssueCommentUri($issueNbr, $comment->id);
 
 		$author = $comment->find('.author', 0)->plaintext;
 
@@ -94,22 +105,21 @@ class GithubIssueBridge extends BridgeAbstract {
 		return $item;
 	}
 
-	protected function extractIssueComment($issueNbr, $title, $comment){
-		$uri = static::URI . $this->getInput('u') . '/'
-			. $this->getInput('p') . '/issues/' . $issueNbr;
+	private function extractIssueComment($issueNbr, $title, $comment){
+
+		$uri = $this->buildGitHubIssueCommentUri($issueNbr, $comment->parent->id);
 
 		$author = $comment->find('.author', 0)->plaintext;
 
 		$title .= ' / ' . trim(
-			$comment->find('.comment .timeline-comment-header-text', 0)->plaintext
+			$comment->find('.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['uri'] = $uri;
 		$item['title'] = html_entity_decode($title, ENT_QUOTES, 'UTF-8');
 		$item['timestamp'] = strtotime(
 			$comment->find('relative-time', 0)->getAttribute('datetime')
@@ -118,25 +128,32 @@ class GithubIssueBridge extends BridgeAbstract {
 		return $item;
 	}
 
-	protected function extractIssueComments($issue){
+	private function extractIssueComments($issue){
 		$items = array();
 		$title = $issue->find('.gh-header-title', 0)->plaintext;
 		$issueNbr = trim(
 			substr($issue->find('.gh-header-number', 0)->plaintext, 1)
 		);
-		$comments = $issue->find('.js-discussion', 0);
-		foreach($comments->children() as $comment) {
+
+		$comments = $issue->find('
+			[id^="issue-"] > .comment,
+			[id^="issuecomment-"] > .comment,
+			[id^="event-"],
+			[id^="ref-"]
+			');
+		foreach($comments as $comment) {
+
 			if (!$comment->hasChildNodes()) {
 				continue;
 			}
-			$comment = $comment->firstChild();
-			$classes = explode(' ', $comment->getAttribute('class'));
-			if (in_array('timeline-comment-wrapper', $classes)) {
+
+			if (!$comment->hasClass('discussion-item-header')) {
 				$item = $this->extractIssueComment($issueNbr, $title, $comment);
 				$items[] = $item;
 				continue;
 			}
-			while (in_array('discussion-item', $classes)) {
+
+			while ($comment->hasClass('discussion-item-header')) {
 				$item = $this->extractIssueEvent($issueNbr, $title, $comment);
 				$items[] = $item;
 				$comment = $comment->nextSibling();
@@ -145,6 +162,7 @@ class GithubIssueBridge extends BridgeAbstract {
 				}
 				$classes = explode(' ', $comment->getAttribute('class'));
 			}
+
 		}
 		return $items;
 	}
@@ -192,8 +210,13 @@ class GithubIssueBridge extends BridgeAbstract {
 					ENT_QUOTES,
 					'UTF-8'
 				);
-				$comments = trim($issue->find('.col-5', 0)->plaintext);
-				$item['content'] .= "\n" . 'Comments: ' . ($comments ? $comments : '0');
+
+				$comment_count = 0;
+				if($span = $issue->find('a[aria-label*="comment"] span', 0)) {
+					$comment_count = $span->plaintext;
+				}
+
+				$item['content'] .= "\n" . 'Comments: ' . $comment_count;
 				$item['uri'] = self::URI
 					. $issue->find('.js-navigation-open', 0)->getAttribute('href');
 				$this->items[] = $item;
@@ -216,4 +239,43 @@ class GithubIssueBridge extends BridgeAbstract {
 			$item['title'] = preg_replace('/\s+/', ' ', $item['title']);
 		});
 	}
+
+	public function detectParameters($url) {
+
+		if(filter_var($url, FILTER_VALIDATE_URL, FILTER_FLAG_PATH_REQUIRED) === false
+		|| strpos($url, self::URI) !== 0) {
+			return null;
+		}
+
+		$url_components = parse_url($url);
+		$path_segments = array_values(array_filter(explode('/', $url_components['path'])));
+
+		switch(count($path_segments)) {
+			case 2: { // Project issues
+				list($user, $project) = $path_segments;
+				$show_comments = 'off';
+			} break;
+			case 3: { // Project issues with issue comments
+				if($path_segments[2] !== 'issues') {
+					return null;
+				}
+				list($user, $project) = $path_segments;
+				$show_comments = 'on';
+			} break;
+			case 4: { // Issue comments
+				list($user, $project, /* issues */, $issue) = $path_segments;
+			} break;
+			default: {
+				return null;
+			}
+		}
+
+		return array(
+			'u' => $user,
+			'p' => $project,
+			'c' => isset($show_comments) ? $show_comments : null,
+			'i' => isset($issue) ? $issue : null,
+		);
+
+	}
 }

bridges/GlassdoorBridge.php

@@ -141,7 +141,7 @@ class GlassdoorBridge extends BridgeAbstract {
 	}
 
 	private function collectReviewData($html, $limit) {
-		$reviews = $html->find('#EmployerReviews li[id^="empReview]')
+		$reviews = $html->find('#ReviewsFeed li[id^="empReview]')
 			or returnServerError('Unable to find reviews!');
 
 		foreach($reviews as $review) {
@@ -153,7 +153,19 @@ class GlassdoorBridge extends BridgeAbstract {
 			$item['timestamp'] = strtotime($review->find('time', 0)->datetime);
 
 			$mainText = $review->find('p.mainText', 0)->plaintext;
-			$description = $review->find('div.prosConsAdvice', 0)->innertext;
+
+			$description = '';
+			foreach($review->find('div.description p') as $p) {
+
+				if ($p->hasClass('strong')) {
+					$p->tag = 'strong';
+					$p->removeClass('strong');
+				}
+
+				$description .= $p;
+
+			}
+
 			$item['content'] = "<p>{$mainText}</p><p>{$description}</p>";
 
 			$this->items[] = $item;

bridges/GogsBridge.php

@@ -0,0 +1,206 @@
+<?php
+class GogsBridge extends BridgeAbstract {
+
+	const NAME = 'Gogs';
+	const URI = 'https://gogs.io';
+	const DESCRIPTION = 'Returns the latest issues, commits or releases';
+	const MAINTAINER = 'logmanoriginal';
+	const CACHE_TIMEOUT = 300; // 5 minutes
+
+	const PARAMETERS = array(
+		'global' => array(
+			'host' => array(
+				'name' => 'Host',
+				'exampleValue' => 'https://gogs.io',
+				'required' => true,
+				'title' => 'Host name without trailing slash',
+			),
+			'user' => array(
+				'name' => 'Username',
+				'exampleValue' => 'gogs',
+				'required' => true,
+				'title' => 'User name as it appears in the URL',
+			),
+			'project' => array(
+				'name' => 'Project name',
+				'exampleValue' => 'gogs',
+				'required' => true,
+				'title' => 'Project name as it appears in the URL',
+			),
+		),
+		'Commits' => array(
+			'branch' => array(
+				'name' => 'Branch name',
+				'defaultValue' => 'master',
+				'required' => true,
+				'title' => 'Branch name as it appears in the URL',
+			),
+		),
+		'Issues' => array(
+			'include_description' => array(
+				'name' => 'Include issue description',
+				'type' => 'checkbox',
+				'title' => 'Activate to include the issue description',
+			),
+		),
+		'Single issue' => array(
+			'issue' => array(
+				'name' => 'Issue number',
+				'type' => 'number',
+				'exampleValue' => 102,
+				'required' => true,
+				'title' => 'Issue number from the issues list',
+			),
+		),
+		'Releases' => array(),
+	);
+
+	private $title = '';
+
+	/**
+	 * Note: detectParamters doesn't make sense for this bridge because there is
+	 * no "single" host for this service. Anyone can host it.
+	 */
+
+	public function getURI() {
+		switch($this->queriedContext) {
+			case 'Commits': {
+				return $this->getInput('host')
+				. '/' . $this->getInput('user')
+				. '/' . $this->getInput('project')
+				. '/commits/' . $this->getInput('branch');
+			} break;
+			case 'Issues': {
+				return $this->getInput('host')
+				. '/' . $this->getInput('user')
+				. '/' . $this->getInput('project')
+				. '/issues/';
+			} break;
+			case 'Single issue': {
+				return $this->getInput('host')
+				. '/' . $this->getInput('user')
+				. '/' . $this->getInput('project')
+				. '/issues/' . $this->getInput('issue');
+			} break;
+			case 'Releases': {
+				return $this->getInput('host')
+				. '/' . $this->getInput('user')
+				. '/' . $this->getInput('project')
+				. '/releases/';
+			} break;
+			default: return parent::getURI();
+		}
+	}
+
+	public function getName() {
+		switch($this->queriedContext) {
+			case 'Commits':
+			case 'Issues':
+			case 'Releases': return $this->title . ' ' . $this->queriedContext;
+			case 'Single issue': return $this->title . ' Issue ' . $this->getInput('issue');
+			default: return parent::getName();
+		}
+	}
+
+	public function getIcon() {
+		return 'https://gogs.io/img/favicon.ico';
+	}
+
+	public function collectData() {
+
+		$html = getSimpleHTMLDOM($this->getURI())
+			or returnServerError('Could not request ' . $this->getURI());
+
+		$html = defaultLinkTo($html, $this->getURI());
+
+		$this->title = $html->find('[property="og:title"]', 0)->content;
+
+		switch($this->queriedContext) {
+			case 'Commits': {
+				$this->collectCommitsData($html);
+			} break;
+			case 'Issues': {
+				$this->collectIssuesData($html);
+			} break;
+			case 'Single issue': {
+				$this->collectSingleIssueData($html);
+			} break;
+			case 'Releases': {
+				$this->collectReleasesData($html);
+			} break;
+		}
+
+	}
+
+	protected function collectCommitsData($html) {
+		$commits = $html->find('#commits-table tbody tr')
+			or returnServerError('Unable to find commits');
+
+		foreach($commits as $commit) {
+			$this->items[] = array(
+				'uri' => $commit->find('a.sha', 0)->href,
+				'title' => $commit->find('.message span', 0)->plaintext,
+				'author' => $commit->find('.author', 0)->plaintext,
+				'timestamp' => $commit->find('.time-since', 0)->title,
+				'uid' => $commit->find('.sha', 0)->plaintext,
+			);
+		}
+	}
+
+	protected function collectIssuesData($html) {
+		$issues = $html->find('.issue.list li')
+			or returnServerError('Unable to find issues');
+
+		foreach($issues as $issue) {
+			$uri = $issue->find('a', 0)->href;
+
+			$item = array(
+				'uri' => $uri,
+				'title' => $issue->find('.label', 0)->plaintext . ' | ' . $issue->find('a.title', 0)->plaintext,
+				'author' => $issue->find('.desc a', 0)->plaintext,
+				'timestamp' => $issue->find('.time-since', 0)->title,
+				'uid' => $issue->find('.label', 0)->plaintext,
+			);
+
+			if($this->getInput('include_description')) {
+				$issue_html = getSimpleHTMLDOMCached($uri, 3600)
+					or returnServerError('Unable to load issue description');
+
+				$issue_html = defaultLinkTo($issue_html, $uri);
+
+				$item['content'] = $issue_html->find('.comment .markdown', 0);
+			}
+
+			$this->items[] = $item;
+		}
+	}
+
+	protected function collectSingleIssueData($html) {
+		$comments = $html->find('.comments .comment')
+			or returnServerError('Unable to find comments');
+
+		foreach($comments as $comment) {
+			$this->items[] = array(
+				'uri' => $comment->find('a[href*="#issue"]', 0)->href,
+				'title' => $comment->find('span', 0)->plaintext,
+				'author' => $comment->find('.content a', 0)->plaintext,
+				'timestamp' => $comment->find('.time-since', 0)->title,
+				'content' => $comment->find('.markdown', 0),
+			);
+		}
+
+		$this->items = array_reverse($this->items);
+	}
+
+	protected function collectReleasesData($html) {
+		$releases = $html->find('#release-list li')
+			or returnServerError('Unable to find releases');
+
+		foreach($releases as $release) {
+			$this->items[] = array(
+				'uri' => $release->find('a', 0)->href,
+				'title' => 'Release ' . $release->find('h4', 0)->plaintext,
+			);
+		}
+	}
+}

bridges/HaveIBeenPwnedBridge.php

@@ -13,6 +13,11 @@ class HaveIBeenPwnedBridge extends BridgeAbstract {
 				'Date added to HIBP' => 'dateAdded',
 			),
 			'defaultValue' => 'dateAdded',
+		),
+		'item_limit' => array(
+			'name' => 'Limit number of returned items',
+			'type' => 'number',
+			'defaultValue' => 20,
 		)
 	));
 
@@ -52,13 +57,15 @@ class HaveIBeenPwnedBridge extends BridgeAbstract {
 			// Remove permalink
 			$breach->find('p', 1)->find('a', 0)->outertext = '';
 
-			$item['title'] = $breach->find('h3', 0)->plaintext . ' - ' . $accounts[1] . ' breached accounts';
+			$item['title'] = html_entity_decode($breach->find('h3', 0)->plaintext, ENT_QUOTES)
+				. ' - ' . $accounts[1] . ' breached accounts';
 			$item['dateAdded'] = strtotime($dateAdded[1]);
 			$item['breachDate'] = strtotime($breachDate[1]);
 			$item['uri'] = self::URI . '/PwnedWebsites' . $permalink;
 
-			$item['content'] = '<p>' . $breach->find('p', 0)->innertext . '<p>';
-			$item['content'] .= '<p>' . $breach->find('p', 1)->innertext . '<p>';
+			$item['content'] = '<p>' . $breach->find('p', 0)->innertext . '</p>';
+			$item['content'] .= '<p>' . $this->breachType($breach) . '</p>';
+			$item['content'] .= '<p>' . $breach->find('p', 1)->innertext . '</p>';
 
 			$this->breaches[] = $item;
 		}
@@ -67,6 +74,25 @@ class HaveIBeenPwnedBridge extends BridgeAbstract {
 		$this->createItems();
 	}
 
+	/**
+	 * Extract data breach type(s)
+	 */
+	private function breachType($breach) {
+
+		$content = '';
+
+		if ($breach->find('h3 > i', 0)) {
+
+			foreach ($breach->find('h3 > i') as $i) {
+				$content .= $i->title . '.<br>';
+			}
+
+		}
+
+		return $content;
+
+	}
+
 	/**
 	 * Order Breaches by date added or date breached
 	 */
@@ -88,6 +114,12 @@ class HaveIBeenPwnedBridge extends BridgeAbstract {
 	 */
 	private function createItems() {
 
+		$limit = $this->getInput('item_limit');
+
+		if ($limit < 1) {
+			$limit = 20;
+		}
+
 		foreach ($this->breaches as $breach) {
 			$item = array();
 
@@ -97,6 +129,10 @@ class HaveIBeenPwnedBridge extends BridgeAbstract {
 			$item['content'] = $breach['content'];
 
 			$this->items[] = $item;
+
+			if (count($this->items) >= $limit) {
+				break;
+			}
 		}
 	}
 }

bridges/HentaiHavenBridge.php

@@ -3,7 +3,7 @@ class HentaiHavenBridge extends BridgeAbstract {
 
 	const MAINTAINER = 'albirew';
 	const NAME = 'Hentai Haven';
-	const URI = 'http://hentaihaven.org/';
+	const URI = 'https://hentaihaven.org/';
 	const CACHE_TIMEOUT = 21600; // 6h
 	const DESCRIPTION = 'Returns releases from Hentai Haven';
 

bridges/IGNBridge.php

@@ -0,0 +1,55 @@
+<?php
+class IGNBridge extends FeedExpander {
+
+	const MAINTAINER = 'IceWreck';
+	const NAME = 'IGN Bridge';
+	const URI = 'https://www.ign.com/';
+	const CACHE_TIMEOUT = 3600;
+	const DESCRIPTION = 'RSS Feed For IGN';
+
+	public function collectData(){
+		$this->collectExpandableDatas('http://feeds.ign.com/ign/all', 15);
+	}
+
+	// IGNs feed is both hidden and incomplete. This bridge tries to fix this.
+
+	protected function parseItem($newsItem){
+		$item = parent::parseItem($newsItem);
+
+		// $articlePage gets the entire page's contents
+		$articlePage = getSimpleHTMLDOM($newsItem->link);
+
+		/*
+		* NOTE: Though articles and wiki/howtos have seperate styles of pages, there is no mechanism
+		* for handling them seperately as it just ignores the DOM querys which it does not find.
+		* (and their scraping)
+		*/
+
+		// For Articles
+		$article = $articlePage->find('section.article-page', 0);
+		// add in verdicts in articles, reviews etc
+		foreach($articlePage->find('div.article-section') as $element) {
+			$article = $article . $element;
+		}
+
+		// For Wikis and HowTos
+		$uselessWikiElements = array(
+			'.wiki-page-tools',
+			'.feedback-container',
+			'.paging-container'
+		);
+		foreach($articlePage->find('.wiki-page') as $wikiContents) {
+			$copy = clone $wikiContents;
+			// Remove useless elements present in IGN wiki/howtos
+			foreach($uselessWikiElements as $uslElement) {
+				$toRemove = $wikiContents->find($uslElement, 0);
+				$copy = str_replace($toRemove, '', $copy);
+			}
+			$article = $article . $copy;
+		}
+
+		// Add content to feed
+		$item['content'] = $article;
+		return $item;
+	}
+}

bridges/IndeedBridge.php

@@ -0,0 +1,245 @@
+<?php
+class IndeedBridge extends BridgeAbstract {
+
+	const NAME = 'Indeed';
+	const URI = 'https://www.indeed.com/';
+	const DESCRIPTION = 'Returns reviews and comments for a company of your choice';
+	const MAINTAINER = 'logmanoriginal';
+	const CACHE_TIMEOUT = 14400; // 4 hours
+
+	const PARAMETERS = array(
+		array(
+			'c' => array(
+				'name' => 'Company',
+				'type' => 'text',
+				'required' => true,
+				'title' => 'Company name',
+				'exampleValue' => 'GitHub',
+			)
+		),
+		'global' => array(
+			'language' => array(
+				'name' => 'Language Code',
+				'type' => 'list',
+				'title' => 'Choose your language code',
+				'defaultValue' => 'en-US',
+				'values' => array(
+					'es-AR' => 'es-AR',
+					'de-AT' => 'de-AT',
+					'en-AU' => 'en-AU',
+					'nl-BE' => 'nl-BE',
+					'fr-BE' => 'fr-BE',
+					'pt-BR' => 'pt-BR',
+					'en-CA' => 'en-CA',
+					'fr-CA' => 'fr-CA',
+					'de-CH' => 'de-CH',
+					'fr-CH' => 'fr-CH',
+					'es-CL' => 'es-CL',
+					'zh-CN' => 'zh-CN',
+					'es-CO' => 'es-CO',
+					'de-DE' => 'de-DE',
+					'es-ES' => 'es-ES',
+					'fr-FR' => 'fr-FR',
+					'en-GB' => 'en-GB',
+					'en-HK' => 'en-HK',
+					'en-IE' => 'en-IE',
+					'en-IN' => 'en-IN',
+					'it-IT' => 'it-IT',
+					'ja-JP' => 'ja-JP',
+					'ko-KR' => 'ko-KR',
+					'es-MX' => 'es-MX',
+					'nl-NL' => 'nl-NL',
+					'pl-PL' => 'pl-PL',
+					'en-SG' => 'en-SG',
+					'en-US' => 'en-US',
+					'en-ZA' => 'en-ZA',
+					'en-AE' => 'en-AE',
+					'da-DK' => 'da-DK',
+					'in-ID' => 'in-ID',
+					'en-MY' => 'en-MY',
+					'es-PE' => 'es-PE',
+					'en-PH' => 'en-PH',
+					'en-PK' => 'en-PK',
+					'ro-RO' => 'ro-RO',
+					'ru-RU' => 'ru-RU',
+					'tr-TR' => 'tr-TR',
+					'zh-TW' => 'zh-TW',
+					'vi-VN' => 'vi-VN',
+					'en-VN' => 'en-VN',
+					'ar-EG' => 'ar-EG',
+					'fr-MA' => 'fr-MA',
+					'en-NG' => 'en-NG',
+				)
+			),
+			'limit' => array(
+				'name' => 'Limit',
+				'type' => 'number',
+				'title' => 'Maximum number of items to return',
+				'exampleValue' => 20,
+			)
+		)
+	);
+
+	const SITES = array(
+		'es-AR' => 'https://ar.indeed.com/',
+		'de-AT' => 'https://at.indeed.com/',
+		'en-AU' => 'https://au.indeed.com/',
+		'nl-BE' => 'https://be.indeed.com/',
+		'fr-BE' => 'https://emplois.be.indeed.com/',
+		'pt-BR' => 'https://www.indeed.com.br/',
+		'en-CA' => 'https://ca.indeed.com/',
+		'fr-CA' => 'https://emplois.ca.indeed.com/',
+		'de-CH' => 'https://www.indeed.ch/',
+		'fr-CH' => 'https://emplois.indeed.ch/',
+		'es-CL' => 'https://www.indeed.cl/',
+		'zh-CN' => 'https://cn.indeed.com/',
+		'es-CO' => 'https://co.indeed.com/',
+		'de-DE' => 'https://de.indeed.com/',
+		'es-ES' => 'https://www.indeed.es/',
+		'fr-FR' => 'https://www.indeed.fr/',
+		'en-GB' => 'https://www.indeed.co.uk/',
+		'en-HK' => 'https://www.indeed.hk/',
+		'en-IE' => 'https://ie.indeed.com/',
+		'en-IN' => 'https://www.indeed.co.in/',
+		'it-IT' => 'https://it.indeed.com/',
+		'ja-JP' => 'https://jp.indeed.com/',
+		'ko-KR' => 'https://kr.indeed.com/',
+		'es-MX' => 'https://www.indeed.com.mx/',
+		'nl-NL' => 'https://www.indeed.nl/',
+		'pl-PL' => 'https://pl.indeed.com/',
+		'en-SG' => 'https://www.indeed.com.sg/',
+		'en-US' => 'https://www.indeed.com/',
+		'en-ZA' => 'https://www.indeed.co.za/',
+		'en-AE' => 'https://www.indeed.ae/',
+		'da-DK' => 'https://dk.indeed.com/',
+		'in-ID' => 'https://id.indeed.com/',
+		'en-MY' => 'https://www.indeed.com.my/',
+		'es-PE' => 'https://www.indeed.com.pe/',
+		'en-PH' => 'https://www.indeed.com.ph/',
+		'en-PK' => 'https://www.indeed.com.pk/',
+		'ro-RO' => 'https://ro.indeed.com/',
+		'ru-RU' => 'https://ru.indeed.com/',
+		'tr-TR' => 'https://tr.indeed.com/',
+		'zh-TW' => 'https://tw.indeed.com/',
+		'vi-VN' => 'https://vn.indeed.com/',
+		'en-VN' => 'https://jobs.vn.indeed.com/',
+		'ar-EG' => 'https://eg.indeed.com/',
+		'fr-MA' => 'https://ma.indeed.com/',
+		'en-NG' => 'https://ng.indeed.com/',
+	);
+
+	private $title;
+
+	public function collectData() {
+
+		$url = $this->getURI();
+		$limit = $this->getInput('limit') ?: 20;
+
+		do {
+
+			$html = getSimpleHTMLDOM($url)
+				or returnServerError('Could not request ' . $url);
+
+			$html = defaultLinkTo($html, $url);
+
+			$this->title = $html->find('h1', 0)->innertext;
+
+			// Use local translation of the word "Rating"
+			$rating_local = $html->find('a[data-id="rating_desc"]', 0)->plaintext;
+
+			foreach($html->find('#cmp-content [id^="cmp-review-"]') as $review) {
+				$item = array();
+
+				$rating = $review->find('.cmp-ratingNumber', 0)->plaintext;
+				$title = $review->find('.cmp-review-title > span', 0)->plaintext;
+				$comment = $this->beautifyComment($review->find('.cmp-review-content-container', 0));
+
+				$item['uri'] = $review->find('.cmp-review-share-popup-item-link--copylink', 0)->href;
+				$item['title'] = "{$rating_local} {$rating} / {$title}";
+				$item['timestamp'] = $review->find('.cmp-review-date-created', 0)->plaintext;
+				$item['author'] = $review->find('.cmp-reviewer', 0)->plaintext;
+				$item['content'] = $comment;
+				//$item['enclosures']
+				$item['categories'][] = $review->find('.cmp-reviewer-job-location', 0)->plaintext;
+				//$item['uid']
+
+				$this->items[] = $item;
+
+				if(count($this->items) >= $limit) {
+					break;
+				}
+			}
+
+			// Break if no more pages available.
+			if($next = $html->find('a[data-tn-element="next-page"]', 0)) {
+				$url = $next->href;
+			} else {
+				break;
+			}
+
+		} while(count($this->items) < $limit);
+
+	}
+
+	public function getURI() {
+		if($this->getInput('language')
+		&& $this->getInput('c')) {
+			return self::SITES[$this->getInput('language')]
+			. 'cmp/'
+			. urlencode($this->getInput('c'))
+			. '/reviews';
+		}
+
+		return parent::getURI();
+	}
+
+	public function getName() {
+		return $this->title ?: parent::getName();
+	}
+
+	public function detectParameters($url) {
+		/**
+		 * Expected: https://<...>.indeed.<...>/cmp/<company>[/reviews][/...]
+		 *
+		 * Note that most users will be redirected to their localized version
+		 * of the page, which adds the language code to the host. For example,
+		 * "en.indeed.com" or "www.indeed.fr" (see link[rel="alternate"]). At
+		 * least each of the sites have ".indeed." in the name.
+		 */
+
+		if(filter_var($url, FILTER_VALIDATE_URL, FILTER_FLAG_PATH_REQUIRED) === false
+		|| stristr($url, '.indeed.') === false) {
+			return null;
+		}
+
+		$url_components = parse_url($url);
+		$path_segments = array_values(array_filter(explode('/', $url_components['path'])));
+
+		if(count($path_segments) < 2 || $path_segments[0] !== 'cmp') {
+			return null;
+		}
+
+		$language = array_search('https://' . $url_components['host'] . '/', self::SITES);
+		if($language === false) {
+			return null;
+		}
+
+		$limit = self::PARAMETERS['global']['limit']['defaultValue'] ?: 20;
+		$company = $path_segments[1];
+
+		return array(
+			'c' => $company,
+			'language' => $language,
+			'limit' => $limit,
+		);
+	}
+
+	private function beautifyComment($comment) {
+		foreach($comment->find('.cmp-bold') as $bold) {
+			$bold->tag = 'strong';
+			$bold->removeClass('cmp-bold');
+		}
+
+		return $comment;
+	}
+}

bridges/InstagramBridge.php

@@ -42,6 +42,38 @@ class InstagramBridge extends BridgeAbstract {
 
 	);
 
+	const USER_QUERY_HASH = '58b6785bea111c67129decbe6a448951';
+	const TAG_QUERY_HASH = '174a5243287c5f3a7de741089750ab3b';
+	const STORY_QUERY_HASH = '865589822932d1b43dfe312121dd353a';
+
+	protected function getInstagramUserId($username) {
+
+		if(is_numeric($username)) return $username;
+
+		$cacheFac = new CacheFactory();
+		$cacheFac->setWorkingDir(PATH_LIB_CACHES);
+		$cache = $cacheFac->create(Configuration::getConfig('cache', 'type'));
+		$cache->setScope(get_called_class());
+		$cache->setKey([$username]);
+		$key = $cache->loadData();
+
+		if($key == null) {
+				$data = getContents(self::URI . 'web/search/topsearch/?query=' . $username);
+
+				foreach(json_decode($data)->users as $user) {
+					if($user->user->username === $username) {
+						$key = $user->user->pk;
+					}
+				}
+				if($key == null) {
+					returnServerError('Unable to find username in search result.');
+				}
+				$cache->saveData($key);
+		}
+		return $key;
+
+	}
+
 	public function collectData(){
 
 		if(is_null($this->getInput('u')) && $this->getInput('media_type') == 'story') {
@@ -51,9 +83,9 @@ class InstagramBridge extends BridgeAbstract {
 		$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;
+			$userMedia = $data->data->user->edge_owner_to_timeline_media->edges;
 		} elseif(!is_null($this->getInput('h'))) {
-			$userMedia = $data->entry_data->TagPage[0]->graphql->hashtag->edge_hashtag_to_media->edges;
+			$userMedia = $data->data->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;
 		}
@@ -99,6 +131,7 @@ class InstagramBridge extends BridgeAbstract {
 			}
 
 			if(!is_null($this->getInput('u')) && $media->__typename == 'GraphSidecar') {
+
 				$data = $this->getInstagramStory($item['uri']);
 				$item['content'] = $data[0];
 				$item['enclosures'] = $data[1];
@@ -118,8 +151,15 @@ class InstagramBridge extends BridgeAbstract {
 
 	protected function getInstagramStory($uri) {
 
-		$data = $this->getInstagramJSON($uri);
-		$mediaInfo = $data->entry_data->PostPage[0]->graphql->shortcode_media;
+		$shortcode = explode('/', $uri)[4];
+		$data = getContents(self::URI .
+					'graphql/query/?query_hash=' .
+					 self::STORY_QUERY_HASH .
+					 '&variables={"shortcode"%3A"' .
+					$shortcode .
+					'"}');
+
+		$mediaInfo = json_decode($data)->data->shortcode_media;
 
 		//Process the first element, that isn't in the node graph
 		if (count($mediaInfo->edge_media_to_caption->edges) > 0) {
@@ -145,13 +185,38 @@ class InstagramBridge extends BridgeAbstract {
 
 	protected function getInstagramJSON($uri) {
 
-		$html = getContents($uri)
-			or returnServerError('Could not request Instagram.');
-		$scriptRegex = '/window\._sharedData = (.*);<\/script>/';
+		if(!is_null($this->getInput('u'))) {
 
-		preg_match($scriptRegex, $html, $matches, PREG_OFFSET_CAPTURE, 0);
+			$userId = $this->getInstagramUserId($this->getInput('u'));
 
-		return json_decode($matches[1][0]);
+			$data = getContents(self::URI .
+								'graphql/query/?query_hash=' .
+								 self::USER_QUERY_HASH .
+								 '&variables={"id"%3A"' .
+								$userId .
+								'"%2C"first"%3A10}');
+			return json_decode($data);
+
+		} elseif(!is_null($this->getInput('h'))) {
+			$data = getContents(self::URI .
+					'graphql/query/?query_hash=' .
+					 self::TAG_QUERY_HASH .
+					 '&variables={"tag_name"%3A"' .
+					$this->getInput('h') .
+					'"%2C"first"%3A10}');
+			return json_decode($data);
+
+		} else {
+
+			$html = getContents($uri)
+				or returnServerError('Could not request Instagram.');
+			$scriptRegex = '/window\._sharedData = (.*);<\/script>/';
+
+			preg_match($scriptRegex, $html, $matches, PREG_OFFSET_CAPTURE, 0);
+
+			return json_decode($matches[1][0]);
+
+		}
 
 	}
 

bridges/InstructablesBridge.php

@@ -1,8 +1,7 @@
 <?php
 /**
 * This class implements a bridge for http://www.instructables.com, supporting
-* general feeds and feeds by category. Instructables doesn't support HTTPS as
-* of now (23.06.2018), so all connections are insecure!
+* general feeds and feeds by category.
 *
 * Remarks:
 * - For some reason it is very important to have the category URI end with a
@@ -13,7 +12,7 @@
 */
 class InstructablesBridge extends BridgeAbstract {
 	const NAME = 'Instructables Bridge';
-	const URI = 'http://www.instructables.com';
+	const URI = 'https://www.instructables.com';
 	const DESCRIPTION = 'Returns general feeds and feeds by category';
 	const MAINTAINER = 'logmanoriginal';
 	const PARAMETERS = array(
@@ -22,219 +21,201 @@ class InstructablesBridge extends BridgeAbstract {
 				'name' => 'Category',
 				'type' => 'list',
 				'values' => array(
-					'Play' => array(
-						'All' => '/play/',
-						'KNEX' => '/play/knex/',
-						'Offbeat' => '/play/offbeat/',
-						'Lego' => '/play/lego/',
-						'Airsoft' => '/play/airsoft/',
-						'Card Games' => '/play/card-games/',
-						'Guitars' => '/play/guitars/',
-						'Instruments' => '/play/instruments/',
-						'Magic Tricks' => '/play/magic-tricks/',
-						'Minecraft' => '/play/minecraft/',
-						'Music' => '/play/music/',
-						'Nerf' => '/play/nerf/',
-						'Nintendo' => '/play/nintendo/',
-						'Office Supplies' => '/play/office-supplies/',
-						'Paintball' => '/play/paintball/',
-						'Paper Airplanes' => '/play/paper-airplanes/',
-						'Party Tricks' => '/play/party-tricks/',
-						'PlayStation' => '/play/playstation/',
-						'Pranks and Humor' => '/play/pranks-and-humor/',
-						'Puzzles' => '/play/puzzles/',
-						'Siege Engines' => '/play/siege-engines/',
-						'Sports' => '/play/sports/',
-						'Table Top' => '/play/table-top/',
-						'Toys' => '/play/toys/',
-						'Video Games' => '/play/video-games/',
-						'Wii' => '/play/wii/',
-						'Xbox' => '/play/xbox/',
-						'Yo-Yo' => '/play/yo-yo/',
-					),
-					'Craft' => array(
-						'All' => '/craft/',
-						'Art' => '/craft/art/',
-						'Sewing' => '/craft/sewing/',
-						'Paper' => '/craft/paper/',
-						'Jewelry' => '/craft/jewelry/',
-						'Fashion' => '/craft/fashion/',
-						'Books & Journals' => '/craft/books-and-journals/',
-						'Cards' => '/craft/cards/',
-						'Clay' => '/craft/clay/',
-						'Duct Tape' => '/craft/duct-tape/',
-						'Embroidery' => '/craft/embroidery/',
-						'Felt' => '/craft/felt/',
-						'Fiber Arts' => '/craft/fiber-arts/',
-						'Gifts & Wrapping' => '/craft/gifts-and-wrapping/',
-						'Knitting & Crocheting' => '/craft/knitting-and-crocheting/',
-						'Leather' => '/craft/leather/',
-						'Mason Jars' => '/craft/mason-jars/',
-						'No-Sew' => '/craft/no-sew/',
-						'Parties & Weddings' => '/craft/parties-and-weddings/',
-						'Print Making' => '/craft/print-making/',
-						'Soap' => '/craft/soap/',
-						'Wallets' => '/craft/wallets/',
-					),
-					'Technology' => array(
-						'All' => '/technology/',
-						'Electronics' => '/technology/electronics/',
-						'Arduino' => '/technology/arduino/',
-						'Photography' => '/technology/photography/',
-						'Leds' => '/technology/leds/',
-						'Science' => '/technology/science/',
-						'Reuse' => '/technology/reuse/',
-						'Apple' => '/technology/apple/',
-						'Computers' => '/technology/computers/',
-						'3D Printing' => '/technology/3D-Printing/',
-						'Robots' => '/technology/robots/',
-						'Art' => '/technology/art/',
-						'Assistive Tech' => '/technology/assistive-technology/',
-						'Audio' => '/technology/audio/',
-						'Clocks' => '/technology/clocks/',
-						'CNC' => '/technology/cnc/',
-						'Digital Graphics' => '/technology/digital-graphics/',
-						'Gadgets' => '/technology/gadgets/',
-						'Kits' => '/technology/kits/',
-						'Laptops' => '/technology/laptops/',
-						'Lasers' => '/technology/lasers/',
-						'Linux' => '/technology/linux/',
-						'Microcontrollers' => '/technology/microcontrollers/',
-						'Microsoft' => '/technology/microsoft/',
-						'Mobile' => '/technology/mobile/',
-						'Raspberry Pi' => '/technology/raspberry-pi/',
-						'Remote Control' => '/technology/remote-control/',
-						'Sensors' => '/technology/sensors/',
-						'Software' => '/technology/software/',
-						'Soldering' => '/technology/soldering/',
-						'Speakers' => '/technology/speakers/',
-						'Steampunk' => '/technology/steampunk/',
-						'Tools' => '/technology/tools/',
-						'USB' => '/technology/usb/',
-						'Wearables' => '/technology/wearables/',
-						'Websites' => '/technology/websites/',
-						'Wireless' => '/technology/wireless/',
+					'Circuits' => array(
+						'All' => '/circuits/',
+						'Apple' => '/circuits/apple/projects/',
+						'Arduino' => '/circuits/arduino/projects/',
+						'Art' => '/circuits/art/projects/',
+						'Assistive Tech' => '/circuits/assistive-tech/projects/',
+						'Audio' => '/circuits/audio/projects/',
+						'Cameras' => '/circuits/cameras/projects/',
+						'Clocks' => '/circuits/clocks/projects/',
+						'Computers' => '/circuits/computers/projects/',
+						'Electronics' => '/circuits/electronics/projects/',
+						'Gadgets' => '/circuits/gadgets/projects/',
+						'Lasers' => '/circuits/lasers/projects/',
+						'LEDs' => '/circuits/leds/projects/',
+						'Linux' => '/circuits/linux/projects/',
+						'Microcontrollers' => '/circuits/microcontrollers/projects/',
+						'Microsoft' => '/circuits/microsoft/projects/',
+						'Mobile' => '/circuits/mobile/projects/',
+						'Raspberry Pi' => '/circuits/raspberry-pi/projects/',
+						'Remote Control' => '/circuits/remote-control/projects/',
+						'Reuse' => '/circuits/reuse/projects/',
+						'Robots' => '/circuits/robots/projects/',
+						'Sensors' => '/circuits/sensors/projects/',
+						'Software' => '/circuits/software/projects/',
+						'Soldering' => '/circuits/soldering/projects/',
+						'Speakers' => '/circuits/speakers/projects/',
+						'Tools' => '/circuits/tools/projects/',
+						'USB' => '/circuits/usb/projects/',
+						'Wearables' => '/circuits/wearables/projects/',
+						'Websites' => '/circuits/websites/projects/',
+						'Wireless' => '/circuits/wireless/projects/',
 					),
 					'Workshop' => array(
 						'All' => '/workshop/',
-						'Woodworking' => '/workshop/woodworking/',
-						'Tools' => '/workshop/tools/',
-						'Gardening' => '/workshop/gardening/',
-						'Cars' => '/workshop/cars/',
-						'Metalworking' => '/workshop/metalworking/',
-						'Cardboard' => '/workshop/cardboard/',
-						'Electric Vehicles' => '/workshop/electric-vehicles/',
-						'Energy' => '/workshop/energy/',
-						'Furniture' => '/workshop/furniture/',
-						'Home Improvement' => '/workshop/home-improvement/',
-						'Home Theater' => '/workshop/home-theater/',
-						'Hydroponics' => '/workshop/hydroponics/',
-						'Laser Cutting' => '/workshop/laser-cutting/',
-						'Lighting' => '/workshop/lighting/',
-						'Molds & Casting' => '/workshop/molds-and-casting/',
-						'Motorcycles' => '/workshop/motorcycles/',
-						'Organizing' => '/workshop/organizing/',
-						'Pallets' => '/workshop/pallets/',
-						'Repair' => '/workshop/repair/',
-						'Shelves' => '/workshop/shelves/',
-						'Solar' => '/workshop/solar/',
-						'Workbenches' => '/workshop/workbenches/',
+						'3D Printing' => '/workshop/3d-printing/projects/',
+						'Cars' => '/workshop/cars/projects/',
+						'CNC' => '/workshop/cnc/projects/',
+						'Electric Vehicles' => '/workshop/electric-vehicles/projects/',
+						'Energy' => '/workshop/energy/projects/',
+						'Furniture' => '/workshop/furniture/projects/',
+						'Home Improvement' => '/workshop/home-improvement/projects/',
+						'Home Theater' => '/workshop/home-theater/projects/',
+						'Hydroponics' => '/workshop/hydroponics/projects/',
+						'Knives' => '/workshop/knives/projects/',
+						'Laser Cutting' => '/workshop/laser-cutting/projects/',
+						'Lighting' => '/workshop/lighting/projects/',
+						'Metalworking' => '/workshop/metalworking/projects/',
+						'Molds & Casting' => '/workshop/molds-and-casting/projects/',
+						'Motorcycles' => '/workshop/motorcycles/projects/',
+						'Organizing' => '/workshop/organizing/projects/',
+						'Pallets' => '/workshop/pallets/projects/',
+						'Repair' => '/workshop/repair/projects/',
+						'Science' => '/workshop/science/projects/',
+						'Shelves' => '/workshop/shelves/projects/',
+						'Solar' => '/workshop/solar/projects/',
+						'Tools' => '/workshop/tools/projects/',
+						'Woodworking' => '/workshop/woodworking/projects/',
+						'Workbenches' => '/workshop/workbenches/projects/',
 					),
-					'Home' => array(
-						'All' => '/home/',
-						'Halloween' => '/home/halloween/',
-						'Decorating' => '/home/decorating/',
-						'Organizing' => '/home/organizing/',
-						'Pets' => '/home/pets/',
-						'Life Hacks' => '/home/life-hacks/',
-						'Beauty' => '/home/beauty/',
-						'Christmas' => '/home/christmas/',
-						'Cleaning' => '/home/cleaning/',
-						'Education' => '/home/education/',
-						'Finances' => '/home/finances/',
-						'Gardening' => '/home/gardening/',
-						'Green' => '/home/green/',
-						'Health' => '/home/health/',
-						'Hiding Places' => '/home/hiding-places/',
-						'Holidays' => '/home/holidays/',
-						'Homesteading' => '/home/homesteading/',
-						'Kids' => '/home/kids/',
-						'Kitchen' => '/home/kitchen/',
-						'Life Skills' => '/home/life-skills/',
-						'Parenting' => '/home/parenting/',
-						'Pest Control' => '/home/pest-control/',
-						'Relationships' => '/home/relationships/',
-						'Reuse' => '/home/reuse/',
-						'Travel' => '/home/travel/',
+					'Craft' => array(
+						'All' => '/craft/',
+						'Art' => '/craft/art/projects/',
+						'Books & Journals' => '/craft/books-and-journals/projects/',
+						'Cardboard' => '/craft/cardboard/projects/',
+						'Cards' => '/craft/cards/projects/',
+						'Clay' => '/craft/clay/projects/',
+						'Costumes & Cosplay' => '/craft/costumes-and-cosplay/projects/',
+						'Digital Graphics' => '/craft/digital-graphics/projects/',
+						'Duct Tape' => '/craft/duct-tape/projects/',
+						'Embroidery' => '/craft/embroidery/projects/',
+						'Fashion' => '/craft/fashion/projects/',
+						'Felt' => '/craft/felt/projects/',
+						'Fiber Arts' => '/craft/fiber-arts/projects/',
+						'Gift Wrapping' => '/craft/gift-wrapping/projects/',
+						'Jewelry' => '/craft/jewelry/projects/',
+						'Knitting & Crochet' => '/craft/knitting-and-crochet/projects/',
+						'Leather' => '/craft/leather/projects/',
+						'Mason Jars' => '/craft/mason-jars/projects/',
+						'No-Sew' => '/craft/no-sew/projects/',
+						'Paper' => '/craft/paper/projects/',
+						'Parties & Weddings' => '/craft/parties-and-weddings/projects/',
+						'Photography' => '/craft/photography/projects/',
+						'Printmaking' => '/craft/printmaking/projects/',
+						'Reuse' => '/craft/reuse/projects/',
+						'Sewing' => '/craft/sewing/projects/',
+						'Soapmaking' => '/craft/soapmaking/projects/',
+						'Wallets' => '/craft/wallets/projects/',
+					),
+					'Cooking' => array(
+						'All' => '/cooking/',
+						'Bacon' => '/cooking/bacon/projects/',
+						'BBQ & Grilling' => '/cooking/bbq-and-grilling/projects/',
+						'Beverages' => '/cooking/beverages/projects/',
+						'Bread' => '/cooking/bread/projects/',
+						'Breakfast' => '/cooking/breakfast/projects/',
+						'Cake' => '/cooking/cake/projects/',
+						'Candy' => '/cooking/candy/projects/',
+						'Canning & Preserving' => '/cooking/canning-and-preserving/projects/',
+						'Cocktails & Mocktails' => '/cooking/cocktails-and-mocktails/projects/',
+						'Coffee' => '/cooking/coffee/projects/',
+						'Cookies' => '/cooking/cookies/projects/',
+						'Cupcakes' => '/cooking/cupcakes/projects/',
+						'Dessert' => '/cooking/dessert/projects/',
+						'Homebrew' => '/cooking/homebrew/projects/',
+						'Main Course' => '/cooking/main-course/projects/',
+						'Pasta' => '/cooking/pasta/projects/',
+						'Pie' => '/cooking/pie/projects/',
+						'Pizza' => '/cooking/pizza/projects/',
+						'Salad' => '/cooking/salad/projects/',
+						'Sandwiches' => '/cooking/sandwiches/projects/',
+						'Snacks & Appetizers' => '/cooking/snacks-and-appetizers/projects/',
+						'Soups & Stews' => '/cooking/soups-and-stews/projects/',
+						'Vegetarian & Vegan' => '/cooking/vegetarian-and-vegan/projects/',
+					),
+					'Living' => array(
+						'All' => '/living/',
+						'Beauty' => '/living/beauty/projects/',
+						'Christmas' => '/living/christmas/projects/',
+						'Cleaning' => '/living/cleaning/projects/',
+						'Decorating' => '/living/decorating/projects/',
+						'Education' => '/living/education/projects/',
+						'Gardening' => '/living/gardening/projects/',
+						'Halloween' => '/living/halloween/projects/',
+						'Health' => '/living/health/projects/',
+						'Hiding Places' => '/living/hiding-places/projects/',
+						'Holidays' => '/living/holidays/projects/',
+						'Homesteading' => '/living/homesteading/projects/',
+						'Kids' => '/living/kids/projects/',
+						'Kitchen' => '/living/kitchen/projects/',
+						'LEGO & KNEX' => '/living/lego-and-knex/projects/',
+						'Life Hacks' => '/living/life-hacks/projects/',
+						'Music' => '/living/music/projects/',
+						'Office Supply Hacks' => '/living/office-supply-hacks/projects/',
+						'Organizing' => '/living/organizing/projects/',
+						'Pest Control' => '/living/pest-control/projects/',
+						'Pets' => '/living/pets/projects/',
+						'Pranks, Tricks, & Humor' => '/living/pranks-tricks-and-humor/projects/',
+						'Relationships' => '/living/relationships/projects/',
+						'Toys & Games' => '/living/toys-and-games/projects/',
+						'Travel' => '/living/travel/projects/',
+						'Video Games' => '/living/video-games/projects/',
 					),
 					'Outside' => array(
 						'All' => '/outside/',
-						'Bikes' => '/outside/bikes/',
-						'Survival' => '/outside/survival/',
-						'Backyard' => '/outside/backyard/',
-						'Beach' => '/outside/beach/',
-						'Birding' => '/outside/birding/',
-						'Boats' => '/outside/boats/',
-						'Camping' => '/outside/camping/',
-						'Climbing' => '/outside/climbing/',
-						'Fire' => '/outside/fire/',
-						'Fishing' => '/outside/fishing/',
-						'Hunting' => '/outside/hunting/',
-						'Kites' => '/outside/kites/',
-						'Knives' => '/outside/knives/',
-						'Knots' => '/outside/knots/',
-						'Paracord' => '/outside/paracord/',
-						'Rockets' => '/outside/rockets/',
-						'Skateboarding' => '/outside/skateboarding/',
-						'Snow' => '/outside/snow/',
-						'Water' => '/outside/water/',
+						'Backyard' => '/outside/backyard/projects/',
+						'Beach' => '/outside/beach/projects/',
+						'Bikes' => '/outside/bikes/projects/',
+						'Birding' => '/outside/birding/projects/',
+						'Boats' => '/outside/boats/projects/',
+						'Camping' => '/outside/camping/projects/',
+						'Climbing' => '/outside/climbing/projects/',
+						'Fire' => '/outside/fire/projects/',
+						'Fishing' => '/outside/fishing/projects/',
+						'Hunting' => '/outside/hunting/projects/',
+						'Kites' => '/outside/kites/projects/',
+						'Knots' => '/outside/knots/projects/',
+						'Launchers' => '/outside/launchers/projects/',
+						'Paracord' => '/outside/paracord/projects/',
+						'Rockets' => '/outside/rockets/projects/',
+						'Siege Engines' => '/outside/siege-engines/projects/',
+						'Skateboarding' => '/outside/skateboarding/projects/',
+						'Snow' => '/outside/snow/projects/',
+						'Sports' => '/outside/sports/projects/',
+						'Survival' => '/outside/survival/projects/',
+						'Water' => '/outside/water/projects/',
 					),
-					'Food' => array(
-						'All' => '/food/',
-						'Dessert' => '/food/dessert/',
-						'Snacks & Appetizers' => '/food/snacks-and-appetizers/',
-						'Bacon' => '/food/bacon/',
-						'BBQ & Grilling' => '/food/bbq-and-grilling/',
-						'Beverages' => '/food/beverages/',
-						'Bread' => '/food/bread/',
-						'Breakfast' => '/food/breakfast/',
-						'Cake' => '/food/cake/',
-						'Candy' => '/food/candy/',
-						'Canning & Preserves' => '/food/canning-and-preserves/',
-						'Cocktails & Mocktails' => '/food/cocktails-and-mocktails/',
-						'Coffee' => '/food/coffee/',
-						'Cookies' => '/food/cookies/',
-						'Cupcakes' => '/food/cupcakes/',
-						'Homebrew' => '/food/homebrew/',
-						'Main Course' => '/food/main-course/',
-						'Pasta' => '/food/pasta/',
-						'Pie' => '/food/pie/',
-						'Pizza' => '/food/pizza/',
-						'Salad' => '/food/salad/',
-						'Sandwiches' => '/food/sandwiches/',
-						'Soups & Stews' => '/food/soups-and-stews/',
-						'Vegetarian & Vegan' => '/food/vegetarian-and-vegan/',
+					'Makeymakey' => array(
+						'All' => '/makeymakey/',
+						'Makey Makey on Instructables' => '/makeymakey/',
+					),
+					'Teachers' => array(
+						'All' => '/teachers/',
+						'ELA' => '/teachers/ela/projects/',
+						'Math' => '/teachers/math/projects/',
+						'Science' => '/teachers/science/projects/',
+						'Social Studies' => '/teachers/social-studies/projects/',
+						'Engineering' => '/teachers/engineering/projects/',
+						'Coding' => '/teachers/coding/projects/',
+						'Electronics' => '/teachers/electronics/projects/',
+						'Robotics' => '/teachers/robotics/projects/',
+						'Arduino' => '/teachers/arduino/projects/',
+						'CNC' => '/teachers/cnc/projects/',
+						'Laser Cutting' => '/teachers/laser-cutting/projects/',
+						'3D Printing' => '/teachers/3d-printing/projects/',
+						'3D Design' => '/teachers/3d-design/projects/',
+						'Art' => '/teachers/art/projects/',
+						'Music' => '/teachers/music/projects/',
+						'Theatre' => '/teachers/theatre/projects/',
+						'Wood Shop' => '/teachers/wood-shop/projects/',
+						'Metal Shop' => '/teachers/metal-shop/projects/',
+						'Resources' => '/teachers/resources/projects/',
 					),
-					'Costumes' => array(
-						'All' => '/costumes/',
-						'Props' => '/costumes/props-and-accessories/',
-						'Animals' => '/costumes/animals/',
-						'Comics' => '/costumes/comics/',
-						'Fantasy' => '/costumes/fantasy/',
-						'For Kids' => '/costumes/for-kids/',
-						'For Pets' => '/costumes/for-pets/',
-						'Funny' => '/costumes/funny/',
-						'Games' => '/costumes/games/',
-						'Historic & Futuristic' => '/costumes/historic-and-futuristic/',
-						'Makeup' => '/costumes/makeup/',
-						'Masks' => '/costumes/masks/',
-						'Scary' => '/costumes/scary/',
-						'TV & Movies' => '/costumes/tv-and-movies/',
-						'Weapons & Armor' => '/costumes/weapons-and-armor/',
-					)
 				),
 				'title' => 'Select your category (required)',
-				'defaultValue' => 'Technology'
+				'defaultValue' => 'Circuits'
 			),
 			'filter' => array(
 				'name' => 'Filter',
@@ -252,65 +233,70 @@ class InstructablesBridge extends BridgeAbstract {
 		)
 	);
 
-	private $uri;
-
 	public function collectData() {
 		// Enable the following line to get the category list (dev mode)
 		// $this->listCategories();
 
-		$this->uri = static::URI;
+		$html = getSimpleHTMLDOM($this->getURI())
+				or returnServerError('Error loading category ' . $this->getURI());
+		$html = defaultLinkTo($html, $this->getURI());
 
-		switch($this->queriedContext) {
-			case 'Category': $this->uri .= $this->getInput('category') . $this->getInput('filter');
-		}
+		$covers = $html->find('
+			.category-projects-list > div,
+			.category-landing-projects-list > div,
+		');
 
-		$html = getSimpleHTMLDOM($this->uri)
-				or returnServerError('Error loading category ' . $this->uri);
-
-		foreach($html->find('ul.explore-covers-list li') as $cover) {
+		foreach($covers as $cover) {
 			$item = array();
 
-			$item['uri'] = static::URI . $cover->find('a.cover-image', 0)->href;
-			$item['title'] = $cover->find('.title', 0)->innertext;
+			$item['uri'] = $cover->find('a.ible-title', 0)->href;
+			$item['title'] = $cover->find('a.ible-title', 0)->innertext;
 			$item['author'] = $this->getCategoryAuthor($cover);
 			$item['content'] = '<a href='
 			. $item['uri']
 			. '><img src='
-			. $cover->find('a.cover-image img', 0)->src
+			. $cover->find('img', 0)->getAttribute('data-src')
 			. '></a>';
 
-			$image = str_replace('.RECTANGLE1', '.LARGE', $cover->find('a.cover-image img', 0)->src);
-			$item['enclosures'] = [$image];
+			$item['enclosures'][] = str_replace(
+				'.RECTANGLE1',
+				'.LARGE',
+				$cover->find('img', 0)->getAttribute('data-src')
+			);
 
 			$this->items[] = $item;
 		}
 	}
 
 	public function getName() {
-		if(!is_null($this->getInput('category'))
-		&& !is_null($this->getInput('filter'))) {
-			foreach(self::PARAMETERS[$this->queriedContext]['category']['values'] as $key => $value) {
-				$subcategory = array_search($this->getInput('category'), $value);
+		switch($this->queriedContext) {
+			case 'Category': {
+				foreach(self::PARAMETERS[$this->queriedContext]['category']['values'] as $key => $value) {
+					$subcategory = array_search($this->getInput('category'), $value);
 
-				if($subcategory !== false)
-					break;
-			}
+					if($subcategory !== false)
+						break;
+				}
 
-			$filter = array_search(
-				$this->getInput('filter'),
-				self::PARAMETERS[$this->queriedContext]['filter']['values']
-			);
+				$filter = array_search(
+					$this->getInput('filter'),
+					self::PARAMETERS[$this->queriedContext]['filter']['values']
+				);
 
-			return $subcategory . ' (' . $filter . ') - ' . static::NAME;
+				return $subcategory . ' (' . $filter . ') - ' . static::NAME;
+			} break;
 		}
 
 		return parent::getName();
 	}
 
 	public function getURI() {
-		if(!is_null($this->getInput('category'))
-		&& !is_null($this->getInput('filter'))) {
-			return $this->uri;
+		switch($this->queriedContext) {
+			case 'Category': {
+				return self::URI
+				. $this->getInput('category')
+				. $this->getInput('filter');
+			} break;
 		}
 
 		return parent::getURI();
@@ -321,24 +307,32 @@ class InstructablesBridge extends BridgeAbstract {
 	 * parameters list)
 	 */
 	private function listCategories(){
-		// Use arbitrary category to receive full list
-		$html = getSimpleHTMLDOM(self::URI . '/technology/');
 
-		foreach($html->find('.channel a') as $channel) {
-			$name = html_entity_decode(trim($channel->innertext));
+		// Use home page to acquire main categories
+		$html = getSimpleHTMLDOM(self::URI);
+		$html = defaultLinkTo($html, self::URI);
 
-			// Remove unwanted entities
-			$name = str_replace("'", '', $name);
-			$name = str_replace('&#39;', '', $name);
+		foreach($html->find('.home-content-explore-link') as $category) {
 
-			$uri = $channel->href;
+			// Use arbitrary category to receive full list
+			$html = getSimpleHTMLDOM($category->href);
 
-			$category = explode('/', $uri)[1];
+			foreach($html->find('.channel-thumbnail a') as $channel) {
+				$name = html_entity_decode(trim($channel->title));
 
-			if(!isset($categories)
-			|| !array_key_exists($category, $categories)
-			|| !in_array($uri, $categories[$category]))
-				$categories[$category][$name] = $uri;
+				// Remove unwanted entities
+				$name = str_replace("'", '', $name);
+				$name = str_replace('&#39;', '', $name);
+
+				$uri = $channel->href;
+
+				$category_name = explode('/', $uri)[1];
+
+				if(!isset($categories)
+				|| !array_key_exists($category_name, $categories)
+				|| !in_array($uri, $categories[$category_name]))
+					$categories[$category_name][$name] = $uri;
+			}
 		}
 
 		// Build PHP array manually
@@ -360,9 +354,9 @@ class InstructablesBridge extends BridgeAbstract {
 	 */
 	private function getCategoryAuthor($cover) {
 		return '<a href='
-		. static::URI . $cover->find('span.author a', 0)->href
+		. $cover->find('.ible-author a', 0)->href
 		. '>'
-		. $cover->find('span.author a', 0)->innertext
+		. $cover->find('.ible-author a', 0)->innertext
 		. '</a>';
 	}
 }

bridges/InternetArchiveBridge.php

@@ -0,0 +1,293 @@
+<?php
+class InternetArchiveBridge extends BridgeAbstract {
+	const NAME = 'Internet Archive Bridge';
+	const URI = 'https://archive.org';
+	const DESCRIPTION = 'Returns newest uploads, posts and more from an account';
+	const MAINTAINER = 'VerifiedJoseph';
+	const PARAMETERS = array(
+		'Account' => array(
+			'username' => array(
+				'name' => 'Username',
+				'type' => 'text',
+				'required' => true,
+				'exampleValue' => '@verifiedjoseph',
+			),
+			'content' => array(
+				'name' => 'Content',
+				'type' => 'list',
+				'values' => array(
+					'Uploads' => 'uploads',
+					'Posts' => 'posts',
+					'Reviews' => 'reviews',
+					'Collections' => 'collections',
+					'Web Archives' => 'web-archive',
+				),
+				'defaultValue' => 'uploads',
+			)
+		)
+	);
+
+	const CACHE_TIMEOUT = 900; // 15 mins
+
+	private $skipClasses = array(
+		'item-ia mobile-header hidden-tiles',
+		'item-ia account-ia'
+	);
+
+	public function collectData() {
+
+		$html = getSimpleHTMLDOM($this->getURI())
+			or returnServerError('Could not request: ' . $this->getURI());
+
+		$html = defaultLinkTo($html, $this->getURI());
+
+		if ($this->getInput('content') !== 'posts') {
+
+			$detailsDivNumber = 0;
+
+			foreach ($html->find('div.results > div[data-id]') as $index => $result) {
+				$item = array();
+
+				if (in_array($result->class, $this->skipClasses)) {
+					continue;
+				}
+
+				switch($result->class) {
+					case 'item-ia':
+
+						switch($this->getInput('content')) {
+							case 'reviews':
+								$item = $this->processReview($result);
+								break;
+							case 'uploads':
+								$item = $this->processUpload($result);
+							break;
+						}
+
+						break;
+					case 'item-ia url-item':
+						$item = $this->processWebArchives($result);
+						break;
+					case 'item-ia collection-ia':
+						$item = $this->processCollection($result);
+						break;
+				}
+
+				if ($this->getInput('content') !== 'reviews') {
+					$hiddenDetails = $this->processHiddenDetails($html, $detailsDivNumber, $item);
+
+					$this->items[] = array_merge($item, $hiddenDetails);
+				} else {
+
+					$this->items[] = $item;
+
+				}
+
+				$detailsDivNumber++;
+			}
+		}
+
+		if ($this->getInput('content') === 'posts') {
+			$this->items = $this->processPosts($html);
+		}
+	}
+
+	public function getURI() {
+
+		if (!is_null($this->getInput('username')) && !is_null($this->getInput('content'))) {
+			return self::URI . '/details/' . $this->processUsername() . '&tab=' . $this->getInput('content');
+		}
+
+		return parent::getURI();
+	}
+
+	public function getName() {
+
+		if (!is_null($this->getInput('username')) && !is_null($this->getInput('content'))) {
+
+			$contentValues = array_flip(self::PARAMETERS['Account']['content']['values']);
+
+			return $contentValues[$this->getInput('content')] . ' - '
+				. $this->processUsername() . ' - Internet Archive';
+		}
+
+		return parent::getName();
+	}
+
+	private function processUsername() {
+
+		if (substr($this->getInput('username'), 0, 1) !== '@') {
+			return '@' . $this->getInput('username');
+		}
+
+		return $this->getInput('username');
+	}
+
+	private function processUpload($result) {
+
+		$item = array();
+
+		$collection = $result->find('a.stealth', 0);
+		$collectionLink = self::URI . $collection->href;
+		$collectionTitle = $collection->find('div.item-parent-ttl', 0)->plaintext;
+
+		$item['title'] = trim($result->find('div.ttl', 0)->innertext);
+		$item['timestamp'] = strtotime($result->find('div.hidden-tiles.pubdate.C.C3', 0)->children(0)->plaintext);
+		$item['uri'] = $result->find('div.item-ttl.C.C2 > a', 0)->href;
+
+		if ($result->find('div.by.C.C4', 0)->children(2)) {
+			$item['author'] = $result->find('div.by.C.C4', 0)->children(2)->plaintext;
+		}
+
+		$item['content'] = <<<EOD
+<p>Media Type: {$result->attr['data-mediatype']}<br>
+Collection: <a href="{$collectionLink}">{$collectionTitle}</a></p>
+EOD;
+
+		$item['enclosures'][] = self::URI . $result->find('img.item-img', 0)->source;
+
+		return $item;
+	}
+
+	private function processReview($result) {
+
+		$item = array();
+
+		$item['title'] = trim($result->find('div.ttl', 0)->innertext);
+		$item['timestamp'] = strtotime($result->find('div.hidden-tiles.pubdate.C.C3', 0)->children(0)->plaintext);
+		$item['uri'] = $result->find('div.review-title', 0)->children(0)->href;
+
+		if ($result->find('div.by.C.C4', 0)->children(2)) {
+			$item['author'] = $result->find('div.by.C.C4', 0)->children(2)->plaintext;
+		}
+
+		$item['content'] = <<<EOD
+<p><strong>Subject: {$result->find('div.review-title', 0)->plaintext}</strong></p>
+<p>{$result->find('div.hidden-lists.review' , 0)->children(1)->plaintext}</p>
+EOD;
+
+		$item['enclosures'][] = self::URI . $result->find('img.item-img', 0)->source;
+
+		return $item;
+	}
+
+	private function processWebArchives($result) {
+
+		$item = array();
+
+		$item['title'] = trim($result->find('div.ttl', 0)->plaintext);
+		$item['timestamp'] = strtotime($result->find('div.hidden-lists', 0)->children(0)->plaintext);
+		$item['uri'] = $result->find('div.item-ttl.C.C2 > a', 0)->href;
+
+		$item['content'] = <<<EOD
+{$this->processUsername()} archived <a href="{$item['uri']}">{$result->find('div.ttl', 0)->plaintext}</a>
+EOD;
+
+		$item['enclosures'][] = $result->find('img.item-img', 0)->source;
+
+		return $item;
+	}
+
+	private function processCollection($result) {
+
+		$item = array();
+
+		$title = trim($result->find('div.collection-title.C.C2', 0)->children(0)->plaintext);
+		$itemCount = strtolower(trim($result->find('div.num-items.topinblock', 0)->plaintext));
+
+		$item['title'] = $title . ' (' . $itemCount . ')';
+		$item['timestamp'] = strtotime($result->find('div.hidden-tiles.pubdate.C.C3', 0)->children(0)->plaintext);
+		$item['uri'] = $result->find('div.collection-title.C.C2 > a', 0)->href;
+
+		$item['content'] = '';
+
+		if ($result->find('img.item-img', 0)) {
+			$item['enclosures'][] = self::URI . $result->find('img.item-img', 0)->source;
+		}
+
+		return $item;
+	}
+
+	private function processHiddenDetails($html, $detailsDivNumber, $item) {
+
+		$description = '';
+
+		if ($html->find('div.details-ia.hidden-tiles', $detailsDivNumber)) {
+			$detailsDiv = $html->find('div.details-ia.hidden-tiles', $detailsDivNumber);
+
+			if ($detailsDiv->find('div.C234', 0)->children(0)) {
+				$description = $detailsDiv->find('div.C234', 0)->children(0)->plaintext;
+
+				$detailsDiv->find('div.C234', 0)->children(0)->innertext = '';
+			}
+
+			$topics = trim($detailsDiv->find('div.C234', 0)->plaintext);
+
+			if (!empty($topics)) {
+				$topics = trim($detailsDiv->find('div.C234', 0)->plaintext);
+				$topics = trim(substr($topics, 7));
+
+				$item['categories'] = explode(',', $topics);
+			}
+
+			$item['content'] = '<p>' . $description . '</p>' . $item['content'];
+		}
+
+		return $item;
+	}
+
+	private function processPosts($html) {
+
+		$items = array();
+
+		foreach ($html->find('table.forumTable > tr') as $index => $tr) {
+			$item = array();
+
+			if ($index === 0) {
+				continue;
+			}
+
+			$item['title'] = $tr->find('td', 0)->plaintext;
+			$item['timestamp'] = strtotime($tr->find('td', 4)->children(0)->plaintext);
+			$item['uri'] = $tr->find('td', 0)->children(0)->href;
+
+			$formLink = <<<EOD
+<a href="{$tr->find('td', 2)->children(0)->href}">{$tr->find('td', 2)->children(0)->plaintext}</a>
+EOD;
+
+			$postDate = $tr->find('td', 4)->children(0)->plaintext;
+
+			$postPageHtml = getSimpleHTMLDOMCached($item['uri'], 3600)
+				or returnServerError('Could not request: ' . $item['uri']);
+
+			$postPageHtml = defaultLinkTo($postPageHtml, $this->getURI());
+
+			$post = $postPageHtml->find('div.box.well.well-sm', 0);
+
+			$parentLink = '';
+			$replyLink = <<<EOD
+<a href="{$post->find('a', 0)->href}">Reply</a>
+EOD;
+
+			if ($post->find('a', 1)->innertext = 'See parent post') {
+				$parentLink = <<<EOD
+<a href="{$post->find('a', 1)->href}">View parent post</a>
+EOD;
+			}
+
+			$post->find('h1', 0)->outertext = '';
+			$post->find('h2', 0)->outertext = '';
+
+			$item['content'] = <<<EOD
+<p>{$post->innertext}</p>{$replyLink} - {$parentLink} - Posted in {$formLink} on {$postDate}
+EOD;
+
+			$items[] = $item;
+
+			if (count($items) >= 10) {
+				break;
+			}
+		}
+		return $items;
+	}
+}

bridges/KununuBridge.php

@@ -24,6 +24,16 @@ class KununuBridge extends BridgeAbstract {
 				'type' => 'checkbox',
 				'exampleValue' => 'checked',
 				'title' => 'Activate to load full article'
+			),
+			'include_ratings' => array(
+				'name' => 'Include ratings',
+				'type' => 'checkbox',
+				'title' => 'Activate to include ratings in the feed'
+			),
+			'include_benefits' => array(
+				'name' => 'Include benefits',
+				'type' => 'checkbox',
+				'title' => 'Activate to include benefits in the feed'
 			)
 		),
 		array(
@@ -116,7 +126,7 @@ class KununuBridge extends BridgeAbstract {
 			$item = array();
 
 			$item['author'] = $this->extractArticleAuthorPosition($article);
-			$item['timestamp'] = strtotime($date);
+			$item['timestamp'] = strtotime($date->content);
 			$item['title'] = $rating->getAttribute('aria-label')
 			. ' : '
 			. strip_tags($summary->innertext);
@@ -175,7 +185,32 @@ class KununuBridge extends BridgeAbstract {
 		$description = $article->find('[itemprop=reviewBody]', 0)
 			or returnServerError('Cannot find article description!');
 
-		return $description->innertext;
+		$retVal = $description->innertext;
+
+		if($this->getInput('include_ratings')
+		&& ($ratings = $article->find('.review-ratings .rating-group'))) {
+			$retVal .= (empty($retVal) ? '' : '<hr>') . '<table>';
+			foreach($ratings as $rating) {
+				$retVal .= <<<EOD
+<tr>
+	<td>{$rating->find('.rating-title', 0)->plaintext}
+	<td>{$rating->find('.rating-badge', 0)->plaintext}
+</tr>
+EOD;
+			}
+			$retVal .= '</table>';
+		}
+
+		if($this->getInput('include_benefits')
+		&& ($benefits = $article->find('benefit'))) {
+			$retVal .= (empty($retVal) ? '' : '<hr>') . '<ul>';
+			foreach($benefits as $benefit) {
+				$retVal .= "<li>{$benefit->plaintext}</li>";
+			}
+			$retVal .= '</ul>';
+		}
+
+		return $retVal;
 	}
 
 	/**

bridges/LaCentraleBridge.php

@@ -0,0 +1,477 @@
+<?php
+class LaCentraleBridge extends BridgeAbstract {
+
+	const MAINTAINER = 'jacknumber';
+	const NAME = 'La Centrale';
+	const URI = 'https://www.lacentrale.fr/';
+	const DESCRIPTION = 'Returns most recent vehicules ads from LaCentrale';
+
+	const PARAMETERS = array( array(
+		'type' => array(
+			'name' => 'Type de véhicule',
+			'type' => 'list',
+			'values' => array(
+				'Voiture' => 'car',
+				'Camion/Pickup' => 'truck',
+				'Moto' => 'moto',
+				'Scooter' => 'scooter',
+				'Quad' => 'quad',
+				'Caravane/Camping-car' => 'mobileHome'
+			)
+		),
+		'brand' => array(
+			'name' => 'Marque',
+			'type' => 'list',
+			'values' => array(
+				'' => '',
+				'ABARTH' => 'ABARTH',
+				'AC' => 'AC',
+				'AIXAM' => 'AIXAM',
+				'ALFA ROMEO' => 'ALFA ROMEO',
+				'ALKE' => 'ALKE',
+				'ALPINA' => 'ALPINA',
+				'ALPINE' => 'ALPINE',
+				'AMC' => 'AMC',
+				'ANAIG' => 'ANAIG',
+				'APRILIA' => 'APRILIA',
+				'ARIEL' => 'ARIEL',
+				'ASTON MARTIN' => 'ASTON MARTIN',
+				'AUDI' => 'AUDI',
+				'AUSTIN HEALEY' => 'AUSTIN HEALEY',
+				'AUSTIN' => 'AUSTIN',
+				'AUTOBIANCHI' => 'AUTOBIANCHI',
+				'AVINTON' => 'AVINTON',
+				'BELLIER' => 'BELLIER',
+				'BENELLI' => 'BENELLI',
+				'BENTLEY' => 'BENTLEY',
+				'BETA' => 'BETA',
+				'BMW' => 'BMW',
+				'BOLLORE' => 'BOLLORE',
+				'BRIXTON' => 'BRIXTON',
+				'BUELL' => 'BUELL',
+				'BUGATTI' => 'BUGATTI',
+				'BUICK' => 'BUICK',
+				'BULLIT' => 'BULLIT',
+				'CADILLAC' => 'CADILLAC',
+				'CASALINI' => 'CASALINI',
+				'CATERHAM' => 'CATERHAM',
+				'CHATENET' => 'CHATENET',
+				'CHEVROLET' => 'CHEVROLET',
+				'CHRYSLER' => 'CHRYSLER',
+				'CHUNLAN' => 'CHUNLAN',
+				'CITROEN' => 'CITROEN',
+				'COURB' => 'COURB',
+				'CR&S' => 'CR&S',
+				'CUPRA' => 'CUPRA',
+				'CYCLONE' => 'CYCLONE',
+				'DACIA' => 'DACIA',
+				'DAELIM' => 'DAELIM',
+				'DAEWOO' => 'DAEWOO',
+				'DAF' => 'DAF',
+				'DAIHATSU' => 'DAIHATSU',
+				'DANGEL' => 'DANGEL',
+				'DATSUN' => 'DATSUN',
+				'DE SOTO' => 'DE SOTO',
+				'DE TOMASO' => 'DE TOMASO',
+				'DERBI' => 'DERBI',
+				'DEVINCI' => 'DEVINCI',
+				'DODGE' => 'DODGE',
+				'DONKERVOORT' => 'DONKERVOORT',
+				'DS' => 'DS',
+				'DUCATI' => 'DUCATI',
+				'DUCATY' => 'DUCATY',
+				'DUE' => 'DUE',
+				'ENFIELD' => 'ENFIELD',
+				'EXCALIBUR' => 'EXCALIBUR',
+				'FACEL VEGA' => 'FACEL VEGA',
+				'FANTIC MOTOR' => 'FANTIC MOTOR',
+				'FERRARI' => 'FERRARI',
+				'FIAT' => 'FIAT',
+				'FISKER' => 'FISKER',
+				'FORD' => 'FORD',
+				'FUSO' => 'FUSO',
+				'GAS GAS' => 'GAS GAS',
+				'GILERA' => 'GILERA',
+				'GMC' => 'GMC',
+				'GOWINN' => 'GOWINN',
+				'GRANDIN' => 'GRANDIN',
+				'HARLEY DAVIDSON' => 'HARLEY DAVIDSON',
+				'HOMMELL' => 'HOMMELL',
+				'HONDA' => 'HONDA',
+				'HUMMER' => 'HUMMER',
+				'HUSABERG' => 'HUSABERG',
+				'HUSQVARNA' => 'HUSQVARNA',
+				'HYOSUNG' => 'HYOSUNG',
+				'HYUNDAI' => 'HYUNDAI',
+				'INDIAN' => 'INDIAN',
+				'INFINITI' => 'INFINITI',
+				'INNOCENTI' => 'INNOCENTI',
+				'ISUZU' => 'ISUZU',
+				'IVECO' => 'IVECO',
+				'JAGUAR' => 'JAGUAR',
+				'JDM SIMPA' => 'JDM SIMPA',
+				'JEEP' => 'JEEP',
+				'JENSEN' => 'JENSEN',
+				'JIAYUAN' => 'JIAYUAN',
+				'KAWASAKI' => 'KAWASAKI',
+				'KEEWAY' => 'KEEWAY',
+				'KIA' => 'KIA',
+				'KSR' => 'KSR',
+				'KTM' => 'KTM',
+				'KYMCO' => 'KYMCO',
+				'LADA' => 'LADA',
+				'LAMBORGHINI' => 'LAMBORGHINI',
+				'LANCIA' => 'LANCIA',
+				'LAND ROVER' => 'LAND ROVER',
+				'LEXUS' => 'LEXUS',
+				'LIGIER' => 'LIGIER',
+				'LINCOLN' => 'LINCOLN',
+				'LONDON TAXI COMPANY' => 'LONDON TAXI COMPANY',
+				'LOTUS' => 'LOTUS',
+				'MAGPOWER' => 'MAGPOWER',
+				'MAN' => 'MAN',
+				'MASAI' => 'MASAI',
+				'MASERATI' => 'MASERATI',
+				'MASH' => 'MASH',
+				'MATRA' => 'MATRA',
+				'MAYBACH' => 'MAYBACH',
+				'MAZDA' => 'MAZDA',
+				'MCLAREN' => 'MCLAREN',
+				'MEGA' => 'MEGA',
+				'MERCEDES' => 'MERCEDES',
+				'MERCEDES-AMG' => 'MERCEDES-AMG',
+				'MERCURY' => 'MERCURY',
+				'MEYERS MANX' => 'MEYERS MANX',
+				'MG' => 'MG',
+				'MIA ELECTRIC' => 'MIA ELECTRIC',
+				'MICROCAR' => 'MICROCAR',
+				'MINAUTO' => 'MINAUTO',
+				'MINI' => 'MINI',
+				'MITSUBISHI' => 'MITSUBISHI',
+				'MORGAN' => 'MORGAN',
+				'MORRIS' => 'MORRIS',
+				'MOTO GUZZI' => 'MOTO GUZZI',
+				'MOTO MORINI' => 'MOTO MORINI',
+				'MOTOBECANE' => 'MOTOBECANE',
+				'MPM MOTORS' => 'MPM MOTORS',
+				'MV AGUSTA' => 'MV AGUSTA',
+				'NISSAN' => 'NISSAN',
+				'NORTON' => 'NORTON',
+				'NSU' => 'NSU',
+				'OLDSMOBILE' => 'OLDSMOBILE',
+				'OPEL' => 'OPEL',
+				'ORCAL' => 'ORCAL',
+				'OSSA' => 'OSSA',
+				'PACKARD' => 'PACKARD',
+				'PANTHER' => 'PANTHER',
+				'PEUGEOT' => 'PEUGEOT',
+				'PGO' => 'PGO',
+				'PIAGGIO' => 'PIAGGIO',
+				'PLYMOUTH' => 'PLYMOUTH',
+				'POLARIS' => 'POLARIS',
+				'PONTIAC' => 'PONTIAC',
+				'PORSCHE' => 'PORSCHE',
+				'REALM' => 'REALM',
+				'REGAL RAPTOR' => 'REGAL RAPTOR',
+				'RENAULT' => 'RENAULT',
+				'RIEJU' => 'RIEJU',
+				'ROLLS ROYCE' => 'ROLLS ROYCE',
+				'ROVER' => 'ROVER',
+				'ROYAL ENFIELD' => 'ROYAL ENFIELD',
+				'SAAB' => 'SAAB',
+				'SANTANA' => 'SANTANA',
+				'SCANIA' => 'SCANIA',
+				'SEAT' => 'SEAT',
+				'SECMA' => 'SECMA',
+				'SHELBY' => 'SHELBY',
+				'SHERCO' => 'SHERCO',
+				'SIMCA' => 'SIMCA',
+				'SKODA' => 'SKODA',
+				'SMART' => 'SMART',
+				'SPYKER' => 'SPYKER',
+				'SSANGYONG' => 'SSANGYONG',
+				'STUDEBAKER' => 'STUDEBAKER',
+				'SUBARU' => 'SUBARU',
+				'SUNBEAM' => 'SUNBEAM',
+				'SUZUKI' => 'SUZUKI',
+				'SWM' => 'SWM',
+				'SYM' => 'SYM',
+				'TALBOT SIMCA' => 'TALBOT SIMCA',
+				'TALBOT' => 'TALBOT',
+				'TEILHOL' => 'TEILHOL',
+				'TESLA' => 'TESLA',
+				'TM' => 'TM',
+				'TNT MOTOR' => 'TNT MOTOR',
+				'TOYOTA' => 'TOYOTA',
+				'TRIUMPH' => 'TRIUMPH',
+				'TVR' => 'TVR',
+				'VAUXHALL' => 'VAUXHALL',
+				'VESPA' => 'VESPA',
+				'VICTORY' => 'VICTORY',
+				'VOLKSWAGEN' => 'VOLKSWAGEN',
+				'VOLVO' => 'VOLVO',
+				'VOXAN' => 'VOXAN',
+				'WIESMANN' => 'WIESMANN',
+				'YAMAHA' => 'YAMAHA',
+				'YCF' => 'YCF',
+				'ZERO' => 'ZERO',
+				'ZONGSHEN' => 'ZONGSHEN'
+			)
+		),
+		'model' => array(
+			'name' => 'Modèle',
+			'type' => 'text',
+			'title' => 'Get the exact name on LaCentrale'
+		),
+		'versions' => array(
+			'name' => 'Version(s)',
+			'type' => 'text',
+			'title' => 'Get the exact name(s) on LaCentrale. Separate by comma'
+		),
+		'category' => array(
+			'name' => 'Catégorie',
+			'type' => 'list',
+			'values' => array(
+				'' => '',
+				'Voiture' => array(
+					'4x4, SUV & Crossover' => '47',
+					'Citadine' => '40',
+					'Berline' => '41_42',
+					'Break' => '43',
+					'Cabriolet' => '46',
+					'Coupé' => '45',
+					'Monospace' => '44',
+					'Bus et minibus' => '82',
+					'Fourgonnette' => '85',
+					'Fourgon (< 3,5 tonnes)' => '81',
+					'Pick-up' => '50',
+					'Voiture société, commerciale' => '80',
+					'Sans permis' => '48',
+					'Camion (> 3,5 tonnes)' => '83',
+				),
+				'Camion/Pickup' => array(
+					'Camion (> 3,5 tonnes)' => '83',
+					'Fourgon (< 3,5 tonnes)' => '81',
+					'Bus et minibus' => '82',
+					'Fourgonnette' => '85',
+					'Pick-up' => '50',
+					'Voiture société, commerciale' => '80'
+				),
+				'Moto' => array(
+					'Custom' => '60',
+					'Offroad' => '61',
+					'Roadster' => '62',
+					'GT' => '63',
+					'Mini moto' => '64',
+					'Mobylette' => '65',
+					'Supermotard' => '66',
+					'Trail' => '67',
+					'Side-car' => '69',
+					'Sportive' => '68'
+				),
+				'Caravane/Camping-car' => array(
+					'Caravane' => '423',
+					'Profilé' => '506',
+					'Fourgon aménagé' => '507',
+					'Intégral' => '508',
+					'Capucine' => '510'
+				)
+			)
+		),
+		'pricemin' => array(
+			'name' => 'Prix min',
+			'type' => 'number'
+		),
+		'pricemax' => array(
+			'name' => 'Prix max',
+			'type' => 'number'
+		),
+		'location' => array(
+			'name' => 'CP ou département',
+			'type' => 'number',
+			'title' => 'Only one'
+		),
+		'distance' => array(
+			'name' => 'Rayon de recherche',
+			'type' => 'list',
+			'values' => array(
+				'' => '',
+				'10 km' => '1',
+				'20 km' => '2',
+				'50 km' => '3',
+				'100 km' => '4',
+				'200 km' => '5'
+			)
+		),
+		'region' => array(
+			'name' => 'Région',
+			'type' => 'list',
+			'values' => array(
+				'' => '',
+				'Auvergne-Rhône-Alpes' => 'FR-ARA',
+				'Bourgogne-Franche-Comté' => 'FR-BFC',
+				'Bretagne' => 'FR-BRE',
+				'Centre-Val de Loire' => 'FR-CVL',
+				'Corse' => 'FR-COR',
+				'Grand Est' => 'FR-GES',
+				'Hauts-de-France' => 'FR-HDF',
+				'Île-de-France' => 'FR-IDF',
+				'Normandie' => 'FR-NOR',
+				'Nouvelle-Aquitaine' => 'FR-PAC',
+				'Occitanie' => 'FR-PDL',
+				'Pays de la Loire' => 'FR-OCC',
+				'Provence-Alpes-Côte d\'Azur' => 'FR-NAQ'
+			)
+		),
+		'mileagemin' => array(
+			'name' => 'Kilométrage min',
+			'type' => 'number'
+		),
+		'mileagemax' => array(
+			'name' => 'Kilométrage max',
+			'type' => 'number'
+		),
+		'yearmin' => array(
+			'name' => 'Année min',
+			'type' => 'number'
+		),
+		'yearmax' => array(
+			'name' => 'Année max',
+			'type' => 'number'
+		),
+		'cubiccapacitymin' => array(
+			'name' => 'Cylindrée min',
+			'type' => 'number'
+		),
+		'cubiccapacitymax' => array(
+			'name' => 'Cylindrée max',
+			'type' => 'number'
+		),
+		'fuel' => array(
+			'name' => 'Énergie',
+			'type' => 'list',
+			'values' => array(
+				'' => '',
+				'Diesel' => 'dies',
+				'Essence' => 'ess',
+				'Électrique' => 'elec',
+				'Hybride' => 'hyb',
+				'GPL' => 'gpl',
+				'Bioéthanol' => 'eth',
+				'Autre' => 'alt'
+			)
+		),
+		'gearbox' => array(
+			'name' => 'Boite de vitesse',
+			'type' => 'list',
+			'values' => array(
+				'' => '',
+				'Boite automatique' => 'AUTO',
+				'Boite mécanique' => 'MANUAL'
+			)
+		),
+		'doors' => array(
+			'name' => 'Nombre de portes',
+			'type' => 'list',
+			'values' => array(
+				'' => '',
+				'2 portes' => '2',
+				'3 portes' => '3',
+				'4 portes' => '4',
+				'5 portes' => '5',
+				'6 portes ou plus' => '6'
+			)
+		),
+		'firsthand' => array(
+			'name' => 'Première main',
+			'type' => 'checkbox'
+		),
+		'seller' => array(
+			'name' => 'Vendeur',
+			'type' => 'list',
+			'values' => array(
+				'' => '',
+				'Particulier' => 'PART',
+				'Professionel' => 'PRO'
+			)
+		),
+		'sort' => array(
+			'name' => 'Tri',
+			'type' => 'list',
+			'values' => array(
+				'Prix (croissant)' => 'priceAsc',
+				'Prix (décroissant)' => 'priceDesc',
+				'Marque (croissant)' => 'makeAsc',
+				'Marque (décroissant)' => 'makeDesc',
+				'Kilométrage (croissant)' => 'mileageAsc',
+				'Kilométrage (décroissant)' => 'mileageDesc',
+				'Année (croissant)' => 'yearAsc',
+				'Année (décroissant)' => 'yearDesc',
+				'Département (croissant)' => 'visitPlaceAsc',
+				'Département (décroissant)' => 'visitPlaceDesc'
+			)
+		),
+	));
+
+	public function collectData(){
+		// check data
+		if(!empty($this->getInput('distance'))
+		&& is_null($this->getInput('location'))) {
+			returnClientError('You need a place ("CP ou département") to search arround.');
+		}
+
+		$params = array(
+			'vertical' => $this->getInput('type'),
+			'makesModelsCommercialNames' => $this->getInput('brand') . ':' . $this->getInput('model'),
+			'versions' => $this->getInput('versions'),
+			'categories' => $this->getInput('category'),
+			'priceMin' => $this->getInput('pricemin'),
+			'priceMax' => $this->getInput('pricemax'),
+			'dptCp' => $this->getInput('location'),
+			'distance' => $this->getInput('distance'),
+			'regions' => $this->getInput('region'),
+			'mileageMin' => $this->getInput('mileagemin'),
+			'mileageMax' => $this->getInput('mileagemax'),
+			'yearMin' => $this->getInput('yearmin'),
+			'yearMax' => $this->getInput('yearmax'),
+			'cubicMin' => $this->getInput('cubiccapacitymin'),
+			'cubicMax' => $this->getInput('cubiccapacitymax'),
+			'energies' => $this->getInput('fuel'),
+			'firstHand' => $this->getInput('firsthand') ? 'true' : 'false',
+			'gearbox' => $this->getInput('gearbox'),
+			'doors' => $this->getInput('doors'),
+			'sortBy' => $this->getInput('sort')
+		);
+		$url = self::URI . 'listing?' . http_build_query($params);
+		$html = getSimpleHTMLDOM($url)
+			or returnServerError('Could not request LaCentrale.');
+
+		foreach($html->find('.linkAd') as $element) {
+
+			$item = array();
+			$item['uri'] = trim(self::URI, '/') . $element->href;
+			$item['title'] = $element->find('.brandModel', 0)->plaintext;
+			$item['sellerType'] = $element->find('.typeSeller', 0)->plaintext;
+			$item['author'] = $item['sellerType'];
+			$item['version'] = $element->find('.version', 0)->plaintext;
+			$item['price'] = $element->find('.fieldPrice', 0)->plaintext;
+			$item['year'] = $element->find('.fieldYear', 0)->plaintext;
+			$item['mileage'] = $element->find('.fieldMileage', 0)->plaintext;
+			$item['departement'] = str_replace(',', '', $element->find('.dptCont', 0)->plaintext);
+			$item['thumbnail'] = $element->find('.imgContent img', 0)->src;
+			$item['enclosures'] = array($item['thumbnail']);
+
+			$item['content'] = '
+			<img src="' . $item['thumbnail'] . '">
+			<br>Variation : ' . $item['version']
+			. '<br>Prix : ' . $item['price']
+			. '<br>Année : ' . $item['year']
+			. '<br>Kilométrage : ' . $item['mileage']
+			. '<br>Département : ' . $item['departement']
+			. '<br>Type de vendeur : ' . $item['sellerType'];
+
+			$this->items[] = $item;
+
+		}
+	}
+}

bridges/LeBonCoinBridge.php

@@ -356,6 +356,7 @@ class LeBonCoinBridge extends BridgeAbstract {
 		$data = $this->buildRequestJson();
 
 		$header = array(
+			'User-Agent: LBC;Android;Null;Null;Null;Null;Null;Null;Null;Null',
 			'Content-Type: application/json',
 			'Content-Length: ' . strlen($data),
 			'api_key: ' . self::$LBC_API_KEY

bridges/MastodonBridge.php

@@ -0,0 +1,89 @@
+<?php
+
+class MastodonBridge extends FeedExpander {
+
+	const MAINTAINER = 'husim0';
+	const NAME = 'Mastodon Bridge';
+	const CACHE_TIMEOUT = 900; // 15mn
+	const DESCRIPTION = 'Returns toots';
+	const URI = 'https://mastodon.social';
+
+	const PARAMETERS = array(array(
+		'canusername' => array(
+			'name' => 'Canonical username (ex : @sebsauvage@framapiaf.org)',
+			'required' => true,
+		),
+		'norep' => array(
+			'name' => 'Without replies',
+			'type' => 'checkbox',
+			'title' => 'Only return initial toots'
+		),
+		'noboost' => array(
+			'name' => 'Without boosts',
+			'required' => false,
+			'type' => 'checkbox',
+			'title' => 'Hide boosts'
+			)
+		));
+
+	public function getName(){
+		switch($this->queriedContext) {
+		case 'By username':
+			return $this->getInput('canusername');
+		default: return parent::getName();
+		}
+	}
+
+	protected function parseItem($newItem){
+		$item = parent::parseItem($newItem);
+
+		$content = str_get_html($item['content']);
+		$title = str_get_html($item['title']);
+
+		$item['title'] = $content->plaintext;
+
+		if(strlen($item['title']) > 75) {
+			$item['title'] = substr($item['title'], 0, strpos(wordwrap($item['title'], 75), "\n")) . '...';
+		}
+
+		if(strpos($title, 'shared a status by') !== false) {
+			if($this->getInput('noboost')) {
+				return null;
+			}
+
+			preg_match('/shared a status by (\S{0,})/', $title, $matches);
+			$item['title'] = 'Boost ' . $matches[1] . ' ' . $item['title'];
+			$item['author'] = $matches[1];
+		} else {
+			$item['author'] = $this->getInput('canusername');
+		}
+
+		// Check if it's a initial toot or a response
+		if($this->getInput('norep') && preg_match('/^@.+/', trim($content->plaintext))) {
+			return null;
+		}
+
+		return $item;
+	}
+
+	private function getInstance(){
+		preg_match('/^@[a-zA-Z0-9_]+@(.+)/', $this->getInput('canusername'), $matches);
+		return $matches[1];
+	}
+
+	private function getUsername(){
+		preg_match('/^@([a-zA-Z_0-9_]+)@.+/', $this->getInput('canusername'), $matches);
+		return $matches[1];
+	}
+
+	public function getURI(){
+		if($this->getInput('canusername'))
+			return 'https://' . $this->getInstance() . '/users/' . $this->getUsername() . '.atom';
+
+		return parent::getURI();
+	}
+
+	public function collectData(){
+		return $this->collectExpandableDatas($this->getURI());
+	}
+}

bridges/NYTBridge.php

@@ -0,0 +1,26 @@
+<?php
+class NYTBridge extends FeedExpander {
+
+	const MAINTAINER = 'IceWreck';
+	const NAME = 'New York Times Bridge';
+	const URI = 'https://www.nytimes.com/';
+	const CACHE_TIMEOUT = 3600;
+	const DESCRIPTION = 'RSS feed for the New York Times';
+
+	public function collectData(){
+		$this->collectExpandableDatas('https://rss.nytimes.com/services/xml/rss/nyt/HomePage.xml', 15);
+	}
+
+	protected function parseItem($newsItem){
+		$item = parent::parseItem($newsItem);
+		// $articlePage gets the entire page's contents
+		$articlePage = getSimpleHTMLDOM($newsItem->link);
+		// figure contain's the main article image
+		$article = $articlePage->find('figure', 0);
+		// p > css-exrw3m has the actual article
+		foreach($articlePage->find('p.css-exrw3m') as $element)
+			$article = $article . $element;
+		$item['content'] = $article;
+		return $item;
+	}
+}

bridges/NationalGeographicBridge.php

@@ -0,0 +1,194 @@
+<?php
+class NationalGeographicBridge extends BridgeAbstract {
+
+	const CONTEXT_BY_TOPIC = 'By Topic';
+	const PARAMETER_TOPIC = 'topic';
+	const PARAMETER_FULL_ARTICLE = 'full';
+	const TOPIC_MAGAZINE = 'Magazine';
+	const TOPIC_LATEST_STORIES = 'Latest Stories';
+
+	const NAME = 'National Geographic';
+	const URI = 'https://www.nationalgeographic.com/';
+	const DESCRIPTION = 'Fetches the latest articles from the National Geographic Magazine';
+	const MAINTAINER = 'logmanoriginal';
+	const PARAMETERS = array(
+		self::CONTEXT_BY_TOPIC => array(
+			self::PARAMETER_TOPIC => array(
+				'name' => 'Topic',
+				'type' => 'list',
+				'values' => array(
+					self::TOPIC_MAGAZINE => 'magazine',
+					self::TOPIC_LATEST_STORIES => 'latest-stories'
+				),
+				'title' => 'Select your topic',
+				'defaultValue' => 'Magazine'
+			)
+		),
+		'global' => array(
+			self::PARAMETER_FULL_ARTICLE => array(
+				'name' => 'Full Article',
+				'type' => 'checkbox',
+				'title' => 'Enable to load full articles (takes longer)'
+			)
+		)
+	);
+
+	private $topicName = '';
+
+	public function getURI() {
+		switch ($this->queriedContext) {
+			case self::CONTEXT_BY_TOPIC: {
+				return self::URI . $this->getInput(self::PARAMETER_TOPIC);
+			} break;
+			default: {
+				return parent::getURI();
+			}
+		}
+	}
+
+	public function collectData() {
+		$this->topicName = $this->getTopicName($this->getInput(self::PARAMETER_TOPIC));
+
+		switch($this->topicName) {
+			case self::TOPIC_MAGAZINE: {
+				return $this->collectMagazine();
+			} break;
+			case self::TOPIC_LATEST_STORIES: {
+				return $this->collectLatestStories();
+			} break;
+			default: {
+				returnServerError('Unknown topic: "' . $this->topicName . '"');
+			}
+		}
+	}
+
+	public function getName() {
+		switch ($this->queriedContext) {
+			case self::CONTEXT_BY_TOPIC: {
+				return static::NAME . ': ' . $this->topicName;
+			} break;
+			default: {
+				return parent::getName();
+			}
+		}
+	}
+
+	private function getTopicName($topic) {
+		return array_search($topic, static::PARAMETERS[self::CONTEXT_BY_TOPIC][self::PARAMETER_TOPIC]['values']);
+	}
+
+	private function collectMagazine() {
+		$uri = $this->getURI();
+
+		$html = getSimpleHTMLDOM($uri)
+			or returnServerError('Could not request ' . $uri);
+
+		$script = $html->find('#lead-component script')[0];
+
+		$json = json_decode($script->innertext, true);
+
+		// This is probably going to break in the future, fix it then :)
+		foreach($json['body']['0']['multilayout_promo_beta']['stories'] as $story) {
+			$this->addStory($story);
+		}
+	}
+
+	private function collectLatestStories() {
+		$uri = self::URI . 'latest-stories/_jcr_content/content/hubfeed.promo-hub-feed-all-stories.json';
+
+		$json_raw = getContents($uri)
+			or returnServerError('Could not request ' . $uri);
+
+		foreach(json_decode($json_raw, true) as $story) {
+			$this->addStory($story);
+		}
+	}
+
+	private function addStory($story) {
+		$title = 'Unknown title';
+		$content = '';
+
+		foreach($story['components'] as $component) {
+			switch($component['content_type']) {
+				case 'title': {
+					$title = $component['title']['text'];
+				} break;
+				case 'dek': {
+					$content = $component['dek']['text'];
+				} break;
+			}
+		}
+
+		$item = array();
+
+		$item['uri'] = $story['uri'];
+		$item['title'] = $title;
+
+		// if full article is requested!
+		if ($this->getInput(self::PARAMETER_FULL_ARTICLE))
+			$item['content'] = $this->getFullArticle($item['uri']);
+		else
+			$item['content'] = $content;
+
+		if (isset($story['promo_image'])) {
+			switch($story['promo_image']['content_type']) {
+				case 'image': {
+					$item['enclosures'][] = $story['promo_image']['image']['uri'];
+				} break;
+			}
+		}
+
+		if (isset($story['lead_media'])) {
+			$media = $story['lead_media'];
+			switch($media['content_type']) {
+				case 'image': {
+					// Don't add if promo_image was added
+					if (empty($item['enclosures']))
+						$item['enclosures'][] = $media['image']['uri'];
+				} break;
+				case 'image_gallery': {
+					foreach($media['image_gallery']['images'] as $image) {
+						$item['enclosures'][] = $image['uri'];
+					}
+				} break;
+			}
+		}
+
+		$this->items[] = $item;
+	}
+
+	private function getFullArticle($uri) {
+		$html = getSimpleHTMLDOMCached($uri)
+			or returnServerError('Could not load ' . $uri);
+
+		$html = defaultLinkTo($html, $uri);
+
+		$content = '';
+
+		foreach($html->find('
+			.content > .smartbody.text,
+			.content > .section.image script[type="text/json"],
+			.content > .section.image span[itemprop="caption"],
+			.content > .section.inline script[type="text/json"]
+			') as $element) {
+			if ($element->tag === 'script') {
+				$json = json_decode($element->innertext, true);
+				if (isset($json['src'])) {
+					$content .= '<img src="' . $json['src'] . '" width="100%" alt="' . $json['alt'] . '">';
+				} elseif (isset($json['galleryType']) && isset($json['endpoint'])) {
+					$doc = getContents($json['endpoint'])
+						or returnServerError('Could not load ' . $json['endpoint']);
+					$json = json_decode($doc, true);
+					foreach($json['items'] as $item) {
+						$content .= '<p>' . $item['caption'] . '</p>';
+						$content .= '<img src="' . $item['url'] . '" width="100%" alt="' . $item['caption'] . '">';
+					}
+				}
+			} else {
+				$content .= $element->outertext;
+			}
+		}
+
+		return $content;
+	}
+}

bridges/NovelUpdatesBridge.php

@@ -3,7 +3,7 @@ class NovelUpdatesBridge extends BridgeAbstract {
 
 	const MAINTAINER = 'albirew';
 	const NAME = 'Novel Updates';
-	const URI = 'http://www.novelupdates.com/';
+	const URI = 'https://www.novelupdates.com/';
 	const CACHE_TIMEOUT = 21600; // 6h
 	const DESCRIPTION = 'Returns releases from Novel Updates';
 	const PARAMETERS = array( array(

bridges/PatreonBridge.php

@@ -0,0 +1,203 @@
+<?php
+class PatreonBridge extends BridgeAbstract {
+	const NAME = 'Patreon Bridge';
+	const URI = 'https://www.patreon.com/';
+	const CACHE_TIMEOUT = 300; // 5min
+	const DESCRIPTION = 'Returns posts by creators on Patreon';
+	const MAINTAINER = 'Roliga';
+	const PARAMETERS = array( array(
+		'creator' => array(
+			'name' => 'Creator',
+			'type' => 'text',
+			'required' => true,
+			'title' => 'Creator name as seen in their page URL'
+		)
+	));
+
+	public function collectData(){
+		$html = getSimpleHTMLDOMCached($this->getURI(), 86400)
+			or returnServerError('Failed to load creator page at ' . $this->getURI());
+		$regex = '#/api/campaigns/([0-9]+)#';
+		if(preg_match($regex, $html->save(), $matches) > 0) {
+			$campaign_id = $matches[1];
+		} else {
+			returnServerError('Could not find campaign ID');
+		}
+
+		$query = array(
+			'include' => implode(',', array(
+				'user',
+				'attachments',
+				'user_defined_tags',
+				//'campaign',
+				//'poll.choices',
+				//'poll.current_user_responses.user',
+				//'poll.current_user_responses.choice',
+				//'poll.current_user_responses.poll',
+				//'access_rules.tier.null',
+				//'images.null',
+				//'audio.null'
+			)),
+			'fields' => array(
+				'post' => implode(',', array(
+					//'change_visibility_at',
+					//'comment_count',
+					'content',
+					//'current_user_can_delete',
+					//'current_user_can_view',
+					//'current_user_has_liked',
+					//'embed',
+					'image',
+					//'is_paid',
+					//'like_count',
+					//'min_cents_pledged_to_view',
+					//'patreon_url',
+					//'patron_count',
+					//'pledge_url',
+					//'post_file',
+					//'post_metadata',
+					//'post_type',
+					'published_at',
+					'teaser_text',
+					//'thumbnail_url',
+					'title',
+					//'upgrade_url',
+					'url',
+					//'was_posted_by_campaign_owner'
+				)),
+				'user' => implode(',', array(
+					//'image_url',
+					'full_name',
+					//'url'
+				))
+			),
+			'filter' => array(
+				'contains_exclusive_posts' => true,
+				'is_draft' => false,
+				'campaign_id' => $campaign_id
+			),
+			'sort' => '-published_at'
+		);
+		$posts = $this->apiGet('posts', $query);
+
+		foreach($posts->data as $post) {
+			$item = array(
+				'uri' => $post->attributes->url,
+				'title' => $post->attributes->title,
+				'timestamp' => $post->attributes->published_at,
+				'content' => '',
+				'uid' => 'patreon.com/' . $post->id
+			);
+
+			$user = $this->findInclude($posts,
+				'user',
+				$post->relationships->user->data->id);
+			$item['author'] = $user->full_name;
+
+			if(isset($post->attributes->image))
+				$item['content'] .= '<p><a href="'
+					. $post->attributes->url
+					. '"><img src="'
+					. $post->attributes->image->thumb_url
+					. '" /></a></p>';
+
+			if(isset($post->attributes->content)) {
+				$item['content'] .= $post->attributes->content;
+			} elseif (isset($post->attributes->teaser_text)) {
+				$item['content'] .= '<p>'
+					. $post->attributes->teaser_text
+					. '</p>';
+			}
+
+			if(isset($post->relationships->user_defined_tags)) {
+				$item['categories'] = array();
+				foreach($post->relationships->user_defined_tags->data as $tag) {
+					$attrs = $this->findInclude($posts, 'post_tag', $tag->id);
+					$item['categories'][] = $attrs->value;
+				}
+			}
+
+			if(isset($post->relationships->attachments)) {
+				$item['enclosures'] = array();
+				foreach($post->relationships->attachments->data as $attachment) {
+					$attrs = $this->findInclude($posts, 'attachment', $attachment->id);
+					$item['enclosures'][] = $attrs->url;
+				}
+			}
+
+			$this->items[] = $item;
+		}
+	}
+
+	/*
+	 * Searches the "included" array in an API response and returns attributes
+	 * for the first match.
+	 */
+	private function findInclude($data, $type, $id) {
+		foreach($data->included as $include)
+			if($include->type === $type && $include->id === $id)
+				return $include->attributes;
+	}
+
+	private function apiGet($endpoint, $query_data = array()) {
+		$query_data['json-api-version'] = 1.0;
+		$query_data['json-api-use-default-includes'] = 0;
+
+		$url = 'https://www.patreon.com/api/'
+			. $endpoint
+			. '?'
+			. http_build_query($query_data);
+
+		/*
+		 * Accept-Language header and the CURL cipher list are for bypassing the
+		 * Cloudflare anti-bot protection on the Patreon API. If this ever breaks,
+		 * here are some other project that also deal with this:
+		 * https://github.com/mikf/gallery-dl/issues/342
+		 * https://github.com/daemionfox/patreon-feed/issues/7
+		 * https://www.patreondevelopers.com/t/api-returning-cloudflare-challenge/2025
+		 * https://github.com/splitbrain/patreon-rss/issues/4
+		 */
+		$header = array(
+			'Accept-Language: en-US',
+			'Content-Type: application/json'
+		);
+		$opts = array(
+			CURLOPT_SSL_CIPHER_LIST => implode(':', array(
+				'DEFAULT',
+				'!DHE-RSA-CHACHA20-POLY1305'
+			))
+		);
+
+		$data = json_decode(getContents($url, $header, $opts))
+			or returnServerError('API request to "' . $url . '" failed.');
+
+		return $data;
+	}
+
+	public function getName(){
+		if(!is_null($this->getInput('creator')))
+			return $this->getInput('creator') . ' posts';
+
+		return parent::getName();
+	}
+
+	public function getURI(){
+		if(!is_null($this->getInput('creator')))
+			return self::URI . $this->getInput('creator');
+
+		return parent::getURI();
+	}
+
+	public function detectParameters($url){
+		$params = array();
+
+		// Matches e.g. https://www.patreon.com/SomeCreator
+		$regex = '/^(https?:\/\/)?(www\.)?patreon\.com\/([^\/&?\n]+)/';
+		if(preg_match($regex, $url, $matches) > 0) {
+			$params['creator'] = urldecode($matches[3]);
+			return $params;
+		}
+
+		return null;
+	}
+}

bridges/PikabuBridge.php

@@ -32,6 +32,13 @@ class PikabuBridge extends BridgeAbstract {
 				'required' => true
 			),
 			'filter' => self::PARAMETERS_FILTER
+		),
+		'По пользователю' => array(
+			'user' => array(
+				'name' => 'Пользователь',
+				'exampleValue' => 'admin',
+				'required' => true
+			)
 		)
 	);
 
@@ -40,6 +47,8 @@ class PikabuBridge extends BridgeAbstract {
 	public function getURI() {
 		if ($this->getInput('tag')) {
 			return self::URI . '/tag/' . rawurlencode($this->getInput('tag')) . '/' . rawurlencode($this->getInput('filter'));
+		} else if ($this->getInput('user')) {
+			return self::URI . '/@' . rawurlencode($this->getInput('user'));
 		} else if ($this->getInput('community')) {
 			$uri = self::URI . '/community/' . rawurlencode($this->getInput('community'));
 			if ($this->getInput('filter') != 'hot') {

bridges/PinterestBridge.php

@@ -16,12 +16,6 @@ class PinterestBridge extends FeedExpander {
 				'name' => 'board',
 				'required' => true
 			)
-		),
-		'From search' => array(
-			'q' => array(
-				'name' => 'Keyword',
-				'required' => true
-			)
 		)
 	);
 
@@ -29,17 +23,9 @@ class PinterestBridge extends FeedExpander {
 		return 'https://s.pinimg.com/webapp/style/images/favicon-9f8f9adf.png';
 	}
 
-	public function collectData(){
-		switch($this->queriedContext) {
-			case 'By username and board':
-				$this->collectExpandableDatas($this->getURI() . '.rss');
-				$this->fixLowRes();
-				break;
-			case 'From search':
-			default:
-				$html = getSimpleHTMLDOMCached($this->getURI());
-				$this->getSearchResults($html);
-		}
+	public function collectData() {
+		$this->collectExpandableDatas($this->getURI() . '.rss');
+		$this->fixLowRes();
 	}
 
 	private function fixLowRes() {
@@ -55,71 +41,21 @@ class PinterestBridge extends FeedExpander {
 
 	}
 
-	private function getSearchResults($html){
-		$json = json_decode($html->find('#jsInit1', 0)->innertext, true);
-		$results = $json['resourceDataCache'][0]['data']['results'];
+	public function getURI() {
 
-		foreach($results as $result) {
-			$item = array();
-
-			$item['uri'] = self::URI . $result['board']['url'];
-
-			// Some use regular titles, others provide 'advanced' infos, a few
-			// provide even less info. Thus we attempt multiple options.
-			$item['title'] = trim($result['title']);
-
-			if($item['title'] === '')
-				$item['title'] = trim($result['rich_summary']['display_name']);
-
-			if($item['title'] === '')
-				$item['title'] = trim($result['grid_description']);
-
-			$item['timestamp'] = strtotime($result['created_at']);
-			$item['username'] = $result['pinner']['username'];
-			$item['fullname'] = $result['pinner']['full_name'];
-			$item['avatar'] = $result['pinner']['image_small_url'];
-			$item['author'] = $item['username'] . ' (' . $item['fullname'] . ')';
-			$item['content'] = '<img align="left" style="margin: 2px 4px;" src="'
-				. htmlentities($item['avatar'])
-				. '" /><p><strong>'
-				. $item['username']
-				. '</strong><br>'
-				. $item['fullname']
-				. '</p><br><img src="'
-				. $result['images']['736x']['url']
-				. '" alt="" /><br><p>'
-				. $result['description']
-				. '</p>';
-
-			$item['enclosures'] = array($result['images']['orig']['url']);
-
-			$this->items[] = $item;
+		if ($this->queriedContext === 'By username and board') {
+			return self::URI . '/' . urlencode($this->getInput('u')) . '/' . urlencode($this->getInput('b'));
 		}
+
+		return parent::getURI();
 	}
 
-	public function getURI(){
-		switch($this->queriedContext) {
-		case 'By username and board':
-			$uri = self::URI . '/' . urlencode($this->getInput('u')) . '/' . urlencode($this->getInput('b'));// . '.rss';
-			break;
-		case 'From search':
-			$uri = self::URI . '/search/?q=' . urlencode($this->getInput('q'));
-			break;
-		default: return parent::getURI();
-		}
-		return $uri;
-	}
+	public function getName() {
 
-	public function getName(){
-		switch($this->queriedContext) {
-		case 'By username and board':
-			$specific = $this->getInput('u') . ' - ' . $this->getInput('b');
-		break;
-		case 'From search':
-			$specific = $this->getInput('q');
-		break;
-		default: return parent::getName();
+		if ($this->queriedContext === 'By username and board') {
+			return $this->getInput('u') . ' - ' . $this->getInput('b') . ' - ' . self::NAME;
 		}
-		return $specific . ' - ' . self::NAME;
+
+		return parent::getName();
 	}
 }

bridges/PirateCommunityBridge.php

@@ -0,0 +1,88 @@
+<?php
+class PirateCommunityBridge extends BridgeAbstract {
+	const NAME = 'Pirate-Community Bridge';
+	const URI = 'https://raymanpc.com/';
+	const CACHE_TIMEOUT = 300; // 5min
+	const DESCRIPTION = 'Returns replies to topics';
+	const MAINTAINER = 'Roliga';
+	const PARAMETERS = array( array(
+		't' => array(
+			'name' => 'Topic ID',
+			'type' => 'number',
+			'title' => 'Topic ID from topic URL. If the URL contains t=12 the ID is 12.',
+			'required' => true
+		)));
+
+	private $feedName = '';
+
+	public function detectParameters($url){
+		$parsed_url = parse_url($url);
+
+		if($parsed_url['host'] !== 'raymanpc.com')
+			return null;
+
+		parse_str($parsed_url['query'], $parsed_query);
+
+		if($parsed_url['path'] === '/forum/viewtopic.php'
+		&& array_key_exists('t', $parsed_query)) {
+			return array('t' => $parsed_query['t']);
+		}
+
+		return null;
+	}
+
+	public function getName() {
+		if(!empty($this->feedName))
+			return $this->feedName;
+
+		return parent::getName();
+	}
+
+	public function getURI(){
+		if(!is_null($this->getInput('t'))) {
+			return self::URI
+				. 'forum/viewtopic.php?t='
+				. $this->getInput('t')
+				. '&sd=d'; // sort posts decending by ate so first page has latest posts
+		}
+
+		return parent::getURI();
+	}
+
+	public function collectData(){
+		$html = getSimpleHTMLDOM($this->getURI())
+			or returnServerError('Could not retrieve topic page at ' . $this->getURI());
+
+		$this->feedName = $html->find('head title', 0)->plaintext;
+
+		foreach($html->find('.post') as $reply) {
+			$item = array();
+
+			$item['uri'] = $this->getURI()
+				. $reply->find('h3 a', 0)->getAttribute('href');
+
+			$item['title'] = $reply->find('h3 a', 0)->plaintext;
+
+			$author_html = $reply->find('.author', 0);
+			// author_html contains the timestamp as text directly inside it,
+			// so delete all other child elements
+			foreach($author_html->children as $child)
+				$child->outertext = '';
+			// Timestamps are always in UTC+1
+			$item['timestamp'] = trim($author_html->innertext) . ' +01:00';
+
+			$item['author'] = $reply
+				->find('.username, .username-coloured', 0)
+				->plaintext;
+
+			$item['content'] = defaultLinkTo($reply->find('.content', 0)->innertext,
+				$this->getURI());
+
+			$item['enclosures'] = array();
+			foreach($reply->find('.attachbox img.postimage') as $img)
+				$item['enclosures'][] = urljoin($this->getURI(), $img->src);
+
+			$this->items[] = $item;
+		}
+	}
+}

bridges/Rule34pahealBridge.php

@@ -7,4 +7,21 @@ class Rule34pahealBridge extends Shimmie2Bridge {
 	const NAME = 'Rule34paheal';
 	const URI = 'http://rule34.paheal.net/';
 	const DESCRIPTION = 'Returns images from given page';
+
+	protected function getItemFromElement($element){
+		$item = array();
+		$item['uri'] = $this->getURI() . $element->href;
+		$item['id'] = (int)preg_replace('/[^0-9]/', '', $element->getAttribute(static::IDATTRIBUTE));
+		$item['timestamp'] = time();
+		$thumbnailUri = $element->find('img', 0)->src;
+		$item['tags'] = $element->getAttribute('data-tags');
+		$item['title'] = $this->getName() . ' | ' . $item['id'];
+		$item['content'] = '<a href="'
+		. $item['uri']
+		. '"><img src="'
+		. $thumbnailUri
+		. '" /></a><br>Tags: '
+		. $item['tags'];
+		return $item;
+	}
 }

bridges/SakugabooruBridge.php

@@ -1,11 +0,0 @@
-<?php
-require_once('MoebooruBridge.php');
-
-class SakugabooruBridge extends MoebooruBridge {
-
-	const MAINTAINER = 'mitsukarenai';
-	const NAME = 'Sakugabooru';
-	const URI = 'http://sakuga.yshi.org/';
-	const DESCRIPTION = 'Returns images from given page';
-
-}

bridges/ShanaprojectBridge.php

@@ -2,70 +2,152 @@
 class ShanaprojectBridge extends BridgeAbstract {
 	const MAINTAINER = 'logmanoriginal';
 	const NAME = 'Shanaproject Bridge';
-	const URI = 'http://www.shanaproject.com';
+	const URI = 'https://www.shanaproject.com';
 	const DESCRIPTION = 'Returns a list of anime from the current Season Anime List';
+	const PARAMETERS = array(
+		array(
+			'min_episodes' => array(
+				'name' => 'Minimum Episodes',
+				'type' => 'number',
+				'title' => 'Minimum number of episodes before including in feed',
+				'defaultValue' => 0,
+			),
+			'min_total_episodes' => array(
+				'name' => 'Minimum Total Episodes',
+				'type' => 'number',
+				'title' => 'Minimum total number of episodes before including in feed',
+				'defaultValue' => 0,
+			),
+			'require_banner' => array(
+				'name' => 'Require Banner',
+				'type' => 'checkbox',
+				'title' => 'Only include anime with custom banner image',
+				'defaultValue' => false,
+			),
+		),
+	);
+
+	private $uri;
+
+	public function getURI() {
+		return isset($this->uri) ? $this->uri : parent::getURI();
+	}
+
+	public function collectData(){
+		$html = $this->loadSeasonAnimeList();
+
+		$animes = $html->find('div.header_display_box_info')
+			or returnServerError('Could not find anime headers!');
+
+		$min_episodes = $this->getInput('min_episodes') ?: 0;
+		$min_total_episodes = $this->getInput('min_total_episodes') ?: 0;
+
+		foreach($animes as $anime) {
+
+			list(
+				$episodes_released,
+				/* of */,
+				$episodes_total
+			) = explode(' ', $this->extractAnimeEpisodeInformation($anime));
+
+			// Skip if not enough episodes yet
+			if ($episodes_released < $min_episodes) {
+				continue;
+			}
+
+			// Skip if too many episodes in total
+			if ($episodes_total !== '?' && $episodes_total < $min_total_episodes) {
+				continue;
+			}
+
+			// Skip if https://static.shanaproject.com/no-art.jpg
+			if ($this->getInput('require_banner')
+			&& strpos($this->extractAnimeBackgroundImage($anime), 'no-art') !== false) {
+				continue;
+			}
+
+			$this->items[] = array(
+				'title' => $this->extractAnimeTitle($anime),
+				'author' => $this->extractAnimeAuthor($anime),
+				'uri' => $this->extractAnimeUri($anime),
+				'timestamp' => $this->extractAnimeTimestamp($anime),
+				'content' => $this->buildAnimeContent($anime),
+			);
+
+		}
+	}
 
 	// Returns an html object for the Season Anime List (latest season)
 	private function loadSeasonAnimeList(){
-		// First we need to find the URI to the latest season from the
-		// 'seasons' page searching for 'Season Anime List'
-		$html = getSimpleHTMLDOM($this->getURI() . '/seasons');
-		if(!$html)
-			returnServerError('Could not load \'seasons\' page!');
 
-		$season = $html->find('div.follows_menu/a', 1);
-		if(!$season)
-			returnServerError('Could not find \'Season Anime List\'!');
+		$html = getSimpleHTMLDOM(self::URI . '/seasons')
+			or returnServerError('Could not load \'seasons\' page!');
 
-		$html = getSimpleHTMLDOM($this->getURI() . $season->href);
-		if(!$html)
-			returnServerError(
+		$html = defaultLinkTo($html, self::URI . '/seasons');
+
+		$season = $html->find('div.follows_menu > a', 1)
+			or returnServerError('Could not find \'Season Anime List\'!');
+
+		$html = getSimpleHTMLDOM($season->href)
+			or returnServerError(
 				'Could not load \'Season Anime List\' from \''
 				. $season->innertext
 				. '\'!'
 			);
 
+		$this->uri = $season->href;
+
+		$html = defaultLinkTo($html, $season->href);
+
 		return $html;
+
 	}
 
 	// Extracts the anime title
 	private function extractAnimeTitle($anime){
-		$title = $anime->find('a', 0);
-		if(!$title)
-			returnServerError('Could not find anime title!');
+		$title = $anime->find('a', 0)
+			or returnServerError('Could not find anime title!');
 		return trim($title->innertext);
 	}
 
 	// Extracts the anime URI
 	private function extractAnimeUri($anime){
-		$uri = $anime->find('a', 0);
-		if(!$uri)
-			returnServerError('Could not find anime URI!');
-		return $this->getURI() . $uri->href;
+		$uri = $anime->find('a', 0)
+			or returnServerError('Could not find anime URI!');
+		return $uri->href;
 	}
 
 	// Extracts the anime release date (timestamp)
 	private function extractAnimeTimestamp($anime){
 		$timestamp = $anime->find('span.header_info_block', 1);
-		if(!$timestamp)
+
+		if(!$timestamp) {
 			return null;
+		}
+
 		return strtotime($timestamp->innertext);
 	}
 
 	// Extracts the anime studio name (author)
 	private function extractAnimeAuthor($anime){
 		$author = $anime->find('span.header_info_block', 2);
-		if(!$author)
-			return; // Sometimes the studio is unknown, so leave empty
+
+		if(!$author) {
+			return null; // Sometimes the studio is unknown, so leave empty
+		}
+
 		return trim($author->innertext);
 	}
 
 	// Extracts the episode information (x of y released)
 	private function extractAnimeEpisodeInformation($anime){
-		$episode = $anime->find('div.header_info_episode', 0);
-		if(!$episode)
-			returnServerError('Could not find anime episode information!');
-		return preg_replace('/\r|\n/', ' ', $episode->plaintext);
+		$episode = $anime->find('div.header_info_episode', 0)
+			or returnServerError('Could not find anime episode information!');
+
+		$retVal = preg_replace('/\r|\n/', ' ', $episode->plaintext);
+		$retVal = preg_replace('/\s+/', ' ', $retVal);
+
+		return $retVal;
 	}
 
 	// Extracts the background image
@@ -73,15 +155,16 @@ class ShanaprojectBridge extends BridgeAbstract {
 		// Getting the picture is a little bit tricky as it is part of the style.
 		// Luckily the style is part of the parent div :)
 
-		if(preg_match('/url\(\/\/([^\)]+)\)/i', $anime->parent->style, $matches))
+		if(preg_match('/url\(\/\/([^\)]+)\)/i', $anime->parent->style, $matches)) {
 			return $matches[1];
+		}
 
 		returnServerError('Could not extract background image!');
 	}
 
 	// Builds an URI to search for a specific anime (subber is left empty)
 	private function buildAnimeSearchUri($anime){
-		return $this->getURI()
+		return self::URI
 		. '/search/?title='
 		. urlencode($this->extractAnimeTitle($anime))
 		. '&subber=';
@@ -102,22 +185,4 @@ class ShanaprojectBridge extends BridgeAbstract {
 		. $this->buildAnimeSearchUri($anime)
 		. '">Search episodes</a></p>';
 	}
-
-	public function collectData(){
-		$html = $this->loadSeasonAnimeList();
-
-		$animes = $html->find('div.header_display_box_info');
-		if(!$animes)
-			returnServerError('Could not find anime headers!');
-
-		foreach($animes as $anime) {
-			$item = array();
-			$item['title'] = $this->extractAnimeTitle($anime);
-			$item['author'] = $this->extractAnimeAuthor($anime);
-			$item['uri'] = $this->extractAnimeUri($anime);
-			$item['timestamp'] = $this->extractAnimeTimestamp($anime);
-			$item['content'] = $this->buildAnimeContent($anime);
-			$this->items[] = $item;
-		}
-	}
 }

bridges/SplCenterBridge.php

@@ -0,0 +1,64 @@
+<?php
+class SplCenterBridge extends FeedExpander {
+
+	const NAME = 'Southern Poverty Law Center Bridge';
+	const URI = 'https://www.splcenter.org';
+	const DESCRIPTION = 'Returns the newest posts from the Southern Poverty Law Center';
+	const MAINTAINER = 'VerifiedJoseph';
+	const PARAMETERS = array(array(
+			'content' => array(
+				'name' => 'Content',
+				'type' => 'list',
+				'values' => array(
+					'News' => 'news',
+					'Hatewatch' => 'hatewatch',
+				),
+				'defaultValue' => 'news',
+			)
+		)
+	);
+
+	const CACHE_TIMEOUT = 3600; // 1 hour
+
+	protected function parseItem($item) {
+		$item = parent::parseItem($item);
+
+		$articleHtml = getSimpleHTMLDOMCached($item['uri'])
+			or returnServerError('Could not request: ' . $item['uri']);
+
+		foreach ($articleHtml->find('.file') as $index => $media) {
+			$articleHtml->find('div.file', $index)->outertext = '<em>' . $media->outertext . '</em>';
+		}
+
+		$item['content'] = $articleHtml->find('div#group-content-container', 0)->innertext;
+		$item['enclosures'][] = $articleHtml->find('meta[name="twitter:image"]', 0)->content;
+
+		return $item;
+	}
+
+	public function collectData() {
+		$this->collectExpandableDatas($this->getURI() . '/rss.xml');
+	}
+
+	public function getURI() {
+
+		if (!is_null($this->getInput('content'))) {
+			return self::URI . '/' . $this->getInput('content');
+		}
+
+		return parent::getURI();
+	}
+
+	public function getName() {
+
+		if (!is_null($this->getInput('content'))) {
+			$parameters = $this->getParameters();
+
+			$contentValues = array_flip($parameters[0]['content']['values']);
+
+			return $contentValues[$this->getInput('content')] . ' - Southern Poverty Law Center';
+		}
+
+		return parent::getName();
+	}
+}

bridges/SteamCommunityBridge.php

@@ -20,7 +20,8 @@ class SteamCommunityBridge extends BridgeAbstract {
 				'values' => array(
 					'Artwork' => 'images',
 					'Screenshots' => 'screenshots',
-					'Videos' => 'videos'
+					'Videos' => 'videos',
+					'Workshop' => 'workshop'
 				)
 			)
 		)
@@ -32,7 +33,7 @@ class SteamCommunityBridge extends BridgeAbstract {
 
 	protected function getMainPage() {
 		$category = $this->getInput('category');
-		$html = getSimpleHTMLDOM($this->getURI() . '/?p=1&browsefilter=mostrecent')
+		$html = getSimpleHTMLDOM($this->getURI())
 			or returnServerError('Could not fetch Steam data.');
 
 		return $html;
@@ -56,12 +57,17 @@ class SteamCommunityBridge extends BridgeAbstract {
 	}
 
 	public function getURI() {
+		if ($this->getInput('category') === 'workshop')
+			return self::URI . '/workshop/browse/?appid='
+				. $this->getInput('i') . '&browsesort=mostrecent';
+
 		return self::URI . '/app/'
 			. $this->getInput('i') . '/'
-			. $this->getInput('category');
+			. $this->getInput('category')
+			. '/?p=1&browsefilter=mostrecent';
 	}
 
-	public function collectData() {
+	private function collectMedia() {
 		$category = $this->getInput('category');
 		$html = $this->getMainPage();
 		$cards = $html->find('div.apphub_Card');
@@ -124,4 +130,62 @@ class SteamCommunityBridge extends BridgeAbstract {
 				break;
 		}
 	}
+
+	private function collectWorkshop() {
+		$category = $this->getInput('category');
+		$html = $this->getMainPage();
+		$workShopItems = $html->find('div.workshopItem');
+
+		foreach($workShopItems as $workShopItem) {
+			$author = $workShopItem->find('div.workshopItemAuthorName', 0)->find('a', 0);
+			$author = $author->innertext;
+
+			$fileRating = $workShopItem->find('img.fileRating', 0);
+
+			$uri = $workShopItem->find('a.ugc', 0)->getAttribute('href');
+
+			$htmlItem = getSimpleHTMLDOMCached($uri);
+
+			$title = $htmlItem->find('div.workshopItemTitle', 0)->innertext;
+			$date = $htmlItem->find('div.detailsStatRight', 0)->innertext;
+			$description = $htmlItem->find('div.workshopItemDescription', 0)->innertext;
+
+			$previewImage = $htmlItem->find('#previewImage', 0);
+
+			$htmlTags = $htmlItem->find('div.workshopTags');
+
+			$tags = '';
+
+			foreach($htmlTags as $htmlTag) {
+				if ($tags !== '')
+					$tags .= ',';
+
+				$tags .= $htmlTag->find('a', 0)->innertext;
+			}
+
+			// create item
+			$item = array();
+			$item['title'] = $title;
+			$item['uri'] = $uri;
+			$item['timestamp'] = strtotime($date);
+			$item['author'] = $author;
+			$item['categories'] = $category;
+
+			$item['content'] = '<p><a href="' . $uri . '">'
+				. $previewImage . '</a></p><p>' . $fileRating
+				. '</p><p>' . $description . '</p>';
+
+			$this->items[] = $item;
+
+			if (count($this->items) >= 10)
+				break;
+		}
+	}
+
+	public function collectData() {
+		if ($this->getInput('category') === 'workshop')
+			$this->collectWorkshop();
+		else
+			$this->collectMedia();
+	}
 }

bridges/StoriesIGBridge.php

@@ -0,0 +1,47 @@
+<?php
+class StoriesIGBridge extends BridgeAbstract {
+
+	const NAME = 'Instagram Stories';
+	const URI = 'https://storiesig.com';
+	const DESCRIPTION = 'Display Instagram Stories';
+	const MAINTAINER = 'antoineturmel';
+	const PARAMETERS = array(
+		array(
+			'username' => array(
+				'name' => 'Instagram username',
+				'type' => 'text',
+				'required' => true,
+				'title' => 'Insert the username here'
+			),
+		)
+	);
+
+	public function collectData(){
+		$html = getSimpleHTMLDOM($this->getURI())
+			or returnServerError('Failed to receive ' . $this->getURI());
+
+		$results = $html->find('article');
+
+		foreach($results as $result) {
+
+			$item = array();
+
+			$item['title'] = $this->getInput('username') . ' story';
+			$item['uri'] = $result->find('div.download', 0)->find('a', 0)->href;
+			$item['author'] = $this->getInput('username');
+			$item['uid'] = $result->find('time', 0)->datetime;
+
+			$item['content'] = $result;
+
+			$this->items[] = $item;
+		}
+	}
+
+	public function getURI(){
+		$uri = self::URI . '/stories/';
+		$uri .= urlencode($this->getInput('username'));
+		return $uri;
+
+		return parent::getURI();
+	}
+}

bridges/TelegramBridge.php

@@ -0,0 +1,301 @@
+<?php
+class TelegramBridge extends BridgeAbstract {
+	const NAME = 'Telegram Bridge';
+	const URI = 'https://t.me';
+	const DESCRIPTION = 'Returns newest posts from a public Telegram channel';
+	const MAINTAINER = 'VerifiedJoseph';
+	const PARAMETERS = array(array(
+			'username' => array(
+				'name' => 'Username',
+				'type' => 'text',
+				'required' => true,
+				'exampleValue' => '@telegram',
+			)
+		)
+	);
+
+	const CACHE_TIMEOUT = 900; // 15 mins
+
+	private $feedName = '';
+	private $enclosures = array();
+	private $itemTitle = '';
+
+	private $backgroundImageRegex = "/background-image:url\('(.*)'\)/";
+
+	public function collectData() {
+
+		$html = getSimpleHTMLDOM($this->getURI())
+			or returnServerError('Could not request: ' . $this->getURI());
+
+		$channelTitle = htmlspecialchars_decode(
+			$html->find('div.tgme_channel_info_header_title span', 0)->plaintext,
+			ENT_QUOTES
+		);
+		$this->feedName = $channelTitle . ' (@' . $this->processUsername() . ')';
+
+		foreach($html->find('div.tgme_widget_message_wrap.js-widget_message_wrap') as $index => $messageDiv) {
+			$this->itemTitle = '';
+			$this->enclosures = array();
+			$item = array();
+
+			$item['uri'] = $this->processUri($messageDiv);
+			$item['content'] = html_entity_decode($this->processContent($messageDiv), ENT_QUOTES);
+			$item['title'] = html_entity_decode($this->itemTitle, ENT_QUOTES);
+			$item['timestamp'] = $this->processDate($messageDiv);
+			$item['enclosures'] = $this->enclosures;
+			$author = trim($messageDiv->find('a.tgme_widget_message_owner_name', 0)->plaintext);
+			$item['author'] = html_entity_decode($author, ENT_QUOTES);
+
+			$this->items[] = $item;
+		}
+		$this->items = array_reverse($this->items);
+	}
+
+	public function getURI() {
+
+		if (!is_null($this->getInput('username'))) {
+			return self::URI . '/s/' . $this->processUsername();
+		}
+
+		return parent::getURI();
+	}
+
+	public function getName() {
+
+		if (!empty($this->feedName)) {
+			return $this->feedName . ' - Telegram';
+		}
+
+		return parent::getName();
+	}
+
+	private function processUsername() {
+
+		if (substr($this->getInput('username'), 0, 1) === '@') {
+			return substr($this->getInput('username'), 1);
+		}
+
+		return $this->getInput('username');
+	}
+
+	private function processUri($messageDiv) {
+		return $messageDiv->find('a.tgme_widget_message_date', 0)->href;
+	}
+
+	private function processContent($messageDiv) {
+		$message = '';
+
+		if ($messageDiv->find('div.tgme_widget_message_forwarded_from', 0)) {
+			$message = $messageDiv->find('div.tgme_widget_message_forwarded_from', 0)->innertext . '<br><br>';
+		}
+
+		if ($messageDiv->find('a.tgme_widget_message_reply', 0)) {
+			$message = $this->processReply($messageDiv);
+		}
+
+		if ($messageDiv->find('div.tgme_widget_message_sticker_wrap', 0)) {
+			$message .= $this->processSticker($messageDiv);
+		}
+
+		if ($messageDiv->find('div.tgme_widget_message_poll', 0)) {
+			$message .= $this->processPoll($messageDiv);
+		}
+
+		if ($messageDiv->find('video', 0)) {
+			$message .= $this->processVideo($messageDiv);
+		}
+
+		if ($messageDiv->find('a.tgme_widget_message_photo_wrap', 0)) {
+			$message .= $this->processPhoto($messageDiv);
+		}
+
+		if ($messageDiv->find('a.not_supported', 0)) {
+			$message .= $this->processNotSupported($messageDiv);
+		}
+
+		if ($messageDiv->find('div.tgme_widget_message_text.js-message_text', 0)) {
+			$message .= $messageDiv->find('div.tgme_widget_message_text.js-message_text', 0);
+
+			$this->itemTitle = $this->ellipsisTitle(
+				$messageDiv->find('div.tgme_widget_message_text.js-message_text', 0)->plaintext
+			);
+		}
+
+		if ($messageDiv->find('a.tgme_widget_message_link_preview', 0)) {
+			$message .= $this->processLinkPreview($messageDiv);
+		}
+
+		return $message;
+	}
+
+	private function processReply($messageDiv) {
+
+		$reply = $messageDiv->find('a.tgme_widget_message_reply', 0);
+
+		return <<<EOD
+<blockquote>{$reply->find('span.tgme_widget_message_author_name', 0)->plaintext}<br>
+{$reply->find('div.tgme_widget_message_text', 0)->innertext} 
+<a href="{$reply->href}">{$reply->href}</a></blockquote><hr>
+EOD;
+	}
+
+	private function processSticker($messageDiv) {
+
+		if (empty($this->itemTitle)) {
+			$this->itemTitle = '@' . $this->processUsername() . ' posted a sticker';
+		}
+
+		$stickerDiv = $messageDiv->find('div.tgme_widget_message_sticker_wrap', 0);
+
+		preg_match($this->backgroundImageRegex, $stickerDiv->find('i', 0)->style, $sticker);
+
+		$this->enclosures[] = $sticker[1];
+
+		return <<<EOD
+<a href="{$stickerDiv->children(0)->herf}"><img src="{$sticker[1]}"></a>
+EOD;
+	}
+
+	private function processPoll($messageDiv) {
+
+		$poll = $messageDiv->find('div.tgme_widget_message_poll', 0);
+
+		$title = $poll->find('div.tgme_widget_message_poll_question', 0)->plaintext;
+		$type = $poll->find('div.tgme_widget_message_poll_type', 0)->plaintext;
+
+		if (empty($this->itemTitle)) {
+			$this->itemTitle = $title;
+		}
+
+		$pollOptions = '<ul>';
+
+		foreach ($poll->find('div.tgme_widget_message_poll_option') as $option) {
+			$pollOptions .= '<li>' . $option->children(0)->plaintext . ' - ' .
+				$option->find('div.tgme_widget_message_poll_option_text', 0)->plaintext . '</li>';
+		}
+		$pollOptions .= '</ul>';
+
+		return <<<EOD
+			{$title}<br><small>$type</small><br>{$pollOptions}
+EOD;
+	}
+
+	private function processLinkPreview($messageDiv) {
+
+		$image = '';
+		$title = '';
+		$site = '';
+		$description = '';
+
+		$preview = $messageDiv->find('a.tgme_widget_message_link_preview', 0);
+
+		if (trim($preview->innertext) === '') {
+			return '';
+		}
+
+		if($preview->find('i', 0) &&
+		   preg_match($this->backgroundImageRegex, $preview->find('i', 0)->style, $photo)) {
+
+			$image = '<img src="' . $photo[1] . '"/>';
+			$this->enclosures[] = $photo[1];
+		}
+
+		if ($preview->find('div.link_preview_title', 0)) {
+			$title = $preview->find('div.link_preview_title', 0)->plaintext;
+		}
+
+		if ($preview->find('div.link_preview_site_name', 0)) {
+			$site = $preview->find('div.link_preview_site_name', 0)->plaintext;
+		}
+
+		if ($preview->find('div.link_preview_description', 0)) {
+			$description = $preview->find('div.link_preview_description', 0)->plaintext;
+		}
+
+		return <<<EOD
+<blockquote><a href="{$preview->href}">$image</a><br><a href="{$preview->href}">
+{$title} - {$site}</a><br>{$description}</blockquote>
+EOD;
+	}
+
+	private function processVideo($messageDiv) {
+
+		if (empty($this->itemTitle)) {
+			$this->itemTitle = '@' . $this->processUsername() . ' posted a video';
+		}
+
+		if ($messageDiv->find('i.tgme_widget_message_video_thumb')) {
+			preg_match($this->backgroundImageRegex, $messageDiv->find('i.tgme_widget_message_video_thumb', 0)->style, $photo);
+		} elseif ($messageDiv->find('i.link_preview_video_thumb')) {
+			preg_match($this->backgroundImageRegex, $messageDiv->find('i.link_preview_video_thumb', 0)->style, $photo);
+		}
+
+		$this->enclosures[] = $photo[1];
+
+		return <<<EOD
+<video controls="" poster="{$photo[1]}" preload="none">
+	<source src="{$messageDiv->find('video', 0)->src}" type="video/mp4">
+</video>
+EOD;
+	}
+
+	private function processPhoto($messageDiv) {
+
+		if (empty($this->itemTitle)) {
+			$this->itemTitle = '@' . $this->processUsername() . ' posted a photo';
+		}
+
+		$photos = '';
+
+		foreach ($messageDiv->find('a.tgme_widget_message_photo_wrap') as $photoWrap) {
+			preg_match($this->backgroundImageRegex, $photoWrap->style, $photo);
+
+			$this->enclosures[] = $photo[1];
+
+			$photos .= <<<EOD
+<a href="{$photoWrap->href}"><img src="{$photo[1]}"/></a><br>
+EOD;
+		}
+		return $photos;
+	}
+
+	private function processNotSupported($messageDiv) {
+
+		if (empty($this->itemTitle)) {
+			$this->itemTitle = '@' . $this->processUsername() . ' posted a video';
+		}
+
+		if ($messageDiv->find('i.tgme_widget_message_video_thumb')) {
+			preg_match($this->backgroundImageRegex, $messageDiv->find('i.tgme_widget_message_video_thumb', 0)->style, $photo);
+		} elseif ($messageDiv->find('i.link_preview_video_thumb')) {
+			preg_match($this->backgroundImageRegex, $messageDiv->find('i.link_preview_video_thumb', 0)->style, $photo);
+		}
+
+		$this->enclosures[] = $photo[1];
+
+		return <<<EOD
+<a href="{$messageDiv->find('a.not_supported', 0)->href}">
+{$messageDiv->find('div.message_media_not_supported_label', 0)->innertext}<br><br>
+{$messageDiv->find('span.message_media_view_in_telegram', 0)->innertext}<br><br>
+<img src="{$photo[1]}"/></a>
+EOD;
+	}
+
+	private function processDate($messageDiv) {
+
+		$messageMeta = $messageDiv->find('span.tgme_widget_message_meta', 0);
+		return $messageMeta->find('time', 0)->datetime;
+
+	}
+
+	private function ellipsisTitle($text) {
+
+		$length = 100;
+
+		if (strlen($text) > $length) {
+			$text = explode('<br>', wordwrap($text, $length, '<br>'));
+			return $text[0] . '...';
+		}
+		return $text;
+	}
+}

bridges/TheGuardianBridge.php

@@ -0,0 +1,96 @@
+<?php
+class TheGuardianBridge extends FeedExpander {
+	const MAINTAINER = 'IceWreck';
+	const NAME = 'The Guardian Bridge';
+	const URI = 'https://www.theguardian.com/';
+	const CACHE_TIMEOUT = 600; // This is a news site, so don't cache for more than 10 mins
+	const DESCRIPTION = 'RSS feed for The Guardian';
+	const PARAMETERS = array( array(
+		'feed' => array(
+			'name' => 'Feed',
+			'type' => 'list',
+			'values' => array(
+				'World News' => 'world/rss',
+				'US News' => '/us-news/rss',
+				'UK News' => '/uk-news/rss',
+				'Europe News' => '/world/europe-news/rss',
+				'Asia News' => '/world/asia/rss',
+				'Tech' => '/uk/technology/rss',
+				'Business News' => '/uk/business/rss',
+				'Opinion' => '/uk/commentisfree/rss',
+				'Lifestyle' => '/uk/lifeandstyle/rss',
+				'Culture' => '/uk/culture/rss',
+				'Sports' => '/uk/sport/rss'
+			)
+		)
+
+		/*
+
+		Topicwise Links
+
+		You can find the base feed for any topic by appending /rss to the url.
+
+		Example:
+
+		https://feeds.theguardian.com/theguardian/uk-news/rss
+		https://feeds.theguardian.com/theguardian/us-news/rss
+
+		Or simply
+
+		https://www.theguardian.com/world/rss
+
+		Just add that topic as a value in the PARAMETERS const.
+
+		*/
+
+
+	));
+
+	public function collectData(){
+		$feed = $this->getInput('feed');
+		$feedURL = 'https://feeds.theguardian.com/theguardian/' . $feed;
+		$this->collectExpandableDatas($feedURL, 10);
+	}
+
+	protected function parseItem($newsItem){
+		$item = parent::parseItem($newsItem);
+
+		// --- Recovering the article ---
+
+		// $articlePage gets the entire page's contents
+		$articlePage = getSimpleHTMLDOM($newsItem->link);
+		// figure contain's the main article image
+		$article = $articlePage->find('figure', 0);
+		// content__article-body has the actual article
+		foreach($articlePage->find('.content__article-body') as $element)
+			$article = $article . $element;
+
+		// --- Fixing ugly elements ---
+
+		// Replace the image viewer and BS with the image itself
+		foreach($articlePage->find('a.article__img-container') as $uslElementLoc) {
+			$main_img = $uslElementLoc->find('img', 0);
+			$article = str_replace($uslElementLoc, $main_img, $article);
+		}
+
+		// List of all the crap in the article
+		$uselessElements = array(
+			'#show-caption',
+			'.element-atom',
+			'.submeta',
+			'youtube-media-atom',
+			'svg'
+		);
+
+		// Remove the listed crap
+		foreach($uselessElements as $uslElement) {
+			foreach($articlePage->find($uslElement) as $uslElementLoc) {
+				$article = str_replace($uslElementLoc, '', $article);
+			}
+		}
+
+		$item['content'] = $article;
+
+		return $item;
+	}
+}

bridges/ThePirateBayBridge.php

@@ -3,7 +3,7 @@ class ThePirateBayBridge extends BridgeAbstract {
 
 	const MAINTAINER = 'mitsukarenai';
 	const NAME = 'The Pirate Bay';
-	const URI = 'https://thepiratebay.wf/';
+	const URI = 'https://thepiratebay.org/';
 	const DESCRIPTION = 'Returns results for the keywords. You can put several
  list of keywords by separating them with a semicolon (e.g. "one show;another
  show"). Category based search needs the category number as input. User based
@@ -149,11 +149,12 @@ class ThePirateBayBridge extends BridgeAbstract {
 				|| !is_null($element->find('img[alt=VIP]', 0))
 				|| !is_null($element->find('img[alt=Trusted]', 0))) {
 					$item = array();
-					$item['uri'] = $element->find('a', 3)->href;
+					$item['uri'] = self::URI . $element->find('a.detLink', 0)->href;
 					$item['id'] = self::URI . $element->find('a.detLink', 0)->href;
 					$item['timestamp'] = parseDateTimestamp($element);
 					$item['author'] = $element->find('a.detDesc', 0)->plaintext;
 					$item['title'] = $element->find('a.detLink', 0)->plaintext;
+					$item['magnet'] = $element->find('a', 3)->href;
 					$item['seeders'] = (int)$element->find('td', 2)->plaintext;
 					$item['leechers'] = (int)$element->find('td', 3)->plaintext;
 					$item['content'] = $element->find('font', 0)->plaintext
@@ -163,7 +164,9 @@ class ThePirateBayBridge extends BridgeAbstract {
 					. $item['leechers']
 					. '<br><a href="'
 					. $item['id']
-					. '">info page</a>';
+					. '">info page</a><br><a href="'
+					. $item['magnet']
+					. '">magnet link</a>';
 
 					if(isset($item['title']))
 						$this->items[] = $item;

bridges/TwitchBridge.php

@@ -0,0 +1,202 @@
+<?php
+class TwitchBridge extends BridgeAbstract {
+
+	const MAINTAINER = 'Roliga';
+	const NAME = 'Twitch Bridge';
+	const URI = 'https://twitch.tv/';
+	const CACHE_TIMEOUT = 300; // 5min
+	const DESCRIPTION = 'Twitch channel videos';
+	const PARAMETERS = array( array(
+		'channel' => array(
+			'name' => 'Channel',
+			'type' => 'text',
+			'required' => true,
+			'title' => 'Lowercase channel name as seen in channel URL'
+		),
+		'type' => array(
+			'name' => 'Type',
+			'type' => 'list',
+			'values' => array(
+				'All' => 'all',
+				'Archive' => 'archive',
+				'Highlights' => 'highlight',
+				'Uploads' => 'upload'
+			),
+			'defaultValue' => 'archive'
+		)
+	));
+
+	/*
+	 * Official instructions for obtaining your own client ID can be found here:
+	 * https://dev.twitch.tv/docs/v5/#getting-a-client-id
+	 */
+	const CLIENT_ID = 'kimne78kx3ncx6brgo4mv6wki5h1ko';
+
+	public function collectData(){
+		// get channel user
+		$query_data = array(
+			'login' => $this->getInput('channel')
+		);
+		$users = $this->apiGet('users', $query_data)->users;
+		if(count($users) === 0)
+			returnClientError('User "'
+			. $this->getInput('channel')
+			. '" could not be found');
+		$user = $users[0];
+
+		// get video list
+		$query_endpoint = 'channels/' . $user->_id . '/videos';
+		$query_data = array(
+			'broadcast_type' => $this->getInput('type'),
+			'limit' => 10
+		);
+		$videos = $this->apiGet($query_endpoint, $query_data)->videos;
+
+		foreach($videos as $video) {
+			$item = array(
+				'uri' => $video->url,
+				'title' => $video->title,
+				'timestamp' => $video->published_at,
+				'author' => $video->channel->display_name,
+			);
+
+			// Add categories for tags and played game
+			$item['categories'] = array_filter(explode(' ', $video->tag_list));
+			if(!empty($video->game))
+				$item['categories'][] = $video->game;
+
+			// Add enclosures for thumbnails from a few points in the video
+			$item['enclosures'] = array();
+			foreach($video->thumbnails->large as $thumbnail)
+				$item['enclosures'][] = $thumbnail->url;
+
+			/*
+			 * Content format example:
+			 *
+			 * [Preview Image]
+			 *
+			 * Some optional video description.
+			 *
+			 * Duration: 1:23:45
+			 * Views: 123
+			 *
+			 * Played games:
+			 * * 00:00:00 Game 1
+			 * * 00:12:34 Game 2
+			 *
+			 */
+			$item['content'] = '<p><a href="'
+				. $video->url
+				. '"><img src="'
+				. $video->preview->large
+				. '" /></a></p><p>'
+				. $video->description_html
+				. '</p><p><b>Duration:</b> '
+				. $this->formatTimestampTime($video->length)
+				. '<br/><b>Views:</b> '
+				. $video->views
+				. '</p>';
+
+			// Add played games list to content
+			$video_id = trim($video->_id, 'v'); // _id gives 'v1234' but API wants '1234'
+			$markers = $this->apiGet('videos/' . $video_id . '/markers')->markers;
+			$item['content'] .= '<p><b>Played games:</b></b><ul><li><a href="'
+				. $video->url
+				. '">00:00:00</a> - '
+				. $video->game
+				. '</li>';
+			if(isset($markers->game_changes)) {
+				usort($markers->game_changes, function($a, $b) {
+					return $a->time - $b->time;
+				});
+				foreach($markers->game_changes as $game_change) {
+					$item['categories'][] = $game_change->label;
+					$item['content'] .= '<li><a href="'
+						. $video->url
+						. '?t='
+						. $this->formatQueryTime($game_change->time)
+						. '">'
+						. $this->formatTimestampTime($game_change->time)
+						. '</a> - '
+						. $game_change->label
+						. '</li>';
+				}
+			}
+			$item['content'] .= '</ul></p>';
+
+			$this->items[] = $item;
+		}
+	}
+
+	// e.g. 01:53:27
+	private function formatTimestampTime($seconds) {
+		return sprintf('%02d:%02d:%02d',
+			floor($seconds / 3600),
+			($seconds / 60) % 60,
+			$seconds % 60);
+	}
+
+	// e.g. 01h53m27s
+	private function formatQueryTime($seconds) {
+		return sprintf('%02dh%02dm%02ds',
+			floor($seconds / 3600),
+			($seconds / 60) % 60,
+			$seconds % 60);
+	}
+
+	/*
+	 * Ideally the new 'helix' API should be used as v5/'kraken' is deprecated.
+	 * The new API however still misses many features (markers, played game..) of
+	 * the old one, so let's use the old one for as long as it's available.
+	 */
+	private function apiGet($endpoint, $query_data = array()) {
+		$query_data['api_version'] = 5;
+		$url = 'https://api.twitch.tv/kraken/'
+			. $endpoint
+			. '?'
+			. http_build_query($query_data);
+		$header = array(
+			'Client-ID: ' . self::CLIENT_ID
+		);
+
+		$data = json_decode(getContents($url, $header))
+			or returnServerError('API request to "' . $url . '" failed.');
+
+		return $data;
+	}
+
+	public function getName(){
+		if(!is_null($this->getInput('channel'))) {
+			return $this->getInput('channel') . ' twitch videos';
+		}
+
+		return parent::getName();
+	}
+
+	public function getURI(){
+		if(!is_null($this->getInput('channel'))) {
+			return self::URI . $this->getInput('channel');
+		}
+
+		return parent::getURI();
+	}
+
+	public function detectParameters($url){
+		$params = array();
+
+		// Matches e.g. https://www.twitch.tv/someuser/videos?filter=archives
+		$regex = '/^(https?:\/\/)?
+			(www\.)?
+			twitch\.tv\/
+			([^\/&?\n]+)
+			\/videos\?.*filter=
+			(all|archive|highlight|upload)/x';
+		if(preg_match($regex, $url, $matches) > 0) {
+			$params['channel'] = urldecode($matches[3]);
+			$params['type'] = $matches[4];
+			return $params;
+		}
+
+		return null;
+	}
+}

bridges/TwitterBridge.php

@@ -28,7 +28,31 @@ class TwitterBridge extends BridgeAbstract {
 				'name' => 'Keyword or #hashtag',
 				'required' => true,
 				'exampleValue' => 'rss-bridge, #rss-bridge',
-				'title' => 'Insert a keyword or hashtag'
+				'title' => <<<EOD
+* To search for multiple words (must contain all of these words), put a space between them.
+
+Example: `rss-bridge release`.
+
+* To search for multiple words (contains any of these words), put "OR" between them.
+
+Example: `rss-bridge OR rssbridge`.
+
+* To search for an exact phrase (including whitespace), put double-quotes around them.
+
+Example: `"rss-bridge release"`
+
+* If you want to search for anything **but** a specific word, put a hyphen before it.
+
+Example: `rss-bridge -release` (ignores "release")
+
+* Of course, this also works for hashtags.
+
+Example: `#rss-bridge OR #rssbridge`
+
+* And you can combine them in any shape or form you like.
+
+Example: `#rss-bridge OR #rssbridge -release`
+EOD
 			)
 		),
 		'By username' => array(
@@ -146,8 +170,15 @@ class TwitterBridge extends BridgeAbstract {
 
 	public function collectData(){
 		$html = '';
+		$page = $this->getURI();
+
+		if(php_sapi_name() === 'cli' && empty(ini_get('curl.cainfo'))) {
+			$cookies = $this->getCookies($page);
+			$html = getSimpleHTMLDOM($page, array("Cookie: $cookies"));
+		} else {
+			$html = getSimpleHTMLDOM($page, array(), array(CURLOPT_COOKIEFILE => ''));
+		}
 
-		$html = getSimpleHTMLDOM($this->getURI());
 		if(!$html) {
 			switch($this->queriedContext) {
 			case 'By keyword or hashtag':
@@ -165,7 +196,7 @@ class TwitterBridge extends BridgeAbstract {
 
 			// Skip retweets?
 			if($this->getInput('noretweet')
-			&& strcasecmp($tweet->getAttribute('data-screen-name'), $this->getInput('u'))) {
+			&& $tweet->find('div.context span.js-retweet-text a', 0)) {
 				continue;
 			}
 
@@ -189,8 +220,8 @@ class TwitterBridge extends BridgeAbstract {
 			$item['fullname'] = htmlspecialchars_decode($tweet->getAttribute('data-name'), ENT_QUOTES);
 			// get author
 			$item['author'] = $item['fullname'] . ' (@' . $item['username'] . ')';
-			if(strcasecmp($tweet->getAttribute('data-screen-name'), $this->getInput('u'))) {
-				$item['author'] .= ' RT: @' . $this->getInput('u');
+			if($rt = $tweet->find('div.context span.js-retweet-text a', 0)) {
+				$item['author'] .= ' RT: @' . $rt->plaintext;
 			}
 			// get avatar link
 			$item['avatar'] = $tweet->find('img', 0)->src;
@@ -245,22 +276,26 @@ EOD;
 
 			// Add embeded image to content
 			$image_html = '';
-			$image = $this->getImageURI($tweet);
-			if(!$this->getInput('noimg') && !is_null($image)) {
-				// Set image scaling
-				$image_orig = $this->getInput('noimgscaling') ? $image : $image . ':orig';
-				$image_thumb = $this->getInput('noimgscaling') ? $image : $image . ':thumb';
+			$images = $this->getImageURI($tweet);
+			if(!$this->getInput('noimg') && !is_null($images)) {
 
-				// add enclosures
-				$item['enclosures'] = array($image_orig);
+				foreach ($images as $image) {
 
-				$image_html = <<<EOD
+					// Set image scaling
+					$image_orig = $this->getInput('noimgscaling') ? $image : $image . ':orig';
+					$image_thumb = $this->getInput('noimgscaling') ? $image : $image . ':thumb';
+
+					// add enclosures
+					$item['enclosures'][] = $image_orig;
+
+					$image_html .= <<<EOD
 <a href="{$image_orig}">
 <img
 	style="align:top; max-width:558px; border:1px solid black;"
 	src="{$image_thumb}" />
 </a>
 EOD;
+				}
 			}
 
 			// add content
@@ -291,22 +326,27 @@ EOD;
 
 				// Add embeded image to content
 				$quotedImage_html = '';
-				$quotedImage = $this->getQuotedImageURI($tweet);
-				if(!$this->getInput('noimg') && !is_null($quotedImage)) {
-					// Set image scaling
-					$quotedImage_orig = $this->getInput('noimgscaling') ? $quotedImage : $quotedImage . ':orig';
-					$quotedImage_thumb = $this->getInput('noimgscaling') ? $quotedImage : $quotedImage . ':thumb';
+				$quotedImages = $this->getQuotedImageURI($tweet);
 
-					// add enclosures
-					$item['enclosures'] = array($quotedImage_orig);
+				if(!$this->getInput('noimg') && !is_null($quotedImages)) {
 
-					$quotedImage_html = <<<EOD
-<a href="{$quotedImage_orig}">
+					foreach ($quotedImages as $image) {
+
+						// Set image scaling
+						$image_orig = $this->getInput('noimgscaling') ? $image : $image . ':orig';
+						$image_thumb = $this->getInput('noimgscaling') ? $image : $image . ':thumb';
+
+						// add enclosures
+						$item['enclosures'][] = $image_orig;
+
+						$quotedImage_html .= <<<EOD
+<a href="{$image_orig}">
 <img
 	style="align:top; max-width:558px; border:1px solid black;"
-	src="{$quotedImage_thumb}" />
+	src="{$image_thumb}" />
 </a>
 EOD;
+					}
 				}
 
 				$item['content'] = <<<EOD
@@ -360,9 +400,18 @@ EOD;
 
 	private function getImageURI($tweet){
 		// Find media in tweet
+		$images = array();
+
 		$container = $tweet->find('div.AdaptiveMedia-container', 0);
+
 		if($container && $container->find('img', 0)) {
-			return $container->find('img', 0)->src;
+			foreach ($container->find('img') as $img) {
+				$images[] = $img->src;
+			}
+		}
+
+		if (!empty($images)) {
+			return $images;
 		}
 
 		return null;
@@ -370,11 +419,43 @@ EOD;
 
 	private function getQuotedImageURI($tweet){
 		// Find media in tweet
+		$images = array();
+
 		$container = $tweet->find('div.QuoteMedia-container', 0);
+
 		if($container && $container->find('img', 0)) {
-			return $container->find('img', 0)->src;
+			foreach ($container->find('img') as $img) {
+				$images[] = $img->src;
+			}
+		}
+
+		if (!empty($images)) {
+			return $images;
 		}
 
 		return null;
 	}
+
+	private function getCookies($pageURL){
+
+		$ctx = stream_context_create(array(
+			'http' => array(
+				'follow_location' => false
+				)
+			)
+		);
+		$a = file_get_contents($pageURL, 0, $ctx);
+
+		//First request to get the cookie
+		$cookies = '';
+		foreach($http_response_header as $hdr) {
+			if(stripos($hdr, 'Set-Cookie') !== false) {
+				$cLine = explode(':', $hdr)[1];
+				$cLine = explode(';', $cLine)[0];
+				$cookies .= ';' . $cLine;
+			}
+		}
+
+		return substr($cookies, 2);
+	}
 }

bridges/UnsplashBridge.php

@@ -3,7 +3,7 @@ class UnsplashBridge extends BridgeAbstract {
 
 	const MAINTAINER = 'nel50n';
 	const NAME = 'Unsplash Bridge';
-	const URI = 'http://unsplash.com/';
+	const URI = 'https://unsplash.com/';
 	const CACHE_TIMEOUT = 43200; // 12h
 	const DESCRIPTION = 'Returns the latests photos from Unsplash';
 
@@ -27,51 +27,42 @@ class UnsplashBridge extends BridgeAbstract {
 
 	public function collectData(){
 		$width = $this->getInput('w');
-		$num = 0;
 		$max = $this->getInput('m');
 		$quality = $this->getInput('q');
-		$lastpage = 1;
 
-		for($page = 1; $page <= $lastpage; $page++) {
-			$link = self::URI . '/grid?page=' . $page;
-			$html = getSimpleHTMLDOM($link)
-				or returnServerError('No results for this query.');
+		$api_response = getContents('https://unsplash.com/napi/photos?page=1&per_page=' . $max)
+			or returnServerError('Could not request Unsplash API.');
+		$json = json_decode($api_response, true);
 
-			if($page === 1) {
-				preg_match(
-					'/=(\d+)$/',
-					$html->find('.pagination > a[!class]', -1)->href,
-					$matches
-				);
+		foreach ($json as $json_item) {
+			$item = array();
 
-				$lastpage = min($matches[1], ceil($max / 40));
+			// Get image URI
+			$uri = $json_item['urls']['regular'] . '.jpg'; // '.jpg' only for format hint
+			$uri = str_replace('q=80', 'q=' . $quality, $uri);
+			$uri = str_replace('w=1080', 'w=' . $width, $uri);
+			$item['uri'] = $uri;
+
+			// Get title from description
+			if (is_null($json_item['alt_description'])) {
+				if (is_null($json_item['description'])) {
+					$item['title'] = 'Unsplash picture from ' . $json_item['user']['name'];
+				} else {
+					$item['title'] = $json_item['description'];
+				}
+			} else {
+				$item['title'] = $json_item['alt_description'];
 			}
 
-			foreach($html->find('.photo') as $element) {
-				$thumbnail = $element->find('img', 0);
-				$thumbnail->src = str_replace('https://', 'http://', $thumbnail->src);
-
-				$item = array();
-				$item['uri'] = str_replace(
-					array('q=75', 'w=400'),
-					array("q=$quality", "w=$width"),
-					$thumbnail->src) . '.jpg'; // '.jpg' only for format hint
-
-				$item['timestamp'] = time();
-				$item['title'] = $thumbnail->alt;
-				$item['content'] = $item['title']
+			$item['timestamp'] = time();
+			$item['content'] = $item['title']
 				. '<br><a href="'
 				. $item['uri']
 				. '"><img src="'
-				. $thumbnail->src
+				. $json_item['urls']['thumb']
 				. '" /></a>';
 
-				$this->items[] = $item;
-
-				$num++;
-				if ($num >= $max)
-					break 2;
-			}
+			$this->items[] = $item;
 		}
 	}
 }

bridges/VimeoBridge.php

@@ -0,0 +1,175 @@
+<?php
+
+class VimeoBridge extends BridgeAbstract {
+
+	const NAME = 'Vimeo Bridge';
+	const URI = 'https://vimeo.com/';
+	const DESCRIPTION = 'Returns search results from Vimeo';
+	const MAINTAINER = 'logmanoriginal';
+
+	const PARAMETERS = array(
+		array(
+			'q' => array(
+				'name' => 'Search Query',
+				'type' => 'text',
+				'required' => true
+			),
+			'type' => array(
+				'name' => 'Show results for',
+				'type' => 'list',
+				'defaultValue' => 'Videos',
+				'values' => array(
+					'Videos' => 'search',
+					'On Demand' => 'search/ondemand',
+					'People' => 'search/people',
+					'Channels' => 'search/channels',
+					'Groups' => 'search/groups'
+				)
+			)
+		)
+	);
+
+	public function getURI() {
+		if(($query = $this->getInput('q'))
+		&& ($type = $this->getInput('type'))) {
+			return self::URI . $type . '/sort:latest?q=' . $query;
+		}
+
+		return parent::getURI();
+	}
+
+	public function collectData() {
+
+		$html = getSimpleHTMLDOM($this->getURI(),
+			$header = array(),
+			$opts = array(),
+			$lowercase = true,
+			$forceTagsClosed = true,
+			$target_charset = DEFAULT_TARGET_CHARSET,
+			$stripRN = false, // We want to keep newline characters
+			$defaultBRText = DEFAULT_BR_TEXT,
+			$defaultSpanText = DEFAULT_SPAN_TEXT)
+			or returnServerError('Could not request ' . $this->getURI());
+
+		$json = null; // Holds the JSON data
+
+		/**
+		 * Search results are included as JSON formatted string inside a script
+		 * tag that has the variable 'vimeo.config'. The data is condensed into
+		 * a single line of code, so we can just search for the newline.
+		 *
+		 * Everything after "vimeo.config = _extend((vimeo.config || {}), " is
+		 * the JSON formatted string.
+		 */
+		foreach($html->find('script') as $script) {
+			foreach(explode("\n", $script) as $line) {
+				$line = trim($line);
+
+				if(strpos($line, 'vimeo.config') !== 0)
+					continue;
+
+				// 45 = strlen("vimeo.config = _extend((vimeo.config || {}), ");
+				// 47 = 45 + 2, because we don't want the final ");"
+				$json = json_decode(substr($line, 45, strlen($line) - 47));
+			}
+		}
+
+		if(is_null($json)) {
+			returnClientError('No results for this query!');
+		}
+
+		foreach($json->api->initial_json->data as $element) {
+			switch($element->type) {
+				case 'clip': $this->addClip($element); break;
+				case 'ondemand': $this->addOnDemand($element); break;
+				case 'people': $this->addPeople($element); break;
+				case 'channel': $this->addChannel($element); break;
+				case 'group': $this->addGroup($element); break;
+
+				default: returnServerError('Unknown type: ' . $element->type);
+			}
+		}
+
+	}
+
+	private function addClip($element) {
+		$item = array();
+
+		$item['uri'] = $element->clip->link;
+		$item['title'] = $element->clip->name;
+		$item['author'] = $element->clip->user->name;
+		$item['timestamp'] = strtotime($element->clip->created_time);
+
+		$item['enclosures'] = array(
+			end($element->clip->pictures->sizes)->link
+		);
+
+		$item['content'] = "<img src={$item['enclosures'][0]} />";
+
+		$this->items[] = $item;
+	}
+
+	private function addOnDemand($element) {
+		$item = array();
+
+		$item['uri'] = $element->ondemand->link;
+		$item['title'] = $element->ondemand->name;
+
+		// Only for films
+		if(isset($element->ondemand->film))
+			$item['timestamp'] = strtotime($element->ondemand->film->release_time);
+
+		$item['enclosures'] = array(
+			end($element->ondemand->pictures->sizes)->link
+		);
+
+		$item['content'] = "<img src={$item['enclosures'][0]} />";
+
+		$this->items[] = $item;
+	}
+
+	private function addPeople($element) {
+		$item = array();
+
+		$item['uri'] = $element->people->link;
+		$item['title'] = $element->people->name;
+
+		$item['enclosures'] = array(
+			end($element->people->pictures->sizes)->link
+		);
+
+		$item['content'] = "<img src={$item['enclosures'][0]} />";
+
+		$this->items[] = $item;
+	}
+
+	private function addChannel($element) {
+		$item = array();
+
+		$item['uri'] = $element->channel->link;
+		$item['title'] = $element->channel->name;
+
+		$item['enclosures'] = array(
+			end($element->channel->pictures->sizes)->link
+		);
+
+		$item['content'] = "<img src={$item['enclosures'][0]} />";
+
+		$this->items[] = $item;
+	}
+
+	private function addGroup($element) {
+		$item = array();
+
+		$item['uri'] = $element->group->link;
+		$item['title'] = $element->group->name;
+
+		$item['enclosures'] = array(
+			end($element->group->pictures->sizes)->link
+		);
+
+		$item['content'] = "<img src={$item['enclosures'][0]} />";
+
+		$this->items[] = $item;
+	}
+}

bridges/WiredBridge.php

@@ -0,0 +1,102 @@
+<?php
+class WiredBridge extends FeedExpander {
+	const MAINTAINER = 'ORelio';
+	const NAME = 'WIRED Bridge';
+	const URI = 'https://www.wired.com/';
+	const DESCRIPTION = 'Returns the newest articles from WIRED';
+
+	const PARAMETERS = array( array(
+		'feed' => array(
+			'name' => 'Feed',
+			'type' => 'list',
+			'values' => array(
+				'WIRED Top Stories' => 'rss',			// /feed/rss
+				'Business' => 'business',				// /feed/category/business/latest/rss
+				'Culture' => 'culture',					// /feed/category/culture/latest/rss
+				'Gear' => 'gear',						// /feed/category/gear/latest/rss
+				'Ideas' => 'ideas',						// /feed/category/ideas/latest/rss
+				'Science' => 'science',					// /feed/category/science/latest/rss
+				'Security' => 'security',				// /feed/category/security/latest/rss
+				'Transportation' => 'transportation',	// /feed/category/transportation/latest/rss
+				'Backchannel' => 'backchannel',			// /feed/category/backchannel/latest/rss
+				'WIRED Guides' => 'wired-guide',		// /feed/tag/wired-guide/latest/rss
+				'Photo' => 'photo'						// /feed/category/photo/latest/rss
+			)
+		)
+	));
+
+	public function collectData(){
+		$feed = $this->getInput('feed');
+		if(empty($feed) || !ctype_alpha(str_replace('-', '', $feed))) {
+			returnClientError('Invalid feed, please check the "feed" parameter.');
+		}
+
+		$feed_url = $this->getURI() . 'feed/';
+		if ($feed != 'rss') {
+			if ($feed != 'wired-guide') {
+				$feed_url .= 'category/';
+			} else {
+				$feed_url .= 'tag/';
+			}
+			$feed_url .= "$feed/latest/";
+		}
+		$feed_url .= 'rss';
+
+		$this->collectExpandableDatas($feed_url);
+	}
+
+	protected function parseItem($newsItem){
+		$item = parent::parseItem($newsItem);
+		$article = getSimpleHTMLDOMCached($item['uri'])
+			or returnServerError('Could not request WIRED: ' . $item['uri']);
+		$item['content'] = $this->extractArticleContent($article);
+
+		$headline = strval($newsItem->description);
+		if(!empty($headline)) {
+			$item['content'] = '<p><b>' . $headline . '</b></p>' . $item['content'];
+		}
+
+		$item_image = $article->find('meta[property="og:image"]', 0);
+		if(!empty($item_image)) {
+			$item['enclosures'] = array($item_image->content);
+			$item['content'] = '<p><img src="' . $item_image->content . '" /></p>' . $item['content'];
+		}
+
+		return $item;
+	}
+
+	private function extractArticleContent($article){
+		$content = $article->find('article', 0);
+		$truncate = true;
+
+		if (empty($content)) {
+			$content = $article->find('div.listicle-main-component__container', 0);
+			$truncate = false;
+		}
+
+		if (!empty($content)) {
+			$content = $content->innertext;
+		}
+
+		foreach (array(
+			'<div class="content-header',
+			'<div class="mid-banner-wrap',
+			'<div class="related',
+			'<div class="social-icons',
+			'<div class="recirc-most-popular',
+			'<div class="grid--item article-related-video',
+			'<div class="row full-bleed-ad',
+		) as $div_start) {
+			$content = stripRecursiveHTMLSection($content, 'div', $div_start);
+		}
+
+		if ($truncate) {
+			//Clutter after standard article is too hard to clean properly
+			$content = trim(explode('<hr', $content)[0]);
+		}
+
+		$content = str_replace('href="/', 'href="' . $this->getURI() . '/', $content);
+
+		return $content;
+	}
+}

bridges/WorldOfTanksBridge.php

@@ -3,7 +3,7 @@ class WorldOfTanksBridge extends FeedExpander {
 
 	const MAINTAINER = 'Riduidel';
 	const NAME = 'World of Tanks';
-	const URI = 'http://worldoftanks.eu/';
+	const URI = 'https://worldoftanks.eu/';
 	const DESCRIPTION = 'News about the tank slaughter game.';
 
 	const PARAMETERS = array( array(
@@ -22,6 +22,8 @@ class WorldOfTanksBridge extends FeedExpander {
 		)
 	));
 
+	const POSSIBLE_ARTICLES = array('article', 'rich-article');
+
 	public function collectData() {
 		$this->collectExpandableDatas(sprintf('https://worldoftanks.eu/%s/rss/news/', $this->getInput('lang')));
 	}
@@ -40,13 +42,17 @@ class WorldOfTanksBridge extends FeedExpander {
 	private function loadFullArticle($uri){
 		$html = getSimpleHTMLDOMCached($uri);
 
-		$content = $html->find('article', 0);
+		foreach(self::POSSIBLE_ARTICLES as $article_class) {
+			$content = $html->find('article', 0);
 
-		// Remove the scripts, please
-		foreach($content->find('script') as $script) {
-			$script->outertext = '';
+			if($content !== null) {
+				// Remove the scripts, please
+				foreach($content->find('script') as $script) {
+					$script->outertext = '';
+				}
+				return $content->innertext;
+			}
 		}
-
-		return $content->innertext;
+		return null;
 	}
 }

bridges/XenForoBridge.php

@@ -118,7 +118,7 @@ class XenForoBridge extends BridgeAbstract {
 		// Notice: The DOM structure changes depending on the XenForo version used
 		if($mainContent = $html->find('div.mainContent', 0)) {
 			$this->version = self::XENFORO_VERSION_1;
-		} elseif ($mainContent = $html->find('div[class="p-body"]', 0)) {
+		} elseif ($mainContent = $html->find('div[class~="p-body"]', 0)) {
 			$this->version = self::XENFORO_VERSION_2;
 		} else {
 			returnServerError('This forum is currently not supported!');
@@ -127,7 +127,7 @@ class XenForoBridge extends BridgeAbstract {
 		switch($this->version) {
 			case self::XENFORO_VERSION_1:
 
-				$titleBar = $mainContent->find('div.titleBar h1', 0)
+				$titleBar = $mainContent->find('div.titleBar > h1', 0)
 					or returnServerError('Error finding title bar!');
 
 				$this->title = $titleBar->plaintext;
@@ -140,7 +140,7 @@ class XenForoBridge extends BridgeAbstract {
 
 			case self::XENFORO_VERSION_2:
 
-				$titleBar = $mainContent->find('div[class="p-title"] h1', 0)
+				$titleBar = $mainContent->find('div[class~="p-title"] h1', 0)
 					or returnServerError('Error finding title bar!');
 
 				$this->title = $titleBar->plaintext;
@@ -166,7 +166,7 @@ class XenForoBridge extends BridgeAbstract {
 		$lang = $html->find('html', 0)->lang;
 
 		// Posts are contained in an "ol"
-		$messageList = $html->find('#messageList li')
+		$messageList = $html->find('#messageList > li')
 			or returnServerError('Error finding message list!');
 
 		foreach($messageList as $post) {
@@ -179,7 +179,7 @@ class XenForoBridge extends BridgeAbstract {
 
 			$item['uri'] = $url . '#' . $post->getAttribute('id');
 
-			$content = $post->find('.messageContent article', 0);
+			$content = $post->find('.messageContent > article', 0);
 
 			// Add some style to quotes
 			foreach($content->find('.bbCodeQuote') as $quote) {
@@ -255,7 +255,7 @@ class XenForoBridge extends BridgeAbstract {
 
 		$lang = $html->find('html', 0)->lang;
 
-		$messageList = $html->find('div[class="block-body"] article')
+		$messageList = $html->find('div[class~="block-body"] article')
 			or returnServerError('Error finding message list!');
 
 		foreach($messageList as $post) {
@@ -268,13 +268,17 @@ class XenForoBridge extends BridgeAbstract {
 
 			$item['uri'] = $url . '#' . $post->getAttribute('id');
 
-			$title = $post->find('div[class="message-content"] article', 0)->plaintext;
+			$title = $post->find('div[class~="message-content"] article', 0)->plaintext;
 			$end = strpos($title, ' ', 70);
 			$item['title'] = substr($title, 0, $end);
 
-			$item['timestamp'] = $this->fixDate($post->find('time', 0)->title, $lang);
+			if ($post->find('time[datetime]', 0)) {
+				$item['timestamp'] = $post->find('time[datetime]', 0)->datetime;
+			} else {
+				$item['timestamp'] = $this->fixDate($post->find('time', 0)->title, $lang);
+			}
 			$item['author'] = $post->getAttribute('data-author');
-			$item['content'] = $post->find('div[class="message-content"] article', 0);
+			$item['content'] = $post->find('div[class~="message-content"] article', 0);
 
 			// Bridge specific properties
 			$item['id'] = $post->getAttribute('id');
@@ -305,7 +309,7 @@ class XenForoBridge extends BridgeAbstract {
 			// Load at least the last page
 			do {
 
-				$pageurl = $hosturl . str_replace($sentinel, $lastpage, $baseurl);
+				$pageurl = str_replace($sentinel, $lastpage, $baseurl);
 
 				// We can optimize performance by caching all but the last page
 				if($page != $lastpage) {
@@ -339,7 +343,7 @@ class XenForoBridge extends BridgeAbstract {
 			}
 
 			// Manually extract baseurl and inject sentinel
-			$baseurl = $pageNav->find('li a', -1)->href;
+			$baseurl = $pageNav->find('li > a', -1)->href;
 			$baseurl = str_replace('page-' . $lastpage, 'page-{{sentinel}}', $baseurl);
 
 			$sentinel = '{{sentinel}}';
@@ -353,7 +357,7 @@ class XenForoBridge extends BridgeAbstract {
 			// Load at least the last page
 			do {
 
-				$pageurl = $hosturl . str_replace($sentinel, $lastpage, $baseurl);
+				$pageurl = str_replace($sentinel, $lastpage, $baseurl);
 
 				// We can optimize performance by caching all but the last page
 				if($page != $lastpage) {
@@ -364,9 +368,9 @@ class XenForoBridge extends BridgeAbstract {
 						or returnServerError('Error loading contents from ' . $pageurl . '!');
 				}
 
-				$html = defaultLinkTo($html, $this->hosturl);
+				$html = defaultLinkTo($html, $hosturl);
 
-				$this->extractThreadPostsV2($html, $this->pageurl);
+				$this->extractThreadPostsV2($html, $pageurl);
 
 				$page--;
 

bridges/YoutubeBridge.php

@@ -65,7 +65,7 @@ class YoutubeBridge extends BridgeAbstract {
 	private $feedName = '';
 
 	private function ytBridgeQueryVideoInfo($vid, &$author, &$desc, &$time){
-		$html = $this->ytGetSimpleHTMLDOM(self::URI . "watch?v=$vid");
+		$html = $this->ytGetSimpleHTMLDOM(self::URI . "watch?v=$vid", true);
 
 		// Skip unavailable videos
 		if(!strpos($html->innertext, 'IS_UNAVAILABLE_PAGE')) {
@@ -127,7 +127,6 @@ class YoutubeBridge extends BridgeAbstract {
 	}
 
 	private function ytBridgeParseHtmlListing($html, $element_selector, $title_selector, $add_parsed_items = true) {
-		$limit = $add_parsed_items ? 10 : INF;
 		$count = 0;
 
 		$duration_min = $this->getInput('duration_min') ?: -1;
@@ -141,40 +140,38 @@ class YoutubeBridge extends BridgeAbstract {
 		}
 
 		foreach($html->find($element_selector) as $element) {
-			if($count < $limit) {
-				$author = '';
-				$desc = '';
-				$time = 0;
-				$vid = str_replace('/watch?v=', '', $element->find('a', 0)->href);
-				$vid = substr($vid, 0, strpos($vid, '&') ?: strlen($vid));
-				$title = trim($this->ytBridgeFixTitle($element->find($title_selector, 0)->plaintext));
+			$author = '';
+			$desc = '';
+			$time = 0;
+			$vid = str_replace('/watch?v=', '', $element->find('a', 0)->href);
+			$vid = substr($vid, 0, strpos($vid, '&') ?: strlen($vid));
+			$title = trim($this->ytBridgeFixTitle($element->find($title_selector, 0)->plaintext));
 
-				if (strpos($vid, 'googleads') !== false
-					|| $title == '[Private video]'
-					|| $title == '[Deleted video]'
-				) {
-					continue;
-				}
-
-				// The duration comes in one of the formats:
-				// hh:mm:ss / mm:ss / m:ss
-				// 01:03:30 / 15:06 / 1:24
-				$durationText = trim($element->find('div.timestamp span', 0)->plaintext);
-				$durationText = preg_replace('/([\d]{1,2})\:([\d]{2})/', '00:$1:$2', $durationText);
-
-				sscanf($durationText, '%d:%d:%d', $hours, $minutes, $seconds);
-				$duration = $hours * 3600 + $minutes * 60 + $seconds;
-
-				if($duration < $duration_min || $duration > $duration_max) {
-					continue;
-				}
-
-				if ($add_parsed_items) {
-					$this->ytBridgeQueryVideoInfo($vid, $author, $desc, $time);
-					$this->ytBridgeAddItem($vid, $title, $author, $desc, $time);
-				}
-				$count++;
+			if (strpos($vid, 'googleads') !== false
+				|| $title == '[Private video]'
+				|| $title == '[Deleted video]'
+			) {
+				continue;
 			}
+
+			// The duration comes in one of the formats:
+			// hh:mm:ss / mm:ss / m:ss
+			// 01:03:30 / 15:06 / 1:24
+			$durationText = trim($element->find('div.timestamp span', 0)->plaintext);
+			$durationText = preg_replace('/([\d]{1,2})\:([\d]{2})/', '00:$1:$2', $durationText);
+
+			sscanf($durationText, '%d:%d:%d', $hours, $minutes, $seconds);
+			$duration = $hours * 3600 + $minutes * 60 + $seconds;
+
+			if($duration < $duration_min || $duration > $duration_max) {
+				continue;
+			}
+
+			if ($add_parsed_items) {
+				$this->ytBridgeQueryVideoInfo($vid, $author, $desc, $time);
+				$this->ytBridgeAddItem($vid, $title, $author, $desc, $time);
+			}
+			$count++;
 		}
 		return $count;
 	}
@@ -184,18 +181,38 @@ class YoutubeBridge extends BridgeAbstract {
 		return html_entity_decode($title, ENT_QUOTES, 'UTF-8');
 	}
 
-	private function ytGetSimpleHTMLDOM($url){
+	private function ytGetSimpleHTMLDOM($url, $cached = false){
+		$header = array(
+			'Accept-Language: en-US'
+		);
+		$opts = array();
+		$lowercase = true;
+		$forceTagsClosed = true;
+		$target_charset = DEFAULT_TARGET_CHARSET;
+		$stripRN = false;
+		$defaultBRText = DEFAULT_BR_TEXT;
+		$defaultSpanText = DEFAULT_SPAN_TEXT;
+		if ($cached) {
+			return getSimpleHTMLDOMCached($url,
+				86400,
+				$header,
+				$opts,
+				$lowercase,
+				$forceTagsClosed,
+				$target_charset,
+				$stripRN,
+				$defaultBRText,
+				$defaultSpanText);
+		}
 		return getSimpleHTMLDOM($url,
-			$header = array(
-				'Accept-Language: en-US'
-			),
-			$opts = array(),
-			$lowercase = true,
-			$forceTagsClosed = true,
-			$target_charset = DEFAULT_TARGET_CHARSET,
-			$stripRN = false,
-			$defaultBRText = DEFAULT_BR_TEXT,
-			$defaultSpanText = DEFAULT_SPAN_TEXT);
+			$header,
+			$opts,
+			$lowercase,
+			$forceTagsClosed,
+			$target_charset,
+			$stripRN,
+			$defaultBRText,
+			$defaultSpanText);
 	}
 
 	public function collectData(){
@@ -229,7 +246,7 @@ class YoutubeBridge extends BridgeAbstract {
 			$url_listing = self::URI . 'playlist?list=' . urlencode($this->request);
 			$html = $this->ytGetSimpleHTMLDOM($url_listing)
 				or returnServerError("Could not request YouTube. Tried:\n - $url_listing");
-			$item_count = $this->ytBridgeParseHtmlListing($html, 'tr.pl-video', '.pl-video-title a', true);
+			$item_count = $this->ytBridgeParseHtmlListing($html, 'tr.pl-video', '.pl-video-title a', false);
 			if ($item_count <= 15 && !$this->skipFeeds() && ($xml = $this->ytGetSimpleHTMLDOM($url_feed))) {
 				$this->ytBridgeParseXmlFeed($xml);
 			} else {

formats/AtomFormat.php

@@ -37,7 +37,7 @@ class AtomFormat extends FormatAbstract{
 		$entries = '';
 		foreach($this->getItems() as $item) {
 			$entryTimestamp = $item->getTimestamp();
-			$entryTitle = $this->xml_encode($item->getTitle());
+			$entryTitle = $item->getTitle();
 			$entryContent = $item->getContent();
 			$entryUri = $item->getURI();
 			$entryID = '';

formats/HtmlFormat.php

@@ -4,8 +4,21 @@ class HtmlFormat extends FormatAbstract {
 		$extraInfos = $this->getExtraInfos();
 		$title = htmlspecialchars($extraInfos['name']);
 		$uri = htmlspecialchars($extraInfos['uri']);
-		$atomquery = str_replace('format=Html', 'format=Atom', htmlentities($_SERVER['QUERY_STRING']));
-		$mrssquery = str_replace('format=Html', 'format=Mrss', htmlentities($_SERVER['QUERY_STRING']));
+
+		// Dynamically build buttons for all formats (except HTML)
+		$formatFac = new FormatFactory();
+		$formatFac->setWorkingDir(PATH_LIB_FORMATS);
+
+		$buttons = '';
+
+		foreach($formatFac->getFormatNames() as $format) {
+			if(strcasecmp($format, 'HTML') === 0) {
+				continue;
+			}
+
+			$query = str_replace('format=Html', 'format=' . $format, htmlentities($_SERVER['QUERY_STRING']));
+			$buttons .= $this->buildButton($format, $query) . PHP_EOL;
+		}
 
 		$entries = '';
 		foreach($this->getItems() as $item) {
@@ -82,18 +95,17 @@ EOD;
 <html>
 <head>
 	<meta charset="{$charset}">
+	<meta name="viewport" content="width=device-width, initial-scale=1.0" />
 	<title>{$title}</title>
 	<link href="static/HtmlFormat.css" rel="stylesheet">
-	<link rel="alternate" type="application/atom+xml" title="Atom" href="./?{$atomquery}" />
-	<link rel="alternate" type="application/rss+xml" title="RSS" href="/?{$mrssquery}" />
+	<link rel="icon" type="image/png" href="static/favicon.png">
 	<meta name="robots" content="noindex, follow">
 </head>
 <body>
 	<h1 class="pagetitle"><a href="{$uri}" target="_blank">{$title}</a></h1>
 	<div class="buttons">
 		<a href="./#bridge-{$_GET['bridge']}"><button class="backbutton">← back to rss-bridge</button></a>
-		<a href="./?{$atomquery}"><button class="rss-feed">RSS feed (ATOM)</button></a>
-		<a href="./?{$mrssquery}"><button class="rss-feed">RSS feed (MRSS)</button></a>
+		{$buttons}
 	</div>
 {$entries}
 </body>
@@ -113,4 +125,10 @@ EOD;
 
 		return parent::display();
 	}
+
+	private function buildButton($format, $query) {
+		return <<<EOD
+<a href="./?{$query}"><button class="rss-feed">{$format}</button></a>
+EOD;
+	}
 }

lib/BridgeAbstract.php

@@ -194,6 +194,11 @@ abstract class BridgeAbstract implements BridgeInterface {
 	 */
 	public function setDatas(array $inputs){
 
+		if(isset($inputs['context'])) { // Context hinting (optional)
+			$this->queriedContext = $inputs['context'];
+			unset($inputs['context']);
+		}
+
 		if(empty(static::PARAMETERS)) {
 
 			if(!empty($inputs)) {
@@ -218,8 +223,11 @@ abstract class BridgeAbstract implements BridgeInterface {
 			);
 		}
 
-		// Guess the paramter context from input data
-		$this->queriedContext = $validator->getQueriedContext($inputs, static::PARAMETERS);
+		// Guess the context from input data
+		if(empty($this->queriedContext)) {
+			$this->queriedContext = $validator->getQueriedContext($inputs, static::PARAMETERS);
+		}
+
 		if(is_null($this->queriedContext)) {
 			returnClientError('Required parameter(s) missing');
 		} elseif($this->queriedContext === false) {

lib/BridgeCard.php

@@ -48,13 +48,19 @@ final class BridgeCard {
 	 * @param bool $isHttps If disabled, adds a warning to the form
 	 * @return string The form header
 	 */
-	private static function getFormHeader($bridgeName, $isHttps = false) {
+	private static function getFormHeader($bridgeName, $isHttps = false, $parameterName = '') {
 		$form = <<<EOD
 			<form method="GET" action="?">
 				<input type="hidden" name="action" value="display" />
 				<input type="hidden" name="bridge" value="{$bridgeName}" />
 EOD;
 
+		if(!empty($parameterName)) {
+			$form .= <<<EOD
+				<input type="hidden" name="context" value="{$parameterName}" />
+EOD;
+		}
+
 		if(!$isHttps) {
 			$form .= '<div class="secure-warning">Warning :
 This bridge is not fetching its content through a secure connection</div>';
@@ -80,7 +86,7 @@ This bridge is not fetching its content through a secure connection</div>';
 	$isHttps = false,
 	$parameterName = '',
 	$parameters = array()) {
-		$form = self::getFormHeader($bridgeName, $isHttps);
+		$form = self::getFormHeader($bridgeName, $isHttps, $parameterName);
 
 		if(count($parameters) > 0) {
 
@@ -299,7 +305,10 @@ This bridge is not fetching its content through a secure connection</div>';
 	 */
 	static function displayBridgeCard($bridgeName, $formats, $isActive = true){
 
-		$bridge = Bridge::create($bridgeName);
+		$bridgeFac = new \BridgeFactory();
+		$bridgeFac->setWorkingDir(PATH_LIB_BRIDGES);
+
+		$bridge = $bridgeFac->create($bridgeName);
 
 		if($bridge == false)
 			return '';

lib/BridgeFactory.php

@@ -35,17 +35,7 @@
  * $bridge = Bridge::create('GitHubIssue');
  * ```
  */
-class Bridge {
-
-	/**
-	 * Holds a path to the working directory.
-	 *
-	 * Do not access this property directly!
-	 * Use {@see Bridge::setWorkingDir()} and {@see Bridge::getWorkingDir()} instead.
-	 *
-	 * @var string|null
-	 */
-	protected static $workingDir = null;
+class BridgeFactory extends FactoryAbstract {
 
 	/**
 	 * Holds a list of whitelisted bridges.
@@ -55,18 +45,7 @@ class Bridge {
 	 *
 	 * @var array
 	 */
-	protected static $whitelist = array();
-
-	/**
-	 * Throws an exception when trying to create a new instance of this class.
-	 * Use {@see Bridge::create()} to instanciate a new bridge from the working
-	 * directory.
-	 *
-	 * @throws \LogicException if called.
-	 */
-	public function __construct(){
-		throw new \LogicException('Use ' . __CLASS__ . '::create($name) to create bridge objects!');
-	}
+	protected $whitelist = array();
 
 	/**
 	 * Creates a new bridge object from the working directory.
@@ -77,13 +56,13 @@ class Bridge {
 	 * @param string $name Name of the bridge object.
 	 * @return object|bool The bridge object or false if the class is not instantiable.
 	 */
-	public static function create($name){
-		if(!self::isBridgeName($name)) {
+	public function create($name){
+		if(!$this->isBridgeName($name)) {
 			throw new \InvalidArgumentException('Bridge name invalid!');
 		}
 
-		$name = self::sanitizeBridgeName($name) . 'Bridge';
-		$filePath = self::getWorkingDir() . $name . '.php';
+		$name = $this->sanitizeBridgeName($name) . 'Bridge';
+		$filePath = $this->getWorkingDir() . $name . '.php';
 
 		if(!file_exists($filePath)) {
 			throw new \Exception('Bridge file ' . $filePath . ' does not exist!');
@@ -98,48 +77,6 @@ class Bridge {
 		return false;
 	}
 
-	/**
-	 * Sets the working directory.
-	 *
-	 * @param string $dir Path to the directory containing bridges.
-	 * @throws \LogicException if the provided path is not a valid string.
-	 * @throws \Exception if the provided path does not exist.
-	 * @throws \InvalidArgumentException if $dir is not a directory.
-	 * @return void
-	 */
-	public static function setWorkingDir($dir){
-		self::$workingDir = null;
-
-		if(!is_string($dir)) {
-			throw new \InvalidArgumentException('Working directory is not a valid string!');
-		}
-
-		if(!file_exists($dir)) {
-			throw new \Exception('Working directory does not exist!');
-		}
-
-		if(!is_dir($dir)) {
-			throw new \InvalidArgumentException('Working directory is not a directory!');
-		}
-
-		self::$workingDir = realpath($dir) . '/';
-	}
-
-	/**
-	 * Returns the working directory.
-	 * The working directory must be specified with {@see Bridge::setWorkingDir()}!
-	 *
-	 * @throws \LogicException if the working directory is not set.
-	 * @return string The current working directory.
-	 */
-	public static function getWorkingDir(){
-		if(is_null(self::$workingDir)) {
-			throw new \LogicException('Working directory is not set!');
-		}
-
-		return self::$workingDir;
-	}
-
 	/**
 	 * Returns true if the provided name is a valid bridge name.
 	 *
@@ -149,7 +86,7 @@ class Bridge {
 	 * @param string $name The bridge name.
 	 * @return bool true if the name is a valid bridge name, false otherwise.
 	 */
-	public static function isBridgeName($name){
+	public function isBridgeName($name){
 		return is_string($name) && preg_match('/^[A-Z][a-zA-Z0-9-]*$/', $name) === 1;
 	}
 
@@ -160,12 +97,12 @@ class Bridge {
 	 *
 	 * @return array List of bridge names
 	 */
-	public static function getBridgeNames(){
+	public function getBridgeNames(){
 
 		static $bridgeNames = array(); // Initialized on first call
 
 		if(empty($bridgeNames)) {
-			$files = scandir(self::getWorkingDir());
+			$files = scandir($this->getWorkingDir());
 
 			if($files !== false) {
 				foreach($files as $file) {
@@ -185,8 +122,8 @@ class Bridge {
 	 * @param string $name Name of the bridge.
 	 * @return bool True if the bridge is whitelisted.
 	 */
-	public static function isWhitelisted($name){
-		return in_array(self::sanitizeBridgeName($name), self::getWhitelist());
+	public function isWhitelisted($name){
+		return in_array($this->sanitizeBridgeName($name), $this->getWhitelist());
 	}
 
 	/**
@@ -205,7 +142,7 @@ class Bridge {
 	 *
 	 * @return array Array of whitelisted bridges
 	 */
-	public static function getWhitelist() {
+	public function getWhitelist() {
 
 		static $firstCall = true; // Initialized on first call
 
@@ -220,17 +157,17 @@ class Bridge {
 			}
 
 			if($contents === '*') { // Whitelist all bridges
-				self::$whitelist = self::getBridgeNames();
+				$this->whitelist = $this->getBridgeNames();
 			} else {
-				//self::$whitelist = array_map('self::sanitizeBridgeName', explode("\n", $contents));
+				//$this->$whitelist = array_map('$this->sanitizeBridgeName', explode("\n", $contents));
 				foreach(explode("\n", $contents) as $bridgeName) {
-					self::$whitelist[] = self::sanitizeBridgeName($bridgeName);
+					$this->whitelist[] = $this->sanitizeBridgeName($bridgeName);
 				}
 			}
 
 		}
 
-		return self::$whitelist;
+		return $this->whitelist;
 
 	}
 
@@ -248,8 +185,8 @@ class Bridge {
 	 * @param array $default The whitelist as array of bridge names.
 	 * @return void
 	 */
-	public static function setWhitelist($default = array()) {
-		self::$whitelist = array_map('self::sanitizeBridgeName', $default);
+	public function setWhitelist($default = array()) {
+		$this->whitelist = array_map('$this->sanitizeBridgeName', $default);
 	}
 
 	/**
@@ -269,7 +206,7 @@ class Bridge {
 	 * @return string|null The sanitized bridge name if the provided name is
 	 * valid, null otherwise.
 	 */
-	protected static function sanitizeBridgeName($name) {
+	protected function sanitizeBridgeName($name) {
 
 		if(is_string($name)) {
 
@@ -284,15 +221,15 @@ class Bridge {
 			}
 
 			// Improve performance for correctly written bridge names
-			if(in_array($name, self::getBridgeNames())) {
-				$index = array_search($name, self::getBridgeNames());
-				return self::getBridgeNames()[$index];
+			if(in_array($name, $this->getBridgeNames())) {
+				$index = array_search($name, $this->getBridgeNames());
+				return $this->getBridgeNames()[$index];
 			}
 
 			// The name is valid if a corresponding bridge file is found on disk
-			if(in_array(strtolower($name), array_map('strtolower', self::getBridgeNames()))) {
-				$index = array_search(strtolower($name), array_map('strtolower', self::getBridgeNames()));
-				return self::getBridgeNames()[$index];
+			if(in_array(strtolower($name), array_map('strtolower', $this->getBridgeNames()))) {
+				$index = array_search(strtolower($name), array_map('strtolower', $this->getBridgeNames()));
+				return $this->getBridgeNames()[$index];
 			}
 
 			Debug::log('Invalid bridge name specified: "' . $name . '"!');

lib/BridgeList.php

@@ -33,6 +33,7 @@ final class BridgeList {
 	<meta name="description" content="RSS-Bridge" />
 	<title>RSS-Bridge</title>
 	<link href="static/style.css" rel="stylesheet">
+	<link rel="icon" type="image/png" href="static/favicon.png">
 	<script src="static/search.js"></script>
 	<script src="static/select.js"></script>
 	<noscript>
@@ -61,14 +62,19 @@ EOD;
 		$totalActiveBridges = 0;
 		$inactiveBridges = '';
 
-		$bridgeList = Bridge::getBridgeNames();
-		$formats = Format::getFormatNames();
+		$bridgeFac = new \BridgeFactory();
+		$bridgeFac->setWorkingDir(PATH_LIB_BRIDGES);
+		$bridgeList = $bridgeFac->getBridgeNames();
+
+		$formatFac = new FormatFactory();
+		$formatFac->setWorkingDir(PATH_LIB_FORMATS);
+		$formats = $formatFac->getFormatNames();
 
 		$totalBridges = count($bridgeList);
 
 		foreach($bridgeList as $bridgeName) {
 
-			if(Bridge::isWhitelisted($bridgeName)) {
+			if($bridgeFac->isWhitelisted($bridgeName)) {
 
 				$body .= BridgeCard::displayBridgeCard($bridgeName, $formats);
 				$totalActiveBridges++;
@@ -111,8 +117,7 @@ EOD;
 
 		return <<<EOD
 <header>
-	<h1>RSS-Bridge</h1>
-	<h2>Reconnecting the Web</h2>
+	<div class="logo"></div>
 	{$warning}
 </header>
 EOD;
@@ -130,7 +135,7 @@ EOD;
 <section class="searchbar">
 	<h3>Search</h3>
 	<input type="text" name="searchfield"
-		id="searchfield" placeholder="Enter the bridge you want to search for"
+		id="searchfield" placeholder="Insert URL or bridge name"
 		onchange="search()" onkeyup="search()" value="{$query}">
 </section>
 EOD;

lib/CacheFactory.php

@@ -31,29 +31,7 @@
  * $cache = Cache::create('FileCache');
  * ```
  */
-class Cache {
-
-	/**
-	 * Holds a path to the working directory.
-	 *
-	 * Do not access this property directly!
-	 * Use {@see Cache::setWorkingDir()} and {@see Cache::getWorkingDir()} instead.
-	 *
-	 * @var string|null
-	 */
-	protected static $workingDir = null;
-
-	/**
-	 * Throws an exception when trying to create a new instance of this class.
-	 * Use {@see Cache::create()} to create a new cache object from the working
-	 * directory.
-	 *
-	 * @throws \LogicException if called.
-	 */
-	public function __construct(){
-		throw new \LogicException('Use ' . __CLASS__ . '::create($name) to create cache objects!');
-	}
-
+class CacheFactory extends FactoryAbstract {
 	/**
 	 * Creates a new cache object from the working directory.
 	 *
@@ -63,14 +41,14 @@ class Cache {
 	 * @param string $name Name of the cache object.
 	 * @return object|bool The cache object or false if the class is not instantiable.
 	 */
-	public static function create($name){
-		$name = self::sanitizeCacheName($name) . 'Cache';
+	public function create($name){
+		$name = $this->sanitizeCacheName($name) . 'Cache';
 
-		if(!self::isCacheName($name)) {
+		if(!$this->isCacheName($name)) {
 			throw new \InvalidArgumentException('Cache name invalid!');
 		}
 
-		$filePath = self::getWorkingDir() . $name . '.php';
+		$filePath = $this->getWorkingDir() . $name . '.php';
 
 		if(!file_exists($filePath)) {
 			throw new \Exception('Cache file ' . $filePath . ' does not exist!');
@@ -85,48 +63,6 @@ class Cache {
 		return false;
 	}
 
-	/**
-	 * Sets the working directory.
-	 *
-	 * @param string $dir Path to a directory containing cache classes
-	 * @throws \InvalidArgumentException if $dir is not a string.
-	 * @throws \Exception if the working directory doesn't exist.
-	 * @throws \InvalidArgumentException if $dir is not a directory.
-	 * @return void
-	 */
-	public static function setWorkingDir($dir){
-		self::$workingDir = null;
-
-		if(!is_string($dir)) {
-			throw new \InvalidArgumentException('Working directory is not a valid string!');
-		}
-
-		if(!file_exists($dir)) {
-			throw new \Exception('Working directory does not exist!');
-		}
-
-		if(!is_dir($dir)) {
-			throw new \InvalidArgumentException('Working directory is not a directory!');
-		}
-
-		self::$workingDir = realpath($dir) . '/';
-	}
-
-	/**
-	 * Returns the working directory.
-	 * The working directory must be set with {@see Cache::setWorkingDir()}!
-	 *
-	 * @throws \LogicException if the working directory is not set.
-	 * @return string The current working directory.
-	 */
-	public static function getWorkingDir(){
-		if(is_null(self::$workingDir)) {
-			throw new \LogicException('Working directory is not set!');
-		}
-
-		return self::$workingDir;
-	}
-
 	/**
 	 * Returns true if the provided name is a valid cache name.
 	 *
@@ -136,7 +72,7 @@ class Cache {
 	 * @param string $name The cache name.
 	 * @return bool true if the name is a valid cache name, false otherwise.
 	 */
-	public static function isCacheName($name){
+	public function isCacheName($name){
 		return is_string($name) && preg_match('/^[A-Z][a-zA-Z0-9-]*$/', $name) === 1;
 	}
 
@@ -147,12 +83,12 @@ class Cache {
 	 *
 	 * @return array List of cache names
 	 */
-	public static function getCacheNames(){
+	public function getCacheNames(){
 
 		static $cacheNames = array(); // Initialized on first call
 
 		if(empty($cacheNames)) {
-			$files = scandir(self::getWorkingDir());
+			$files = scandir($this->getWorkingDir());
 
 			if($files !== false) {
 				foreach($files as $file) {
@@ -183,7 +119,7 @@ class Cache {
 	 * @return string|null The sanitized cache name if the provided name is
 	 * valid, null otherwise.
 	 */
-	protected static function sanitizeCacheName($name) {
+	protected function sanitizeCacheName($name) {
 
 		if(is_string($name)) {
 
@@ -198,9 +134,9 @@ class Cache {
 			}
 
 			// The name is valid if a corresponding file is found on disk
-			if(in_array(strtolower($name), array_map('strtolower', self::getCacheNames()))) {
-				$index = array_search(strtolower($name), array_map('strtolower', self::getCacheNames()));
-				return self::getCacheNames()[$index];
+			if(in_array(strtolower($name), array_map('strtolower', $this->getCacheNames()))) {
+				$index = array_search(strtolower($name), array_map('strtolower', $this->getCacheNames()));
+				return $this->getCacheNames()[$index];
 			}
 
 			Debug::log('Invalid cache name specified: "' . $name . '"!');

lib/Configuration.php

@@ -28,7 +28,7 @@ final class Configuration {
 	 *
 	 * @todo Replace this property by a constant.
 	 */
-	public static $VERSION = '2019-06-08';
+	public static $VERSION = '2019-09-12';
 
 	/**
 	 * Holds the configuration data.

lib/FormatFactory.php

@@ -31,29 +31,7 @@
  * $format = Format::create('Atom');
  * ```
  */
-class Format {
-
-	/**
-	 * Holds a path to the working directory.
-	 *
-	 * Do not access this property directly!
-	 * Use {@see Format::setWorkingDir()} and {@see Format::getWorkingDir()} instead.
-	 *
-	 * @var string|null
-	 */
-	protected static $workingDir = null;
-
-	/**
-	 * Throws an exception when trying to create a new instance of this class.
-	 * Use {@see Format::create()} to create a new format object from the working
-	 * directory.
-	 *
-	 * @throws \LogicException if called.
-	 */
-	public function __construct(){
-		throw new \LogicException('Use ' . __CLASS__ . '::create($name) to create cache objects!');
-	}
-
+class FormatFactory extends FactoryAbstract {
 	/**
 	 * Creates a new format object from the working directory.
 	 *
@@ -63,13 +41,13 @@ class Format {
 	 * @param string $name Name of the format object.
 	 * @return object|bool The format object or false if the class is not instantiable.
 	 */
-	public static function create($name){
-		if(!self::isFormatName($name)) {
+	public function create($name){
+		if(!$this->isFormatName($name)) {
 			throw new \InvalidArgumentException('Format name invalid!');
 		}
 
-		$name = $name . 'Format';
-		$pathFormat = self::getWorkingDir() . $name . '.php';
+		$name = $this->sanitizeFormatName($name) . 'Format';
+		$pathFormat = $this->getWorkingDir() . $name . '.php';
 
 		if(!file_exists($pathFormat)) {
 			throw new \Exception('Format file ' . $filePath . ' does not exist!');
@@ -84,48 +62,6 @@ class Format {
 		return false;
 	}
 
-	/**
-	 * Sets the working directory.
-	 *
-	 * @param string $dir Path to a directory containing cache classes
-	 * @throws \InvalidArgumentException if $dir is not a string.
-	 * @throws \Exception if the working directory doesn't exist.
-	 * @throws \InvalidArgumentException if $dir is not a directory.
-	 * @return void
-	 */
-	public static function setWorkingDir($dir){
-		self::$workingDir = null;
-
-		if(!is_string($dir)) {
-			throw new \InvalidArgumentException('Dir format must be a string.');
-		}
-
-		if(!file_exists($dir)) {
-			throw new \Exception('Working directory does not exist!');
-		}
-
-		if(!is_dir($dir)) {
-			throw new \InvalidArgumentException('Working directory is not a directory!');
-		}
-
-		self::$workingDir = realpath($dir) . '/';
-	}
-
-	/**
-	 * Returns the working directory.
-	 * The working directory must be set with {@see Format::setWorkingDir()}!
-	 *
-	 * @throws \LogicException if the working directory is not set.
-	 * @return string The current working directory.
-	 */
-	public static function getWorkingDir(){
-		if(is_null(self::$workingDir)) {
-			throw new \LogicException('Working directory is not set!');
-		}
-
-		return self::$workingDir;
-	}
-
 	/**
 	 * Returns true if the provided name is a valid format name.
 	 *
@@ -135,7 +71,7 @@ class Format {
 	 * @param string $name The format name.
 	 * @return bool true if the name is a valid format name, false otherwise.
 	 */
-	public static function isFormatName($name){
+	public function isFormatName($name){
 		return is_string($name) && preg_match('/^[A-Z][a-zA-Z0-9-]*$/', $name) === 1;
 	}
 
@@ -146,11 +82,11 @@ class Format {
 	 *
 	 * @return array List of format names
 	 */
-	public static function getFormatNames(){
+	public function getFormatNames(){
 		static $formatNames = array(); // Initialized on first call
 
 		if(empty($formatNames)) {
-			$files = scandir(self::getWorkingDir());
+			$files = scandir($this->getWorkingDir());
 
 			if($files !== false) {
 				foreach($files as $file) {
@@ -163,4 +99,55 @@ class Format {
 
 		return $formatNames;
 	}
+
+	/**
+	 * Returns the sanitized format name.
+	 *
+	 * The format name can be specified in various ways:
+	 * * The PHP file name (i.e. `AtomFormat.php`)
+	 * * The PHP file name without file extension (i.e. `AtomFormat`)
+	 * * The format name (i.e. `Atom`)
+	 *
+	 * Casing is ignored (i.e. `ATOM` and `atom` are the same).
+	 *
+	 * A format file matching the given format name must exist in the working
+	 * directory!
+	 *
+	 * @param string $name The format name
+	 * @return string|null The sanitized format name if the provided name is
+	 * valid, null otherwise.
+	 */
+	protected function sanitizeFormatName($name) {
+
+		if(is_string($name)) {
+
+			// Trim trailing '.php' if exists
+			if(preg_match('/(.+)(?:\.php)/', $name, $matches)) {
+				$name = $matches[1];
+			}
+
+			// Trim trailing 'Format' if exists
+			if(preg_match('/(.+)(?:Format)/i', $name, $matches)) {
+				$name = $matches[1];
+			}
+
+			// Improve performance for correctly written format names
+			if(in_array($name, $this->getFormatNames())) {
+				$index = array_search($name, $this->getFormatNames());
+				return $this->getFormatNames()[$index];
+			}
+
+			// The name is valid if a corresponding format file is found on disk
+			if(in_array(strtolower($name), array_map('strtolower', $this->getFormatNames()))) {
+				$index = array_search(strtolower($name), array_map('strtolower', $this->getFormatNames()));
+				return $this->getFormatNames()[$index];
+			}
+
+			Debug::log('Invalid format name: "' . $name . '"!');
+
+		}
+
+		return null; // Bad parameter
+
+	}
 }

lib/ParameterValidator.php

@@ -214,6 +214,7 @@ class ParameterValidator {
 
 		switch(array_sum($queriedContexts)) {
 		case 0: // Found no match, is there a context without parameters?
+			if(isset($data['context'])) return $data['context'];
 			foreach($queriedContexts as $context => $queried) {
 				if(is_null($queried)) {
 					return $context;

lib/contents.php

@@ -45,7 +45,9 @@ function getContents($url, $header = array(), $opts = array()){
 	Debug::log('Reading contents from "' . $url . '"');
 
 	// Initialize cache
-	$cache = Cache::create(Configuration::getConfig('cache', 'type'));
+	$cacheFac = new CacheFactory();
+	$cacheFac->setWorkingDir(PATH_LIB_CACHES);
+	$cache = $cacheFac->create(Configuration::getConfig('cache', 'type'));
 	$cache->setScope('server');
 	$cache->purgeCache(86400); // 24 hours (forced)
 
@@ -54,7 +56,20 @@ function getContents($url, $header = array(), $opts = array()){
 
 	// Use file_get_contents if in CLI mode with no root certificates defined
 	if(php_sapi_name() === 'cli' && empty(ini_get('curl.cainfo'))) {
-		$data = @file_get_contents($url);
+
+		$httpHeaders = '';
+
+		foreach ($header as $headerL) {
+			$httpHeaders .= $headerL . "\r\n";
+		}
+
+		$ctx = stream_context_create(array(
+			'http' => array(
+				'header' => $httpHeaders
+			)
+		));
+
+		$data = @file_get_contents($url, 0, $ctx);
 
 		if($data === false) {
 			$errorCode = 500;
@@ -270,7 +285,9 @@ function getSimpleHTMLDOMCached($url,
 	Debug::log('Caching url ' . $url . ', duration ' . $duration);
 
 	// Initialize cache
-	$cache = Cache::create(Configuration::getConfig('cache', 'type'));
+	$cacheFac = new CacheFactory();
+	$cacheFac->setWorkingDir(PATH_LIB_CACHES);
+	$cache = $cacheFac->create(Configuration::getConfig('cache', 'type'));
 	$cache->setScope('pages');
 	$cache->purgeCache(86400); // 24 hours (forced)
 
@@ -322,8 +339,8 @@ function parseResponseHeader($header) {
 				$header['http_code'] = $line;
 			} else {
 
-				list ($key, $value) = explode(': ', $line);
-				$header[$key] = $value;
+				list ($key, $value) = explode(':', $line);
+				$header[$key] = trim($value);
 
 			}
 

lib/rssbridge.php

@@ -61,12 +61,12 @@ require_once PATH_LIB . 'FactoryAbstract.php';
 require_once PATH_LIB . 'FeedItem.php';
 require_once PATH_LIB . 'Debug.php';
 require_once PATH_LIB . 'Exceptions.php';
-require_once PATH_LIB . 'Format.php';
+require_once PATH_LIB . 'FormatFactory.php';
 require_once PATH_LIB . 'FormatAbstract.php';
-require_once PATH_LIB . 'Bridge.php';
+require_once PATH_LIB . 'BridgeFactory.php';
 require_once PATH_LIB . 'BridgeAbstract.php';
 require_once PATH_LIB . 'FeedExpander.php';
-require_once PATH_LIB . 'Cache.php';
+require_once PATH_LIB . 'CacheFactory.php';
 require_once PATH_LIB . 'Authentication.php';
 require_once PATH_LIB . 'Configuration.php';
 require_once PATH_LIB . 'BridgeCard.php';
@@ -84,14 +84,3 @@ require_once PATH_LIB . 'contents.php';
 define('MAX_FILE_SIZE', 10000000); /* Allow larger files for simple_html_dom */
 require_once PATH_LIB_VENDOR . 'simplehtmldom/simple_html_dom.php';
 require_once PATH_LIB_VENDOR . 'php-urljoin/src/urljoin.php';
-
-// Initialize static members
-try {
-	Bridge::setWorkingDir(PATH_LIB_BRIDGES);
-	Format::setWorkingDir(PATH_LIB_FORMATS);
-	Cache::setWorkingDir(PATH_LIB_CACHES);
-} catch(Exception $e) {
-	error_log($e);
-	header('Content-type: text/plain', true, 500);
-	die($e->getMessage());
-}

static/HtmlFormat.css

@@ -96,3 +96,20 @@ html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockq
  button:hover {
 	background: #49afff;
 }
+
+@media screen and (max-width: 767px) {
+
+	section {
+		width: 100%;
+		padding: 0;
+
+	}
+
+	button {
+		display: inline-block;
+		width: 40%;
+		padding: 5px auto;
+		margin: 3px auto 0;
+	}
+
+}

static/favicon.svg

@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="200mm"
+   height="200mm"
+   viewBox="0 0 200 200"
+   version="1.1"
+   id="svg871"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="favicon_rssbridge.svg">
+  <defs
+     id="defs865" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.35"
+     inkscape:cx="495.71429"
+     inkscape:cy="542.85714"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1366"
+     inkscape:window-height="705"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata868">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Calque 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-97)">
+    <g
+       id="g2147"
+       transform="matrix(1.7746042,0,0,1.7746042,3145.263,-3080.4079)"
+       inkscape:export-xdpi="61.620663"
+       inkscape:export-ydpi="61.620663">
+      <rect
+         inkscape:export-ydpi="68"
+         inkscape:export-xdpi="68"
+         ry="17.993027"
+         rx="17.993027"
+         y="1803.3181"
+         x="-1759.36"
+         height="86.856956"
+         width="86.856956"
+         id="rect2098"
+         style="opacity:1;vector-effect:none;fill:#ff6600;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:4.00000008, 8.00000016;stroke-dashoffset:0;stroke-opacity:1" />
+      <flowRoot
+         inkscape:export-filename="C:\Users\Gyrev\Dropbox\4 - Obs\01 - Com - media\03 - infographies\logo_glasses.png"
+         transform="matrix(0.5968306,0,0,0.5968306,-1834.59,1688.6939)"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:40px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2.61466217"
+         id="flowRoot2106"
+         xml:space="preserve"
+         inkscape:export-xdpi="68.183243"
+         inkscape:export-ydpi="68.183243"><flowRegion
+           id="flowRegion2102"
+           style="fill:#ffffff;fill-opacity:1;stroke-width:2.61466217"><rect
+             y="275.93942"
+             x="140.55341"
+             height="65.626038"
+             width="253.20284"
+             id="rect2100"
+             style="fill:#ffffff;fill-opacity:1;stroke-width:2.61466217" /></flowRegion><flowPara
+           style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-family:'Exo 2';-inkscape-font-specification:'Exo 2 Semi-Bold';letter-spacing:-1px;fill:#ffffff;fill-opacity:1;stroke-width:2.61466217"
+           id="flowPara2104">Bridge</flowPara></flowRoot>      <g
+         style="stroke-width:2.99397564"
+         inkscape:export-ydpi="68"
+         inkscape:export-xdpi="68"
+         id="g2118"
+         transform="matrix(0.33400405,0,0,0.33400405,-1609.4253,1569.2886)">
+        <flowRoot
+           inkscape:export-filename="C:\Users\Gyrev\Dropbox\4 - Obs\01 - Com - media\03 - infographies\logo_glasses.png"
+           transform="matrix(1.7868963,0,0,1.7868963,-620.90965,302.19806)"
+           style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:40px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2.61466217"
+           id="flowRoot2116"
+           xml:space="preserve"
+           inkscape:export-xdpi="68.183243"
+           inkscape:export-ydpi="68.183243"><flowRegion
+             id="flowRegion2112"
+             style="fill:#ffffff;fill-opacity:1;stroke-width:2.61466217"><rect
+               y="275.93942"
+               x="140.55341"
+               height="65.626038"
+               width="253.20284"
+               id="rect2110"
+               style="fill:#ffffff;fill-opacity:1;stroke-width:2.61466217" /></flowRegion><flowPara
+             style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-family:'Exo 2';-inkscape-font-specification:'Exo 2 Semi-Bold';letter-spacing:-1px;fill:#ffffff;fill-opacity:1;stroke-width:2.61466217"
+             id="flowPara2114">rss</flowPara></flowRoot>      </g>
+      <path
+         inkscape:export-ydpi="68"
+         inkscape:export-xdpi="68"
+         inkscape:connector-curvature="0"
+         id="path2120"
+         d="m -1719.2669,1838.3599 c -5.0205,-1.3144 -8.8786,-5.3846 -10.0117,-10.5624 -0.335,-1.5309 -0.2541,-4.567 0.1641,-6.161 1.284,-4.8933 4.9001,-8.573 9.7609,-9.9326 1.5509,-0.4338 4.2673,-0.512 6.1345,-0.1767 4.1633,0.7477 8.2284,4.1132 9.8663,8.1681 0.7975,1.9744 0.9807,2.9793 0.9762,5.3548 0,1.8242 -0.075,2.499 -0.3818,3.58 -1.3733,4.8468 -5.1589,8.5581 -9.9346,9.7395 -1.8168,0.4494 -4.837,0.445 -6.5739,-0.01 z m 2.2445,-7.5051 c -0.2717,-0.1738 -3.5329,-0.3553 -3.6195,-0.2014 -0.1223,0.2172 1.1312,3.2066 1.6601,3.9591 0.2581,0.3672 0.8046,0.9237 1.2144,1.2364 l 0.745,0.5688 0.083,-2.7282 c 0.053,-1.7295 0.022,-2.7672 -0.083,-2.8347 z m 3.4669,4.5392 c 0.6573,-0.6108 1.0277,-1.2558 1.7728,-3.087 0.3973,-0.9763 0.5822,-1.631 0.4789,-1.6949 -0.1723,-0.1065 -2.753,0.054 -3.429,0.2138 -0.3689,0.087 -0.3747,0.1285 -0.3747,2.7067 0,1.4401 0.05,2.6687 0.1116,2.73 0.1328,0.1328 0.7879,-0.2623 1.4404,-0.8686 z m -7.1654,-0.2901 c 0.057,-0.057 -0.07,-0.4503 -0.2823,-0.8742 -0.5012,-1.0013 -0.9314,-2.3267 -1.0704,-3.2976 l -0.1107,-0.7741 -1.0768,-0.2197 c -0.5923,-0.1208 -1.5232,-0.3704 -2.0688,-0.5546 -0.5455,-0.1842 -1.0215,-0.3053 -1.0578,-0.269 -0.1007,0.1007 0.5958,1.4049 1.2973,2.4294 0.7668,1.1198 1.9378,2.2559 3.1536,3.0595 0.9557,0.6316 1.047,0.6692 1.2159,0.5003 z m 11.6482,-1.1869 c 0.4342,-0.3121 1.1176,-0.9425 1.5185,-1.4009 0.7228,-0.8263 2.2126,-3.2507 2.0793,-3.3839 -0.081,-0.081 -3.4631,0.9745 -3.9405,1.23 -0.1894,0.1013 -0.3734,0.436 -0.4412,0.8027 -0.064,0.346 -0.4063,1.3351 -0.7607,2.1982 -0.3543,0.863 -0.6045,1.6335 -0.5558,1.7122 0.096,0.1552 0.8564,-0.2642 2.1004,-1.1583 z m -7.7321,-7.5308 c 0.028,-1.5854 -0.012,-2.9457 -0.089,-3.0227 -0.077,-0.077 -1.1425,-0.1909 -2.3677,-0.2529 l -2.2276,-0.1128 0.1048,2.6632 c 0.058,1.4647 0.1506,2.7824 0.2066,2.9281 0.068,0.1771 0.4702,0.3241 1.2128,0.4429 1.0818,0.1732 2.6072,0.3083 2.9427,0.2606 0.1015,-0.014 0.1865,-1.1506 0.2176,-2.9064 z m 4.7233,2.6386 c 0.6339,-0.097 1.1476,-0.2656 1.1959,-0.3916 0.047,-0.1215 0.1731,-0.9804 0.281,-1.9087 0.1853,-1.5935 0.1233,-3.2044 -0.1388,-3.6068 -0.084,-0.1292 -0.7256,-0.1333 -2.241,-0.014 l -2.1231,0.1669 v 2.9435 c 0,1.6188 0.039,2.9822 0.086,3.0297 0.1077,0.1077 1.4775,0.01 2.9397,-0.2189 z m -10.6043,-0.8169 c -0.1446,-0.4559 -0.1658,-4.6514 -0.026,-5.08 0.1024,-0.3129 -0.039,-0.3779 -1.7622,-0.8077 -1.0305,-0.2571 -1.9525,-0.4987 -2.0489,-0.5369 -0.2228,-0.088 -0.7405,2.5619 -0.7405,3.7909 0,1.3374 0.5346,1.8093 2.914,2.572 1.5268,0.4894 1.8022,0.4996 1.6632,0.062 z m 15.5636,-0.1064 c 1.2002,-0.3876 2.3124,-1.419 2.5141,-2.3313 0.1656,-0.7493 0.01,-1.8941 -0.4444,-3.2707 -0.2107,-0.6382 -0.3209,-0.7776 -0.5391,-0.6817 -0.1509,0.066 -1.0236,0.3247 -1.9395,0.5742 -1.1985,0.3265 -1.6453,0.5175 -1.5943,0.6816 0.1128,0.3635 0.051,4.4177 -0.076,4.9964 l -0.1154,0.5253 0.6589,-0.1053 c 0.3623,-0.058 1.0533,-0.2328 1.5355,-0.3885 z m -9.7252,-6.5935 c 0.045,-0.1165 0.061,-1.9335 0.036,-4.038 l -0.045,-3.8262 -1.1336,1.0763 c -0.8596,0.8162 -1.2919,1.3997 -1.7889,2.4145 -0.6761,1.3806 -1.4646,4.0002 -1.2644,4.2005 0.3609,0.3609 4.0646,0.5135 4.1953,0.1729 z m 5.1134,0.062 c 0.4359,-0.072 0.84,-0.1778 0.8978,-0.2357 0.1638,-0.1638 -0.9127,-3.4126 -1.4982,-4.5217 -0.5028,-0.9524 -2.3179,-3.085 -2.6256,-3.085 -0.1694,0 -0.205,7.7131 -0.036,7.8817 0.1489,0.1489 2.2742,0.1233 3.2624,-0.039 z m -10.6939,-1.057 c 0.4232,-1.6148 0.7365,-2.617 1.2494,-3.9963 0.2979,-0.8014 0.5037,-1.457 0.4573,-1.457 -0.3843,0 -2.3317,1.2786 -3.2089,2.1068 -1.2568,1.1867 -2.3208,2.8017 -2.0344,3.0881 0.1665,0.1666 2.6682,0.9242 3.1493,0.9537 0.111,0.01 0.2852,-0.306 0.3873,-0.6953 z m 14.5638,0.4564 c 1.3057,-0.275 2.0815,-0.556 2.0815,-0.754 0,-0.3409 -1.7648,-2.7156 -2.5545,-3.4374 -0.7298,-0.667 -2.662,-1.8848 -2.9904,-1.8848 -0.048,0 0.095,0.3754 0.3159,0.8343 0.4315,0.8944 1.071,2.9784 1.392,4.5358 0.1085,0.5266 0.2856,0.9561 0.3936,0.9545 0.108,0 0.7209,-0.1133 1.3619,-0.2484 z"
+         style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2.00000024;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:4.00000004, 8.0000001;stroke-dashoffset:0;stroke-opacity:1" />
+    </g>
+  </g>
+</svg>

static/logo.svg

@@ -0,0 +1,162 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="300mm"
+   height="100mm"
+   viewBox="0 0 300 100"
+   version="1.1"
+   id="svg1551"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="logo_rssbridge.svg">
+  <defs
+     id="defs1545" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.35"
+     inkscape:cx="517.88898"
+     inkscape:cy="397.65625"
+     inkscape:document-units="mm"
+     inkscape:current-layer="g1492"
+     showgrid="false"
+     inkscape:window-width="1366"
+     inkscape:window-height="705"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata1548">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Calque 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-197)">
+    <g
+       style="fill:#1182db;fill-opacity:1"
+       id="g1492"
+       transform="matrix(1.063066,0,0,1.063066,31.239097,-1662.8034)"
+       inkscape:export-xdpi="84.084839"
+       inkscape:export-ydpi="84.084839">
+      <flowRoot
+         inkscape:export-ydpi="68.183243"
+         inkscape:export-xdpi="68.183243"
+         xml:space="preserve"
+         id="flowRoot1458"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:40px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold';letter-spacing:0px;word-spacing:0px;fill:#1182db;fill-opacity:1;stroke:none;stroke-width:5.40849686"
+         transform="matrix(0.2885294,0,0,0.2885294,11.385677,1734.3629)"
+         inkscape:export-filename="C:\Users\Gyrev\Dropbox\4 - Obs\01 - Com - media\03 - infographies\logo_glasses.png"><flowRegion
+           style="fill:#1182db;fill-opacity:1;stroke-width:5.40849686"
+           id="flowRegion1454"><rect
+             style="fill:#1182db;fill-opacity:1;stroke-width:5.40849686"
+             id="rect1452"
+             width="555.50842"
+             height="60.796875"
+             x="140.55341"
+             y="275.93942" /></flowRegion><flowPara
+           id="flowPara1456"
+           style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-family:'Exo 2';-inkscape-font-specification:'Exo 2 Semi-Bold';letter-spacing:3.48859px;fill:#1182db;fill-opacity:1;stroke-width:5.40849686">reconnecting the web</flowPara></flowRoot>      <g
+         id="g1468"
+         style="fill:#1182db;fill-opacity:1;stroke-width:1.69267535"
+         transform="matrix(0.59078074,0,0,0.59078074,36.380377,1356.4656)">
+        <flowRoot
+           inkscape:export-ydpi="68.183243"
+           inkscape:export-xdpi="68.183243"
+           xml:space="preserve"
+           id="flowRoot1466"
+           style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:40px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold';letter-spacing:0px;word-spacing:0px;fill:#1182db;fill-opacity:1;stroke:none;stroke-width:1.47822654"
+           transform="matrix(1.7868963,0,0,1.7868963,-131.08627,186.65131)"
+           inkscape:export-filename="C:\Users\Gyrev\Dropbox\4 - Obs\01 - Com - media\03 - infographies\logo_glasses.png"><flowRegion
+             style="fill:#1182db;fill-opacity:1;stroke-width:1.47822654"
+             id="flowRegion1462"><rect
+               style="fill:#1182db;fill-opacity:1;stroke-width:1.47822654"
+               id="rect1460"
+               width="253.20284"
+               height="65.626038"
+               x="140.55341"
+               y="275.93942" /></flowRegion><flowPara
+             id="flowPara1464"
+             style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-family:'Exo 2';-inkscape-font-specification:'Exo 2 Semi-Bold';letter-spacing:-2.1810503px;fill:#1182db;fill-opacity:1;stroke-width:1.47822654">Bridge</flowPara></flowRoot>      </g>
+      <g
+         transform="matrix(0.59078074,0,0,0.59078074,66.923727,1356.4656)"
+         style="fill:#1182db;fill-opacity:1;stroke-width:1.69267535"
+         id="g1478">
+        <flowRoot
+           inkscape:export-filename="C:\Users\Gyrev\Dropbox\4 - Obs\01 - Com - media\03 - infographies\logo_glasses.png"
+           transform="matrix(1.7868963,0,0,1.7868963,-294.87276,186.65131)"
+           style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:40px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold';letter-spacing:0px;word-spacing:0px;fill:#1182db;fill-opacity:1;stroke:none;stroke-width:1.47822654"
+           id="flowRoot1476"
+           xml:space="preserve"
+           inkscape:export-xdpi="68.183243"
+           inkscape:export-ydpi="68.183243"><flowRegion
+             id="flowRegion1472"
+             style="fill:#1182db;fill-opacity:1;stroke-width:1.47822654"><rect
+               y="275.93942"
+               x="140.55341"
+               height="65.626038"
+               width="253.20284"
+               id="rect1470"
+               style="fill:#1182db;fill-opacity:1;stroke-width:1.47822654" /></flowRegion><flowPara
+             style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-family:'Exo 2';-inkscape-font-specification:'Exo 2 Semi-Bold';letter-spacing:-2.1810503px;fill:#1182db;fill-opacity:1;stroke-width:1.47822654"
+             id="flowPara1474">rss</flowPara></flowRoot>      </g>
+      <rect
+         ry="7.3332076"
+         rx="7.3332076"
+         y="1763.6888"
+         x="3.8301878"
+         height="41.961315"
+         width="99.644852"
+         id="rect1480"
+         style="opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#1182db;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <g
+         id="g1490"
+         transform="matrix(0.42065629,0,0,0.42065629,481.55091,842.16455)"
+         style="fill:#1182db;fill-opacity:1;stroke-width:2.3772378">
+        <g
+           style="fill:#1182db;fill-opacity:1;stroke-width:3.88193178"
+           transform="matrix(0.61238525,0,0,0.61238525,-1199.6119,2184.4357)"
+           id="g1488">
+          <path
+             style="opacity:1;vector-effect:none;fill:#1182db;fill-opacity:1;stroke:none;stroke-width:29.34373856;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:58.68747418, 117.37494829;stroke-dashoffset:0;stroke-opacity:1"
+             d="m 541.51249,525.34565 c -10.41315,-4.00956 -14.78996,-6.8636 -21.21485,-13.83378 -9.51065,-10.31784 -12.16446,-17.61997 -12.22497,-33.63782 -0.0451,-11.93786 0.4192,-14.53892 3.85734,-21.60913 4.60063,-9.46079 15.51168,-20.18661 24.98644,-24.56227 5.4253,-2.50553 9.38434,-3.11239 20.31033,-3.11325 11.66691,-9.2e-4 14.67404,0.52181 21.42857,3.7249 9.99443,4.73949 19.32279,14.0885 24.07789,24.13117 5.25545,11.09941 5.95363,27.48145 1.65888,38.9238 -4.02442,10.72212 -14.87839,22.6043 -25.31059,27.7083 -10.28725,5.03309 -27.6637,6.08212 -37.56904,2.26808 z"
+             id="path1482"
+             inkscape:connector-curvature="0"
+             transform="scale(0.26458333)" />
+          <path
+             style="opacity:1;vector-effect:none;fill:#1182db;fill-opacity:1;stroke:none;stroke-width:29.34373856;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:58.68747418, 117.37494829;stroke-dashoffset:0;stroke-opacity:1"
+             d="m 683.89345,526.92166 c -0.52382,-0.5238 -0.96246,-2.93451 -0.97477,-5.35714 -0.0352,-6.92667 -5.18979,-29.62173 -10.01089,-44.07679 C 648.75042,405.05698 592.21848,359.91722 516.2625,352.40923 l -9.75001,-0.96376 0.31432,-35.60003 c 0.17288,-19.58002 0.82532,-36.11103 1.44987,-36.73558 1.81708,-1.81708 35.29533,1.40642 53.50247,5.15156 47.00787,9.66933 86.72265,29.83563 117.9638,59.89942 22.60831,21.7563 38.25173,44.31995 51.33931,74.05042 11.72719,26.64016 21.65262,66.64856 24.10447,97.16279 l 1.00439,12.5 h -35.67264 c -19.61996,0 -36.10123,-0.42858 -36.62503,-0.95239 z"
+             id="path1484"
+             inkscape:connector-curvature="0"
+             transform="scale(0.26458333)" />
+          <path
+             style="opacity:1;vector-effect:none;fill:#1182db;fill-opacity:1;stroke:none;stroke-width:29.34373856;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:58.68747418, 117.37494829;stroke-dashoffset:0;stroke-opacity:1"
+             d="m 823.42333,526.81959 -8.80344,-0.50396 -0.79067,-6.72078 c -0.43486,-3.69645 -1.19383,-10.89938 -1.68659,-16.00652 -4.34718,-45.05596 -23.32007,-100.71198 -47.77185,-140.13638 -22.38739,-36.09589 -54.4142,-68.56278 -89.46856,-90.69793 -41.25297,-26.04928 -95.0629,-43.89344 -148.38973,-49.20819 -9.42857,-0.93969 -17.94643,-1.93722 -18.92857,-2.21675 -1.37004,-0.38992 -1.78572,-9.19669 -1.78572,-37.83338 v -37.32517 l 15.35715,0.93347 c 45.68823,2.77713 80.32407,8.98439 117.5,21.05774 91.16555,29.60718 160.46184,87.77122 202.6182,170.06818 24.63558,48.09321 41.9844,114.7859 45.52317,175.00127 l 0.86054,14.64286 -27.71524,-0.27526 c -15.24339,-0.15139 -31.6768,-0.50203 -36.51869,-0.7792 z"
+             id="path1486"
+             inkscape:connector-curvature="0"
+             transform="scale(0.26458333)" />
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>

static/style.css

@@ -43,14 +43,11 @@ header {
 	color: #1182DB;
 }
 
-header > h1 {
-	font-size: 500%;
-	font-weight: bold;
-}
-
-header > h2 {
-	margin-left: 1em;
-	font-size: 200%;
+header > div.logo {
+	background-image: url(logo_600px.png);
+	width: 599px;
+	height: 177px;
+	margin: auto;
 }
 
 header > section.warning {
@@ -199,6 +196,7 @@ form {
 
 	.parameters label {
 		text-align: right;
+		line-height: 1.5em;
 	}
 
 	.parameters label::before {
@@ -303,3 +301,60 @@ h5 {
 .advice > li {
 	text-align: left;
 }
+
+@media screen and (max-width: 767px) {
+	body {
+		font-size: 75%;
+	}
+
+	header > div.logo {
+		background-image: url(logo_300px.png);
+		width: 300px;
+		height: 89px;
+	}
+
+	header > section.warning {
+		width: 90%;
+	}
+
+	header > section.critical-warning {
+		width: 90%;
+	}
+
+	.searchbar {
+		width: 90%;
+		margin: 0 auto;
+	}
+
+	section {
+		width: 90%;
+		margin: 10px auto;
+		overflow: hidden;
+	}
+
+	button {
+		display: inline-block;
+		width: 40%;
+		padding: 5px auto;
+		margin: 3px auto 0;
+	}
+
+	@supports (display: grid) {
+
+		.parameters {
+			grid-template-columns: auto auto;
+			grid-column-gap: 5px;
+		}
+
+		.parameters label {
+			line-height: 2em;
+			word-break: break-word;
+		}
+
+	} /* @supports (display: grid) */
+
+	.secure-warning {
+		width: 100%;
+	}
+
+}

tests/AtomFormatTest.php

@@ -77,7 +77,9 @@ class AtomFormatTest extends TestCase {
 	}
 
 	private function initFormat() {
-		$this->format = \Format::create('Atom');
+		$formatFac = new FormatFactory();
+		$formatFac->setWorkingDir(PATH_LIB_FORMATS);
+		$this->format = $formatFac->create('Atom');
 		$this->format->setItems($this->sample->items);
 		$this->format->setExtraInfos($this->sample->meta);
 		$this->format->setLastModified(strtotime('2000-01-01 12:00:00 UTC'));

tests/JsonFormatTest.php

@@ -77,7 +77,9 @@ class JsonFormatTest extends TestCase {
 	}
 
 	private function initFormat() {
-		$this->format = \Format::create('Json');
+		$formatFac = new FormatFactory();
+		$formatFac->setWorkingDir(PATH_LIB_FORMATS);
+		$this->format = $formatFac->create('Json');
 		$this->format->setItems($this->sample->items);
 		$this->format->setExtraInfos($this->sample->meta);
 		$this->format->setLastModified(strtotime('2000-01-01 12:00:00 UTC'));

tests/ListActionTest.php

@@ -42,8 +42,11 @@ class ListActionTest extends TestCase {
 			'Item count doesn\'t match'
 		);
 
+		$bridgeFac = new BridgeFactory();
+		$bridgeFac->setWorkingDir(PATH_LIB_BRIDGES);
+
 		$this->assertEquals(
-			count(Bridge::getBridgeNames()),
+			count($bridgeFac->getBridgeNames()),
 			count($items['bridges']),
 			'Number of bridges doesn\'t match'
 		);

tests/MrssFormatTest.php

@@ -78,7 +78,9 @@ class MrssFormatTest extends TestCase {
 	}
 
 	private function initFormat() {
-		$this->format = \Format::create('Mrss');
+		$formatFac = new FormatFactory();
+		$formatFac->setWorkingDir(PATH_LIB_FORMATS);
+		$this->format = $formatFac->create('Mrss');
 		$this->format->setItems($this->sample->items);
 		$this->format->setExtraInfos($this->sample->meta);
 		$this->format->setLastModified(strtotime('2000-01-01 12:00:00 UTC'));