Merge branch 'release/2.3.0' into develop

[github/Chocobozzz/PeerTube.git] / server / initializers / migrations / 0315-user-notifications.ts

diff --git a/server/initializers/migrations/0315-user-notifications.ts b/server/initializers/migrations/0315-user-notifications.ts
index 8c54c5d6c9e5d48067b314f05188ed3f36c90d82..0e3f4fbef6990f467820df497631f602cee057d3 100644 (file)
--- a/server/initializers/migrations/0315-user-notifications.ts
+++ b/server/initializers/migrations/0315-user-notifications.ts
@@ -1,8 +1,8 @@
 import * as Sequelize from 'sequelize'
 
 async function up (utils: {
 import * as Sequelize from 'sequelize'
 
 async function up (utils: {

-  transaction: Sequelize.Transaction,
-  queryInterface: Sequelize.QueryInterface,
+  transaction: Sequelize.Transaction
+  queryInterface: Sequelize.QueryInterface

   sequelize: Sequelize.Sequelize
 }): Promise<void> {
 
   sequelize: Sequelize.Sequelize
 }): Promise<void> {
 


@@ -15,6 +15,9 @@ CREATE TABLE IF NOT EXISTS "userNotificationSetting" ("id" SERIAL,
 "blacklistOnMyVideo" INTEGER NOT NULL DEFAULT NULL,
 "myVideoPublished" INTEGER NOT NULL DEFAULT NULL,
 "myVideoImportFinished" INTEGER NOT NULL DEFAULT NULL,
 "blacklistOnMyVideo" INTEGER NOT NULL DEFAULT NULL,
 "myVideoPublished" INTEGER NOT NULL DEFAULT NULL,
 "myVideoImportFinished" INTEGER NOT NULL DEFAULT NULL,

+"newUserRegistration" INTEGER NOT NULL DEFAULT NULL,
+"newFollow" INTEGER NOT NULL DEFAULT NULL,
+"commentMention" INTEGER NOT NULL DEFAULT NULL,

 "userId" INTEGER REFERENCES "user" ("id") ON DELETE CASCADE ON UPDATE CASCADE,
 "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL,
 "updatedAt" TIMESTAMP WITH TIME ZONE NOT NULL,
 "userId" INTEGER REFERENCES "user" ("id") ON DELETE CASCADE ON UPDATE CASCADE,
 "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL,
 "updatedAt" TIMESTAMP WITH TIME ZONE NOT NULL,


@@ -26,8 +29,9 @@ PRIMARY KEY ("id"))
   {
     const query = 'INSERT INTO "userNotificationSetting" ' +
       '("newVideoFromSubscription", "newCommentOnMyVideo", "videoAbuseAsModerator", "blacklistOnMyVideo", ' +
   {
     const query = 'INSERT INTO "userNotificationSetting" ' +
       '("newVideoFromSubscription", "newCommentOnMyVideo", "videoAbuseAsModerator", "blacklistOnMyVideo", ' +

-      '"myVideoPublished", "myVideoImportFinished", "userId", "createdAt", "updatedAt") ' +
-      '(SELECT 2, 2, 4, 4, 2, 2, id, NOW(), NOW() FROM "user")'
+      '"myVideoPublished", "myVideoImportFinished", "newUserRegistration", "newFollow", "commentMention", ' +
+      '"userId", "createdAt", "updatedAt") ' +
+      '(SELECT 1, 1, 3, 3, 1, 1, 1, 1, 1, id, NOW(), NOW() FROM "user")'

 
     await utils.sequelize.query(query)
   }
 
     await utils.sequelize.query(query)
   }