161sh/iceshrimp-161sh
1
0
Fork 0
mirror of https://iceshrimp.dev/crimekillz/iceshrimp-161sh.git synced 2024-11-22 04:03:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://codeberg.org/calckey/calckey into upstream

Browse Source
This commit is contained in:
freeplay 2023-07-16 17:25:12 -04:00
commit e858e13fd3
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/client/src/components/MkMedia.vue
View File

@ -54,7 +54,7 @@
controls
@contextmenu.stop
>
<source :src="media.url" :type="media.type" />
<source :src="media.url" :type="mediaType" />
</video>
</VuePlyr>
</template>
@ -80,7 +80,7 @@
</template>
<script lang="ts" setup>
import { watch, ref } from "vue";
import { watch, ref, computed } from "vue";
import VuePlyr from "vue-plyr";
import "vue-plyr/dist/vue-plyr.css";
import type * as misskey from "calckey-js";
@ -107,6 +107,10 @@ const url =
? getStaticImageUrl(props.media.thumbnailUrl)
: props.media.thumbnailUrl;
const mediaType = computed(() => {
return props.media.type === 'video/quicktime' ? 'video/mp4' : props.media.type;
});
function captionPopup() {
os.alert({
type: "info",

2
packages/client/src/pages/settings/import-export.vue
View File

@ -222,7 +222,7 @@ const importPosts = async (ev) => {
const file = await selectFile(ev.currentTarget ?? ev.target);
os.api("i/import-posts", {
fileId: file.id,
signatureCheck: importType.value === "mastodon" ? true : false,
signatureCheck: false,
})
.then(onImportSuccess)
.catch(onError);