diff options
| -rw-r--r-- | src/components/notification/notification.vue | 14 | ||||
| -rw-r--r-- | src/services/entity_normalizer/entity_normalizer.service.js | 4 |
2 files changed, 7 insertions, 11 deletions
diff --git a/src/components/notification/notification.vue b/src/components/notification/notification.vue index 7d88c90b..282ee6c1 100644 --- a/src/components/notification/notification.vue +++ b/src/components/notification/notification.vue @@ -6,15 +6,15 @@ > </status> <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"> - <UserAvatar :compact="true" :betterShadow="betterShadow" :src="notification.action.account.profile_image_url_original"/> + <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.account" :rounded="true" :bordered="true" v-if="userExpanded"/> <span class="notification-details"> <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-else :title="'@'+notification.action.account.screen_name">{{ notification.action.account.name }}</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.user.screen_name">{{ notification.action.user.name }}</span> <span v-if="notification.type === 'like'"> <i class="fa icon-star lit"></i> <small>{{$t('notifications.favorited_you')}}</small> @@ -30,18 +30,18 @@ </div> <div class="timeago" v-if="notification.type === 'follow'"> <span class="faint"> - <timeago :since="notification.action.notified_at" :auto-update="240"></timeago> + <timeago :since="notification.action.created_at" :auto-update="240"></timeago> </span> </div> <div class="timeago" v-else> <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> </div> </span> <div class="follow-text" v-if="notification.type === 'follow'"> <router-link :to="userProfileLink(notification.action.user)"> - @{{notification.action.account.screen_name}} + @{{notification.action.user.screen_name}} </router-link> </div> <template v-else> diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js index 546ae1c6..9d00162f 100644 --- a/src/services/entity_normalizer/entity_normalizer.service.js +++ b/src/services/entity_normalizer/entity_normalizer.service.js @@ -267,8 +267,6 @@ export const parseFollow = (data) => { output.visibility = true output.created_at = new Date(data.created_at) output.user = parseUser(data.account) - output.notified_at = output.created_at - output.account = output.user return output } @@ -289,8 +287,6 @@ export const parseNotification = (data) => { : parseStatus(data.status) if (data.type === 'reblog' || data.type === 'favourite') { 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.from_profile = parseUser(data.account) |