From eba2a7a834c4ef5a409e80021faad54ceef4e6d8 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Thu, 12 Jan 2023 11:19:42 +0100 Subject: [PATCH] Don't need a special comment sort function --- server/models/shared/sort.ts | 14 -------------- .../comment/video-comment-list-query-builder.ts | 4 ++-- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/server/models/shared/sort.ts b/server/models/shared/sort.ts index a9a093099..d923072f2 100644 --- a/server/models/shared/sort.ts +++ b/server/models/shared/sort.ts @@ -44,19 +44,6 @@ function getPlaylistSort (value: string, lastSort: OrderItem = [ 'id', 'ASC' ]): return getSort(value, lastSort) } -function getCommentSort (value: string, lastSort: OrderItem = [ 'id', 'ASC' ]): OrderItem[] { - const { direction, field } = buildSortDirectionAndField(value) - - if (field === 'totalReplies') { - return [ - [ 'totalReplies', direction ], - lastSort - ] - } - - return getSort(value, lastSort) -} - function getVideoSort (value: string, lastSort: OrderItem = [ 'id', 'ASC' ]): OrderItem[] { const { direction, field } = buildSortDirectionAndField(value) @@ -151,7 +138,6 @@ export { buildSortDirectionAndField, getPlaylistSort, getSort, - getCommentSort, getAdminUsersSort, getVideoSort, getBlacklistSort, diff --git a/server/models/video/sql/comment/video-comment-list-query-builder.ts b/server/models/video/sql/comment/video-comment-list-query-builder.ts index 6d752d4a4..a7eed22a1 100644 --- a/server/models/video/sql/comment/video-comment-list-query-builder.ts +++ b/server/models/video/sql/comment/video-comment-list-query-builder.ts @@ -1,7 +1,7 @@ import { Model, Sequelize, Transaction } from 'sequelize' import { AbstractRunQuery, ModelBuilder } from '@server/models/shared' import { ActorImageType, VideoPrivacy } from '@shared/models' -import { createSafeIn, getCommentSort, parseRowCountResult } from '../../../shared' +import { createSafeIn, getSort, parseRowCountResult } from '../../../shared' import { VideoCommentTableAttributes } from './video-comment-table-attributes' export interface ListVideoCommentsOptions { @@ -384,7 +384,7 @@ export class VideoCommentListQueryBuilder extends AbstractRunQuery { private getOrder () { if (!this.options.sort) return '' - const orders = getCommentSort(this.options.sort) + const orders = getSort(this.options.sort) return 'ORDER BY ' + orders.map(o => `"${o[0]}" ${o[1]}`).join(', ') }