From f4a16e6541cd02c5d0cc13a81c8486f5ca052fa9 Mon Sep 17 00:00:00 2001
From: taehoon <th.dev91@gmail.com>
Date: Thu, 25 Apr 2019 04:19:54 -0400
Subject: add subscribing to user entity normalizer

---
 src/services/entity_normalizer/entity_normalizer.service.js | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/services/entity_normalizer/entity_normalizer.service.js')

diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js
index df6747a6..60c6285a 100644
--- a/src/services/entity_normalizer/entity_normalizer.service.js
+++ b/src/services/entity_normalizer/entity_normalizer.service.js
@@ -68,6 +68,7 @@ export const parseUser = (data) => {
         output.following = relationship.following
         output.statusnet_blocking = relationship.blocking
         output.muted = relationship.muting
+        output.subscribing = relationship.subscribing
       }
 
       output.hide_follows = data.pleroma.hide_follows
-- 
cgit v1.2.3-70-g09d2


From 670cbfdd1c262ddd34717b88f879d5fb80280b60 Mon Sep 17 00:00:00 2001
From: taehoon <th.dev91@gmail.com>
Date: Thu, 25 Apr 2019 12:33:50 -0400
Subject: change subscribing to subscribed

---
 src/components/user_card/user_card.vue                      | 2 +-
 src/modules/users.js                                        | 2 +-
 src/services/entity_normalizer/entity_normalizer.service.js | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/services/entity_normalizer/entity_normalizer.service.js')

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
-- 
cgit v1.2.3-70-g09d2