#436 - merge develop

This commit is contained in:
dave 2019-04-08 21:04:59 -04:00
commit d3218807b4
22 changed files with 1759 additions and 13 deletions

View file

@ -21,6 +21,9 @@ const Notification = {
},
userProfileLink (user) {
return generateProfileLink(user.id, user.screen_name, this.$store.state.instance.restrictedNicknames)
},
getUser (notification) {
return this.$store.state.users.usersObject[notification.action.user.id]
}
},
computed: {

View file

@ -10,7 +10,7 @@
<UserAvatar :compact="true" :betterShadow="betterShadow" :src="notification.from_profile.profile_image_url_original" />
</a>
<div class='notification-right'>
<UserCard :user="user" :rounded="true" :bordered="true" v-if="userExpanded" />
<UserCard :user="getUser(notification)" :rounded="true" :bordered="true" v-if="userExpanded" />
<span class="notification-details">
<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>