db > fix error when running /setup and server doesn't have guild-wide…

… config
YappyBots · Mar 10, 2024 · 1412235 · 1412235
1 parent 6250f9e
commit 1412235
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/lib/Models/Channel.js b/lib/Models/Channel.js
@@ -67,8 +67,14 @@ const Channel = bookshelf.Model.extend(
   {
     validKeys: ['repo', 'useEmbed', 'ignoreUnknown', 'secret'],
 
-    create(channel) {
-      if (!channel?.guild) return Promise.resolve();
+    async create(channel) {
+      if (!channel?.guild?.id) return Promise.resolve();
+
+      const Guild = bookshelf.model('Guild'); // regular import doesn't work due to circular deps
+
+      // prevent failing foreign key
+      if (!(await Guild.find(channel.guild.id)))
+        await Guild.create(channel.guild);
 
       Log.info(`DB | Channels + <#${channel.id}>`);
 

diff --git a/lib/Models/plugin.js b/lib/Models/plugin.js
@@ -59,7 +59,7 @@ module.exports = (bookshelf) =>
         Log.addBreadcrumb({
           category: 'db.find',
           message: `${model.tableName} #${id} ${
-            withRelated ? `+ ${withRelated.join(', ')}` : ``
+            withRelated?.length ? `+ ${withRelated.join(', ')}` : ``
           }`,
           level: 'debug',
         });