Index: src/wp-includes/class-oembed.php =================================================================== --- src/wp-includes/class-oembed.php (revision 38742) +++ src/wp-includes/class-oembed.php (working copy) @@ -108,6 +108,17 @@ '#https?://www\.facebook\.com/notes/.*#i' => array( 'https://www.facebook.com/plugins/post/oembed.json/', true ), '#https?://www\.facebook\.com/.*/videos/.*#i' => array( 'https://www.facebook.com/plugins/video/oembed.json/', true ), '#https?://www\.facebook\.com/video\.php.*#i' => array( 'https://www.facebook.com/plugins/video/oembed.json/', true ), + '#https?://([a-z0-9-]+\.)?amazon\.(com|com\.mx|com\.br|ca)/.*#i' => array( 'https://read.amazon.com/kp/api/oembed', true ), + '#https?://([a-z0-9-]+\.)?amazon\.(co\.uk|de|fr|it|es|in|nl|ru)/.*#i' => array( 'https://read.amazon.co.uk/kp/api/oembed', true ), + '#https?://([a-z0-9-]+\.)?amazon\.(co\.jp|com\.au)/.*#i' => array( 'https://read.amazon.com.au/kp/api/oembed', true ), + '#https?://([a-z0-9-]+\.)?amazon\.cn/.*#i' => array( 'https://read.amazon.cn/kp/api/oembed', true ), + '#https?://(www\.)?a.co/.*#i' => array( 'https://read.amazon.com/kp/api/oembed', true ), + '#https?://(www\.)?amz.onl/.*#i' => array( 'https://read.amazon.com/kp/api/oembed', true ), + '#https?://(www\.)?amzn.to/.*#i' => array( 'https://read.amazon.com/kp/api/oembed', true ), + '#https?://(www\.)?amzn.eu/.*#i' => array( 'https://read.amazon.co.uk/kp/api/oembed', true ), + '#https?://(www\.)?amzn.in/.*#i' => array( 'https://read.amazon.in/kp/api/oembed', true ), + '#https?://(www\.)?amzn.asia/.*#i' => array( 'https://read.amazon.com.au/kp/api/oembed', true ), + '#https?://(www\.)?z.cn/.*#i' => array( 'https://read.amazon.cn/kp/api/oembed', true ), ); if ( ! empty( self::$early_providers['add'] ) ) { @@ -181,6 +192,28 @@ * | Twitter | twitter.com/user | Yes | 4.7.0 | * | Twitter | twitter.com/likes | Yes | 4.7.0 | * | Twitter | twitter.com/lists | Yes | 4.7.0 | + * | Amazon Kindle| *.amazon.com | Yes | 4.7.0 | + * | Amazon Kindle| *.amazon.co.uk | Yes | 4.7.0 | + * | Amazon Kindle| *.amazon.de | Yes | 4.7.0 | + * | Amazon Kindle| *.amazon.fr | Yes | 4.7.0 | + * | Amazon Kindle| *.amazon.it | Yes | 4.7.0 | + * | Amazon Kindle| *.amazon.es | Yes | 4.7.0 | + * | Amazon Kindle| *.amazon.co.jp | Yes | 4.7.0 | + * | Amazon Kindle| *.amazon.cn | Yes | 4.7.0 | + * | Amazon Kindle| *.amazon.com.au | Yes | 4.7.0 | + * | Amazon Kindle| *.amazon.in | Yes | 4.7.0 | + * | Amazon Kindle| *.amazon.com.mx | Yes | 4.7.0 | + * | Amazon Kindle| *.amazon.com.br | Yes | 4.7.0 | + * | Amazon Kindle| *.amazon.ca | Yes | 4.7.0 | + * | Amazon Kindle| *.amazon.nl | Yes | 4.7.0 | + * | Amazon Kindle| *.amazon.ru | Yes | 4.7.0 | + * | Amazon Kindle| a.co | Yes | 4.7.0 | + * | Amazon Kindle| amzn.onl | Yes | 4.7.0 | + * | Amazon Kindle| amzn.to | Yes | 4.7.0 | + * | Amazon Kindle| amzn.eu | Yes | 4.7.0 | + * | Amazon Kindle| amzn.in | Yes | 4.7.0 | + * | Amazon Kindle| amzn.asia | Yes | 4.7.0 | + * | Amazon Kindle| z.cn | Yes | 4.7.0 | * * No longer supported providers: * @@ -201,6 +234,7 @@ */ $this->providers = apply_filters( 'oembed_providers', $providers ); + // Fix any embeds that contain new lines in the middle of the HTML which breaks wpautop(). add_filter( 'oembed_dataparse', array($this, '_strip_newlines'), 10, 3 ); } Index: tests/phpunit/tests/external-http/oembed.php =================================================================== --- tests/phpunit/tests/external-http/oembed.php (revision 38742) +++ tests/phpunit/tests/external-http/oembed.php (working copy) @@ -43,4 +43,96 @@ $out = $wp_embed->autoembed( 'https://www.youtube.com/v/QcIy9NiNbmo' ); $this->assertContains( 'https://youtube.com/watch?v=QcIy9NiNbmo', $out ); } + + /** + * Test Kindle Instant Previews embeds + * + * @ticket 38181 + */ + function test_amazon_kindle_non_book_embed() { + $out = wp_oembed_get( 'http://www.amazon.com/All-New-Kindle-E-reader-Glare-Free-Touchscreen/dp/B00ZV9PXP2/r' ); + $this->assertFalse( $out ); + + $out = wp_oembed_get( 'https://www.amazon.com/All-New-Kindle-E-reader-Glare-Free-Touchscreen/dp/B00ZV9PXP2/r' ); + $this->assertFalse( $out ); + } + + /** + * Support for Kindle previews shared from Kindle devices or apps + * + * @link http://www.amazon.com/bettersharing Kindle Instant Previews sharing homepage + * + * @ticket 38181 + */ + function test_amazon_kindle_shared_preview_embed() { + // book + $out = wp_oembed_get( 'https://read.amazon.com/kp/kshare?asin=B008TW1HMG&tag=foo-20' ); + $this->assertContains( 'https://read.amazon.com/kp/card?', $out ); + $this->assertContains( 'asin=B008TW1HMG', $out ); + $this->assertContains( 'tag=foo-20', $out ); + + // quote + $out = wp_oembed_get( 'https://read.amazon.com/kp/kshare?asin=B00DPM7TIG&tag=foo-20&id=XD3ezAVVQ3KP0bWxSFvosg' ); + $this->assertContains( 'https://read.amazon.com/kp/card?', $out ); + $this->assertContains( 'asin=B00DPM7TIG', $out ); + $this->assertContains( 'tag=foo-20', $out ); + + // reading progress + $out = wp_oembed_get( 'https://read.amazon.com/kp/kshare?asin=B007P7HRS4&id=Sd6UmMYYTc6rHl1BYkXU2g&tag=foo-20' ); + $this->assertContains( 'https://read.amazon.com/kp/card?', $out ); + $this->assertContains( 'asin=B007P7HRS4', $out ); + $this->assertContains( 'tag=foo-20', $out ); + } + + /** + * Support for Kindle previews created from the self-service embedding tool + * + * @link http://www.amazon.com/kindleinstantpreview Kindle Instant Previews for third parties + * + * @ticket 38181 + */ + function test_amazon_kindle_embedded_preview_embed() { + // URL + $out = wp_oembed_get( 'https://read.amazon.com/kp/embed?asin=B008TW1HMG&tag=foo-20' ); + $this->assertContains( 'https://read.amazon.com/kp/card?', $out ); + $this->assertContains( 'asin=B008TW1HMG', $out ); + $this->assertContains( 'tag=foo-20', $out ); + + // interactive book card + $out = wp_oembed_get( 'https://read.amazon.com/kp/card?asin=B008TW1HMG&tag=foo-20&preview=inline' ); + $this->assertContains( 'https://read.amazon.com/kp/card?', $out ); + $this->assertContains( 'asin=B008TW1HMG', $out ); + $this->assertContains( 'tag=foo-20', $out ); + } + + /** + * Support for Kindle Instant Previews in non-US marketplaces + * + * @ticket 38181 + */ + function test_amazon_kindle_preview_non_us_embed() { + // Americas (canonical TLD: .com) + $out = wp_oembed_get( 'https://read.amazon.ca/kp/embed?asin=B008TW1HMG&tag=foo-20&ref_=bar_qux' ); + $this->assertContains( 'https://read.amazon.com/kp/card?', $out ); + $this->assertContains( 'asin=B008TW1HMG', $out ); + $this->assertContains( 'tag=foo-20', $out ); + + // Europe (canonical TLD: .co.uk) + $out = wp_oembed_get( 'https://read.amazon.in/kp/embed?asin=B008TW1HMG&tag=foo-20&ref_=bar_qux' ); + $this->assertContains( 'https://read.amazon.co.uk/kp/card?', $out ); + $this->assertContains( 'asin=B008TW1HMG', $out ); + $this->assertContains( 'tag=foo-20', $out ); + + // Asia (canonical TLD: .com.au) + $out = wp_oembed_get( 'https://read.amazon.co.jp/kp/embed?asin=B008TW1HMG&tag=foo-20&ref_=bar_qux&preview=inline' ); + $this->assertContains( 'https://read.amazon.com.au/kp/card?', $out ); + $this->assertContains( 'asin=B008TW1HMG', $out ); + $this->assertContains( 'tag=foo-20', $out ); + + // China (canonical TLD: .cn) + $out = wp_oembed_get( 'https://read.amazon.cn/kp/embed?asin=B01M06TYLV&tag=foo-20&ref_=bar_qux&preview=inline' ); + $this->assertContains( 'https://read.amazon.cn/kp/card?', $out ); + $this->assertContains( 'asin=B01M06TYLV', $out ); + $this->assertContains( 'tag=foo-20', $out ); + } } \ No newline at end of file Index: tests/phpunit/tests/oembed.php =================================================================== --- tests/phpunit/tests/oembed.php (revision 38742) +++ tests/phpunit/tests/oembed.php (working copy) @@ -56,6 +56,18 @@ 'facebook-notes' => '#https?://www\.facebook\.com/notes/.*#i', 'facebook-video' => '#https?://www\.facebook\.com/.*/videos/.*#i', 'facebook-videophp' => '#https?://www\.facebook\.com/video\.php.*#i', + 'facebook-videophp' => '#https?://www\.facebook\.com/video\.php.*#i', + 'amazon-na' => '#https?://([a-z0-9-]+\.)?amazon\.(com|com\.mx|com\.br|ca)/.*#i', + 'amazon-eu' => '#https?://([a-z0-9-]+\.)?amazon\.(co\.uk|de|fr|it|es|in|nl|ru)/.*#i', + 'amazon-asia' => '#https?://([a-z0-9-]+\.)?amazon\.(co\.jp|com\.au)/.*#i', + 'amazon-cn' => '#https?://([a-z0-9-]+\.)?amazon\.cn/.*#i', + 'amazon-a-co' => '#https?://(www\.)?a.co/.*#i', + 'amazon-amz-onl' => '#https?://(www\.)?amz.onl/.*#i', + 'amazon-amzn-to' => '#https?://(www\.)?amzn.to/.*#i', + 'amazon-amzn-eu' => '#https?://(www\.)?amzn.eu/.*#i', + 'amazon-amzn-in' => '#https?://(www\.)?amzn.in/.*#i', + 'amazon-amzn-asia' => '#https?://(www\.)?amzn.asia/.*#i', + 'amazon-z-cn' => '#https?://(www\.)?z.cn/.*#i', ); /** @@ -801,6 +813,82 @@ 'https://www.facebook.com/video.php?v=317622575398', ), ), + array( + $providers['amazon-na'], + array( + 'https://read.amazon.com/kp/kshare?asin=B008TW1HMG&tag=foo-20', + 'https://read.amazon.com/kp/kshare?asin=B00DPM7TIG&tag=foo-20&id=XD3ezAVVQ3KP0bWxSFvosg', + 'https://read.amazon.com/kp/embed?asin=B008TW1HMG&tag=foo-20', + 'https://read.amazon.com/kp/card?asin=B008TW1HMG&tag=foo-20&preview=inline', + 'https://www.amazon.com/dp/B008TW1HMG', + 'https://smile.amazon.com/dp/B008TW1HMG', + ), + ), + array( + $providers['amazon-eu'], + array( + 'https://read.amazon.co.uk/kp/embed?asin=B008TW1HMG&tag=foo-20&ref_=bar_qux', + 'https://lire.amazon.fr/kp/embed?asin=B008TW1HMG&tag=foo-20&ref_=bar_qux', + 'https://www.amazon.fr/dp/B008TW1HMG', + ), + ), + array( + $providers['amazon-asia'], + array( + 'https://read.amazon.com.au/kp/embed?asin=B008TW1HMG&tag=foo-20&ref_=bar_qux', + 'https://read.amazon.co.jp/kp/embed?asin=B008TW1HMG&tag=foo-20&ref_=bar_qux', + 'https://www.amazon.com.au/dp/B008TW1HMG', + ), + ), + array( + $providers['amazon-cn'], + array( + 'https://read.amazon.cn/kp/embed?asin=B01M06TYLV&tag=foo-20&ref_=bar_qux', + 'https://www.amazon.cn.au/dp/B01M06TYLV', + ), + ), + array( + $providers['amazon-a-co'], + array( + 'https://a.co/2dyHj3O', + ), + ), + array( + $providers['amazon-amz-onl'], + array( + 'https://read.amazon.com/kp/embed?asin=B008TW1HMG&tag=foo-20&ref_=bar_qux', + ), + ), + array( + $providers['amazon-amzn-to'], + array( + 'http://amzn.to/2dyHj3O', + ), + ), + array( + $providers['amazon-amzn-eu'], + array( + 'http://amzn.eu/4J2OlYl', + ), + ), + array( + $providers['amazon-amzn-in'], + array( + 'http://amzn.in/a6Xi0h0', + ), + ), + array( + $providers['amazon-amzn-asia'], + array( + 'http://amzn.asia/b6z94pa', + ), + ), + array( + $providers['amazon-z-cn'], + array( + 'http://z.cn/85oPeSf', + ), + ), ); }