OpenCloud
/
PeerTube
mirror of https://github.com/Chocobozzz/PeerTube
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix sort inconsistency

pull/304/head
Chocobozzz 2018-02-19 09:41:03 +01:00
parent 2519d9fec6
commit 3bb6c52645
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
9 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/models/account/account.ts
View File

@ -197,7 +197,7 @@ export class AccountModel extends Model<AccountModel> {
const query = { const query = {
offset: start, offset: start,
limit: count, limit: count,
order: [ getSort(sort) ] order: getSort(sort),
} }
return AccountModel.findAndCountAll(query) return AccountModel.findAndCountAll(query)

2
server/models/account/user.ts
View File

@ -125,7 +125,7 @@ export class UserModel extends Model<UserModel> {
const query = { const query = {
offset: start, offset: start,
limit: count, limit: count,
order: [ getSort(sort) ] order: getSort(sort),
} }
return UserModel.findAndCountAll(query) return UserModel.findAndCountAll(query)

4
server/models/activitypub/actor-follow.ts
View File

@ -215,7 +215,7 @@ export class ActorFollowModel extends Model<ActorFollowModel> {
distinct: true, distinct: true,
offset: start, offset: start,
limit: count, limit: count,
order: [ getSort(sort) ], order: getSort(sort),
include: [ include: [
{ {
model: ActorModel, model: ActorModel,
@ -248,7 +248,7 @@ export class ActorFollowModel extends Model<ActorFollowModel> {
distinct: true, distinct: true,
offset: start, offset: start,
limit: count, limit: count,
order: [ getSort(sort) ], order: getSort(sort),
include: [ include: [
{ {
model: ActorModel, model: ActorModel,

14
server/models/utils.ts
View File

@ -1,5 +1,5 @@
// Translate for example "-name" to [ 'name', 'DESC' ] // Translate for example "-name" to [ [ 'name', 'DESC' ], [ 'id', 'ASC' ] ]
function getSort (value: string) { function getSort (value: string, lastSort: string[] = [ 'id', 'ASC' ]) {
let field: string let field: string
let direction: 'ASC' | 'DESC' let direction: 'ASC' | 'DESC'
@ -11,14 +11,14 @@ function getSort (value: string) {
field = value field = value
} }
return [ field, direction ] return [ [ field, direction ], lastSort ]
} }
function getSortOnModel (model: any, value: string) { function getSortOnModel (model: any, value: string, lastSort: string[] = [ 'id', 'ASC' ]) {
let sort = getSort(value) let [ firstSort ] = getSort(value)
if (model) return [ model, sort[0], sort[1] ] if (model) return [ [ model, firstSort[0], firstSort[1] ], lastSort ]
return sort return [ firstSort, lastSort ]
} }
function throwIfNotValid (value: any, validator: (value: any) => boolean, fieldName = 'value') { function throwIfNotValid (value: any, validator: (value: any) => boolean, fieldName = 'value') {

2
server/models/video/video-abuse.ts
View File

@ -64,7 +64,7 @@ export class VideoAbuseModel extends Model<VideoAbuseModel> {
const query = { const query = {
offset: start, offset: start,
limit: count, limit: count,
order: [ getSort(sort) ], order: getSort(sort),
include: [ include: [
{ {
model: AccountModel, model: AccountModel,

2
server/models/video/video-blacklist.ts
View File

@ -36,7 +36,7 @@ export class VideoBlacklistModel extends Model<VideoBlacklistModel> {
const query = { const query = {
offset: start, offset: start,
limit: count, limit: count,
order: [ getSortOnModel(sort.sortModel, sort.sortValue) ], order: getSortOnModel(sort.sortModel, sort.sortValue),
include: [ { model: VideoModel } ] include: [ { model: VideoModel } ]
} }

4
server/models/video/video-channel.ts
View File

@ -151,7 +151,7 @@ export class VideoChannelModel extends Model<VideoChannelModel> {
const query = { const query = {
offset: start, offset: start,
limit: count, limit: count,
order: [ getSort(sort) ] order: getSort(sort)
} }
return VideoChannelModel return VideoChannelModel
@ -164,7 +164,7 @@ export class VideoChannelModel extends Model<VideoChannelModel> {
static listByAccount (accountId: number) { static listByAccount (accountId: number) {
const query = { const query = {
order: [ getSort('createdAt') ], order: getSort('createdAt'),
include: [ include: [
{ {
model: AccountModel, model: AccountModel,

2
server/models/video/video-comment.ts
View File

@ -268,7 +268,7 @@ export class VideoCommentModel extends Model<VideoCommentModel> {
const query = { const query = {
offset: start, offset: start,
limit: count, limit: count,
order: [ getSort(sort) ], order: getSort(sort),
where: { where: {
videoId, videoId,
inReplyToCommentId: null inReplyToCommentId: null

8
server/models/video/video.ts
View File

@ -493,7 +493,7 @@ export class VideoModel extends Model<VideoModel> {
distinct: true, distinct: true,
offset: start, offset: start,
limit: count, limit: count,
order: [ getSort('createdAt'), [ 'Tags', 'name', 'ASC' ] ], order: getSort('createdAt', [ 'Tags', 'name', 'ASC' ]),
where: { where: {
id: { id: {
[Sequelize.Op.in]: Sequelize.literal('(' + rawQuery + ')') [Sequelize.Op.in]: Sequelize.literal('(' + rawQuery + ')')
@ -607,7 +607,7 @@ export class VideoModel extends Model<VideoModel> {
const query = { const query = {
offset: start, offset: start,
limit: count, limit: count,
order: [ getSort(sort) ], order: getSort(sort),
include: [ include: [
{ {
model: VideoChannelModel, model: VideoChannelModel,
@ -637,7 +637,7 @@ export class VideoModel extends Model<VideoModel> {
const query = { const query = {
offset: start, offset: start,
limit: count, limit: count,
order: [ getSort(sort) ] order: getSort(sort),
} }
const serverActor = await getServerActor() const serverActor = await getServerActor()
@ -656,7 +656,7 @@ export class VideoModel extends Model<VideoModel> {
const query: IFindOptions<VideoModel> = { const query: IFindOptions<VideoModel> = {
offset: start, offset: start,
limit: count, limit: count,
order: [ getSort(sort) ], order: getSort(sort),
where: { where: {
name: { name: {
[Sequelize.Op.iLike]: '%' + value + '%' [Sequelize.Op.iLike]: '%' + value + '%'