diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2023-02-04 14:23:38 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2023-02-04 14:23:38 +0900 |
| commit | 9bde9edcf68430cb98bc08ff74f6804bd56ecf47 (patch) | |
| tree | e09781a1f26bae331968902a79253820e3a80e4e /packages/frontend/src/components | |
| parent | Merge branch 'develop' (diff) | |
| parent | 13.3.2 (diff) | |
| download | misskey-9bde9edcf68430cb98bc08ff74f6804bd56ecf47.tar.gz misskey-9bde9edcf68430cb98bc08ff74f6804bd56ecf47.tar.bz2 misskey-9bde9edcf68430cb98bc08ff74f6804bd56ecf47.zip | |
Merge branch 'develop'
Diffstat (limited to 'packages/frontend/src/components')
| -rw-r--r-- | packages/frontend/src/components/MkUrlPreview.vue | 3 | ||||
| -rw-r--r-- | packages/frontend/src/components/MkYoutubePlayer.vue | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/packages/frontend/src/components/MkUrlPreview.vue b/packages/frontend/src/components/MkUrlPreview.vue index f7677faf74..62e58e1553 100644 --- a/packages/frontend/src/components/MkUrlPreview.vue +++ b/packages/frontend/src/components/MkUrlPreview.vue @@ -1,7 +1,8 @@ <template> <div v-if="playerEnabled" :class="$style.player" :style="`padding: ${(player.height || 0) / (player.width || 1) * 100}% 0 0`"> <button :class="$style.disablePlayer" :title="i18n.ts.disablePlayer" @click="playerEnabled = false"><i class="ti ti-x"></i></button> - <iframe :class="$style.playerIframe" :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/> + <iframe v-if="player.url.startsWith('http://') || player.url.startsWith('https://')" :class="$style.playerIframe" :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/> + <span v-else>invalid url</span> </div> <div v-else-if="tweetId && tweetExpanded" ref="twitter" :class="$style.twitter"> <iframe ref="tweet" scrolling="no" frameborder="no" :style="{ position: 'relative', width: '100%', height: `${tweetHeight}px` }" :src="`https://platform.twitter.com/embed/index.html?embedId=${embedId}&hideCard=false&hideThread=false&lang=en&theme=${$store.state.darkMode ? 'dark' : 'light'}&id=${tweetId}`"></iframe> diff --git a/packages/frontend/src/components/MkYoutubePlayer.vue b/packages/frontend/src/components/MkYoutubePlayer.vue index 50d38a71bd..460b038838 100644 --- a/packages/frontend/src/components/MkYoutubePlayer.vue +++ b/packages/frontend/src/components/MkYoutubePlayer.vue @@ -7,9 +7,10 @@ <div class="poamfof"> <Transition :name="$store.state.animation ? 'fade' : ''" mode="out-in"> - <div v-if="player.url" class="player"> + <div v-if="player.url && (player.url.startsWith('http://') || player.url.startsWith('https://'))" class="player"> <iframe v-if="!fetching" :src="player.url + (player.url.match(/\?/) ? '&autoplay=1&auto_play=1' : '?autoplay=1&auto_play=1')" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen/> </div> + <span v-else>invalid url</span> </Transition> <MkLoading v-if="fetching"/> <MkError v-else-if="!player.url" @retry="ytFetch()"/> |