Mizah/Sharkey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge: upstream

Browse source
This commit is contained in:
Marie 2023-12-23 02:09:23 +01:00
commit 5db583a3eb
701 changed files with 50809 additions and 13660 deletions
Download patch file Download diff file Expand all files Collapse all files

10
packages/frontend/src/components/MkModPlayer.vue
View file

@ -29,7 +29,7 @@
</template>
<script lang="ts" setup>
import { ref, nextTick } from 'vue';
import { ref, nextTick, computed } from 'vue';
import * as Misskey from 'misskey-js';
import { i18n } from '@/i18n.js';
import { defaultStore } from '@/store.js';
@ -71,9 +71,9 @@ const props = defineProps<{
module: Misskey.entities.DriveFile
}>();
const isSensitive = $computed(() => { return props.module.isSensitive; });
const url = $computed(() => { return props.module.url; });
let hide = ref((defaultStore.state.nsfw === 'force') ? true : isSensitive && (defaultStore.state.nsfw !== 'ignore'));
const isSensitive = computed(() => { return props.module.isSensitive; });
const url = computed(() => { return props.module.url; });
let hide = ref((defaultStore.state.nsfw === 'force') ? true : isSensitive.value && (defaultStore.state.nsfw !== 'ignore'));
let playing = ref(false);
let displayCanvas = ref<HTMLCanvasElement>();
let progress = ref<HTMLProgressElement>();
@ -84,7 +84,7 @@ const rowBuffer = 24;
let buffer = null;
let isSeeking = false;
player.value.load(url).then((result) => {
player.value.load(url.value).then((result) => {
buffer = result;
try {
player.value.play(buffer);