Skip to content

Commit c45f5e5

Browse files
committed
Merge branch 'youtube-to-many-requests'
2 parents b12f6da + dc44f69 commit c45f5e5

25 files changed

+89
-30
lines changed

src/Adapters/Archive.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class Archive extends Webpage implements AdapterInterface
1515
*/
1616
public static function check(Request $request)
1717
{
18-
return $request->match([
18+
return $request->isValid() && $request->match([
1919
'https?://archive.org/details/*',
2020
]);
2121
}

src/Adapters/Facebook.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class Facebook extends Webpage implements AdapterInterface
1414
*/
1515
public static function check(Request $request)
1616
{
17-
return $request->match([
17+
return $request->isValid() && $request->match([
1818
'https://www.facebook.com/*',
1919
]);
2020
}

src/Adapters/File.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class File extends Adapter implements AdapterInterface
4040
*/
4141
public static function check(Request $request)
4242
{
43-
return isset(self::$contentTypes[$request->getMimeType()]);
43+
return $request->isValid() && isset(self::$contentTypes[$request->getMimeType()]);
4444
}
4545

4646
/**

src/Adapters/Flickr.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class Flickr extends Webpage implements AdapterInterface
1515
*/
1616
public static function check(Request $request)
1717
{
18-
return $request->match([
18+
return $request->isValid() && $request->match([
1919
'https://www.flickr.com/photos/*',
2020
]);
2121
}

src/Adapters/Giphy.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class Giphy extends Webpage implements AdapterInterface
1414
*/
1515
public static function check(Request $request)
1616
{
17-
return $request->match([
17+
return $request->isValid() && $request->match([
1818
'https?://giphy.com/gifs/*',
1919
]);
2020
}

src/Adapters/Github.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class Github extends Webpage implements AdapterInterface
1414
*/
1515
public static function check(Request $request)
1616
{
17-
return $request->match([
17+
return $request->isValid() && $request->match([
1818
'https://gist.github.com/*/*',
1919
'https://github.com/*',
2020
]);

src/Adapters/Google.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class Google extends Webpage implements AdapterInterface
1515
*/
1616
public static function check(Request $request)
1717
{
18-
return $request->match([
18+
return $request->isValid() && $request->match([
1919
'https://maps.google.*',
2020
'https://www.google.*/maps*',
2121
'https://drive.google.com/file/*/view',
@@ -30,7 +30,7 @@ public function getCode()
3030
$url = $this->request->createUrl();
3131

3232
if ($this->request->getHost() === 'drive.google.com') {
33-
return Utils::iframe($url->withDirectoryPosition(3, 'preview'));
33+
return Utils::iframe($url->withDirectoryPosition(3, 'preview')->withQueryParameters([]));
3434
}
3535

3636
return Utils::iframe($url->withQueryParameter('output', 'embed')->withQueryParameter('s', ''));

src/Adapters/Howcast.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class Howcast extends Webpage implements AdapterInterface
1313
*/
1414
public static function check(Request $request)
1515
{
16-
return $request->match([
16+
return $request->isValid() && $request->match([
1717
'http?://www.howcast.com/videos/*',
1818
]);
1919
}

src/Adapters/Lavozdegalicia.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class Lavozdegalicia extends Webpage implements AdapterInterface
1414
*/
1515
public static function check(Request $request)
1616
{
17-
return $request->match([
17+
return $request->isValid() && $request->match([
1818
'http://www.lavozdegalicia.es/*',
1919
]);
2020
}

src/Adapters/Line.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class Line extends Webpage implements AdapterInterface
1515
*/
1616
public static function check(Request $request)
1717
{
18-
return $request->match([
18+
return $request->isValid() && $request->match([
1919
'https://line.do/*',
2020
]);
2121
}

0 commit comments

Comments
 (0)