From b7ceb2063b825aa7b0f08017ee158d162c1425d2 Mon Sep 17 00:00:00 2001
From: Tess K <me@thvxl.se>
Date: Thu, 2 May 2024 17:53:05 +0000
Subject: [PATCH] fix: `MkPageWindow` doesn't render custom emojis in the
 titlebar when displaying a user profile who has custom emojis in their
 display-name

---
 packages/frontend/src/components/MkPageWindow.vue | 3 ++-
 packages/frontend/src/pages/user/index.vue        | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/frontend/src/components/MkPageWindow.vue b/packages/frontend/src/components/MkPageWindow.vue
index c3fa724a7a..d664dc9731 100644
--- a/packages/frontend/src/components/MkPageWindow.vue
+++ b/packages/frontend/src/components/MkPageWindow.vue
@@ -18,7 +18,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 	<template #header>
 		<template v-if="pageMetadata">
 			<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>
 
@@ -43,6 +43,7 @@ import { claimAchievement } from '@/scripts/achievements.js';
 import { getScrollContainer } from '@/scripts/scroll.js';
 import { useRouterFactory } from '@/router/supplier.js';
 import { mainRouter } from '@/router/main.js';
+import MkUserName from './global/MkUserName.vue';
 
 const props = defineProps<{
 	initialPath: string;
diff --git a/packages/frontend/src/pages/user/index.vue b/packages/frontend/src/pages/user/index.vue
index 7f20e941d3..ebe4176196 100644
--- a/packages/frontend/src/pages/user/index.vue
+++ b/packages/frontend/src/pages/user/index.vue
@@ -130,7 +130,7 @@ definePageMetadata(() => ({
 	title: i18n.ts.user,
 	icon: 'ph-user ph-bold ph-lg',
 	...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)}`,
 		userName: user.value,
 		avatar: user.value,