From 36117ada372daed93124b942f9666b4dcd58f1de Mon Sep 17 00:00:00 2001
From: les <lesion@autistici.org>
Date: Thu, 20 Feb 2020 23:47:31 +0100
Subject: [PATCH] fix fedi moderation / user block

---
 components/admin/Moderation.vue | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/components/admin/Moderation.vue b/components/admin/Moderation.vue
index c0c1cc22..737da11b 100644
--- a/components/admin/Moderation.vue
+++ b/components/admin/Moderation.vue
@@ -64,7 +64,7 @@
                 el-dropdown-item(v-if='!data.row.hidden' icon='el-icon-remove' @click.native='hideResource(data.row, true)') {{$t('admin.hide_resource')}}
                 el-dropdown-item(v-else icon='el-icon-success' @click.native='hideResource(data.row, false)') {{$t('admin.show_resource')}}
                 el-dropdown-item(icon='el-icon-delete' @click.native='deleteResource(data.row)') {{$t('admin.delete_resource')}}
-                el-dropdown-item(icon='el-icon-lock' @click.native='blockUser(data.row)') {{$t('admin.block_user')}}
+                el-dropdown-item(icon='el-icon-lock' @click.native='toggleUserBlock(data.row.ap_user)') {{$t('admin.block_user')}}
 </template>
 <script>
 import { mapState, mapActions } from 'vuex'
@@ -129,15 +129,17 @@ export default {
       await this.$axios.$put(`/resources/${resource.id}`, { hidden })
       resource.hidden = hidden
     },
-    async blockUser (resource) {
+    async toggleUserBlock (ap_user) {
       try {
-        await MessageBox.confirm(this.$t('admin.user_block_confirm'), {
-          confirmButtonText: this.$t('common.ok'),
-          cancelButtonText: this.$t('common.cancel'),
-          type: 'error'
-        })
-        await this.$axios.post('/instances/toggle_user_block', { ap_id: resource.ap_user.ap_id })
-        Message({ message: this.$t('admin.user_blocked', { user: resource.ap_user.ap_id }), type: 'success', showClose: true })
+        if (!ap_user.blocked) {
+          await MessageBox.confirm(this.$t('admin.user_block_confirm'), {
+            confirmButtonText: this.$t('common.ok'),
+            cancelButtonText: this.$t('common.cancel'),
+            type: 'error'
+          })
+        }
+        await this.$axios.post('/instances/toggle_user_block', { ap_id: ap_user.ap_id })
+        ap_user.blocked = !ap_user.blocked
       } catch (e) { }
     },
     async deleteResource (resource) {