diff options
Diffstat (limited to 'server/models/actor')
-rw-r--r-- | server/models/actor/actor-follow.ts | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/server/models/actor/actor-follow.ts b/server/models/actor/actor-follow.ts index 3a09e51d6..83c00a22d 100644 --- a/server/models/actor/actor-follow.ts +++ b/server/models/actor/actor-follow.ts | |||
@@ -324,13 +324,13 @@ export class ActorFollowModel extends Model<Partial<AttributesOnly<ActorFollowMo | |||
324 | 324 | ||
325 | const followWhere = state ? { state } : {} | 325 | const followWhere = state ? { state } : {} |
326 | const followingWhere: WhereOptions = {} | 326 | const followingWhere: WhereOptions = {} |
327 | const followingServerWhere: WhereOptions = {} | ||
328 | 327 | ||
329 | if (search) { | 328 | if (search) { |
330 | Object.assign(followingServerWhere, { | 329 | Object.assign(followWhere, { |
331 | host: { | 330 | [Op.or]: [ |
332 | [Op.iLike]: '%' + search + '%' | 331 | searchAttribute(options.search, '$ActorFollowing.preferredUsername$'), |
333 | } | 332 | searchAttribute(options.search, '$ActorFollowing.Server.host$') |
333 | ] | ||
334 | }) | 334 | }) |
335 | } | 335 | } |
336 | 336 | ||
@@ -361,8 +361,7 @@ export class ActorFollowModel extends Model<Partial<AttributesOnly<ActorFollowMo | |||
361 | include: [ | 361 | include: [ |
362 | { | 362 | { |
363 | model: ServerModel, | 363 | model: ServerModel, |
364 | required: true, | 364 | required: true |
365 | where: followingServerWhere | ||
366 | } | 365 | } |
367 | ] | 366 | ] |
368 | } | 367 | } |
@@ -391,13 +390,13 @@ export class ActorFollowModel extends Model<Partial<AttributesOnly<ActorFollowMo | |||
391 | 390 | ||
392 | const followWhere = state ? { state } : {} | 391 | const followWhere = state ? { state } : {} |
393 | const followerWhere: WhereOptions = {} | 392 | const followerWhere: WhereOptions = {} |
394 | const followerServerWhere: WhereOptions = {} | ||
395 | 393 | ||
396 | if (search) { | 394 | if (search) { |
397 | Object.assign(followerServerWhere, { | 395 | Object.assign(followWhere, { |
398 | host: { | 396 | [Op.or]: [ |
399 | [Op.iLike]: '%' + search + '%' | 397 | searchAttribute(search, '$ActorFollower.preferredUsername$'), |
400 | } | 398 | searchAttribute(search, '$ActorFollower.Server.host$') |
399 | ] | ||
401 | }) | 400 | }) |
402 | } | 401 | } |
403 | 402 | ||
@@ -420,8 +419,7 @@ export class ActorFollowModel extends Model<Partial<AttributesOnly<ActorFollowMo | |||
420 | include: [ | 419 | include: [ |
421 | { | 420 | { |
422 | model: ServerModel, | 421 | model: ServerModel, |
423 | required: true, | 422 | required: true |
424 | where: followerServerWhere | ||
425 | } | 423 | } |
426 | ] | 424 | ] |
427 | }, | 425 | }, |