Browse Source

bridges: Return parent::getURI by default

logmanoriginal 7 years ago
parent
commit
512a4f292b

+ 5 - 1
bridges/AskfmBridge.php

@@ -65,6 +65,10 @@ class AskfmBridge extends BridgeAbstract {
 	}
 
 	public function getURI(){
-		return self::URI . urlencode($this->getInput('u')) . '/answers/more?page=0';
+		if(!is_null($this->getInput('u'))){
+			return self::URI . urlencode($this->getInput('u')) . '/answers/more?page=0';
+		}
+
+		return parent::getURI();
 	}
 }

+ 5 - 1
bridges/BandcampBridge.php

@@ -46,7 +46,11 @@ class BandcampBridge extends BridgeAbstract {
 	}
 
 	public function getURI(){
-		return self::URI . 'tag/' . urlencode($this->getInput('tag')) . '?sort_field=date';
+		if(!is_null($this->getInput('tag'))){
+			return self::URI . 'tag/' . urlencode($this->getInput('tag')) . '?sort_field=date';
+		}
+
+		return parent::getURI();
 	}
 
 	public function getName(){

+ 5 - 1
bridges/BooruprojectBridge.php

@@ -28,7 +28,11 @@ class BooruprojectBridge extends GelbooruBridge {
 	const PIDBYPAGE = 20;
 
 	public function getURI(){
-		return 'http://' . $this->getInput('i') . '.booru.org/';
+		if(!is_null($this->getInput('i'))){
+			return 'http://' . $this->getInput('i') . '.booru.org/';
+		}
+
+		return parent::getURI();
 	}
 
 	public function getName(){

+ 1 - 0
bridges/DailymotionBridge.php

@@ -116,6 +116,7 @@ class DailymotionBridge extends BridgeAbstract {
 				$uri .= '/' . $this->getInput('pa');
 			}
 			break;
+		default: return parent::getURI();
 		}
 		return $uri;
 	}

+ 5 - 1
bridges/FourchanBridge.php

@@ -20,7 +20,11 @@ class FourchanBridge extends BridgeAbstract {
 	));
 
 	public function getURI(){
-		return static::URI . $this->getInput('c') . '/thread/' . $this->getInput('t');
+		if(!is_null($this->getInput('c')) && !is_null($this->getInput('t'))){
+			return static::URI . $this->getInput('c') . '/thread/' . $this->getInput('t');
+		}
+
+		return parent::getURI();
 	}
 
 	public function collectData(){

+ 10 - 6
bridges/GithubIssueBridge.php

@@ -53,13 +53,17 @@ class GithubIssueBridge extends BridgeAbstract {
 	}
 
 	public function getURI(){
-		$uri = static::URI . $this->getInput('u') . '/' . $this->getInput('p') . '/issues';
-		if($this->queriedContext === 'Issue comments'){
-			$uri .= '/' . $this->getInput('i');
-		} elseif($this->getInput('c')){
-			$uri .= '?q=is%3Aissue+sort%3Aupdated-desc';
+		if(!is_null($this->getInput('u')) && !is_null($this->getInput('p'))){
+			$uri = static::URI . $this->getInput('u') . '/' . $this->getInput('p') . '/issues';
+			if($this->queriedContext === 'Issue comments'){
+				$uri .= '/' . $this->getInput('i');
+			} elseif($this->getInput('c')){
+				$uri .= '?q=is%3Aissue+sort%3Aupdated-desc';
+			}
+			return $uri;
 		}
-		return $uri;
+
+		return parent::getURI();
 	}
 
 	protected function extractIssueComment($issueNbr, $title, $comment){

+ 5 - 1
bridges/GoComicsBridge.php

@@ -42,7 +42,11 @@ class GoComicsBridge extends BridgeAbstract {
 	}
 
 	public function getURI(){
-		return self::URI . urlencode($this->getInput('comicname'));
+		if(!is_null($this->getInput('comicname'))){
+			return self::URI . urlencode($this->getInput('comicname'));
+		}
+
+		return parent::getURI();
 	}
 
 	public function getName(){

+ 1 - 1
bridges/GooglePlusPostBridge.php

@@ -97,6 +97,6 @@ class GooglePlusPostBridge extends BridgeAbstract{
 	}
 
 	public function getURI(){
-		return $this->_url ?: self::URI;
+		return $this->_url ?: parent::getURI();
 	}
 }

+ 5 - 1
bridges/IdenticaBridge.php

@@ -43,6 +43,10 @@ class IdenticaBridge extends BridgeAbstract {
 	}
 
 	public function getURI(){
-		return self::URI . urlencode($this->getInput('u'));
+		if(!is_null($this->getInput('u'))){
+			return self::URI . urlencode($this->getInput('u'));
+		}
+
+		return parent::getURI();
 	}
 }

+ 5 - 1
bridges/InstagramBridge.php

@@ -61,6 +61,10 @@ class InstagramBridge extends BridgeAbstract {
 	}
 
 	public function getURI(){
-		return self::URI . urlencode($this->getInput('u'));
+		if(!is_null($this->getInput('u'))){
+			return self::URI . urlencode($this->getInput('u'));
+		}
+
+		return parent::getURI();
 	}
 }

+ 5 - 1
bridges/NovelUpdatesBridge.php

@@ -17,7 +17,11 @@ class NovelUpdatesBridge extends BridgeAbstract {
 	private $seriesTitle = '';
 
 	public function getURI(){
-		return static::URI . '/series/' . $this->getInput('n') . '/';
+		if(!is_null($this->getInput('n'))){
+			return static::URI . '/series/' . $this->getInput('n') . '/';
+		}
+
+		return parent::getURI();
 	}
 
 	public function collectData(){

+ 5 - 1
bridges/OpenClassroomsBridge.php

@@ -27,7 +27,11 @@ class OpenClassroomsBridge extends BridgeAbstract {
 	));
 
 	public function getURI(){
-		return self::URI . '/courses?categories=' . $this->getInput('u') . '&title=&sort=updatedAt+desc';
+		if(!is_null($this->getInput('u'))){
+			return self::URI . '/courses?categories=' . $this->getInput('u') . '&title=&sort=updatedAt+desc';
+		}
+
+		return parent::getURI();
 	}
 
 	public function collectData(){

+ 12 - 8
bridges/PickyWallpapersBridge.php

@@ -70,15 +70,19 @@ class PickyWallpapersBridge extends BridgeAbstract {
 	}
 
 	public function getURI(){
-		$subcategory = $this->getInput('s');
-		$link = self::URI
-		. $this->getInput('r')
-		. '/'
-		. $this->getInput('c')
-		. '/'
-		. $subcategory;
+		if(!is_null($this->getInput('s')) && !is_null($this->getInput('r')) && !is_null($this->getInput('c'))){
+			$subcategory = $this->getInput('s');
+			$link = self::URI
+			. $this->getInput('r')
+			. '/'
+			. $this->getInput('c')
+			. '/'
+			. $subcategory;
+
+			return $link;
+		}
 
-		return $link;
+		return parent::getURI();
 	}
 
 	public function getName(){

+ 5 - 1
bridges/RTBFBridge.php

@@ -49,7 +49,11 @@ class RTBFBridge extends BridgeAbstract {
 	}
 
 	public function getURI(){
-	  return self::URI . 'detail?id=' . $this->getInput('c');
+		if(!is_null($this->getInput('c'))){
+			return self::URI . 'detail?id=' . $this->getInput('c');
+		}
+
+		return parent::getURI();
 	}
 
 	public function getName(){

+ 1 - 0
bridges/TwitterBridge.php

@@ -62,6 +62,7 @@ class TwitterBridge extends BridgeAbstract {
 			return self::URI
 			. urlencode($this->getInput('u'))
 			. ($this->getInput('norep') ? '' : '/with_replies');
+		default: return parent::getURI();
 		}
 	}
 

+ 5 - 1
bridges/VkBridge.php

@@ -16,7 +16,11 @@ class VkBridge extends BridgeAbstract {
 	);
 
 	public function getURI(){
-		return static::URI . urlencode($this->getInput('u'));
+		if(!is_null($this->getInput('u'))){
+			return static::URI . urlencode($this->getInput('u'));
+		}
+
+		return parent::getURI();
 	}
 
 	public function collectData(){

+ 1 - 1
bridges/WebfailBridge.php

@@ -34,7 +34,7 @@ class WebfailBridge extends BridgeAbstract {
 
 	public function getURI(){
 		if(is_null($this->getInput('language')))
-			return self::URI;
+			return parent::getURI();
 
 		// e.g.: https://en.webfail.com
 		return 'https://' . $this->getInput('language') . '.webfail.com';

+ 7 - 3
bridges/WikipediaBridge.php

@@ -43,9 +43,13 @@ class WikipediaBridge extends BridgeAbstract {
 	));
 
 	public function getURI(){
-		return 'https://'
-		. strtolower($this->getInput('language'))
-		. '.wikipedia.org';
+		if(!is_null($this->getInput('language'))){
+			return 'https://'
+			. strtolower($this->getInput('language'))
+			. '.wikipedia.org';
+		}
+
+		return parent::getURI();
 	}
 
 	public function getName(){

+ 1 - 1
bridges/WordPressBridge.php

@@ -56,7 +56,7 @@ class WordPressBridge extends FeedExpander {
 	public function getURI(){
 		$url = $this->getInput('url');
 		if(empty($url)){
-			$url = static::URI;
+			$url = parent::getURI();
 		}
 		return $url;
 	}

+ 10 - 6
bridges/WorldOfTanksBridge.php

@@ -28,13 +28,17 @@ class WorldOfTanksBridge extends BridgeAbstract {
 
 	private $title = '';
 
-	function getURI(){
-		$lang = $this->getInput('lang');
-		$uri = self::URI . $lang . '/news/';
-		if(!empty($this->getInput('category'))) {
-			$uri .= 'pc-browser/' . $this->getInput('category') . '/';
+	public function getURI(){
+		if(!is_null($this->getInput('lang'))){
+			$lang = $this->getInput('lang');
+			$uri = self::URI . $lang . '/news/';
+			if(!empty($this->getInput('category'))) {
+				$uri .= 'pc-browser/' . $this->getInput('category') . '/';
+			}
+			return $uri;
 		}
-		return $uri;
+
+		return parent::getURI();
 	}
 
 	public function getName(){

+ 1 - 1
lib/FeedExpander.php

@@ -190,7 +190,7 @@ abstract class FeedExpander extends BridgeAbstract {
 	}
 
 	public function getURI(){
-		return $this->uri;
+		return $this->uri ?: parent::getURI();
 	}
 
 	public function getName(){