From eab973d7c30c4c9b7fc3b506f450d1cdcae1b90b Mon Sep 17 00:00:00 2001
From: taiy <53635909+taiyme@users.noreply.github.com>
Date: Wed, 1 May 2024 19:43:28 +0900
Subject: [PATCH] =?UTF-8?q?enhance(MkMention):=20Acct=E3=81=8C=E9=95=B7?=
 =?UTF-8?q?=E3=81=84=E5=A0=B4=E5=90=88=E7=9C=81=E7=95=A5=E3=81=97=E3=81=A6?=
 =?UTF-8?q?=E8=A1=A8=E7=A4=BA=E3=81=99=E3=82=8B=E3=80=81=E4=BB=96=20(#209)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* enh: Acctが長い場合省略して表示する (fix: Acctが長い場合謎の改行が発生する問題)
* fix: 一部の値がリアクティブでない問題
* fix: 特定の条件下で自分自身を判定できない問題
---
 .../frontend/src/components/MkMention.vue     | 70 +++++++++++++------
 1 file changed, 50 insertions(+), 20 deletions(-)

diff --git a/packages/frontend/src/components/MkMention.vue b/packages/frontend/src/components/MkMention.vue
index 6d364b688e7e..a864107dfdda 100644
--- a/packages/frontend/src/components/MkMention.vue
+++ b/packages/frontend/src/components/MkMention.vue
@@ -4,17 +4,23 @@ SPDX-License-Identifier: AGPL-3.0-only
 -->
 
 <template>
-<MkA v-user-preview="canonical" :class="[$style.root, { [$style.isMe]: isMe }]" :to="url" :style="{ background: bgCss }" :behavior="behavior">
-	<img :class="$style.icon" :src="avatarUrl" alt="">
-	<span>
+<MkA
+	v-user-preview="canonicalRef"
+	:class="[$style.root, { [$style.isMe]: isMeRef }]"
+	:to="userPageUrlRef"
+	:style="{ background: bgColorRef }"
+	:behavior="behavior"
+>
+	<img :class="$style.icon" :src="avatarUrlRef" alt="">
+	<span :class="$style.acct">
 		<span>@{{ username }}</span>
-		<span v-if="(host != localHost) || defaultStore.state.showFullAcct" :class="$style.host">@{{ toUnicode(host) }}</span>
+		<span v-if="showHostRef" :class="$style.host">@{{ toUnicode(host) }}</span>
 	</span>
 </MkA>
 </template>
 
 <script lang="ts" setup>
-import { toUnicode } from 'punycode';
+import { toASCII, toUnicode } from 'punycode';
 import { computed } from 'vue';
 import tinycolor from 'tinycolor2';
 import { host as localHost } from '@/config.js';
@@ -29,27 +35,47 @@ const props = defineProps<{
 	behavior?: MkABehavior;
 }>();
 
-const canonical = props.host === localHost ? `@${props.username}` : `@${props.username}@${toUnicode(props.host)}`;
+const canonicalRef = computed(() => {
+	if (toASCII(props.host) === toASCII(localHost)) {
+		return `@${props.username}`;
+	}
+	return `@${props.username}@${toUnicode(props.host)}`;
+});
+
+const isMeRef = computed(() => {
+	if ($i == null) return false;
+	return canonicalRef.value.toLowerCase() === `@${$i.username}`.toLowerCase();
+});
 
-const url = `/${canonical}`;
+const showHostRef = computed(() => {
+	return (toASCII(props.host) !== toASCII(localHost)) || defaultStore.reactiveState.showFullAcct.value;
+});
 
-const isMe = $i && (
-	`@${props.username}@${toUnicode(props.host)}` === `@${$i.username}@${toUnicode(localHost)}`.toLowerCase()
-);
+const userPageUrlRef = computed(() => {
+	return `/${canonicalRef.value}`;
+});
 
-const bg = tinycolor(getComputedStyle(document.documentElement).getPropertyValue(isMe ? '--mentionMe' : '--mention'));
-bg.setAlpha(0.1);
-const bgCss = bg.toRgbString();
+const avatarUrlRef = computed(() => {
+	if (defaultStore.state.disableShowingAnimatedImages) {
+		return getStaticImageUrl(`/avatar/@${props.username}@${toASCII(props.host)}`);
+	}
+	return `/avatar/@${props.username}@${toASCII(props.host)}`;
+});
 
-const avatarUrl = computed(() => defaultStore.state.disableShowingAnimatedImages
-	? getStaticImageUrl(`/avatar/@${props.username}@${props.host}`)
-	: `/avatar/@${props.username}@${props.host}`,
-);
+const bgColorRef = computed(() => {
+	const fgColor = window.getComputedStyle(document.documentElement).getPropertyValue(isMeRef.value ? '--mentionMe' : '--mention');
+	return tinycolor(fgColor).setAlpha(0.1).toRgbString();
+});
 </script>
 
 <style lang="scss" module>
 .root {
-	display: inline-block;
+	box-sizing: border-box;
+	display: inline-flex;
+	max-width: 100%;
+	gap: 0.2em;
+	align-items: center;
+	vertical-align: middle;
 	padding: 4px 8px 4px 4px;
 	border-radius: 999px;
 	color: var(--mention);
@@ -63,11 +89,15 @@ const avatarUrl = computed(() => defaultStore.state.disableShowingAnimatedImages
 	width: 1.5em;
 	height: 1.5em;
 	object-fit: cover;
-	margin: 0 0.2em 0 0;
-	vertical-align: bottom;
 	border-radius: 100%;
 }
 
+.acct {
+	overflow: hidden;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+}
+
 .host {
 	opacity: 0.5;
 }