summaryrefslogtreecommitdiff
path: root/src/client/app/common/views/components
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2018-04-09 19:18:15 +0900
committersyuilo <syuilotan@yahoo.co.jp>2018-04-09 19:18:15 +0900
commit2560d3d1c18b474700e8f1ed76da0d71bd332b07 (patch)
treeca96851e517ae18c1071e6378ecd936cbfca9989 /src/client/app/common/views/components
parentoops (diff)
downloadmisskey-2560d3d1c18b474700e8f1ed76da0d71bd332b07.tar.gz
misskey-2560d3d1c18b474700e8f1ed76da0d71bd332b07.tar.bz2
misskey-2560d3d1c18b474700e8f1ed76da0d71bd332b07.zip
Fix bug
Diffstat (limited to 'src/client/app/common/views/components')
-rw-r--r--src/client/app/common/views/components/messaging-room.message.vue6
-rw-r--r--src/client/app/common/views/components/messaging.vue2
-rw-r--r--src/client/app/common/views/components/welcome-timeline.vue2
3 files changed, 3 insertions, 7 deletions
diff --git a/src/client/app/common/views/components/messaging-room.message.vue b/src/client/app/common/views/components/messaging-room.message.vue
index 7200b59bb2..fdb820a4ab 100644
--- a/src/client/app/common/views/components/messaging-room.message.vue
+++ b/src/client/app/common/views/components/messaging-room.message.vue
@@ -1,6 +1,6 @@
<template>
<div class="message" :data-is-me="isMe">
- <router-link class="avatar-anchor" :to="`/@${acct}`" :title="acct" target="_blank">
+ <router-link class="avatar-anchor" :to="message.user | userPage" :title="acct" target="_blank">
<img class="avatar" :src="`${message.user.avatarUrl}?thumbnail&size=80`" alt=""/>
</router-link>
<div class="content">
@@ -34,7 +34,6 @@
<script lang="ts">
import Vue from 'vue';
-import getAcct from '../../../../../acct/render';
import parse from '../../../../../text/parse';
export default Vue.extend({
@@ -44,9 +43,6 @@ export default Vue.extend({
}
},
computed: {
- acct(): string {
- return getAcct(this.message.user);
- },
isMe(): boolean {
return this.message.userId == (this as any).os.i.id;
},
diff --git a/src/client/app/common/views/components/messaging.vue b/src/client/app/common/views/components/messaging.vue
index 751e4de50d..05bf889746 100644
--- a/src/client/app/common/views/components/messaging.vue
+++ b/src/client/app/common/views/components/messaging.vue
@@ -24,7 +24,7 @@
<template>
<a v-for="message in messages"
class="user"
- :href="`/i/messaging/${getAcct(isMe(message) ? message.recipient : message.user)}`"
+ :href="`/i/messaging/${isMe(message) ? message.recipient : message.user | acct}`"
:data-is-me="isMe(message)"
:data-is-read="message.isRead"
@click.prevent="navigate(isMe(message) ? message.recipient : message.user)"
diff --git a/src/client/app/common/views/components/welcome-timeline.vue b/src/client/app/common/views/components/welcome-timeline.vue
index 7571cfc5fd..a80bc04f7f 100644
--- a/src/client/app/common/views/components/welcome-timeline.vue
+++ b/src/client/app/common/views/components/welcome-timeline.vue
@@ -9,7 +9,7 @@
<router-link class="name" :to="note.user | userPage" v-user-preview="note.user.id">{{ note.user | userName }}</router-link>
<span class="username">@{{ note.user | acct }}</span>
<div class="info">
- <router-link class="created-at" :to="`/@${getAcct(note.user)}/${note.id}`">
+ <router-link class="created-at" :to="note | notePage">
<mk-time :time="note.createdAt"/>
</router-link>
</div>