diff options
Diffstat (limited to 'server/models')
-rw-r--r-- | server/models/actor/actor-follow.ts | 4 | ||||
-rw-r--r-- | server/models/oauth/oauth-client.ts | 4 | ||||
-rw-r--r-- | server/models/redundancy/video-redundancy.ts | 2 | ||||
-rw-r--r-- | server/models/user/user.ts | 4 | ||||
-rw-r--r-- | server/models/video/video-playlist.ts | 2 | ||||
-rw-r--r-- | server/models/video/video.ts | 2 |
6 files changed, 8 insertions, 10 deletions
diff --git a/server/models/actor/actor-follow.ts b/server/models/actor/actor-follow.ts index af1d85e9f..8870bec05 100644 --- a/server/models/actor/actor-follow.ts +++ b/server/models/actor/actor-follow.ts | |||
@@ -218,7 +218,7 @@ export class ActorFollowModel extends Model<Partial<AttributesOnly<ActorFollowMo | |||
218 | const query = { | 218 | const query = { |
219 | where: { | 219 | where: { |
220 | actorId, | 220 | actorId, |
221 | targetActorId: targetActorId | 221 | targetActorId |
222 | }, | 222 | }, |
223 | include: [ | 223 | include: [ |
224 | { | 224 | { |
@@ -372,7 +372,7 @@ export class ActorFollowModel extends Model<Partial<AttributesOnly<ActorFollowMo | |||
372 | }) { | 372 | }) { |
373 | const { actorId, start, count, sort } = options | 373 | const { actorId, start, count, sort } = options |
374 | const where = { | 374 | const where = { |
375 | actorId: actorId | 375 | actorId |
376 | } | 376 | } |
377 | 377 | ||
378 | if (options.search) { | 378 | if (options.search) { |
diff --git a/server/models/oauth/oauth-client.ts b/server/models/oauth/oauth-client.ts index 860fa6f53..457e84613 100644 --- a/server/models/oauth/oauth-client.ts +++ b/server/models/oauth/oauth-client.ts | |||
@@ -53,8 +53,8 @@ export class OAuthClientModel extends Model<Partial<AttributesOnly<OAuthClientMo | |||
53 | static getByIdAndSecret (clientId: string, clientSecret: string) { | 53 | static getByIdAndSecret (clientId: string, clientSecret: string) { |
54 | const query = { | 54 | const query = { |
55 | where: { | 55 | where: { |
56 | clientId: clientId, | 56 | clientId, |
57 | clientSecret: clientSecret | 57 | clientSecret |
58 | } | 58 | } |
59 | } | 59 | } |
60 | 60 | ||
diff --git a/server/models/redundancy/video-redundancy.ts b/server/models/redundancy/video-redundancy.ts index 6f84747da..b363afb28 100644 --- a/server/models/redundancy/video-redundancy.ts +++ b/server/models/redundancy/video-redundancy.ts | |||
@@ -530,7 +530,7 @@ export class VideoRedundancyModel extends Model<Partial<AttributesOnly<VideoRedu | |||
530 | } | 530 | } |
531 | 531 | ||
532 | if (strategy) { | 532 | if (strategy) { |
533 | Object.assign(redundancyWhere, { strategy: strategy }) | 533 | Object.assign(redundancyWhere, { strategy }) |
534 | } | 534 | } |
535 | 535 | ||
536 | const videoFilterWhere = { | 536 | const videoFilterWhere = { |
diff --git a/server/models/user/user.ts b/server/models/user/user.ts index dc260e512..3fd359359 100644 --- a/server/models/user/user.ts +++ b/server/models/user/user.ts | |||
@@ -488,9 +488,7 @@ export class UserModel extends Model<Partial<AttributesOnly<UserModel>>> { | |||
488 | } | 488 | } |
489 | 489 | ||
490 | if (blocked !== undefined) { | 490 | if (blocked !== undefined) { |
491 | Object.assign(where, { | 491 | Object.assign(where, { blocked }) |
492 | blocked: blocked | ||
493 | }) | ||
494 | } | 492 | } |
495 | 493 | ||
496 | const query: FindOptions = { | 494 | const query: FindOptions = { |
diff --git a/server/models/video/video-playlist.ts b/server/models/video/video-playlist.ts index 00cca0549..81ce3dc9e 100644 --- a/server/models/video/video-playlist.ts +++ b/server/models/video/video-playlist.ts | |||
@@ -423,7 +423,7 @@ export class VideoPlaylistModel extends Model<Partial<AttributesOnly<VideoPlayli | |||
423 | ]).then(([ count, rows ]) => ({ total: count, data: rows })) | 423 | ]).then(([ count, rows ]) => ({ total: count, data: rows })) |
424 | } | 424 | } |
425 | 425 | ||
426 | static searchForApi (options: Pick<AvailableForListOptions, 'followerActorId' | 'search'| 'host'| 'uuids'> & { | 426 | static searchForApi (options: Pick<AvailableForListOptions, 'followerActorId' | 'search' | 'host' | 'uuids'> & { |
427 | start: number | 427 | start: number |
428 | count: number | 428 | count: number |
429 | sort: string | 429 | sort: string |
diff --git a/server/models/video/video.ts b/server/models/video/video.ts index cdc1137be..53328d311 100644 --- a/server/models/video/video.ts +++ b/server/models/video/video.ts | |||
@@ -949,7 +949,7 @@ export class VideoModel extends Model<Partial<AttributesOnly<VideoModel>>> { | |||
949 | const total = totalVideos + totalVideoShares | 949 | const total = totalVideos + totalVideoShares |
950 | return { | 950 | return { |
951 | data: rows, | 951 | data: rows, |
952 | total: total | 952 | total |
953 | } | 953 | } |
954 | }) | 954 | }) |
955 | } | 955 | } |