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

merge: fix #520, render usernames containing custom emoji in welcome toast properly (!541)

Browse source 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/541

Closes #520

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <marie@kaifa.ch>
This commit is contained in:
Marie 2024-06-09 21:02:58 +00:00
commit 8f3549b494
3 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -14,7 +14,8 @@ SPDX-License-Identifier: AGPL-3.0-only
>
<div v-if="showing" class="_acrylic" :class="$style.root" :style="{ zIndex }">
<div style="padding: 16px 24px;">
{{ message }}
<Mfm v-if="renderMfm" :text="message" plain/>
<template v-else>{{ message }}</template>
</div>
</div>
</Transition>
@ -26,9 +27,12 @@ import { onMounted, ref } from 'vue';
import * as os from '@/os.js';
import { defaultStore } from '@/store.js';
defineProps<{
withDefaults(defineProps<{
message: string;
}>();
renderMfm: boolean;
}>(), {
renderMfm: false,
});
const emit = defineEmits<{
(ev: 'closed'): void;