diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2018-04-09 19:52:17 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2018-04-09 19:52:17 +0900 |
| commit | b4d806033ca505e55a825a8fc3e36ef826482c47 (patch) | |
| tree | f8f50aafea8b12ec0357e7ed08d4ea02d68c291b /src | |
| parent | Disable en (diff) | |
| download | sharkey-b4d806033ca505e55a825a8fc3e36ef826482c47.tar.gz sharkey-b4d806033ca505e55a825a8fc3e36ef826482c47.tar.bz2 sharkey-b4d806033ca505e55a825a8fc3e36ef826482c47.zip | |
Fix bug
Diffstat (limited to 'src')
| -rw-r--r-- | src/client/app/common/views/components/messaging.vue | 4 | ||||
| -rw-r--r-- | src/client/app/desktop/views/pages/user/user.header.vue | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/client/app/common/views/components/messaging.vue b/src/client/app/common/views/components/messaging.vue index 05bf889746..4da842f5d8 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/${isMe(message) ? message.recipient : message.user | acct}`" + :href="`/i/messaging/${getAcct(isMe(message) ? message.recipient : message.user)}`" :data-is-me="isMe(message)" :data-is-read="message.isRead" @click.prevent="navigate(isMe(message) ? message.recipient : message.user)" @@ -51,6 +51,7 @@ <script lang="ts"> import Vue from 'vue'; +import getAcct from '../../../../../acct/render'; export default Vue.extend({ props: { @@ -92,6 +93,7 @@ export default Vue.extend({ (this as any).os.streams.messagingIndexStream.dispose(this.connectionId); }, methods: { + getAcct, isMe(message) { return message.userId == (this as any).os.i.id; }, diff --git a/src/client/app/desktop/views/pages/user/user.header.vue b/src/client/app/desktop/views/pages/user/user.header.vue index 67e52d1737..e026820b39 100644 --- a/src/client/app/desktop/views/pages/user/user.header.vue +++ b/src/client/app/desktop/views/pages/user/user.header.vue @@ -12,9 +12,9 @@ <p class="location" v-if="user.host === null && user.profile.location">%fa:map-marker%{{ user.profile.location }}</p> </div> <footer> - <router-link :to="`/@${acct}`" :data-active="$parent.page == 'home'">%fa:home%概要</router-link> - <router-link :to="`/@${acct}/media`" :data-active="$parent.page == 'media'">%fa:image%メディア</router-link> - <router-link :to="`/@${acct}/graphs`" :data-active="$parent.page == 'graphs'">%fa:chart-bar%グラフ</router-link> + <router-link :to="user | userPage" :data-active="$parent.page == 'home'">%fa:home%概要</router-link> + <router-link :to="user | userPage('media')" :data-active="$parent.page == 'media'">%fa:image%メディア</router-link> + <router-link :to="user | userPage('graphs')" :data-active="$parent.page == 'graphs'">%fa:chart-bar%グラフ</router-link> </footer> </div> </div> |