heartles/egirlskey
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Fix bug

Browse source
This commit is contained in:
syuilo 2018-04-09 19:52:17 +09:00
parent a86757904c
commit b4d806033c
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/client/app/common/views/components/messaging.vue
View file

@ -24,7 +24,7 @@
<template> <template>
<a v-for="message in messages" <a v-for="message in messages"
class="user" 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-me="isMe(message)"
:data-is-read="message.isRead" :data-is-read="message.isRead"
@click.prevent="navigate(isMe(message) ? message.recipient : message.user)" @click.prevent="navigate(isMe(message) ? message.recipient : message.user)"
@ -51,6 +51,7 @@
<script lang="ts"> <script lang="ts">
import Vue from 'vue'; import Vue from 'vue';
import getAcct from '../../../../../acct/render';
export default Vue.extend({ export default Vue.extend({
props: { props: {
@ -92,6 +93,7 @@ export default Vue.extend({
(this as any).os.streams.messagingIndexStream.dispose(this.connectionId); (this as any).os.streams.messagingIndexStream.dispose(this.connectionId);
}, },
methods: { methods: {
getAcct,
isMe(message) { isMe(message) {
return message.userId == (this as any).os.i.id; return message.userId == (this as any).os.i.id;
}, },

6
src/client/app/desktop/views/pages/user/user.header.vue
View file

@ -12,9 +12,9 @@
<p class="location" v-if="user.host === null && user.profile.location">%fa:map-marker%{{ user.profile.location }}</p> <p class="location" v-if="user.host === null && user.profile.location">%fa:map-marker%{{ user.profile.location }}</p>
</div> </div>
<footer> <footer>
<router-link :to="`/@${acct}`" :data-active="$parent.page == 'home'">%fa:home%概要</router-link> <router-link :to="user | userPage" :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="user | userPage('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('graphs')" :data-active="$parent.page == 'graphs'">%fa:chart-bar%グラフ</router-link>
</footer> </footer>
</div> </div>
</div> </div>