diff options
| author | kaniini <nenolod@gmail.com> | 2018-08-24 23:04:36 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2018-08-24 23:04:36 +0000 |
| commit | 673f0fca3f7898641cdc488e6e6cc9033ca51777 (patch) | |
| tree | a92128b2779b3971d15699b4410c37687446d480 /src/components/notification/notification.vue | |
| parent | 55650ff7ea9867cdb8adf7077b36bbb8c7bfcb75 (diff) | |
| parent | fe906cc3f0c8388bcb2a33be9c72ca5365bde0a5 (diff) | |
Merge branch 'notifications' into 'develop'
Support qvitter api notifications
Closes #129
See merge request pleroma/pleroma-fe!306
Diffstat (limited to 'src/components/notification/notification.vue')
| -rw-r--r-- | src/components/notification/notification.vue | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/components/notification/notification.vue b/src/components/notification/notification.vue index bb76ddf8..72c1ca69 100644 --- a/src/components/notification/notification.vue +++ b/src/components/notification/notification.vue @@ -12,7 +12,7 @@ <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 v-if="notification.type === 'favorite'"> + <span v-if="notification.type === 'like'"> <i class="fa icon-star lit"></i> <small>{{$t('notifications.favorited_you')}}</small> </span> @@ -25,12 +25,17 @@ <small>{{$t('notifications.followed_you')}}</small> </span> </div> - <small class="timeago"><router-link :to="{ name: 'conversation', params: { id: notification.status.id } }"><timeago :since="notification.action.created_at" :auto-update="240"></timeago></router-link></small> + <small class="timeago"><router-link v-if="notification.status" :to="{ name: 'conversation', params: { id: notification.status.id } }"><timeago :since="notification.action.created_at" :auto-update="240"></timeago></router-link></small> </span> <div class="follow-text" v-if="notification.type === 'follow'"> <router-link :to="{ name: 'user-profile', params: { id: notification.action.user.id } }">@{{notification.action.user.screen_name}}</router-link> </div> - <status v-else class="faint" :compact="true" :statusoid="notification.status" :noHeading="true"></status> + <template v-else> + <status v-if="notification.status" class="faint" :compact="true" :statusoid="notification.status" :noHeading="true"></status> + <div class="broken-favorite" v-else> + {{$t('notifications.broken_favorite')}} + </div> + </template> </div> </div> </template> |