X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fmodels%2Fuser%2Fuser.ts;h=20c2222a78e16074e36c67be3f37fbf5092607bb;hb=0c9a83546687d2ae80b3f5299a8ee59d741f894f;hp=85720abfb59348a2b1547456cb7a383e96f09b8d;hpb=9a82ce2455874a80167f5ae30bb19ea12eb0551e;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/models/user/user.ts b/server/models/user/user.ts index 85720abfb..20c2222a7 100644 --- a/server/models/user/user.ts +++ b/server/models/user/user.ts @@ -22,6 +22,7 @@ import { UpdatedAt } from 'sequelize-typescript' import { TokensCache } from '@server/lib/auth/tokens-cache' +import { LiveQuotaStore } from '@server/lib/live' import { MMyUserFormattable, MUser, @@ -65,15 +66,13 @@ import { ActorModel } from '../actor/actor' import { ActorFollowModel } from '../actor/actor-follow' import { ActorImageModel } from '../actor/actor-image' import { OAuthTokenModel } from '../oauth/oauth-token' -import { getSort, throwIfNotValid } from '../utils' +import { getAdminUsersSort, throwIfNotValid } from '../utils' import { VideoModel } from '../video/video' import { VideoChannelModel } from '../video/video-channel' import { VideoImportModel } from '../video/video-import' import { VideoLiveModel } from '../video/video-live' import { VideoPlaylistModel } from '../video/video-playlist' import { UserNotificationSettingModel } from './user-notification-setting' -import { LiveQuotaStore } from '@server/lib/live' -import { logger } from '@server/helpers/logger' enum ScopeNames { FOR_ME_API = 'FOR_ME_API', @@ -462,7 +461,7 @@ export class UserModel extends Model>> { return this.count() } - static listForApi (parameters: { + static listForAdminApi (parameters: { start: number count: number sort: string @@ -498,7 +497,7 @@ export class UserModel extends Model>> { const query: FindOptions = { offset: start, limit: count, - order: getSort(sort), + order: getAdminUsersSort(sort), where }