diff options
| author | Shpuld Shpludson <shp@cock.li> | 2019-04-08 19:01:40 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2019-04-08 19:01:40 +0000 |
| commit | 546ced43d9edbaf176f71b010aadc11bf7e5e851 (patch) | |
| tree | b198a3b47ecea40df33b072ff5576583ab722f22 /src/components/notification | |
| parent | 2f725c570b5567eb6d92f056f723b193529e3ffd (diff) | |
| parent | 6b6878bde06b375b1e715a3557f153acc73a8af0 (diff) | |
Merge branch 'moderation-menu' into 'develop'
Moderation menu #310
See merge request pleroma/pleroma-fe!595
Diffstat (limited to 'src/components/notification')
| -rw-r--r-- | src/components/notification/notification.js | 3 | ||||
| -rw-r--r-- | src/components/notification/notification.vue | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/components/notification/notification.js b/src/components/notification/notification.js index 42a48f3f..6aa6101f 100644 --- a/src/components/notification/notification.js +++ b/src/components/notification/notification.js @@ -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: { diff --git a/src/components/notification/notification.vue b/src/components/notification/notification.vue index 8f532747..cac335ce 100644 --- a/src/components/notification/notification.vue +++ b/src/components/notification/notification.vue @@ -5,7 +5,7 @@ <UserAvatar :compact="true" :betterShadow="betterShadow" :src="notification.action.user.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.action.user.name_html" :title="'@'+notification.action.user.screen_name" v-html="notification.action.user.name_html"></span> |