From 648f635429da929e7090b103b9c8d354a1d3860a Mon Sep 17 00:00:00 2001
From: eugenijm <eugenijm@protonmail.com>
Date: Mon, 4 Feb 2019 17:03:35 +0300
Subject: Allow to configure visibility for admin and moderator badges

---
 src/components/user_settings/user_settings.js  | 7 ++++++-
 src/components/user_settings/user_settings.vue | 5 +++++
 2 files changed, 11 insertions(+), 1 deletion(-)

(limited to 'src/components/user_settings')

diff --git a/src/components/user_settings/user_settings.js b/src/components/user_settings/user_settings.js
index ef9398f6..4f991370 100644
--- a/src/components/user_settings/user_settings.js
+++ b/src/components/user_settings/user_settings.js
@@ -14,6 +14,8 @@ const UserSettings = {
       newDefaultScope: this.$store.state.users.currentUser.default_scope,
       hideFollows: this.$store.state.users.currentUser.hide_follows,
       hideFollowers: this.$store.state.users.currentUser.hide_followers,
+      showRole: this.$store.state.users.currentUser.show_role,
+      role: this.$store.state.users.currentUser.role,
       followList: null,
       followImportError: false,
       followsImported: false,
@@ -71,6 +73,8 @@ const UserSettings = {
       const no_rich_text = this.newNoRichText
       const hide_follows = this.hideFollows
       const hide_followers = this.hideFollowers
+      const show_role = this.showRole
+
       /* eslint-enable camelcase */
       this.$store.state.api.backendInteractor
         .updateProfile({
@@ -83,7 +87,8 @@ const UserSettings = {
             default_scope,
             no_rich_text,
             hide_follows,
-            hide_followers
+            hide_followers,
+            show_role
             /* eslint-enable camelcase */
           }}).then((user) => {
             if (!user.error) {
diff --git a/src/components/user_settings/user_settings.vue b/src/components/user_settings/user_settings.vue
index 19b7bdbd..ea5b3de5 100644
--- a/src/components/user_settings/user_settings.vue
+++ b/src/components/user_settings/user_settings.vue
@@ -37,6 +37,11 @@
               <input type="checkbox" v-model="hideFollowers" id="account-hide-followers">
               <label for="account-hide-followers">{{$t('settings.hide_followers_description')}}</label>
             </p>
+            <p>
+              <input type="checkbox" v-model="showRole" id="account-show-role">
+              <label for="account-show-role" v-if="role === 'admin'">{{$t('settings.show_admin_badge')}}</label>
+              <label for="account-show-role" v-if="role === 'moderator'">{{$t('settings.show_moderator_badge')}}</label>
+            </p>
             <button :disabled='newName && newName.length === 0' class="btn btn-default" @click="updateProfile">{{$t('general.submit')}}</button>
           </div>
           <div class="setting-item">
-- 
cgit v1.2.3-70-g09d2


From 2f12ac7ea4ab96ba3af8a9d1d0941e13f5fb16b8 Mon Sep 17 00:00:00 2001
From: dave <starpumadev@gmail.com>
Date: Wed, 6 Feb 2019 11:17:23 -0500
Subject: #315 - export all follows as CSV

---
 src/components/user_settings/user_settings.js                        | 5 ++++-
 src/services/api/api.service.js                                      | 5 ++++-
 .../backend_interactor_service/backend_interactor_service.js         | 4 ++--
 3 files changed, 10 insertions(+), 4 deletions(-)

(limited to 'src/components/user_settings')

diff --git a/src/components/user_settings/user_settings.js b/src/components/user_settings/user_settings.js
index ef9398f6..cb0ad9f3 100644
--- a/src/components/user_settings/user_settings.js
+++ b/src/components/user_settings/user_settings.js
@@ -238,7 +238,10 @@ const UserSettings = {
     exportFollows () {
       this.enableFollowsExport = false
       this.$store.state.api.backendInteractor
-        .fetchFriends({id: this.$store.state.users.currentUser.id})
+        .fetchFriends({
+          id: this.$store.state.users.currentUser.id,
+          isExport: true
+        })
         .then((friendList) => {
           this.exportPeople(friendList, 'friends.csv')
           setTimeout(() => { this.enableFollowsExport = true }, 2000)
diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js
index d4d52ab1..cf0c2eb2 100644
--- a/src/services/api/api.service.js
+++ b/src/services/api/api.service.js
@@ -247,11 +247,14 @@ const fetchUser = ({id, credentials}) => {
     .then((data) => parseUser(data))
 }
 
-const fetchFriends = ({id, page, credentials}) => {
+const fetchFriends = ({id, page, isExport, credentials}) => {
   let url = `${FRIENDS_URL}?user_id=${id}`
   if (page) {
     url = url + `&page=${page}`
   }
+  if (isExport !== undefined) {
+    url = url + `&export=${isExport}`
+  }
   return fetch(url, { headers: authHeaders(credentials) })
     .then((data) => data.json())
     .then((data) => data.map(parseUser))
diff --git a/src/services/backend_interactor_service/backend_interactor_service.js b/src/services/backend_interactor_service/backend_interactor_service.js
index ed7d4b49..423aeba5 100644
--- a/src/services/backend_interactor_service/backend_interactor_service.js
+++ b/src/services/backend_interactor_service/backend_interactor_service.js
@@ -10,8 +10,8 @@ const backendInteractorService = (credentials) => {
     return apiService.fetchConversation({id, credentials})
   }
 
-  const fetchFriends = ({id, page}) => {
-    return apiService.fetchFriends({id, page, credentials})
+  const fetchFriends = ({id, page, isExport = false}) => {
+    return apiService.fetchFriends({id, page, isExport, credentials})
   }
 
   const fetchFollowers = ({id, page}) => {
-- 
cgit v1.2.3-70-g09d2


From 312841717619e397c7cb3255c1cc3e66c0a1044e Mon Sep 17 00:00:00 2001
From: dave <starpumadev@gmail.com>
Date: Thu, 7 Feb 2019 09:57:16 -0500
Subject: #315 - separate export and fetch follows logic

---
 src/components/user_settings/user_settings.js               |  5 ++---
 src/services/api/api.service.js                             | 13 +++++++++----
 .../backend_interactor_service.js                           |  5 +++++
 3 files changed, 16 insertions(+), 7 deletions(-)

(limited to 'src/components/user_settings')

diff --git a/src/components/user_settings/user_settings.js b/src/components/user_settings/user_settings.js
index cb0ad9f3..a2a23c6f 100644
--- a/src/components/user_settings/user_settings.js
+++ b/src/components/user_settings/user_settings.js
@@ -238,9 +238,8 @@ const UserSettings = {
     exportFollows () {
       this.enableFollowsExport = false
       this.$store.state.api.backendInteractor
-        .fetchFriends({
-          id: this.$store.state.users.currentUser.id,
-          isExport: true
+        .exportFriends({
+          id: this.$store.state.users.currentUser.id
         })
         .then((friendList) => {
           this.exportPeople(friendList, 'friends.csv')
diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js
index df920573..24ff0f74 100644
--- a/src/services/api/api.service.js
+++ b/src/services/api/api.service.js
@@ -247,14 +247,18 @@ const fetchUser = ({id, credentials}) => {
     .then((data) => parseUser(data))
 }
 
-const fetchFriends = ({id, page, isExport, credentials}) => {
+const fetchFriends = ({id, page, credentials}) => {
   let url = `${FRIENDS_URL}?user_id=${id}`
   if (page) {
     url = url + `&page=${page}`
   }
-  if (isExport) {
-    url = url + `&export=${isExport}`
-  }
+  return fetch(url, { headers: authHeaders(credentials) })
+    .then((data) => data.json())
+    .then((data) => data.map(parseUser))
+}
+
+const exportFriends = ({id, credentials}) => {
+  let url = `${FRIENDS_URL}?user_id=${id}&export=true`
   return fetch(url, { headers: authHeaders(credentials) })
     .then((data) => data.json())
     .then((data) => data.map(parseUser))
@@ -539,6 +543,7 @@ const apiService = {
   fetchConversation,
   fetchStatus,
   fetchFriends,
+  exportFriends,
   fetchFollowers,
   followUser,
   unfollowUser,
diff --git a/src/services/backend_interactor_service/backend_interactor_service.js b/src/services/backend_interactor_service/backend_interactor_service.js
index 423aeba5..c2d1617e 100644
--- a/src/services/backend_interactor_service/backend_interactor_service.js
+++ b/src/services/backend_interactor_service/backend_interactor_service.js
@@ -14,6 +14,10 @@ const backendInteractorService = (credentials) => {
     return apiService.fetchFriends({id, page, isExport, credentials})
   }
 
+  const exportFriends = ({id}) => {
+    return apiService.exportFriends({id, credentials})
+  }
+
   const fetchFollowers = ({id, page}) => {
     return apiService.fetchFollowers({id, page, credentials})
   }
@@ -78,6 +82,7 @@ const backendInteractorService = (credentials) => {
     fetchStatus,
     fetchConversation,
     fetchFriends,
+    exportFriends,
     fetchFollowers,
     followUser,
     unfollowUser,
-- 
cgit v1.2.3-70-g09d2