From 2453a338bec08d44233a8215986c362fd3efc55b Mon Sep 17 00:00:00 2001
From: Sean King <seanking2919@protonmail.com>
Date: Thu, 15 Sep 2022 22:02:58 -0600
Subject: [PATCH] Added support for removing users from followers

---
 src/components/account_actions/account_actions.js  | 3 +++
 src/components/account_actions/account_actions.vue | 7 +++++++
 src/i18n/en.json                                   | 1 +
 src/modules/users.js                               | 8 ++++++++
 src/services/api/api.service.js                    | 9 +++++++++
 5 files changed, 28 insertions(+)

diff --git a/src/components/account_actions/account_actions.js b/src/components/account_actions/account_actions.js
index c227c409..7a712e31 100644
--- a/src/components/account_actions/account_actions.js
+++ b/src/components/account_actions/account_actions.js
@@ -52,6 +52,9 @@ const AccountActions = {
     unblockUser () {
       this.$store.dispatch('unblockUser', this.user.id)
     },
+    removeUserFromFollowers () {
+      this.$store.dispatch('removeUserFromFollowers', this.user.id)
+    },
     reportUser () {
       this.$store.dispatch('openUserReportingModal', { userId: this.user.id })
     }
diff --git a/src/components/account_actions/account_actions.vue b/src/components/account_actions/account_actions.vue
index 3e65aa62..71562b0c 100644
--- a/src/components/account_actions/account_actions.vue
+++ b/src/components/account_actions/account_actions.vue
@@ -28,6 +28,13 @@
               class="dropdown-divider"
             />
           </template>
+          <button
+            v-if="relationship.followed_by"
+            class="btn button-default btn-block dropdown-item"
+            @click="removeUserFromFollowers"
+          >
+            {{ $t('user_card.remove_this_follower') }}
+          </button>
           <button
             v-if="relationship.blocking"
             class="btn button-default btn-block dropdown-item"
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 9647b36e..9cadbbff 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -1124,6 +1124,7 @@
         "note": "Private note",
         "per_day": "per day",
         "remote_follow": "Remote follow",
+        "remove_this_follower": "Remove this follower",
         "replies": "With Replies",
         "report": "Report",
         "show_repeats": "Show repeats",
diff --git a/src/modules/users.js b/src/modules/users.js
index fb72a6a8..00dd1f2a 100644
--- a/src/modules/users.js
+++ b/src/modules/users.js
@@ -54,6 +54,11 @@ const unblockUser = (store, id) => {
     .then((relationship) => store.commit('updateUserRelationship', [relationship]))
 }
 
+const removeUserFromFollowers = (store, id) => {
+  return store.rootState.api.backendInteractor.removeUserFromFollowers({ id })
+    .then((relationship) => store.commit('updateUserRelationship', [relationship]))
+}
+
 const muteUser = (store, id) => {
   const predictedRelationship = store.state.relationships[id] || { id }
   predictedRelationship.muting = true
@@ -317,6 +322,9 @@ const users = {
     unblockUser (store, id) {
       return unblockUser(store, id)
     },
+    removeUserFromFollowers (store, id) {
+      return removeUserFromFollowers(store, id)
+    },
     blockUsers (store, ids = []) {
       return Promise.all(ids.map(id => blockUser(store, id)))
     },
diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js
index 2ed0f1ac..0cacf251 100644
--- a/src/services/api/api.service.js
+++ b/src/services/api/api.service.js
@@ -68,6 +68,7 @@ const MASTODON_BLOCK_USER_URL = id => `/api/v1/accounts/${id}/block`
 const MASTODON_UNBLOCK_USER_URL = id => `/api/v1/accounts/${id}/unblock`
 const MASTODON_MUTE_USER_URL = id => `/api/v1/accounts/${id}/mute`
 const MASTODON_UNMUTE_USER_URL = id => `/api/v1/accounts/${id}/unmute`
+const MASTODON_REMOVE_USER_FROM_FOLLOWERS = id => `/api/v1/accounts/${id}/remove_from_followers`
 const MASTODON_SUBSCRIBE_USER = id => `/api/v1/pleroma/accounts/${id}/subscribe`
 const MASTODON_UNSUBSCRIBE_USER = id => `/api/v1/pleroma/accounts/${id}/unsubscribe`
 const MASTODON_SET_NOTE_URL = id => `/api/v1/accounts/${id}/note`
@@ -305,6 +306,13 @@ const unblockUser = ({ id, credentials }) => {
   }).then((data) => data.json())
 }
 
+const removeUserFromFollowers = ({ id, credentials }) => {
+  return fetch(MASTODON_REMOVE_USER_FROM_FOLLOWERS(id), {
+    headers: authHeaders(credentials),
+    method: 'POST'
+  }).then((data) => data.json())
+}
+
 const approveUser = ({ id, credentials }) => {
   let url = MASTODON_APPROVE_USER_URL(id)
   return fetch(url, {
@@ -1625,6 +1633,7 @@ const apiService = {
   unmuteConversation,
   blockUser,
   unblockUser,
+  removeUserFromFollowers,
   fetchUser,
   fetchUserRelationship,
   favorite,