From 2eb1d2b8409adff8c0f5160ec9eddc1c360b89da Mon Sep 17 00:00:00 2001
From: Angelina Filippova <linakirsanova@gmail.com>
Date: Mon, 17 Aug 2020 23:44:29 +0300
Subject: [PATCH 1/6] Update relay URL when unfollowing a relay

---
 src/api/relays.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/api/relays.js b/src/api/relays.js
index 3be0188d..100ad396 100644
--- a/src/api/relays.js
+++ b/src/api/relays.js
@@ -27,7 +27,7 @@ export async function deleteRelay(relay, authHost, token) {
     url: '/api/pleroma/admin/relay',
     method: 'delete',
     headers: authHeaders(token),
-    data: { relay_url: `https://${relay}/actor` }
+    data: { relay_url: `https://${relay}` }
   })
 }
 

From 04c10cf5e664510026b548b8b20d68949870dfdc Mon Sep 17 00:00:00 2001
From: Angelina Filippova <linakirsanova@gmail.com>
Date: Wed, 19 Aug 2020 00:47:07 +0300
Subject: [PATCH 2/6] Fix fetching relays, add Followed Back field

---
 src/api/relays.js                        |  8 ++++----
 src/lang/en.js                           |  1 +
 src/store/modules/relays.js              |  5 ++---
 src/views/settings/components/Relays.vue | 22 +++++++++++++---------
 4 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/src/api/relays.js b/src/api/relays.js
index 100ad396..7891917e 100644
--- a/src/api/relays.js
+++ b/src/api/relays.js
@@ -11,23 +11,23 @@ export async function fetchRelays(authHost, token) {
   })
 }
 
