aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/models
diff options
context:
space:
mode:
Diffstat (limited to 'server/models')
-rw-r--r--server/models/user/user.ts2
-rw-r--r--server/models/utils.ts2
-rw-r--r--server/models/video/video-file.ts2
3 files changed, 3 insertions, 3 deletions
diff --git a/server/models/user/user.ts b/server/models/user/user.ts
index 4ad76e5bc..e7bf22806 100644
--- a/server/models/user/user.ts
+++ b/server/models/user/user.ts
@@ -623,7 +623,7 @@ export class UserModel extends Model<Partial<AttributesOnly<UserModel>>> {
623 const query = { 623 const query = {
624 where: { 624 where: {
625 [Op.or]: [ 625 [Op.or]: [
626 where(fn('lower', col('username')), fn('lower', username)), 626 where(fn('lower', col('username')), '=', fn('lower', username)),
627 627
628 { email } 628 { email }
629 ] 629 ]
diff --git a/server/models/utils.ts b/server/models/utils.ts
index 8c694d4e5..0950f5f32 100644
--- a/server/models/utils.ts
+++ b/server/models/utils.ts
@@ -1,5 +1,5 @@
1import { literal, Op, OrderItem, Sequelize } from 'sequelize' 1import { literal, Op, OrderItem, Sequelize } from 'sequelize'
2import { Col } from 'sequelize/types/lib/utils' 2import { Col } from 'sequelize/types/utils'
3import validator from 'validator' 3import validator from 'validator'
4 4
5type SortType = { sortModel: string, sortValue: string } 5type SortType = { sortModel: string, sortValue: string }
diff --git a/server/models/video/video-file.ts b/server/models/video/video-file.ts
index 6f03fae3a..1a9f4561a 100644
--- a/server/models/video/video-file.ts
+++ b/server/models/video/video-file.ts
@@ -18,7 +18,7 @@ import {
18 Table, 18 Table,
19 UpdatedAt 19 UpdatedAt
20} from 'sequelize-typescript' 20} from 'sequelize-typescript'
21import { Where } from 'sequelize/types/lib/utils' 21import { Where } from 'sequelize/types/utils'
22import validator from 'validator' 22import validator from 'validator'
23import { buildRemoteVideoBaseUrl } from '@server/helpers/activitypub' 23import { buildRemoteVideoBaseUrl } from '@server/helpers/activitypub'
24import { logger } from '@server/helpers/logger' 24import { logger } from '@server/helpers/logger'