2 files changed, 28 insertions, 1 deletions

diff --git a/server/initializers/constants.ts b/server/initializers/constants.ts
index 0bb251043..6ab4d957a 100644
--- a/server/initializers/constants.ts
+++ b/server/initializers/constants.ts
@@ -23,7 +23,7 @@ import { CONFIG, registerConfigChangedHandler } from './config'
 
 // ---------------------------------------------------------------------------
 
-const LAST_MIGRATION_VERSION = 545
+const LAST_MIGRATION_VERSION = 550
 
 // ---------------------------------------------------------------------------
 
diff --git a/server/initializers/migrations/0550-actor-follow-cleanup.ts b/server/initializers/migrations/0550-actor-follow-cleanup.ts
new file mode 100644
index 000000000..8ba6feec2
--- /dev/null
+++ b/server/initializers/migrations/0550-actor-follow-cleanup.ts
@@ -0,0 +1,27 @@
+import * as Sequelize from 'sequelize'
+
+async function up (utils: {
+  transaction: Sequelize.Transaction
+  queryInterface: Sequelize.QueryInterface
+  sequelize: Sequelize.Sequelize
+}): Promise<void> {
+  const query = `
+    WITH t AS (
+      SELECT actor.id FROM actor
+      LEFT JOIN "videoChannel" ON "videoChannel"."actorId" = actor.id
+      LEFT JOIN account ON account."actorId" = "actor"."id"
+      WHERE "videoChannel".id IS NULL and "account".id IS NULL
+    ) DELETE FROM "actorFollow" WHERE "actorId" IN (SELECT t.id FROM t) OR "targetActorId" in (SELECT t.id FROM t)
+  `
+
+  await utils.sequelize.query(query)
+}
+
+function down (options) {
+  throw new Error('Not implemented.')
+}
+
+export {
+  up,
+  down
+}