From 8a1b8802b34080bf1bb7668e86a23e51d7f345ac Mon Sep 17 00:00:00 2001
From: Dragory <dragory.up@gmail.com>
Date: Mon, 19 Feb 2018 00:49:44 +0200
Subject: [PATCH] legacyMigrator: possible fix for last commit

---
 src/legacy/legacyMigrator.js | 66 ++++++++++++++++++++----------------
 1 file changed, 36 insertions(+), 30 deletions(-)

diff --git a/src/legacy/legacyMigrator.js b/src/legacy/legacyMigrator.js
index be8df88..24ec71a 100644
--- a/src/legacy/legacyMigrator.js
+++ b/src/legacy/legacyMigrator.js
@@ -69,44 +69,50 @@ async function shouldMigrate() {
 
 async function migrateOpenThreads() {
   const bot = new Eris.Client(config.token);
-  await bot.connect();
 
-  const oldThreads = await jsonDb.get('threads', []);
-  const promises = oldThreads.map(async oldThread => {
-    const existingOpenThread = await knex('threads')
-      .where('channel_id', oldThread.channelId)
-      .first();
+  return new Promise(resolve => {
+    bot.on('ready', async () => {
+      const oldThreads = await jsonDb.get('threads', []);
 
-    if (existingOpenThread) return;
+      const promises = oldThreads.map(async oldThread => {
+        const existingOpenThread = await knex('threads')
+          .where('channel_id', oldThread.channelId)
+          .first();
 
-    const threadMessages = await bot.getChannel(oldThread.channelId).getMessages(1000);
-    const log = threadMessages.reverse().map(msg => {
-      const date = moment.utc(msg.timestamp, 'x').format('YYYY-MM-DD HH:mm:ss');
-      return `[${date}] ${msg.author.username}#${msg.author.discriminator}: ${msg.content}`;
-    }).join('\n') + '\n';
+        if (existingOpenThread) return;
 
-    const newThread = {
-      status: THREAD_STATUS.OPEN,
-      user_id: oldThread.userId,
-      user_name: oldThread.username,
-      channel_id: oldThread.channelId,
-      is_legacy: 1
-    };
+        const threadMessages = await bot.getChannel(oldThread.channelId).getMessages(1000);
+        const log = threadMessages.reverse().map(msg => {
+          const date = moment.utc(msg.timestamp, 'x').format('YYYY-MM-DD HH:mm:ss');
+          return `[${date}] ${msg.author.username}#${msg.author.discriminator}: ${msg.content}`;
+        }).join('\n') + '\n';
 
-    const threadId = await threads.createThreadInDB(newThread);
+        const newThread = {
+          status: THREAD_STATUS.OPEN,
+          user_id: oldThread.userId,
+          user_name: oldThread.username,
+          channel_id: oldThread.channelId,
+          is_legacy: 1
+        };
 
-    await trx('thread_messages').insert({
-      thread_id: threadId,
-      message_type: THREAD_MESSAGE_TYPE.LEGACY,
-      user_id: oldThread.userId,
-      user_name: '',
-      body: log,
-      is_anonymous: 0,
-      created_at: moment.utc().format('YYYY-MM-DD HH:mm:ss')
+        const threadId = await threads.createThreadInDB(newThread);
+
+        await trx('thread_messages').insert({
+          thread_id: threadId,
+          message_type: THREAD_MESSAGE_TYPE.LEGACY,
+          user_id: oldThread.userId,
+          user_name: '',
+          body: log,
+          is_anonymous: 0,
+          created_at: moment.utc().format('YYYY-MM-DD HH:mm:ss')
+        });
+      });
+
+      resolve(Promise.all(promises));
     });
-  });
 
-  return Promise.all(promises);
+    bot.connect();
+  });
 }
 
 async function migrateLogs() {