From 8f734af8b387ed6622b19e0d9dc401efd6a93986 Mon Sep 17 00:00:00 2001
From: Megghy <megghy@qq.com>
Date: Tue, 6 May 2025 02:19:23 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0API=E6=A8=A1=E5=9E=8B?=
 =?UTF-8?q?=E5=92=8C=E7=BB=84=E4=BB=B6=E4=BB=A5=E6=94=AF=E6=8C=81=E7=AD=BE?=
 =?UTF-8?q?=E5=88=B0=E6=8E=92=E8=A1=8C=E5=BC=80=E5=85=B3=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在api-models.ts中将SongRequest更改为LiveRequest，并添加CheckInRanking
- 更新CheckInSettings.vue以支持签到排行的开关
- 在多个视图中调整签到排行的显示逻辑
- 移除不再使用的allowCheckInRanking字段
---
 src/api/api-models.ts                          |  6 +++---
 .../autoaction/settings/CheckInSettings.vue    | 12 ++++++++----
 src/components/QuestionItem.vue                |  1 -
 src/views/ViewerLayout.vue                     |  2 +-
 src/views/manage/SettingsManageView.vue        |  5 ++++-
 src/views/manage/point/PointSettings.vue       |  1 -
 src/views/open_live/LiveRequest.vue            | 18 +++++++++---------
 .../components/SongRequestSettings.vue         | 14 +++++++-------
 .../SimpleSongListTemplate.vue                 |  2 +-
 9 files changed, 33 insertions(+), 28 deletions(-)

diff --git a/src/api/api-models.ts b/src/api/api-models.ts
index 4bdd17d..2620e8e 100644
--- a/src/api/api-models.ts
+++ b/src/api/api-models.ts
@@ -239,7 +239,6 @@ export interface Setting_Point {
   maxBonusPoints: number           // 最大奖励积分
   allowSelfCheckIn: boolean        // 是否允许自己签到
   requireAuth: boolean             // 是否需要认证
-  allowCheckInRanking: boolean     // 是否允许查询签到排行
 }
 export interface Setting_QuestionDisplay {
   font?: string // Optional string, with a maximum length of 30 characters
@@ -293,10 +292,11 @@ export enum FunctionTypes {
   SongList,
   QuestionBox,
   Schedule,
-  SongRequest,
+  LiveRequest,
   Queue,
   Point,
-  VideoCollect
+  VideoCollect,
+  CheckInRanking,
 }
 export interface SongAuthorInfo {
   name: string
diff --git a/src/client/components/autoaction/settings/CheckInSettings.vue b/src/client/components/autoaction/settings/CheckInSettings.vue
index 81215f7..c46f7b6 100644
--- a/src/client/components/autoaction/settings/CheckInSettings.vue
+++ b/src/client/components/autoaction/settings/CheckInSettings.vue
@@ -148,8 +148,8 @@
 
               <NFormItem label="允许查看签到排行">
                 <NSwitch
-                  v-model:value="serverSetting.allowCheckInRanking"
-                  @update:value="updateServerSettings"
+                  :value="accountInfo.settings.enableFunctions.includes(FunctionTypes.CheckInRanking)"
+                  @update:value="updateCheckInRanking"
                 />
                 <template #feedback>
                   启用后，用户可以查看签到排行榜
@@ -381,8 +381,8 @@
 </template>
 
 <script lang="ts" setup>
-import { SaveSetting, useAccount } from '@/api/account';
-import { CheckInRankingInfo, CheckInResult } from '@/api/api-models';
+import { SaveEnableFunctions, SaveSetting, useAccount } from '@/api/account';
+import { CheckInRankingInfo, CheckInResult, FunctionTypes } from '@/api/api-models';
 import { QueryGetAPI } from '@/api/query';
 import { useAutoAction } from '@/client/store/useAutoAction';
 import { CHECKIN_API_URL } from '@/data/constants';
@@ -791,6 +791,10 @@ async function handleTestCheckIn() {
     });
   }
 }
