Megghy/vtsuru.live
1
0
Fork 0
mirror of https://github.com/Megghy/vtsuru.live.git synced 2025-12-07 02:46:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix sort

Browse Source
This commit is contained in:
Megghy
2023-12-18 10:06:01 +08:00
parent 8803550eb9
commit 4a85eaaa07
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/views/obs/QueueOBS.vue
View File

@@ -38,15 +38,15 @@ const activeItems = computed(() => {
let list = new List(queue.value).Where((q) => q?.status == QueueStatus.Waiting).OrderByDescending((q) => q.from == QueueFrom.Manual) let list = new List(queue.value).Where((q) => q?.status == QueueStatus.Waiting).OrderByDescending((q) => q.from == QueueFrom.Manual)
switch (settings.value.sortType) { switch (settings.value.sortType) {
case QueueSortType.TimeFirst: { case QueueSortType.TimeFirst: {
list = list.OrderByDescending((q) => q.createAt) list = list.ThenBy((q) => q.createAt)
break break
} }
case QueueSortType.GuardFirst: { case QueueSortType.GuardFirst: {
list = list.OrderBy((q) => q.user?.guard_level).ThenByDescending((q) => q.createAt) list = list.OrderBy((q) => q.user?.guard_level).ThenBy((q) => q.createAt)
break break
} }
case QueueSortType.PaymentFist: { case QueueSortType.PaymentFist: {
list = list.OrderByDescending((q) => q.giftPrice ?? 0).ThenByDescending((q) => q.createAt) list = list.OrderByDescending((q) => q.giftPrice ?? 0).ThenBy((q) => q.createAt)
} }
} }
if(settings.value.isReverse){ if(settings.value.isReverse){

7
src/views/open_live/OpenQueue.vue
View File

@@ -151,20 +151,21 @@ const queue = computed(() => {
.OrderByDescending((q) => q.from == QueueFrom.Manual) .OrderByDescending((q) => q.from == QueueFrom.Manual)
switch (settings.value.sortType) { switch (settings.value.sortType) {
case QueueSortType.TimeFirst: { case QueueSortType.TimeFirst: {
list = list.OrderByDescending((q) => q.createAt) list = list.ThenBy((q) => q.createAt)
break break
} }
case QueueSortType.GuardFirst: { case QueueSortType.GuardFirst: {
list = list.OrderBy((q) => q.user?.guard_level).ThenByDescending((q) => q.createAt) list = list.OrderBy((q) => q.user?.guard_level).ThenBy((q) => q.createAt)
break break
} }
case QueueSortType.PaymentFist: { case QueueSortType.PaymentFist: {
list = list.OrderByDescending((q) => q.giftPrice ?? 0).ThenByDescending((q) => q.createAt) list = list.OrderByDescending((q) => q.giftPrice ?? 0).ThenBy((q) => q.createAt)
} }
} }
if (configCanEdit.value ? settings.value.isReverse : isReverse.value) { if (configCanEdit.value ? settings.value.isReverse : isReverse.value) {
list = list.Reverse() list = list.Reverse()
} }
list = list.OrderByDescending((q) => q.status == QueueStatus.Progressing ? 1 : 0)
return list.ToArray() return list.ToArray()
}) })
const historySongs = computed(() => { const historySongs = computed(() => {