-export async function addRelay(relay, authHost, token) {
+export async function addRelay(relay_url, authHost, token) {
   return await request({
     baseURL: baseName(authHost),
     url: '/api/pleroma/admin/relay',
     method: 'post',
     headers: authHeaders(token),
-    data: { relay_url: relay }
+    data: { relay_url }
   })
 }
 
-export async function deleteRelay(relay, authHost, token) {
+export async function deleteRelay(relay_url, authHost, token) {
   return await request({
     baseURL: baseName(authHost),
     url: '/api/pleroma/admin/relay',
     method: 'delete',
     headers: authHeaders(token),
-    data: { relay_url: `https://${relay}` }
+    data: { relay_url }
   })
 }
 
diff --git a/src/lang/en.js b/src/lang/en.js
index 2008aec8..6181cf32 100644
--- a/src/lang/en.js
+++ b/src/lang/en.js
@@ -406,6 +406,7 @@ export default {
     relays: 'Relays',
     follow: 'Follow',
     followRelay: 'Follow new relay',
+    followedBack: 'Followed Back',
     instanceUrl: 'Instance URL',
     success: 'Settings changed successfully!',
     description: 'Description',
diff --git a/src/store/modules/relays.js b/src/store/modules/relays.js
index 3a0d15cc..555886a2 100644
--- a/src/store/modules/relays.js
+++ b/src/store/modules/relays.js
@@ -23,9 +23,8 @@ const relays = {
     async FetchRelays({ commit, getters }) {
       commit('SET_LOADING', true)
 
-      const response = await fetchRelays(getters.authHost, getters.token)
-
-      commit('SET_RELAYS', response.data.relays)
+      const { data } = await fetchRelays(getters.authHost, getters.token)
+      commit('SET_RELAYS', data.relays)
       commit('SET_LOADING', false)
     },
     async AddRelay({ commit, dispatch, getters }, relay) {
diff --git a/src/views/settings/components/Relays.vue b/src/views/settings/components/Relays.vue
index eb3ac264..4ce16a56 100644
--- a/src/views/settings/components/Relays.vue
+++ b/src/views/settings/components/Relays.vue
@@ -4,16 +4,25 @@
       <el-input v-model="newRelay" :placeholder="$t('settings.followRelay')" class="follow-relay" @keyup.enter.native="followRelay"/>
       <el-button type="primary" @click.native="followRelay">{{ $t('settings.follow') }}</el-button>
     </div>
-    <el-table :data="relaysTable">
+    <el-table :data="relays">
       <el-table-column
         :label="$t('settings.instanceUrl')"
-        prop="instance"/>
-      <el-table-column fixed="right" width="120">
+        prop="actor"/>
+      <el-table-column
+        :label="$t('settings.followedBack')"
+        prop="followed_back"
+        width="120"
+        align="center">
+        <template slot-scope="scope">
+          <i :class="scope.row.followed_back ? 'el-icon-check' : 'el-icon-minus'"/>
+        </template>
+      </el-table-column>
+      <el-table-column :label="$t('table.actions')" fixed="right" width="120" align="center">
         <template slot-scope="scope">
           <el-button
             type="text"
             size="small"
-            @click.native="deleteRelay(scope.row.instance)">
+            @click.native="deleteRelay(scope.row.actor)">
             {{ $t('table.delete') }}
           </el-button>
         </template>
@@ -34,11 +43,6 @@ export default {
     relays() {
       return this.$store.state.relays.fetchedRelays
     },
-    relaysTable() {
-      return this.relays.map(relay => {
-        return { instance: relay }
-      })
-    },
     loading() {
       return this.$store.state.relays.loading
     }

From 7e72078f29abba0caa3af751e85c8e2d1c362e3b Mon Sep 17 00:00:00 2001
From: Angelina Filippova <linakirsanova@gmail.com>
Date: Wed, 19 Aug 2020 00:53:02 +0300
Subject: [PATCH 3/6] Fix adding new relay

---
 src/store/modules/relays.js              | 2 +-
 src/views/settings/components/Relays.vue | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/store/modules/relays.js b/src/store/modules/relays.js
index 555886a2..5cdeb353 100644
--- a/src/store/modules/relays.js
+++ b/src/store/modules/relays.js
@@ -13,7 +13,7 @@ const relays = {
       state.fetchedRelays = relays
     },
     ADD_RELAY: (state, relay) => {
-      state.fetchedRelays = [...state.fetchedRelays, relay]
+      state.fetchedRelays = [...state.fetchedRelays, { actor: relay }]
     },
     DELETE_RELAY: (state, relay) => {
       state.fetchedRelays = state.fetchedRelays.filter(fetchedRelay => fetchedRelay !== relay)
diff --git a/src/views/settings/components/Relays.vue b/src/views/settings/components/Relays.vue
index 4ce16a56..8811dfea 100644
--- a/src/views/settings/components/Relays.vue
+++ b/src/views/settings/components/Relays.vue
@@ -53,6 +53,7 @@ export default {
   methods: {
     followRelay() {
       this.$store.dispatch('AddRelay', this.newRelay)
+      this.newRelay = ''
     },
     deleteRelay(relay) {
       this.$store.dispatch('DeleteRelay', relay)

From 0a146aef7f2f5ecb564c6e0c74f246c439d67199 Mon Sep 17 00:00:00 2001
From: Angelina Filippova <linakirsanova@gmail.com>
Date: Wed, 19 Aug 2020 01:02:56 +0300
Subject: [PATCH 4/6] Fix optimistic update when unfollowing a relay

---
 src/lang/en.js                           | 3 ++-
 src/store/modules/relays.js              | 2 +-
 src/views/settings/components/Relays.vue | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/lang/en.js b/src/lang/en.js
index 6181cf32..8e9629b2 100644
--- a/src/lang/en.js
+++ b/src/lang/en.js
@@ -150,7 +150,8 @@ export default {
     draft: 'Draft',
     delete: 'Delete',
     cancel: 'Cancel',
-    confirm: 'Confirm'
+    confirm: 'Confirm',
+    unfollow: 'Unfollow'
   },
   errorLog: {
     tips: 'Please click the bug icon in the upper right corner',
diff --git a/src/store/modules/relays.js b/src/store/modules/relays.js
index 5cdeb353..2d611c0e 100644
--- a/src/store/modules/relays.js
+++ b/src/store/modules/relays.js
@@ -16,7 +16,7 @@ const relays = {
       state.fetchedRelays = [...state.fetchedRelays, { actor: relay }]
     },
     DELETE_RELAY: (state, relay) => {
-      state.fetchedRelays = state.fetchedRelays.filter(fetchedRelay => fetchedRelay !== relay)
+      state.fetchedRelays = state.fetchedRelays.filter(fetchedRelay => fetchedRelay.actor !== relay)
     }
   },
   actions: {
diff --git a/src/views/settings/components/Relays.vue b/src/views/settings/components/Relays.vue
index 8811dfea..e65b152c 100644
--- a/src/views/settings/components/Relays.vue
+++ b/src/views/settings/components/Relays.vue
@@ -2,7 +2,7 @@
   <div v-if="!loading" class="relays-container">
     <div class="follow-relay-container">
       <el-input v-model="newRelay" :placeholder="$t('settings.followRelay')" class="follow-relay" @keyup.enter.native="followRelay"/>
-      <el-button type="primary" @click.native="followRelay">{{ $t('settings.follow') }}</el-button>
+      <el-button @click.native="followRelay">{{ $t('settings.follow') }}</el-button>
     </div>
     <el-table :data="relays">
       <el-table-column
@@ -23,7 +23,7 @@
             type="text"
             size="small"
             @click.native="deleteRelay(scope.row.actor)">
-            {{ $t('table.delete') }}
+            {{ $t('table.unfollow') }}
           </el-button>
         </template>
       </el-table-column>

From d2107a71017895194025d166f9d710cc2a810c79 Mon Sep 17 00:00:00 2001
From: Angelina Filippova <linakirsanova@gmail.com>
Date: Wed, 19 Aug 2020 02:56:05 +0300
Subject: [PATCH 5/6] Fix mobile UI

---
 src/views/settings/components/Relays.vue | 14 ++++++++++----
 src/views/settings/styles/main.scss      |  3 ++-
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/views/settings/components/Relays.vue b/src/views/settings/components/Relays.vue
index e65b152c..4ac29042 100644
--- a/src/views/settings/components/Relays.vue
+++ b/src/views/settings/components/Relays.vue
@@ -10,14 +10,14 @@
         prop="actor"/>
       <el-table-column
         :label="$t('settings.followedBack')"
+        :width="getLabelWidth"
         prop="followed_back"
-        width="120"
         align="center">
         <template slot-scope="scope">
           <i :class="scope.row.followed_back ? 'el-icon-check' : 'el-icon-minus'"/>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('table.actions')" fixed="right" width="120" align="center">
+      <el-table-column :label="$t('table.actions')" :width="getLabelWidth" fixed="right" align="center">
         <template slot-scope="scope">
           <el-button
             type="text"
@@ -40,11 +40,17 @@ export default {
     }
   },
   computed: {
-    relays() {
-      return this.$store.state.relays.fetchedRelays
+    getLabelWidth() {
+      return this.isDesktop ? '130px' : '85px'
+    },
+    isDesktop() {
+      return this.$store.state.app.device === 'desktop'
     },
     loading() {
       return this.$store.state.relays.loading
+    },
+    relays() {
+      return this.$store.state.relays.fetchedRelays
     }
   },
   mounted() {
diff --git a/src/views/settings/styles/main.scss b/src/views/settings/styles/main.scss
index 4cecb962..551e99e5 100644
--- a/src/views/settings/styles/main.scss
+++ b/src/views/settings/styles/main.scss
@@ -431,7 +431,7 @@
       height: 2px;
     }
     .follow-relay {
-      width: 70%;
+      width: 75%;
       margin-right: 5px;
       input {
         width: 100%;
@@ -440,6 +440,7 @@
     .follow-relay-container {
       display: flex;
       justify-content: space-between;
+      margin: 0 5px;
     }
     h1 {
       font-size: 24px;

From 75531b3fcd19ef22688cf53de477408da039af70 Mon Sep 17 00:00:00 2001
From: Angelina Filippova <linakirsanova@gmail.com>
Date: Wed, 19 Aug 2020 03:05:40 +0300
Subject: [PATCH 6/6] Update Changelog

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a0a873ae..45eb0a9b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+## Unreleased
+
+### Fixed
+
+- Fix following and unfollowing relays from Admin-FE, update mobile UI
+
 ## [2.1] - 2020-08-14
 
 ### Added