From af112da9a84bcec547bc31fcf212ac8ad421ea0f Mon Sep 17 00:00:00 2001 From: Megghy Date: Tue, 12 Mar 2024 14:36:01 +0800 Subject: [PATCH] update song-request to live-request, add questionbox tag support --- src/api/api-models.ts | 7 +- src/components/QuestionItem.vue | 10 +- src/data/constants.ts | 2 +- src/router/manage.ts | 10 +- src/router/obs.ts | 7 +- src/router/open_live.ts | 6 +- src/store/useQuestionBox.ts | 114 +++++++++++++- src/views/AboutView.vue | 1 + src/views/ManageLayout.vue | 10 +- src/views/OpenLiveLayout.vue | 4 +- src/views/ViewerLayout.vue | 2 +- src/views/manage/DashboardView.vue | 2 +- src/views/manage/QuestionBoxManageView.vue | 123 +++++++++++---- src/views/manage/QuestionDisplayCard.vue | 6 +- src/views/manage/SettingsManageView.vue | 2 +- src/views/manage/SongListManageView.vue | 2 +- ...{SongRequestOBS.vue => LiveRequestOBS.vue} | 148 +++++++++--------- src/views/obs/QueueOBS.vue | 2 +- .../{SongRequest.vue => LiveRequest.vue} | 98 ++++++------ src/views/open_live/OpenLiveIndex.vue | 2 +- src/views/open_live/OpenQueue.vue | 2 +- src/views/others | 0 src/views/single/QuestionDisplay.vue | 8 + src/views/view/QuestionBoxView.vue | 49 +++++- src/views/view/SongListView.vue | 12 +- src/views/view/VideoCollectView.vue | 15 ++ .../DefaultSongListTemplate.vue | 18 ++- .../SimpleSongListTemplate.vue | 96 ++++++++++-- 28 files changed, 542 insertions(+), 216 deletions(-) rename src/views/obs/{SongRequestOBS.vue => LiveRequestOBS.vue} (68%) rename src/views/open_live/{SongRequest.vue => LiveRequest.vue} (93%) delete mode 100644 src/views/others create mode 100644 src/views/view/VideoCollectView.vue diff --git a/src/api/api-models.ts b/src/api/api-models.ts index e187fe1..ede1c39 100644 --- a/src/api/api-models.ts +++ b/src/api/api-models.ts @@ -98,7 +98,7 @@ export interface Setting_QuestionBox { export interface UserSetting { sendEmail: Setting_SendEmail questionBox: Setting_QuestionBox - songRequest: Setting_SongRequest + songRequest: Setting_LiveRequest queue: Setting_Queue point: Setting_Point questionDisplay: Setting_QuestionDisplay @@ -109,7 +109,7 @@ export interface UserSetting { songListTemplate: string | null scheduleTemplate: string | null } -export interface Setting_SongRequest { +export interface Setting_LiveRequest { orderPrefix: string enableOnStreaming: boolean onlyAllowSongList: boolean @@ -134,6 +134,7 @@ export interface Setting_SongRequest { showRequireInfo: boolean showUserName: boolean showFanMadelInfo: boolean + obsTitle: string isReverse: boolean } @@ -301,6 +302,8 @@ export interface QAInfo { isFavorite: boolean sendAt: number isAnonymous: boolean + + tag?: string } export interface LotteryUserInfo { name: string diff --git a/src/components/QuestionItem.vue b/src/components/QuestionItem.vue index bfa9884..6b37209 100644 --- a/src/components/QuestionItem.vue +++ b/src/components/QuestionItem.vue @@ -10,7 +10,7 @@ const props = defineProps<{