diff options
author | Chocobozzz <me@florianbigard.com> | 2019-11-29 11:16:43 +0100 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2019-11-29 11:16:43 +0100 |
commit | cb5ce4cb13095dbea6e5f05b96eaa42ffccf0716 (patch) | |
tree | fbfcb2b23b78a7dc464df22c166bee34b5b8bcb0 /server/models/activitypub | |
parent | 97ecddae104f4013d261f0e9645e8b319ff0f1a6 (diff) | |
download | PeerTube-cb5ce4cb13095dbea6e5f05b96eaa42ffccf0716.tar.gz PeerTube-cb5ce4cb13095dbea6e5f05b96eaa42ffccf0716.tar.zst PeerTube-cb5ce4cb13095dbea6e5f05b96eaa42ffccf0716.zip |
Add more filters to admin follows table
Diffstat (limited to 'server/models/activitypub')
-rw-r--r-- | server/models/activitypub/actor-follow.ts | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/server/models/activitypub/actor-follow.ts b/server/models/activitypub/actor-follow.ts index c3c4d61ab..c65b975d2 100644 --- a/server/models/activitypub/actor-follow.ts +++ b/server/models/activitypub/actor-follow.ts | |||
@@ -23,7 +23,7 @@ import { logger } from '../../helpers/logger' | |||
23 | import { getServerActor } from '../../helpers/utils' | 23 | import { getServerActor } from '../../helpers/utils' |
24 | import { ACTOR_FOLLOW_SCORE, FOLLOW_STATES, SERVER_ACTOR_NAME } from '../../initializers/constants' | 24 | import { ACTOR_FOLLOW_SCORE, FOLLOW_STATES, SERVER_ACTOR_NAME } from '../../initializers/constants' |
25 | import { ServerModel } from '../server/server' | 25 | import { ServerModel } from '../server/server' |
26 | import { createSafeIn, getSort } from '../utils' | 26 | import { createSafeIn, getSort, getFollowsSort } from '../utils' |
27 | import { ActorModel, unusedActorAttributesForAPI } from './actor' | 27 | import { ActorModel, unusedActorAttributesForAPI } from './actor' |
28 | import { VideoChannelModel } from '../video/video-channel' | 28 | import { VideoChannelModel } from '../video/video-channel' |
29 | import { AccountModel } from '../account/account' | 29 | import { AccountModel } from '../account/account' |
@@ -324,7 +324,7 @@ export class ActorFollowModel extends Model<ActorFollowModel> { | |||
324 | distinct: true, | 324 | distinct: true, |
325 | offset: start, | 325 | offset: start, |
326 | limit: count, | 326 | limit: count, |
327 | order: getSort(sort), | 327 | order: getFollowsSort(sort), |
328 | where: followWhere, | 328 | where: followWhere, |
329 | include: [ | 329 | include: [ |
330 | { | 330 | { |
@@ -391,7 +391,7 @@ export class ActorFollowModel extends Model<ActorFollowModel> { | |||
391 | distinct: true, | 391 | distinct: true, |
392 | offset: start, | 392 | offset: start, |
393 | limit: count, | 393 | limit: count, |
394 | order: getSort(sort), | 394 | order: getFollowsSort(sort), |
395 | where: followWhere, | 395 | where: followWhere, |
396 | include: [ | 396 | include: [ |
397 | { | 397 | { |