Merge upstream

This commit is contained in:
ASTRO:? 2024-12-22 12:36:04 +09:00
commit 3358fb7a9b
No known key found for this signature in database
GPG key ID: 8947F3AF5B0B4BFE
97 changed files with 3254 additions and 3066 deletions

View file

@ -5,12 +5,12 @@ 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"/>
<div v-else-if="media.isSensitive && hide" :class="$style.sensitive" @click="showHiddenContent" @dblclick="showHiddenContentDouble">
<div v-if="media.isSensitive && hide" :class="$style.sensitive" @click="showHiddenContent" @dblclick="showHiddenContentDouble">
<span style="font-size: 1.6em;"><i class="ti ti-alert-triangle"></i></span>
<b>{{ i18n.ts.sensitive }}</b>
<span>{{ i18n.ts.clickToShow }}</span>
</div>
<MkMediaAudio v-else-if="media.type.startsWith('audio') && media.type !== 'audio/midi'" :audio="media" :user="user"/>
<a
v-else :class="$style.download"
:href="media.url"
@ -34,6 +34,7 @@ import { defaultStore } from '@/store.js';
const props = withDefaults(defineProps<{
media: Misskey.entities.DriveFile;
user?: Misskey.entities.UserLite;
}>(), {
});