feat: support webhooks in threads

trello-talk · Jan 20, 2025 · ba5e257 · ba5e257
1 parent 2f23ac5
commit ba5e257
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 4 deletions.
diff --git a/locale b/locale
diff --git a/src/db/postgres.ts b/src/db/postgres.ts
@@ -19,6 +19,8 @@ interface WebhookAttributes {
   guildID: string;
   webhookID: string;
   webhookToken: string;
+  threadID: string;
+  threadParent: string;
   whitelist: string;
   lists: string[];
   cards: string[];
@@ -37,6 +39,8 @@ export class Webhook extends Model<WebhookAttributes> implements WebhookAttribut
   public guildID!: string;
   public webhookID!: string;
   public webhookToken!: string;
+  public threadID!: string;
+  public threadParent!: string;
   public whitelist!: string;
   public lists!: string[];
   public cards!: string[];
@@ -86,6 +90,8 @@ Webhook.init(
     },
     webhookID: Sequelize.STRING,
     webhookToken: Sequelize.STRING,
+    threadID: Sequelize.STRING,
+    threadParent: Sequelize.STRING,
     whitelist: {
       type: Sequelize.BOOLEAN,
       allowNull: false,

diff --git a/src/util/webhookData.ts b/src/util/webhookData.ts
@@ -393,8 +393,9 @@ export default class WebhookData {
   }
 
   private async _send(embeds: any[], attempt = 1) {
+    const thread = this.webhook.threadID;
     try {
-      await request('POST', `/webhooks/${this.webhook.webhookID}/${this.webhook.webhookToken}`, {
+      await request('POST', `/webhooks/${this.webhook.webhookID}/${this.webhook.webhookToken}${thread ? `?thread_id=${thread}` : ''}`, {
         embeds
       });
     } catch (e) {
@@ -404,7 +405,9 @@ export default class WebhookData {
           await Webhook.update(
             {
               webhookID: null,
-              webhookToken: null
+              webhookToken: null,
+              threadID: null,
+              threadParent: null
             },
             { where: { id: this.webhook.id } }
           );
@@ -413,7 +416,36 @@ export default class WebhookData {
           await Webhook.update(
             {
               webhookID: null,
-              webhookToken: null
+              webhookToken: null,
+              threadID: null,
+              threadParent: null
+            },
+            { where: { id: this.webhook.id } }
+          );
+        } else if (e.code === 10003) {
+          logger.warn(`Discord webhook points to a lost thread, removing thread setting @ ${this.webhook.webhookID}:${this.webhook.id}`, e);
+          await Webhook.update(
+            {
+              threadID: null,
+              active: false
+            },
+            { where: { id: this.webhook.id } }
+          );
+        } else if (e.code === 160005) {
+          logger.warn(`Discord webhook points to a locked thread, removing thread setting @ ${this.webhook.webhookID}:${this.webhook.id}`, e);
+          await Webhook.update(
+            {
+              threadID: null,
+              active: false
+            },
+            { where: { id: this.webhook.id } }
+          );
+        } else if (e.code === 220001) {
+          logger.warn(`Discord webhook tried posting to forum channel with no thread id @ ${this.webhook.webhookID}:${this.webhook.id}`, e);
+          await Webhook.update(
+            {
+              threadID: '0',
+              active: false
             },
             { where: { id: this.webhook.id } }
           );
+16 −3		commands/en.json
+367 −85		commands/fr.json
+237 −217		webhook/fr.json