Troplo/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

#436 - sync notification & timeline users

Browse source
This commit is contained in:
dave 2019-04-01 12:22:49 -04:00
parent 0af2f8e4fd
commit 6482201dc9
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/components/notification/notification.js
View file

@ -33,13 +33,13 @@ const Notification = {
return highlightStyle(highlight[user.screen_name]) return highlightStyle(highlight[user.screen_name])
}, },
userInStore () { userInStore () {
return this.$store.getters.findUser(this.notification.action.user.id) return this.$store.getters.findUser(this.notification.from_profile.id)
}, },
user () { user () {
if (this.userInStore) { if (this.userInStore) {
return this.userInStore return this.userInStore
} }
return {} return this.notification.from_profile
} }
} }
} }

2
src/components/notification/notification.vue
View file

@ -10,7 +10,7 @@
<UserAvatar :compact="true" :betterShadow="betterShadow" :src="notification.from_profile.profile_image_url_original" /> <UserAvatar :compact="true" :betterShadow="betterShadow" :src="notification.from_profile.profile_image_url_original" />
</a> </a>
<div class='notification-right'> <div class='notification-right'>
<UserCard :user="notification.from_profile" :rounded="true" :bordered="true" v-if="userExpanded" /> <UserCard :user="user" :rounded="true" :bordered="true" v-if="userExpanded" />
<span class="notification-details"> <span class="notification-details">
<div class="name-and-action"> <div class="name-and-action">
<span class="username" v-if="!!notification.from_profile.name_html" :title="'@'+notification.from_profile.screen_name" v-html="notification.from_profile.name_html"></span> <span class="username" v-if="!!notification.from_profile.name_html" :title="'@'+notification.from_profile.screen_name" v-html="notification.from_profile.name_html"></span>