Fix update host script

[github/Chocobozzz/PeerTube.git] / server / models / account / account.ts

diff --git a/server/models/account/account.ts b/server/models/account/account.ts
index 464105261a463bba2e58b03dae10cce89fc5ab29..faf5fa841f5ca3c645cea15e37d736f458329d8d 100644 (file)
--- a/server/models/account/account.ts
+++ b/server/models/account/account.ts
@@ -1,29 +1,24 @@
 import * as Sequelize from 'sequelize'
 
 import {
-  isUserUsernameValid,
-  isAccountPublicKeyValid,
-  isAccountUrlValid,
-  isAccountPrivateKeyValid,
+  activityPubContextify,
   isAccountFollowersCountValid,
+  isAccountFollowersValid,
   isAccountFollowingCountValid,
+  isAccountFollowingValid,
   isAccountInboxValid,
   isAccountOutboxValid,
+  isAccountPrivateKeyValid,
+  isAccountPublicKeyValid,
   isAccountSharedInboxValid,
-  isAccountFollowersValid,
-  isAccountFollowingValid,
-  activityPubContextify
+  isAccountUrlValid,
+  isUserUsernameValid
 } from '../../helpers'
-
-import { addMethodsToModel, getSort } from '../utils'
-import {
-  AccountInstance,
-  AccountAttributes,
-
-  AccountMethods
-} from './account-interface'
-import { sendDeleteAccount } from '../../lib/activitypub/send-request'
 import { CONFIG, CONSTRAINTS_FIELDS } from '../../initializers/constants'
+import { sendDeleteAccount } from '../../lib/activitypub/send-request'
+
+import { addMethodsToModel } from '../utils'
+import { AccountAttributes, AccountInstance, AccountMethods } from './account-interface'
 
 let Account: Sequelize.Model<AccountInstance, AccountAttributes>
 let loadAccountByServerAndUUID: AccountMethods.LoadAccountByServerAndUUID
@@ -75,7 +70,7 @@ export default function defineAccount (sequelize: Sequelize.Sequelize, DataTypes
       },
       publicKey: {
         type: DataTypes.STRING(CONSTRAINTS_FIELDS.ACCOUNTS.PUBLIC_KEY.max),
-        allowNull: false,
+        allowNull: true,
         validate: {
           publicKeyValid: value => {
             const res = isAccountPublicKeyValid(value)
@@ -263,6 +258,7 @@ function associate (models) {
       name: 'targetAccountId',
       allowNull: false
     },
+    as: 'followers',
     onDelete: 'cascade'
   })
 }