diff options
| author | Marie <marie@kaifa.ch> | 2024-06-09 21:02:58 +0000 |
|---|---|---|
| committer | Marie <marie@kaifa.ch> | 2024-06-09 21:02:58 +0000 |
| commit | 8f3549b494136a4da8d111beaa83d45d6add0f38 (patch) | |
| tree | d8028c81e4c943e80dd0cae73051cdeacaea560f /packages/frontend/src/components | |
| parent | merge: celebrate our testers - fixes #552 (!543) (diff) | |
| parent | Pass renderMfm as true to wrap welcome back toast in Mfm (diff) | |
| download | sharkey-8f3549b494136a4da8d111beaa83d45d6add0f38.tar.gz sharkey-8f3549b494136a4da8d111beaa83d45d6add0f38.tar.bz2 sharkey-8f3549b494136a4da8d111beaa83d45d6add0f38.zip | |
merge: fix #520, render usernames containing custom emoji in welcome toast properly (!541)
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>
Diffstat (limited to 'packages/frontend/src/components')
| -rw-r--r-- | packages/frontend/src/components/MkToast.vue | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/packages/frontend/src/components/MkToast.vue b/packages/frontend/src/components/MkToast.vue index a117e49350..f731b3264f 100644 --- a/packages/frontend/src/components/MkToast.vue +++ b/packages/frontend/src/components/MkToast.vue @@ -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; |