diff --git a/packages/frontend/src/embed/components/EmMediaBanner.vue b/packages/frontend/src/embed/components/EmMediaBanner.vue index 11995e1f3b..0b87ffdcff 100644 --- a/packages/frontend/src/embed/components/EmMediaBanner.vue +++ b/packages/frontend/src/embed/components/EmMediaBanner.vue @@ -5,7 +5,7 @@ SPDX-License-Identifier: AGPL-3.0-only <template> <div :class="$style.root"> - <MkMediaAudio v-if="media.type.startsWith('audio') && media.type !== 'audio/midi'" :audio="media"/> + <EmMediaAudio v-if="media.type.startsWith('audio') && media.type !== 'audio/midi'" :audio="media"/> <div v-else-if="media.isSensitive && hide" :class="$style.sensitive" @click="show"> <span style="font-size: 1.6em;"><i class="ti ti-alert-triangle"></i></span> <b>{{ i18n.ts.sensitive }}</b> @@ -26,10 +26,8 @@ SPDX-License-Identifier: AGPL-3.0-only <script lang="ts" setup> import { ref } from 'vue'; import * as Misskey from 'misskey-js'; +import EmMediaAudio from './EmMediaAudio.vue'; import { i18n } from '@/i18n.js'; -import { defaultStore } from '@/store.js'; -import * as os from '@/os.js'; -import MkMediaAudio from '@/components/MkMediaAudio.vue'; const props = defineProps<{ media: Misskey.entities.DriveFile; @@ -38,14 +36,6 @@ const props = defineProps<{ const hide = ref(true); async function show() { - if (props.media.isSensitive && defaultStore.state.confirmWhenRevealingSensitiveMedia) { - const { canceled } = await os.confirm({ - type: 'question', - text: i18n.ts.sensitiveMediaRevealConfirm, - }); - if (canceled) return; - } - hide.value = false; } </script> diff --git a/packages/frontend/src/embed/components/EmMediaList.vue b/packages/frontend/src/embed/components/EmMediaList.vue index 27ed3ca089..9ea55aee8d 100644 --- a/packages/frontend/src/embed/components/EmMediaList.vue +++ b/packages/frontend/src/embed/components/EmMediaList.vue @@ -6,8 +6,8 @@ SPDX-License-Identifier: AGPL-3.0-only <template> <div> <div v-for="media in mediaList.filter(media => !previewable(media))" :key="media.id" :class="$style.banner"> - <XBanner :media="media" :inert="inEmbedPage"/> - <a v-if="inEmbedPage && originalEntityUrl" :href="originalEntityUrl" target="_blank" rel="noopener" :class="$style.mediaLinkForEmbed"></a> + <XBanner :media="media" :inert="true"/> + <a v-if="originalEntityUrl" :href="originalEntityUrl" target="_blank" rel="noopener" :class="$style.mediaLinkForEmbed"></a> </div> <div v-if="mediaList.filter(media => previewable(media)).length > 0" :class="$style.container"> <div @@ -17,9 +17,9 @@ SPDX-License-Identifier: AGPL-3.0-only ]" > <div v-for="media in mediaList.filter(media => previewable(media))" :class="$style.media"> - <XVideo v-if="media.type.startsWith('video')" :key="`video:${media.id}`" :video="media" :class="$style.mediaInner" :inert="inEmbedPage"/> - <XImage v-else-if="media.type.startsWith('image')" :key="`image:${media.id}`" :class="$style.mediaInner" class="image" :inert="inEmbedPage" :data-id="media.id" :image="media" :raw="raw"/> - <a v-if="inEmbedPage && originalEntityUrl" :href="originalEntityUrl" target="_blank" rel="noopener" :class="$style.mediaLinkForEmbed"></a> + <XVideo v-if="media.type.startsWith('video')" :key="`video:${media.id}`" :video="media" :class="$style.mediaInner" :inert="true"/> + <XImage v-else-if="media.type.startsWith('image')" :key="`image:${media.id}`" :class="$style.mediaInner" class="image" :inert="true" :data-id="media.id" :image="media" :raw="raw"/> + <a v-if="originalEntityUrl" :href="originalEntityUrl" target="_blank" rel="noopener" :class="$style.mediaLinkForEmbed"></a> </div> </div> </div> @@ -43,8 +43,6 @@ const props = defineProps<{ originalEntityUrl?: string; }>(); -const inEmbedPage = inject<boolean>('EMBED_PAGE', false); - const pswpZIndex = os.claimZIndex('middle'); document.documentElement.style.setProperty('--mk-pswp-root-z-index', pswpZIndex.toString()); const count = computed(() => props.mediaList.filter(media => previewable(media)).length);