From ef70d1719457f60b86708d6bce87cf805336e8dc Mon Sep 17 00:00:00 2001
From: mei23 <m@m544.net>
Date: Thu, 28 Feb 2019 03:46:37 +0900
Subject: [PATCH] =?UTF-8?q?url-preview=E3=81=A7embed=E3=83=97=E3=83=AC?=
 =?UTF-8?q?=E3=82=A4=E3=83=A4=E3=83=BC=E5=B1=95=E9=96=8B=E3=82=92=E3=82=AA?=
 =?UTF-8?q?=E3=83=97=E3=83=88=E3=82=A4=E3=83=B3=E3=81=AB=E3=81=99=E3=82=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 locales/ja-JP.yml                             |   3 +
 .../common/views/components/url-preview.vue   | 109 ++++--------------
 2 files changed, 25 insertions(+), 87 deletions(-)

diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index f9adf2009..7fcea0855 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -257,6 +257,9 @@ common/views/pages/explore.vue:
   explore: "{host}を探索"
   users-info: "現在{users}ユーザーが登録されています"
 
+common/views/components/url-preview.vue:
+  enable-player: "プレイヤーを開く"
+
 common/views/components/user-list.vue:
   no-users: "ユーザーがいません"
 
diff --git a/src/client/app/common/views/components/url-preview.vue b/src/client/app/common/views/components/url-preview.vue
index de5631dc2..97bf36879 100644
--- a/src/client/app/common/views/components/url-preview.vue
+++ b/src/client/app/common/views/components/url-preview.vue
@@ -1,6 +1,6 @@
 <template>
-<div v-if="player.url" class="player" :style="`padding: ${(player.height || 0) / (player.width || 1) * 100}% 0 0`">
-	<iframe :src="player.url" :width="player.width || '100%'" :heigth="player.height || 250" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen />
+<div v-if="playerEnabled" class="player" :style="`padding: ${(player.height || 0) / (player.width || 1) * 100}% 0 0`">
+	<iframe :src="player.url + (player.url.match(/\?/) ? '&autoplay=1&auto_play=1' : '?autoplay=1&auto_play=1')" :width="player.width || '100%'" :heigth="player.height || 250" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen />
 </div>
 <div v-else-if="tweetUrl && detail" class="twitter">
 	<blockquote ref="tweet" class="twitter-tweet" :data-theme="$store.state.device.darkmode ? 'dark' : null">
@@ -9,7 +9,9 @@
 </div>
 <div v-else class="mk-url-preview">
 	<a :class="{ mini: narrow, compact }" :href="url" target="_blank" :title="url" v-if="!fetching">
-		<div class="thumbnail" v-if="thumbnail" :style="`background-image: url('${thumbnail}')`"></div>
+		<div class="thumbnail" v-if="thumbnail" :style="`background-image: url('${thumbnail}')`">
+			<button v-if="!playerEnabled && player.url" @click.prevent="playerEnabled = true" :title="$t('enable-player')"><fa :icon="['far', 'play-circle']"/></button>
+		</div>
 		<article>
 			<header>
 				<h1 :title="title">{{ title }}</h1>
@@ -26,88 +28,11 @@
 
 <script lang="ts">
 import Vue from 'vue';
+import i18n from '../../../i18n';
 import { url as misskeyUrl } from '../../../config';
 
-// THIS IS THE WHITELIST FOR THE EMBED PLAYER
-const whiteList = [
-	'afreecatv.com',
-	'aparat.com',
-	'applemusic.com',
-	'amazon.com',
-	'awa.fm',
-	'bandcamp.com',
-	'bbc.co.uk',
-	'beatport.com',
-	'bilibili.com',
-	'boomstream.com',
-	'breakers.tv',
-	'cam4.com',
-	'cavelis.net',
-	'chaturbate.com',
-	'cnn.com',
-	'cybergame.tv',
-	'dailymotion.com',
-	'deezer.com',
-	'djlive.pl',
-	'e-onkyo.com',
-	'eventials.com',
-	'facebook.com',
-	'fc2.com',
-	'gameplank.tv',
-	'goodgame.ru',
-	'google.com',
-	'hardtunes.com',
-	'instagram.com',
-	'johnnylooch.com',
-	'kexp.org',
-	'lahzenegar.com',
-	'liveedu.tv',
-	'livetube.cc',
-	'livestream.com',
-	'meridix.com',
-	'mixcloud.com',
-	'mixer.com',
-	'mobcrush.com',
-	'mylive.in.th',
-	'myspace.com',
-	'netflix.com',
-	'newretrowave.com',
-	'nhk.or.jp',
-	'nicovideo.jp',
-	'nico.ms',
-	'noisetrade.com',
-	'nood.tv',
-	'npr.org',
-	'openrec.tv',
-	'pandora.com',
-	'pandora.tv',
-	'picarto.tv',
-	'pscp.tv',
-	'restream.io',
-	'reverbnation.com',
-	'sermonaudio.com',
-	'smashcast.tv',
-	'songkick.com',
-	'soundcloud.com',
-	'spinninrecords.com',
-	'spotify.com',
-	'stitcher.com',
-	'stream.me',
-	'switchboard.live',
-	'tunein.com',
-	'twitcasting.tv',
-	'twitch.tv',
-	'twitter.com',
-	'vaughnlive.tv',
-	'veoh.com',
-	'vimeo.com',
-	'watchpeoplecode.com',
-	'web.tv',
-	'youtube.com',
-	'youtu.be'
-];
-
 export default Vue.extend({
+	i18n: i18n('common/views/components/url-preview.vue'),
 	props: {
 		url: {
 			type: String,
@@ -147,7 +72,8 @@ export default Vue.extend({
 				height: null
 			},
 			tweetUrl: null,
-			misskeyUrl
+			playerEnabled: false,
+			misskeyUrl,
 		};
 	},
 
@@ -188,9 +114,7 @@ export default Vue.extend({
 				this.icon = info.icon;
 				this.sitename = info.sitename;
 				this.fetching = false;
-				if (whiteList.some(x => x == url.hostname || url.hostname.endsWith(`.${x}`))) {
-					this.player = info.player;
-				}
+				this.player = info.player;
 			})
 		});
 	}
@@ -230,6 +154,17 @@ export default Vue.extend({
 			height 100%
 			background-position center
 			background-size cover
+			display flex
+			justify-content center
+			align-items center
+
+			> button
+				font-size 3.5em
+				opacity: 0.7
+
+				&:hover
+					font-size 4em
+					opacity 0.9
 
 			& + article
 				left 100px
@@ -279,7 +214,7 @@ export default Vue.extend({
 				& + article
 					left 0
 					width 100%
-
+			
 		@media (max-width 550px)
 			font-size 12px