Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

enhance(MkMention): Acctが長い場合省略して表示する、他 #209

Merged
merged 2 commits into from
May 1, 2024
Merged

enhance(MkMention): Acctが長い場合省略して表示する、他 #209

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a9e010d
enhance(MkMention): Acctが長い場合省略して表示する、他
taiyme May 1, 2024
040d2da
fix: box-sizing
taiyme May 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 50 additions & 20 deletions packages/frontend/src/components/MkMention.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand All @@ -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);
Expand All @@ -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;
}
Expand Down