diff options
Diffstat (limited to 'server/models')
-rw-r--r-- | server/models/shared/sort.ts | 14 | ||||
-rw-r--r-- | server/models/video/sql/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' ]): | |||
44 | return getSort(value, lastSort) | 44 | return getSort(value, lastSort) |
45 | } | 45 | } |
46 | 46 | ||
47 | function getCommentSort (value: string, lastSort: OrderItem = [ 'id', 'ASC' ]): OrderItem[] { | ||
48 | const { direction, field } = buildSortDirectionAndField(value) | ||
49 | |||
50 | if (field === 'totalReplies') { | ||
51 | return [ | ||
52 | [ 'totalReplies', direction ], | ||
53 | lastSort | ||
54 | ] | ||
55 | } | ||
56 | |||
57 | return getSort(value, lastSort) | ||
58 | } | ||
59 | |||
60 | function getVideoSort (value: string, lastSort: OrderItem = [ 'id', 'ASC' ]): OrderItem[] { | 47 | function getVideoSort (value: string, lastSort: OrderItem = [ 'id', 'ASC' ]): OrderItem[] { |
61 | const { direction, field } = buildSortDirectionAndField(value) | 48 | const { direction, field } = buildSortDirectionAndField(value) |
62 | 49 | ||
@@ -151,7 +138,6 @@ export { | |||
151 | buildSortDirectionAndField, | 138 | buildSortDirectionAndField, |
152 | getPlaylistSort, | 139 | getPlaylistSort, |
153 | getSort, | 140 | getSort, |
154 | getCommentSort, | ||
155 | getAdminUsersSort, | 141 | getAdminUsersSort, |
156 | getVideoSort, | 142 | getVideoSort, |
157 | getBlacklistSort, | 143 | 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 @@ | |||
1 | import { Model, Sequelize, Transaction } from 'sequelize' | 1 | import { Model, Sequelize, Transaction } from 'sequelize' |
2 | import { AbstractRunQuery, ModelBuilder } from '@server/models/shared' | 2 | import { AbstractRunQuery, ModelBuilder } from '@server/models/shared' |
3 | import { ActorImageType, VideoPrivacy } from '@shared/models' | 3 | import { ActorImageType, VideoPrivacy } from '@shared/models' |
4 | import { createSafeIn, getCommentSort, parseRowCountResult } from '../../../shared' | 4 | import { createSafeIn, getSort, parseRowCountResult } from '../../../shared' |
5 | import { VideoCommentTableAttributes } from './video-comment-table-attributes' | 5 | import { VideoCommentTableAttributes } from './video-comment-table-attributes' |
6 | 6 | ||
7 | export interface ListVideoCommentsOptions { | 7 | export interface ListVideoCommentsOptions { |
@@ -384,7 +384,7 @@ export class VideoCommentListQueryBuilder extends AbstractRunQuery { | |||
384 | private getOrder () { | 384 | private getOrder () { |
385 | if (!this.options.sort) return '' | 385 | if (!this.options.sort) return '' |
386 | 386 | ||
387 | const orders = getCommentSort(this.options.sort) | 387 | const orders = getSort(this.options.sort) |
388 | 388 | ||
389 | return 'ORDER BY ' + orders.map(o => `"${o[0]}" ${o[1]}`).join(', ') | 389 | return 'ORDER BY ' + orders.map(o => `"${o[0]}" ${o[1]}`).join(', ') |
390 | } | 390 | } |