+function updateCheckInRanking(value: boolean) {
+  accountInfo.value.settings.enableFunctions = value ? [...accountInfo.value.settings.enableFunctions, FunctionTypes.CheckInRanking] : accountInfo.value.settings.enableFunctions.filter(f => f !== FunctionTypes.CheckInRanking);
+  SaveEnableFunctions(accountInfo.value.settings.enableFunctions);
+}
 
 // 组件挂载时加载排行榜
 onMounted(() => {
diff --git a/src/components/QuestionItem.vue b/src/components/QuestionItem.vue
index 602610c..c93327f 100644
--- a/src/components/QuestionItem.vue
+++ b/src/components/QuestionItem.vue
@@ -156,7 +156,6 @@ function getScoreColor(score: number | undefined): string {
           lazy
         />
       </NSpace>
-      <NDivider style="margin: 10px 0;" />
     </template>
 
     <NText
diff --git a/src/views/ViewerLayout.vue b/src/views/ViewerLayout.vue
index 1a2f7a2..2c4b440 100644
--- a/src/views/ViewerLayout.vue
+++ b/src/views/ViewerLayout.vue
@@ -121,7 +121,7 @@
       {
         label: () => h(RouterLink, { to: { name: 'user-checkin' } }, { default: () => '签到排行' }),
         key: 'user-checkin', icon: renderIcon(CheckmarkCircle24Filled),
-        show: userInfo.value?.extra?.allowCheckInRanking
+        show: userInfo.value?.extra?.enableFunctions.includes(FunctionTypes.CheckInRanking)
       },
     ].filter(option => option.show !== false) as MenuOption[]; // 过滤掉 show 为 false 的菜单项
   }
diff --git a/src/views/manage/SettingsManageView.vue b/src/views/manage/SettingsManageView.vue
index 7618334..bf58df1 100644
--- a/src/views/manage/SettingsManageView.vue
+++ b/src/views/manage/SettingsManageView.vue
@@ -633,12 +633,15 @@
             <NCheckbox :value="FunctionTypes.Schedule">
               日程
             </NCheckbox>
-            <NCheckbox :value="FunctionTypes.SongRequest">
+            <NCheckbox :value="FunctionTypes.LiveRequest">
               点歌
             </NCheckbox>
             <NCheckbox :value="FunctionTypes.Queue">
               排队
             </NCheckbox>
+            <NCheckbox :value="FunctionTypes.CheckInRanking">
+              签到排行
+            </NCheckbox>
           </NCheckboxGroup>
 
           <NDivider> 通知 </NDivider>
diff --git a/src/views/manage/point/PointSettings.vue b/src/views/manage/point/PointSettings.vue
index 8a21ef6..ced7a31 100644
--- a/src/views/manage/point/PointSettings.vue
+++ b/src/views/manage/point/PointSettings.vue
@@ -54,7 +54,6 @@ const defaultSettingPoint: Setting_Point = {
   maxBonusPoints: 0,
   allowSelfCheckIn: false,
   requireAuth: false,
-  allowCheckInRanking: false
 }
 
 // 响应式设置对象
diff --git a/src/views/open_live/LiveRequest.vue b/src/views/open_live/LiveRequest.vue
index 716d193..5105cc5 100644
--- a/src/views/open_live/LiveRequest.vue
+++ b/src/views/open_live/LiveRequest.vue
@@ -76,12 +76,12 @@ const props = defineProps<{
 async function onUpdateFunctionEnable() {
   if (accountInfo.value.id) {
     const oldValue = JSON.parse(JSON.stringify(accountInfo.value.settings.enableFunctions))
-    if (accountInfo.value?.settings.enableFunctions.includes(FunctionTypes.SongRequest)) {
+    if (accountInfo.value?.settings.enableFunctions.includes(FunctionTypes.LiveRequest)) {
       accountInfo.value.settings.enableFunctions = accountInfo.value.settings.enableFunctions.filter(
-        (f) => f != FunctionTypes.SongRequest,
+        (f) => f != FunctionTypes.LiveRequest,
       )
     } else {
-      accountInfo.value.settings.enableFunctions.push(FunctionTypes.SongRequest)
+      accountInfo.value.settings.enableFunctions.push(FunctionTypes.LiveRequest)
     }
     if (!accountInfo.value.settings.songRequest.orderPrefix) {
       accountInfo.value.settings.songRequest.orderPrefix = songRequest.defaultPrefix
@@ -90,20 +90,20 @@ async function onUpdateFunctionEnable() {
       .then((data) => {
         if (data.code == 200) {
           message.success(
-            `已${accountInfo.value?.settings.enableFunctions.includes(FunctionTypes.SongRequest) ? '启用' : '禁用'}点播功能`,
+            `已${accountInfo.value?.settings.enableFunctions.includes(FunctionTypes.LiveRequest) ? '启用' : '禁用'}点播功能`,
           )
         } else {
           if (accountInfo.value.id) {
             accountInfo.value.settings.enableFunctions = oldValue
           }
           message.error(
-            `点播功能${accountInfo.value?.settings.enableFunctions.includes(FunctionTypes.SongRequest) ? '启用' : '禁用'}失败: ${data.message}`,
+            `点播功能${accountInfo.value?.settings.enableFunctions.includes(FunctionTypes.LiveRequest) ? '启用' : '禁用'}失败: ${data.message}`,
           )
         }
       })
       .catch((err) => {
         message.error(
-          `点播功能${accountInfo.value?.settings.enableFunctions.includes(FunctionTypes.SongRequest) ? '启用' : '禁用'}失败: ${err}`,
+          `点播功能${accountInfo.value?.settings.enableFunctions.includes(FunctionTypes.LiveRequest) ? '启用' : '禁用'}失败: ${err}`,
         )
       })
   }
@@ -158,11 +158,11 @@ onUnmounted(() => {
 <template>
   <NAlert
     v-if="accountInfo.id"
-    :type="accountInfo.settings.enableFunctions.includes(FunctionTypes.SongRequest) ? 'success' : 'warning'"
+    :type="accountInfo.settings.enableFunctions.includes(FunctionTypes.LiveRequest) ? 'success' : 'warning'"
   >
     启用弹幕点播功能
     <NSwitch
-      :value="accountInfo?.settings.enableFunctions.includes(FunctionTypes.SongRequest)"
+      :value="accountInfo?.settings.enableFunctions.includes(FunctionTypes.LiveRequest)"
       @update:value="onUpdateFunctionEnable"
     />
 
@@ -215,7 +215,7 @@ onUnmounted(() => {
   <br>
   <NCard>
     <NTabs
-      v-if="!accountInfo || accountInfo.settings.enableFunctions.includes(FunctionTypes.SongRequest)"
+      v-if="!accountInfo || accountInfo.settings.enableFunctions.includes(FunctionTypes.LiveRequest)"
       animated
       display-directive="show:lazy"
     >
diff --git a/src/views/open_live/components/SongRequestSettings.vue b/src/views/open_live/components/SongRequestSettings.vue
index ae7285a..2c1554d 100644
--- a/src/views/open_live/components/SongRequestSettings.vue
+++ b/src/views/open_live/components/SongRequestSettings.vue
@@ -24,7 +24,7 @@ const message = useMessage()
 
 const enableSongRequest = computed({
   get: () => {
-    return accountInfo.value?.settings?.enableFunctions?.includes(FunctionTypes.SongRequest) || false
+    return accountInfo.value?.settings?.enableFunctions?.includes(FunctionTypes.LiveRequest) || false
   },
   set: async () => {
     await updateEnableFunctions()
@@ -35,12 +35,12 @@ const enableSongRequest = computed({
 async function updateEnableFunctions() {
   if (accountInfo.value.id) {
     const oldValue = JSON.parse(JSON.stringify(accountInfo.value.settings.enableFunctions))
-    if (accountInfo.value?.settings.enableFunctions.includes(FunctionTypes.SongRequest)) {
+    if (accountInfo.value?.settings.enableFunctions.includes(FunctionTypes.LiveRequest)) {
       accountInfo.value.settings.enableFunctions = accountInfo.value.settings.enableFunctions.filter(
-        (f: number) => f != FunctionTypes.SongRequest,
+        (f: number) => f != FunctionTypes.LiveRequest,
       )
     } else {
-      accountInfo.value.settings.enableFunctions.push(FunctionTypes.SongRequest)
+      accountInfo.value.settings.enableFunctions.push(FunctionTypes.LiveRequest)
     }
     if (!accountInfo.value.settings.songRequest.orderPrefix) {
       accountInfo.value.settings.songRequest.orderPrefix = liveRequest.defaultPrefix
@@ -49,20 +49,20 @@ async function updateEnableFunctions() {
       .then((data) => {
         if (data.code == 200) {
           message.success(
-            `已${accountInfo.value?.settings.enableFunctions.includes(FunctionTypes.SongRequest) ? '启用' : '禁用'}点播功能`,
+            `已${accountInfo.value?.settings.enableFunctions.includes(FunctionTypes.LiveRequest) ? '启用' : '禁用'}点播功能`,
           )
         } else {
           if (accountInfo.value.id) {
             accountInfo.value.settings.enableFunctions = oldValue
           }
           message.error(
-            `点播功能${accountInfo.value?.settings.enableFunctions.includes(FunctionTypes.SongRequest) ? '启用' : '禁用'}失败: ${data.message}`,
+            `点播功能${accountInfo.value?.settings.enableFunctions.includes(FunctionTypes.LiveRequest) ? '启用' : '禁用'}失败: ${data.message}`,
           )
         }
       })
       .catch((err) => {
         message.error(
-          `点播功能${accountInfo.value?.settings.enableFunctions.includes(FunctionTypes.SongRequest) ? '启用' : '禁用'}失败: ${err}`,
+          `点播功能${accountInfo.value?.settings.enableFunctions.includes(FunctionTypes.LiveRequest) ? '启用' : '禁用'}失败: ${err}`,
         )
       })
   }
diff --git a/src/views/view/songListTemplate/SimpleSongListTemplate.vue b/src/views/view/songListTemplate/SimpleSongListTemplate.vue
index 2a669d2..d5c9760 100644
--- a/src/views/view/songListTemplate/SimpleSongListTemplate.vue
+++ b/src/views/view/songListTemplate/SimpleSongListTemplate.vue
@@ -153,7 +153,7 @@ function loadMore() {
           clearable
         />
         <NDivider />
-        <LiveRequestOBS v-if="userInfo?.extra?.enableFunctions.includes(FunctionTypes.SongRequest)" />
+        <LiveRequestOBS v-if="userInfo?.extra?.enableFunctions.includes(FunctionTypes.LiveRequest)" />
       </NSpace>
     </NCard>
     <NEmpty