sjw
/
pleroma-fe
mirror of https://git.pleroma.social/sjw/pleroma-fe.git
1
0
Fork 0
Code Issues Releases Wiki Activity

#436 - keep original naming

This commit is contained in:
dave 2019-03-31 13:41:22 -04:00
parent 8efcfc69e8
commit 0db66e2905
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/components/notification/notification.vue
View File

@ -6,15 +6,15 @@
> >
</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.account.statusnet_profile_url" @click.stop.prevent.capture="toggleUserExpanded"> <a class='avatar-container' :href="notification.action.user.statusnet_profile_url" @click.stop.prevent.capture="toggleUserExpanded">
<UserAvatar :compact="true" :betterShadow="betterShadow" :src="notification.action.account.profile_image_url_original"/> <UserAvatar :compact="true" :betterShadow="betterShadow" :src="notification.action.user.profile_image_url_original"/>
</a> </a>
<div class='notification-right'> <div class='notification-right'>
<UserCard :user="notification.action.account" :rounded="true" :bordered="true" v-if="userExpanded"/> <UserCard :user="notification.action.account" :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.action.account.name_html" :title="'@'+notification.action.account.screen_name" v-html="notification.action.account.name_html"></span> <span class="username" v-if="!!notification.action.user.name_html" :title="'@'+notification.action.user.screen_name" v-html="notification.action.user.name_html"></span>
<span class="username" v-else :title="'@'+notification.action.account.screen_name">{{ notification.action.account.name }}</span> <span class="username" v-else :title="'@'+notification.action.user.screen_name">{{ notification.action.user.name }}</span>
<span v-if="notification.type === 'like'"> <span v-if="notification.type === 'like'">
<i class="fa icon-star lit"></i> <i class="fa icon-star lit"></i>
<small>{{$t('notifications.favorited_you')}}</small> <small>{{$t('notifications.favorited_you')}}</small>
@ -30,18 +30,18 @@
</div> </div>
<div class="timeago" v-if="notification.type === 'follow'"> <div class="timeago" v-if="notification.type === 'follow'">
<span class="faint"> <span class="faint">
<timeago :since="notification.action.notified_at" :auto-update="240"></timeago> <timeago :since="notification.action.created_at" :auto-update="240"></timeago>
</span> </span>
</div> </div>
<div class="timeago" v-else> <div class="timeago" v-else>
<router-link v-if="notification.status" :to="{ name: 'conversation', params: { id: notification.status.id } }" class="faint-link"> <router-link v-if="notification.status" :to="{ name: 'conversation', params: { id: notification.status.id } }" class="faint-link">
<timeago :since="notification.action.notified_at" :auto-update="240"></timeago> <timeago :since="notification.action.created_at" :auto-update="240"></timeago>
</router-link> </router-link>
</div> </div>
</span> </span>
<div class="follow-text" v-if="notification.type === 'follow'"> <div class="follow-text" v-if="notification.type === 'follow'">
<router-link :to="userProfileLink(notification.action.user)"> <router-link :to="userProfileLink(notification.action.user)">
@{{notification.action.account.screen_name}} @{{notification.action.user.screen_name}}
</router-link> </router-link>
</div> </div>
<template v-else> <template v-else>

4
src/services/entity_normalizer/entity_normalizer.service.js
View File

@ -267,8 +267,6 @@ export const parseFollow = (data) => {
output.visibility = true output.visibility = true
output.created_at = new Date(data.created_at) output.created_at = new Date(data.created_at)
output.user = parseUser(data.account) output.user = parseUser(data.account)
output.notified_at = output.created_at
output.account = output.user
return output return output
} }
@ -289,8 +287,6 @@ export const parseNotification = (data) => {
: parseStatus(data.status) : parseStatus(data.status)
if (data.type === 'reblog' || data.type === 'favourite') { if (data.type === 'reblog' || data.type === 'favourite') {
output.status.user = parseUser(data.account) output.status.user = parseUser(data.account)
output.status.account = parseUser(data.account)
output.status.notified_at = new Date(data.created_at)
} }
output.action = output.status // not sure output.action = output.status // not sure
output.from_profile = parseUser(data.account) output.from_profile = parseUser(data.account)