heartles/egirlskey
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

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
Show stats Download patch file Download diff file Expand all files Collapse all files

4
packages/frontend/src/boot/main-boot.ts
View file

@ -94,7 +94,7 @@ export async function mainBoot() {
}).render(); }).render();
} }
} }
} }
} catch (error) { } catch (error) {
// console.error(error); // console.error(error);
console.error('Failed to initialise the seasonal screen effect canvas context:', error); console.error('Failed to initialise the seasonal screen effect canvas context:', error);
@ -224,7 +224,7 @@ export async function mainBoot() {
if (Date.now() - lastUsedDate > 1000 * 60 * 60 * 2) { if (Date.now() - lastUsedDate > 1000 * 60 * 60 * 2) {
toast(i18n.tsx.welcomeBackWithName({ toast(i18n.tsx.welcomeBackWithName({
name: $i.name || $i.username, name: $i.name || $i.username,
})); }), true);
} }
} }
miLocalStorage.setItem('lastUsed', Date.now().toString()); miLocalStorage.setItem('lastUsed', Date.now().toString());

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

3
packages/frontend/src/os.ts
View file

@ -211,9 +211,10 @@ export function pageWindow(path: string) {
}, {}, 'closed'); }, {}, 'closed');
} }
export function toast(message: string) { export function toast(message: string, renderMfm = false) {
popup(MkToast, { popup(MkToast, {
message, message,
renderMfm,
}, {}, 'closed'); }, {}, 'closed');
} }