commit: 6c24ae9b0be25becc453cd62ba78b955c5fb6c70
parent: 0117f6af9f8ae600e613402590de4c9364806967
Author: Shpuld Shpludson <shp@cock.li>
Date: Mon, 1 Apr 2019 15:38:14 +0000
Merge branch 'fix/user-card-buttons' into 'develop'
#467 Fix/Muted and Blocked not "pressed" on User Card
Closes #467
See merge request pleroma/pleroma-fe!720
Diffstat:
3 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/src/components/notification/notification.js b/src/components/notification/notification.js
@@ -31,6 +31,15 @@ const Notification = {
const highlight = this.$store.state.config.highlight
const user = this.notification.action.user
return highlightStyle(highlight[user.screen_name])
+ },
+ userInStore () {
+ return this.$store.getters.findUser(this.notification.action.user.id)
+ },
+ user () {
+ if (this.userInStore) {
+ return this.userInStore
+ }
+ return {}
}
}
}
diff --git a/src/components/notification/notification.vue b/src/components/notification/notification.vue
@@ -1,11 +1,11 @@
<template>
<status v-if="notification.type === 'mention'" :compact="true" :statusoid="notification.status"></status>
- <div class="non-mention" :class="[userClass, { highlighted: userStyle }]" :style="[ userStyle ]"v-else>
+ <div class="non-mention" :class="[userClass, { highlighted: userStyle }]" :style="[ userStyle ]" v-else>
<a class='avatar-container' :href="notification.action.user.statusnet_profile_url" @click.stop.prevent.capture="toggleUserExpanded">
<UserAvatar :compact="true" :betterShadow="betterShadow" :src="notification.action.user.profile_image_url_original"/>
</a>
<div class='notification-right'>
- <UserCard :user="notification.action.user" :rounded="true" :bordered="true" v-if="userExpanded"/>
+ <UserCard :user="user" :rounded="true" :bordered="true" v-if="userExpanded"/>
<span class="notification-details">
<div class="name-and-action">
<span class="username" v-if="!!notification.action.user.name_html" :title="'@'+notification.action.user.screen_name" v-html="notification.action.user.name_html"></span>
diff --git a/src/components/user_profile/user_profile.js b/src/components/user_profile/user_profile.js
@@ -72,9 +72,6 @@ const UserProfile = {
return this.$store.getters.findUser(this.fetchedUserId || routeParams.name || routeParams.id)
},
user () {
- if (this.timeline.statuses[0]) {
- return this.timeline.statuses[0].user
- }
if (this.userInStore) {
return this.userInStore
}