aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authortaehoon <th.dev91@gmail.com>2019-04-25 12:33:50 -0400
committertaehoon <th.dev91@gmail.com>2019-07-10 21:01:07 -0400
commit670cbfdd1c262ddd34717b88f879d5fb80280b60 (patch)
tree95be070f3038d7a60c4d6925e868aff235e77cd0 /src
parent0c52d69a525aa200f03650e52f21d7b52a3918ca (diff)
change subscribing to subscribed
Diffstat (limited to 'src')
-rw-r--r--src/components/user_card/user_card.vue2
-rw-r--r--src/modules/users.js2
-rw-r--r--src/services/entity_normalizer/entity_normalizer.service.js2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/components/user_card/user_card.vue b/src/components/user_card/user_card.vue
index 720415f0..5d23bf1e 100644
--- a/src/components/user_card/user_card.vue
+++ b/src/components/user_card/user_card.vue
@@ -73,7 +73,7 @@
</span>
</div>
<div v-if="loggedIn">
- <ProgressButton :click="subscribeUser" v-if="!user.subscribing">
+ <ProgressButton :click="subscribeUser" v-if="!user.subscribed">
{{ $t('user_card.subscribe') }}
</ProgressButton>
<ProgressButton class="pressed" :click="unsubscribeUser" v-else>
diff --git a/src/modules/users.js b/src/modules/users.js
index c7ebbc85..57d3a3e3 100644
--- a/src/modules/users.js
+++ b/src/modules/users.js
@@ -135,7 +135,7 @@ export const mutations = {
user.following = relationship.following
user.muted = relationship.muting
user.statusnet_blocking = relationship.blocking
- user.subscribing = relationship.subscribing
+ user.subscribed = relationship.subscribing
}
})
},
diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js
index 60c6285a..de6664d1 100644
--- a/src/services/entity_normalizer/entity_normalizer.service.js
+++ b/src/services/entity_normalizer/entity_normalizer.service.js
@@ -68,7 +68,7 @@ export const parseUser = (data) => {
output.following = relationship.following
output.statusnet_blocking = relationship.blocking
output.muted = relationship.muting
- output.subscribing = relationship.subscribing
+ output.subscribed = relationship.subscribing
}
output.hide_follows = data.pleroma.hide_follows