From 6ab0c6dba5f4aa9dc0e5d0020819cd5650c117fa Mon Sep 17 00:00:00 2001
From: Megghy <megghy@qq.com>
Date: Tue, 30 Jul 2024 20:25:05 +0800
Subject: [PATCH] queue add danmaku content

---
 src/api/api-models.ts                      |  1 +
 src/components/FeedbackItem.vue            | 18 +++++++++++------
 src/views/manage/point/PointUserManage.vue |  1 +
 src/views/obs/QueueOBS.vue                 |  8 ++++++--
 src/views/open_live/OpenQueue.vue          | 23 ++++++++++++++++++++--
 5 files changed, 41 insertions(+), 10 deletions(-)

diff --git a/src/api/api-models.ts b/src/api/api-models.ts
index 0202754..9cd7f05 100644
--- a/src/api/api-models.ts
+++ b/src/api/api-models.ts
@@ -543,6 +543,7 @@ export interface ResponseQueueModel {
   status: QueueStatus
   from: QueueFrom
   giftPrice?: number
+  content?: string
   user?: DanmakuUserInfo
   createAt: number
   finishAt?: number | null
diff --git a/src/components/FeedbackItem.vue b/src/components/FeedbackItem.vue
index 88cbc34..098c323 100644
--- a/src/components/FeedbackItem.vue
+++ b/src/components/FeedbackItem.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { FeedbackStatus, FeedbackType, ResponseFeedbackModel } from '@/api/api-models'
-import { NCard, NTag, NEllipsis, NDivider, NSpin, NText, NSpace, NTooltip, NTime } from 'naive-ui'
+import { NCard, NTag, NEllipsis, NDivider, NSpin, NText, NSpace, NTooltip, NTime, NFlex } from 'naive-ui'
 import { computed } from 'vue'
 
 defineProps<{
@@ -9,7 +9,7 @@ defineProps<{
 </script>
 
 <template>
-  <NCard v-bind:key="item.createAt" size="small" embedded style="min-width: 300px; max-width: 500px">
+  <NCard v-bind:key="item.createAt" size="small" embedded style="width: 400px; height: 150px">
     <template #header>
       <NTag v-if="item.status == FeedbackStatus.Padding" :bordered="false"> 等待 </NTag>
       <NTag v-else-if="item.status == FeedbackStatus.Progressing" type="success">
@@ -77,14 +77,20 @@ defineProps<{
         其他
       </NTag>
     </template>
-    {{ item.message }}
+    <NFlex justify="space-between" align="center" style="height: 100%;">
+      <NEllipsis :line-clamp="item.replyMessage ? 1 : 3">
+        {{ item.message }}
+      </NEllipsis>
+    </NFlex>
     <template v-if="item.replyMessage" #footer>
       <NDivider style="margin: 0px 0 10px 0" />
       <NSpace align="center" :wrap="false">
         <div :style="`border-radius: 4px; background-color: #75c37f; width: 10px; height: 15px`"></div>
-        <NText>
-          {{ item.replyMessage }}
-        </NText>
+        <NEllipsis :line-clamp="1">
+          <NText>
+            {{ item.replyMessage }}
+          </NText>
+        </NEllipsis>
       </NSpace>
     </template>
   </NCard>
diff --git a/src/views/manage/point/PointUserManage.vue b/src/views/manage/point/PointUserManage.vue
index fcdfcd9..3c8ac85 100644
--- a/src/views/manage/point/PointUserManage.vue
+++ b/src/views/manage/point/PointUserManage.vue
@@ -30,6 +30,7 @@ import {
 import { computed, h, onMounted, ref } from 'vue'
 import PointUserDetailCard from './PointUserDetailCard.vue'
 import { Info24Filled } from '@vicons/fluent'
+import { objectsToCSV } from '@/Utils'
 
 const props = defineProps<{
   goods: ResponsePointGoodModel[]
diff --git a/src/views/obs/QueueOBS.vue b/src/views/obs/QueueOBS.vue
index 8a12ae6..7a2ed1b 100644
--- a/src/views/obs/QueueOBS.vue
+++ b/src/views/obs/QueueOBS.vue
@@ -17,6 +17,7 @@ import { useRoute } from 'vue-router'
 import { Vue3Marquee } from 'vue3-marquee'
 import { NCard, NDivider, NEmpty, NSpace, NText, useMessage } from 'naive-ui'
 import { List } from 'linqts'
+import { isSameDay } from 'date-fns'
 
 const props = defineProps<{
   id?: number
@@ -63,7 +64,10 @@ const activeItems = computed(() => {
       break
     }
     case QueueSortType.FansMedalFirst: {
-      list = list.OrderByDescending(q => q.user?.fans_medal_wearing_status ? 1 : 0).ThenByDescending((q) => q.user?.fans_medal_level ?? 0).ThenBy((q) => q.createAt)
+      list = list
+        .OrderByDescending((q) => (q.user?.fans_medal_wearing_status ? 1 : 0))
+        .ThenByDescending((q) => q.user?.fans_medal_level ?? 0)
+        .ThenBy((q) => q.createAt)
       break
     }
   }
@@ -198,7 +202,7 @@ onUnmounted(() => {
             </p>
           </span>
 
-        <NDivider v-if="isMoreThanContainer" class="queue-footer-divider" style="margin: 10px 0 10px 0" />
+          <NDivider v-if="isMoreThanContainer" class="queue-footer-divider" style="margin: 10px 0 10px 0" />
         </Vue3Marquee>
       </template>
       <div v-else style="position: relative; top: 20%">
diff --git a/src/views/open_live/OpenQueue.vue b/src/views/open_live/OpenQueue.vue
index c1032c7..0a55cf1 100644
--- a/src/views/open_live/OpenQueue.vue
+++ b/src/views/open_live/OpenQueue.vue
@@ -156,7 +156,7 @@ const queue = computed(() => {
           : q?.user?.name.toLowerCase() == filterName.value.toLowerCase()),
     )
     .Where((q) => (q?.status ?? QueueStatus.Cancel) < QueueStatus.Finish)
-    //.OrderByDescending((q) => q.from == QueueFrom.Manual)
+  //.OrderByDescending((q) => q.from == QueueFrom.Manual)
   switch (settings.value.sortType) {
     case QueueSortType.TimeFirst: {
       list = list.OrderBy((q) => q.createAt)
@@ -173,7 +173,10 @@ const queue = computed(() => {
       break
     }
     case QueueSortType.FansMedalFirst: {
-      list = list.OrderByDescending(q => q.user?.fans_medal_wearing_status ? 1 : 0).ThenByDescending((q) => q.user?.fans_medal_level ?? 0).ThenBy((q) => q.createAt)
+      list = list
+        .OrderByDescending((q) => (q.user?.fans_medal_wearing_status ? 1 : 0))
+        .ThenByDescending((q) => q.user?.fans_medal_level ?? 0)
+        .ThenBy((q) => q.createAt)
       break
     }
   }
@@ -909,6 +912,22 @@ onUnmounted(() => {
                     </template>
                     <NTime :time="queueData.createAt" />
                   </NTooltip>
+
+                  <NTooltip v-if="queueData.content" content-style="margin: 0">
+                    <template #trigger>
+                      <NText strong style="font-size: 18px">
+                        <NIcon :component="Info24Filled" />
+                      </NText>
+                    </template>
+                    <NCard size="small" :bordered="false">
+                      <template #header>
+                        <span style="font-size: small; color: gray;">
+                          {{ '来自' + (queueData?.from == QueueFrom.Gift ? '礼物' : '弹幕') + ': ' }}
+                        </span>
+                      </template>
+                      {{ queueData?.content }}
+                    </NCard>
+                  </NTooltip>
                 </NSpace>
                 <NSpace justify="end" align="center">
                   <NTooltip>