DatseMultimediaSites
/
Sharkey
mirror of https://activitypub.software/TransFem-org/Sharkey.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

merge: fix: `MkPageWindow` doesn't render custom emojis in the titlebar when displaying a user profile who has custom emojis in their display-name (!494) 

View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/494

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <marie@kaifa.ch>
Approved-by: Ember <acomputerdog@gmail.com>
This commit is contained in:
Ember 2024-05-02 17:53:05 +00:00
parent e0afeff248 b7ceb2063b
commit 9de4e3c7aa
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/frontend/src/components/MkPageWindow.vue
View File

@ -18,7 +18,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<template #header> <template #header>
<template v-if="pageMetadata"> <template v-if="pageMetadata">
<i v-if="pageMetadata.icon" :class="pageMetadata.icon" style="margin-right: 0.5em;"></i> <i v-if="pageMetadata.icon" :class="pageMetadata.icon" style="margin-right: 0.5em;"></i>
<span>{{ pageMetadata.title }}</span> <span><MkUserName v-if="pageMetadata.userName?.name" :user="pageMetadata.userName" />{{ pageMetadata.title }}</span>
</template> </template>
</template> </template>
@ -43,6 +43,7 @@ import { claimAchievement } from '@/scripts/achievements.js';
import { getScrollContainer } from '@/scripts/scroll.js'; import { getScrollContainer } from '@/scripts/scroll.js';
import { useRouterFactory } from '@/router/supplier.js'; import { useRouterFactory } from '@/router/supplier.js';
import { mainRouter } from '@/router/main.js'; import { mainRouter } from '@/router/main.js';
import MkUserName from './global/MkUserName.vue';
const props = defineProps<{ const props = defineProps<{
initialPath: string; initialPath: string;

2
packages/frontend/src/pages/user/index.vue
View File

@ -130,7 +130,7 @@ definePageMetadata(() => ({
title: i18n.ts.user, title: i18n.ts.user,
icon: 'ph-user ph-bold ph-lg', icon: 'ph-user ph-bold ph-lg',
...user.value ? { ...user.value ? {
title: user.value.name ? `${user.value.name} (@${user.value.username})` : `@${user.value.username}`, title: user.value.name ? ` (@${user.value.username})` : `@${user.value.username}`,
subtitle: `@${getAcct(user.value)}`, subtitle: `@${getAcct(user.value)}`,
userName: user.value, userName: user.value,
avatar: user.value, avatar: user.value,