diff options
| author | dave <starpumadev@gmail.com> | 2019-03-18 14:42:09 -0400 |
|---|---|---|
| committer | dave <starpumadev@gmail.com> | 2019-03-18 14:42:09 -0400 |
| commit | 13e727b5eebb60330bc87c7ccc70109683c5b963 (patch) | |
| tree | dbe517feea60a3d43cf758ed8fb82501ac6b06c3 /src/components/notification | |
| parent | 060d3b0713307dc247a2bf4b0d4bc957ffab97f6 (diff) | |
#436: sync notification with timeline
Diffstat (limited to 'src/components/notification')
| -rw-r--r-- | src/components/notification/notification.vue | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/components/notification/notification.vue b/src/components/notification/notification.vue index fa931fb6..7d88c90b 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.user.statusnet_profile_url" @click.stop.prevent.capture="toggleUserExpanded"> - <UserAvatar :compact="true" :betterShadow="betterShadow" :src="notification.action.user.profile_image_url_original"/> + <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> <div class='notification-right'> - <UserCard :user="notification.action.user" :rounded="true" :bordered="true" v-if="userExpanded"/> + <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.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 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 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.created_at" :auto-update="240"></timeago> + <timeago :since="notification.action.notified_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.created_at" :auto-update="240"></timeago> + <timeago :since="notification.action.notified_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.user.screen_name}} + @{{notification.action.account.screen_name}} </router-link> </div> <template v-else> |