From 76e4f473e96496eb2e26686145ada8741050c865 Mon Sep 17 00:00:00 2001
From: Megghy <megghy@qq.com>
Date: Sat, 27 Apr 2024 12:00:40 +0800
Subject: [PATCH] fix blacklist display

---
 src/api/account.ts                      |  5 ++++
 src/api/api-models.ts                   |  2 +-
 src/views/manage/SettingsManageView.vue | 34 +++++++++++++++++++++++--
 3 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/src/api/account.ts b/src/api/account.ts
index 13ba455..64fe061 100644
--- a/src/api/account.ts
+++ b/src/api/account.ts
@@ -140,6 +140,11 @@ export async function DelBiliBlackList(id: number): Promise<APIRoot<unknown>> {
     id: id,
   })
 }
+export async function DelBlackList(id: number): Promise<APIRoot<unknown>> {
+  return QueryGetAPI<AccountInfo>(`${ACCOUNT_API_URL}black-list/del`, {
+    id: id,
+  })
+}
 export function downloadConfigDirect(name: string) {
   return QueryGetAPI<string>(VTSURU_API_URL + 'get-config', {
     name: name,
diff --git a/src/api/api-models.ts b/src/api/api-models.ts
index 57502f7..ea8ddf1 100644
--- a/src/api/api-models.ts
+++ b/src/api/api-models.ts
@@ -67,7 +67,7 @@ export interface AccountInfo extends UserInfo {
 
   nextSendEmailTime?: number
   isServerFetcherOnline: boolean
-  blackList: number[]
+  blackList: UserBasicInfo[]
   biliBlackList: { [key: number]: string }
   streamerInfo?: StreamerModel
   biliUserAuthInfo?: BiliAuthModel
diff --git a/src/views/manage/SettingsManageView.vue b/src/views/manage/SettingsManageView.vue
index 6e4c170..aa59704 100644
--- a/src/views/manage/SettingsManageView.vue
+++ b/src/views/manage/SettingsManageView.vue
@@ -1,6 +1,7 @@
 <script setup lang="ts">
 import {
   DelBiliBlackList,
+  DelBlackList,
   SaveAccountSettings,
   SaveEnableFunctions,
   downloadConfigDirect,
@@ -461,7 +462,7 @@ const buttonGroup = computed(() => {
   ])
 })
 
-function unblockUser(id: number) {
+function unblockBiliUser(id: number) {
   DelBiliBlackList(id)
     .then((data) => {
       if (data.code == 200) {
@@ -477,6 +478,22 @@ function unblockUser(id: number) {
       message.error(err)
     })
 }
+function unblockUser(id: number) {
+  DelBlackList(id)
+    .then((data) => {
+      if (data.code == 200) {
+        message.success(`[${id}] 已移除黑名单`)
+        if (accountInfo.value) {
+          accountInfo.value.blackList = accountInfo.value.blackList.filter((u) => u.id != id)
+        }
+      } else {
+        message.error(data.message)
+      }
+    })
+    .catch((err) => {
+      message.error(err)
+    })
+}
 async function getIndexInfo() {
   try {
     isLoading.value = true
@@ -608,7 +625,20 @@ onMounted(async () => {
                 <NText depth="3">
                   {{ item[0] }}
                 </NText>
-                <NButton type="error" @click="unblockUser(Number(item[0]))" size="small"> 移除 </NButton>
+                <NButton type="error" @click="unblockBiliUser(Number(item[0]))" size="small"> 移除 </NButton>
+              </NSpace>
+            </NListItem>
+          </NList>
+          <NList v-if="accountInfo.blackList && accountInfo.blackList.length > 0">
+            <NListItem v-for="item in accountInfo.blackList" :key="item.id">
+              <NSpace align="center">
+                <NText>
+                  {{ item.name }}
+                </NText>
+                <NText depth="3">
+                  {{ item.id }}
+                </NText>
+                <NButton type="error" @click="unblockUser(Number(item.id))" size="small"> 移除 </NButton>
               </NSpace>
             </NListItem>
           </NList>