From ca00e93b6092c855b0109e1e6dab93c29a28716a Mon Sep 17 00:00:00 2001 From: Shpuld Shpuldson <shp@cock.li> Date: Thu, 23 Apr 2020 14:27:27 +0300 Subject: [PATCH] minor fixes --- src/components/follow_card/follow_card.vue | 3 +-- src/components/side_drawer/side_drawer.vue | 2 +- src/components/status/status.vue | 2 +- src/services/entity_normalizer/entity_normalizer.service.js | 1 + 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/follow_card/follow_card.vue b/src/components/follow_card/follow_card.vue index d789a325..76a70730 100644 --- a/src/components/follow_card/follow_card.vue +++ b/src/components/follow_card/follow_card.vue @@ -17,10 +17,9 @@ </template> <template v-else> <FollowButton - :user="user" :relationship="relationship" - class="follow-card-follow-button" :label-following="$t('user_card.follow_unfollow')" + class="follow-card-follow-button" /> </template> </div> diff --git a/src/components/side_drawer/side_drawer.vue b/src/components/side_drawer/side_drawer.vue index a9dbbeec..2958a386 100644 --- a/src/components/side_drawer/side_drawer.vue +++ b/src/components/side_drawer/side_drawer.vue @@ -19,7 +19,7 @@ > <UserCard v-if="currentUser" - :userId="currentUser.id" + :user-id="currentUser.id" :hide-bio="true" /> <div diff --git a/src/components/status/status.vue b/src/components/status/status.vue index a04b501a..dd7cd579 100644 --- a/src/components/status/status.vue +++ b/src/components/status/status.vue @@ -94,7 +94,7 @@ <div class="status-body"> <UserCard v-if="userExpanded" - :userId="status.user.id" + :user-id="status.user.id" :rounded="true" :bordered="true" class="status-usercard" diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js index 7237fdfc..724dcc4b 100644 --- a/src/services/entity_normalizer/entity_normalizer.service.js +++ b/src/services/entity_normalizer/entity_normalizer.service.js @@ -336,6 +336,7 @@ export const parseNotification = (data) => { } const masto = !data.hasOwnProperty('ntype') const output = {} + if (masto) { output.type = mastoDict[data.type] || data.type output.seen = data.pleroma.is_seen