diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index a98d055f8..ade4e6887 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -179,6 +179,7 @@ common:
dev: "アプリの作成に失敗しました。再度お試しください。"
ai-chan-kawaii: "藍ちゃかわいい"
+ you: "あなた"
auth/views/form.vue:
share-access: "{name}があなたのアカウントにアクセスすることを許可しますか?"
diff --git a/src/client/app/common/views/components/mention.vue b/src/client/app/common/views/components/mention.vue
new file mode 100644
index 000000000..45c033743
--- /dev/null
+++ b/src/client/app/common/views/components/mention.vue
@@ -0,0 +1,70 @@
+
+
+ {{ $t('@.you') }}
+
+ @{{ username }}
+ @{{ toUnicode(host) }}
+
+
+
+
+
+
+
diff --git a/src/client/app/common/views/components/mfm.ts b/src/client/app/common/views/components/mfm.ts
index a6487aa4f..399e8e884 100644
--- a/src/client/app/common/views/components/mfm.ts
+++ b/src/client/app/common/views/components/mfm.ts
@@ -3,11 +3,12 @@ import { length } from 'stringz';
import { Node } from '../../../../../mfm/parser';
import parse from '../../../../../mfm/parse';
import MkUrl from './url.vue';
+import MkMention from './mention.vue';
import { concat, sum } from '../../../../../prelude/array';
import MkFormula from './formula.vue';
import MkGoogle from './google.vue';
-import { toUnicode } from 'punycode';
import syntaxHighlight from '../../../../../mfm/syntax-highlight';
+import { host } from '../../../config';
function getTextCount(tokens: Node[]): number {
const rootCount = sum(tokens.filter(x => x.name === 'text').map(x => length(x.props.text)));
@@ -158,21 +159,13 @@ export default Vue.component('misskey-flavored-markdown', {
}
case 'mention': {
- const host = token.props.host == null && this.author && this.author.host != null ? this.author.host : token.props.host;
- const canonical = host != null ? `@${token.props.username}@${toUnicode(host)}` : `@${token.props.username}`;
- return (createElement as any)('router-link', {
+ return [createElement(MkMention, {
key: Math.random(),
- attrs: {
- to: `/${canonical}`,
- // TODO
- //dataIsMe: (this as any).i && getAcct((this as any).i) == getAcct(token),
- style: 'color:var(--mfmMention);'
- },
- directives: [{
- name: 'user-preview',
- value: canonical
- }]
- }, canonical);
+ props: {
+ host: (token.props.host == null && this.author && this.author.host != null ? this.author.host : token.props.host) || host,
+ username: token.props.username
+ }
+ })];
}
case 'hashtag': {