Merge 1003caecd9 into 794cb9ffe2

CHANGELOG.md

@@ -133,6 +133,7 @@
 - Fix: ファイルの詳細ページのファイルの説明で改行が正しく表示されない問題を修正  
   (Cherry-picked from https://activitypub.software/TransFem-org/Sharkey/-/commit/bde6bb0bd2e8b0d027e724d2acdb8ae0585a8110)
 - Fix: 一部画面のページネーションが動作しにくくなっていたのを修正 ( #12766 , #11449 )
+- Fix: MFMが機能すべき箇所で機能していないところがある問題を修正
 
 ### Server
 - Feat: Misskey® Reactions Boost Technology™ (RBT)により、リアクションの作成負荷を低減することが可能に

packages/frontend/src/components/MkChannelPreview.vue

@@ -30,7 +30,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 			</div>
 		</div>
 		<article v-if="channel.description">
-			<p :title="channel.description">{{ channel.description.length > 85 ? channel.description.slice(0, 85) + '…' : channel.description }}</p>
+			<Mfm :text="channel.description.length > 85 ? channel.description.slice(0, 85) + '…' : channel.description" :plain="true"/>
 		</article>
 		<footer>
 			<span v-if="channel.lastNotedAt">

packages/frontend/src/components/MkFlashPreview.vue

@@ -14,7 +14,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 		</p>
 		<footer>
 			<img class="icon" :src="flash.user.avatarUrl"/>
-			<p>{{ userName(flash.user) }}</p>
+			<MkUserName class="name" :user="flash.user"/>
 		</footer>
 	</article>
 </MkA>
@@ -23,7 +23,6 @@ SPDX-License-Identifier: AGPL-3.0-only
 <script lang="ts" setup>
 import { } from 'vue';
 import * as Misskey from 'misskey-js';
-import { userName } from '@/filters/user.js';
 
 const props = defineProps<{
 	flash: Misskey.entities.Flash;
@@ -80,7 +79,7 @@ const props = defineProps<{
 				vertical-align: top;
 			}
 
-			> p {
+			> .name {
 				display: inline-block;
 				margin: 0;
 				font-size: 0.8em;

packages/frontend/src/components/MkPagePreview.vue

@@ -21,7 +21,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 		<p v-if="page.summary" :title="page.summary">{{ page.summary.length > 85 ? page.summary.slice(0, 85) + '…' : page.summary }}</p>
 		<footer>
 			<img v-if="page.user.avatarUrl" class="icon" :src="page.user.avatarUrl"/>
-			<p>{{ userName(page.user) }}</p>
+			<MkUserName class="name" :user="page.user"/>
 		</footer>
 	</article>
 </MkA>
@@ -30,7 +30,6 @@ SPDX-License-Identifier: AGPL-3.0-only
 <script lang="ts" setup>
 import { } from 'vue';
 import * as Misskey from 'misskey-js';
-import { userName } from '@/filters/user.js';
 import MediaImage from '@/components/MkMediaImage.vue';
 
 const props = defineProps<{
@@ -112,7 +111,7 @@ const props = defineProps<{
 				vertical-align: top;
 			}
 
-			> p {
+			> .name {
 				display: inline-block;
 				margin: 0;
 				font-size: 0.8em;

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>
+			<Mfm :text="pageMetadata.title" :plain="true"/>
 		</template>
 	</template>
 

packages/frontend/src/components/MkToast.vue

@@ -14,7 +14,7 @@ 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 :text="message" :plain="true" :nowrap="true"/>
 			</div>
 		</div>
 	</Transition>

packages/frontend/src/filters/user.ts

@@ -10,10 +10,6 @@ export const acct = (user: Misskey.Acct) => {
 	return Misskey.acct.toString(user);
 };
 
-export const userName = (user: Misskey.entities.User) => {
-	return user.name || user.username;
-};
-
 export const userPage = (user: Misskey.Acct, path?: string, absolute = false) => {
 	return `${absolute ? url : ''}/@${acct(user)}${(path ? `/${path}` : '')}`;
 };

packages/frontend/src/ui/deck/main-column.vue

@@ -8,7 +8,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 	<template #header>
 		<template v-if="pageMetadata">
 			<i :class="pageMetadata.icon"></i>
-			{{ pageMetadata.title }}
+			<Mfm :text="pageMetadata.title" :plain="true"/>
 		</template>
 	</template>