Upgrade common server dependencies

3 files changed, 6 insertions, 3 deletions

diff --git a/server/models/user/user-video-rate-interface.ts b/server/models/user/user-video-rate-interface.ts
index 4e6efc01a..ea0fdc4d9 100644
--- a/server/models/user/user-video-rate-interface.ts
+++ b/server/models/user/user-video-rate-interface.ts
@@ -13,6 +13,8 @@ export interface UserVideoRateClass {
 
 export interface UserVideoRateAttributes {
   type: VideoRateType
+  userId: number
+  videoId: number
 }
 
 export interface UserVideoRateInstance extends UserVideoRateClass, UserVideoRateAttributes, Sequelize.Instance<UserVideoRateAttributes> {
diff --git a/server/models/user/user-video-rate.ts b/server/models/user/user-video-rate.ts
index c14598650..7d6dd7281 100644
--- a/server/models/user/user-video-rate.ts
+++ b/server/models/user/user-video-rate.ts
@@ -66,7 +66,7 @@ function associate (models) {
 }
 
 load = function (userId: number, videoId: number, transaction: Sequelize.Transaction) {
-  const options: Sequelize.FindOptions = {
+  const options: Sequelize.FindOptions<UserVideoRateAttributes> = {
     where: {
       userId,
       videoId
diff --git a/server/models/user/user.ts b/server/models/user/user.ts
index e1b933988..d481fa13c 100644
--- a/server/models/user/user.ts
+++ b/server/models/user/user.ts
@@ -198,7 +198,7 @@ loadById = function (id: number) {
 loadByUsername = function (username: string) {
   const query = {
     where: {
-      username: username
+      username
     }
   }
 
@@ -212,5 +212,6 @@ loadByUsernameOrEmail = function (username: string, email: string) {
     }
   }
 
-  return User.findOne(query)
+  // FIXME: https://github.com/DefinitelyTyped/DefinitelyTyped/issues/18387
+  return (User as any).findOne(query)
 }