3 files changed, 18 insertions, 20 deletions

diff --git a/server/initializers/migrations/0660-object-storage.ts b/server/initializers/migrations/0660-object-storage.ts
index c815c71c6..53cb89ce6 100644
--- a/server/initializers/migrations/0660-object-storage.ts
+++ b/server/initializers/migrations/0660-object-storage.ts
@@ -24,27 +24,25 @@ async function up (utils: {
   }
 
   {
-    await utils.queryInterface.addColumn('videoFile', 'storage', { type: Sequelize.INTEGER, allowNull: true })
-  }
-  {
-    await utils.sequelize.query(
-      `UPDATE "videoFile" SET "storage" = ${VideoStorage.FILE_SYSTEM}`
-    )
-  }
-  {
-    await utils.queryInterface.changeColumn('videoFile', 'storage', { type: Sequelize.INTEGER, allowNull: false })
+    await utils.queryInterface.addColumn('videoFile', 'storage', {
+      type: Sequelize.INTEGER,
+      allowNull: true,
+      defaultValue: VideoStorage.FILE_SYSTEM
+    })
+    await utils.queryInterface.changeColumn('videoFile', 'storage', { type: Sequelize.INTEGER, allowNull: false, defaultValue: null })
   }
 
   {
-    await utils.queryInterface.addColumn('videoStreamingPlaylist', 'storage', { type: Sequelize.INTEGER, allowNull: true })
-  }
-  {
-    await utils.sequelize.query(
-      `UPDATE "videoStreamingPlaylist" SET "storage" = ${VideoStorage.FILE_SYSTEM}`
-    )
-  }
-  {
-    await utils.queryInterface.changeColumn('videoStreamingPlaylist', 'storage', { type: Sequelize.INTEGER, allowNull: false })
+    await utils.queryInterface.addColumn('videoStreamingPlaylist', 'storage', {
+      type: Sequelize.INTEGER,
+      allowNull: true,
+      defaultValue: VideoStorage.FILE_SYSTEM
+    })
+    await utils.queryInterface.changeColumn('videoStreamingPlaylist', 'storage', {
+      type: Sequelize.INTEGER,
+      allowNull: false,
+      defaultValue: null
+    })
   }
 }
 
diff --git a/server/models/user/user.ts b/server/models/user/user.ts
index 20696b1f4..069d7266e 100644
--- a/server/models/user/user.ts
+++ b/server/models/user/user.ts
@@ -958,7 +958,7 @@ export class UserModel extends Model<Partial<AttributesOnly<UserModel>>> {
   }
 
   toMeFormattedJSON (this: MMyUserFormattable): MyUser {
-    const formatted = this.toFormattedJSON()
+    const formatted = this.toFormattedJSON({ withAdminFlags: true })
 
     const specialPlaylists = this.Account.VideoPlaylists
                                  .map(p => ({ id: p.id, name: p.name, type: p.type }))
diff --git a/server/tests/api/users/users.ts b/server/tests/api/users/users.ts
index 1419ae820..318ff832a 100644
--- a/server/tests/api/users/users.ts
+++ b/server/tests/api/users/users.ts
@@ -290,7 +290,7 @@ describe('Test users', function () {
         expect(user.account.description).to.be.null
       }
 
-      expect(userMe.adminFlags).to.be.undefined
+      expect(userMe.adminFlags).to.equal(UserAdminFlag.BYPASS_VIDEO_AUTO_BLACKLIST)
       expect(userGet.adminFlags).to.equal(UserAdminFlag.BYPASS_VIDEO_AUTO_BLACKLIST)
 
       expect(userMe.specialPlaylists).to.have.lengthOf(1)