From 444459629673741a1b6bf1b1028b125ea64bc025 Mon Sep 17 00:00:00 2001 From: Lindsay Gilbert Date: Wed, 26 Aug 2026 09:32:33 -0400 Subject: [PATCH 1/2] await message handler, add error logs --- src/Classes/APIBots/utils.ts | 5 +- src/Classes/ArtIndexerBot.ts | 13 +++++ src/Classes/ProjectBot.ts | 81 ++++++++++++++++++++---------- src/ProjectConfig/projectConfig.ts | 4 +- src/index.ts | 10 ++-- 5 files changed, 78 insertions(+), 35 deletions(-) diff --git a/src/Classes/APIBots/utils.ts b/src/Classes/APIBots/utils.ts index 2b7fb111..fa088fe9 100644 --- a/src/Classes/APIBots/utils.ts +++ b/src/Classes/APIBots/utils.ts @@ -402,7 +402,10 @@ export async function replaceVideoWithGIF(url: string) { // some GIFs are not available, so we fallback to PNG try { - const resp = await fetch(gifURL) + const controller = new AbortController() + const timeoutId = setTimeout(() => controller.abort(), 10000) + const resp = await fetch(gifURL, { signal: controller.signal }) + clearTimeout(timeoutId) if (!resp.ok) { if (resp.status === 404) { diff --git a/src/Classes/ArtIndexerBot.ts b/src/Classes/ArtIndexerBot.ts index b659398b..228cda2d 100644 --- a/src/Classes/ArtIndexerBot.ts +++ b/src/Classes/ArtIndexerBot.ts @@ -524,9 +524,22 @@ export class ArtIndexerBot { if (!projectBot) { logger.info({ content }, "Wasn't able to parse message") + msg.channel.send( + `Sorry, I wasn't able to understand that: ${content}` + ) return } + logger.info( + { + content, + messageType, + projectName: projectBot.projectName, + projectId: projectBot.id, + }, + 'Resolved # command to project' + ) + if ( messageType === MessageTypes.ARTIST && triviaBot.isArtistActiveTriviaAnswer(projectBot?.artistName) diff --git a/src/Classes/ProjectBot.ts b/src/Classes/ProjectBot.ts index f9473ff8..82e775d8 100644 --- a/src/Classes/ProjectBot.ts +++ b/src/Classes/ProjectBot.ts @@ -11,6 +11,7 @@ import { PROJECTBOT_EXPLORE_UTM, PROJECTBOT_UTM, ethFromWeiString, + buildGeneratorUrl, getProjectSlugUrl, getTokenApiUrl, getTokenUrl, @@ -278,6 +279,9 @@ export class ProjectBot { { err: e, msgContent: msg.content, tokenId: `${this.coreContract}-${tokenID}` }, 'Error getting token metadata' ) + await msg.channel.send( + `Sorry, I couldn't load that ${this.projectName} token. Try again in a bit!` + ) return } let external_url = tokenMetadata.contract?.token_base_url @@ -322,40 +326,63 @@ export class ProjectBot { PROJECTBOT_UTM : '' - const embedContent = new EmbedBuilder() - // Set the title of the field. - .setTitle(title) - // Add link to title. - .setURL(titleLink) - // Set the full image for embed. - .setImage(assetUrl) + const generatorUrl = tokenMetadata.live_view_url + ? tokenMetadata.live_view_url + PROJECTBOT_UTM + : buildGeneratorUrl(this.chainId, this.coreContract, tokenID) + + PROJECTBOT_UTM + + try { + const embedContent = new EmbedBuilder().setTitle(title) + + if (titleLink.startsWith('http')) { + embedContent.setURL(titleLink) + } + if (assetUrl.startsWith('http')) { + embedContent.setImage(assetUrl) + } + + if (ownerText) { + embedContent.addFields({ + name: 'Owner', + value: `[${ownerText}](${ownerProfileLink})`, + inline: true, + }) + } - if (ownerText) { embedContent.addFields({ - name: 'Owner', - value: `[${ownerText}](${ownerProfileLink})`, + name: 'Live Script', + value: `[Generator](${generatorUrl})`, inline: true, }) - } - embedContent.addFields({ - name: 'Live Script', - value: `[Generator](${tokenMetadata.live_view_url + PROJECTBOT_UTM})`, - inline: true, - }) + const listPrice = tokenMetadata.list_price + const listCurrencySymbol = tokenMetadata.list_currency_symbol + if (listPrice && listCurrencySymbol) { + embedContent.addFields({ + name: 'Buy Now', + value: `[${listPrice} ${listCurrencySymbol} on Art Blocks Marketplace](${ + tokenUrl + PROJECTBOT_BUY_UTM + })`, + }) + } - const listPrice = tokenMetadata.list_price - const listCurrencySymbol = tokenMetadata.list_currency_symbol - if (listPrice && listCurrencySymbol) { - embedContent.addFields({ - name: 'Buy Now', - value: `[${listPrice} ${listCurrencySymbol} on Art Blocks Marketplace](${ - tokenUrl + PROJECTBOT_BUY_UTM - })`, - }) + await msg.channel.send({ embeds: [embedContent] }) + } catch (err) { + logger.error( + { + err, + msgContent: msg.content, + projectName: this.projectName, + tokenId: `${this.coreContract}-${tokenID}`, + titleLink, + assetUrl, + }, + 'Error sending token embed' + ) + await msg.channel.send( + `Sorry, I found ${this.projectName} but couldn't post it. Try again in a bit!` + ) } - - msg.channel.send({ embeds: [embedContent] }) } async sendBirthdayMessage(channels: Collection) { diff --git a/src/ProjectConfig/projectConfig.ts b/src/ProjectConfig/projectConfig.ts index 8384232b..df09fab5 100644 --- a/src/ProjectConfig/projectConfig.ts +++ b/src/ProjectConfig/projectConfig.ts @@ -261,7 +261,7 @@ export class ProjectConfig { * @param {string} channelID Channel ID the incoming msg has been sent from. * @param msg Incoming discord.js message object */ - routeProjectNumberMsg(channelID: string, msg: Message) { + async routeProjectNumberMsg(channelID: string, msg: Message) { const channel = this.channels[channelID] const botName = channel.botNameFromNumberMsgContent( msg.content.toLowerCase() @@ -271,6 +271,6 @@ export class ProjectConfig { logger.error({ channelID }, 'Channel does not have a ProjectBot') return } - this.projectBots[botName].handleNumberMessage(msg) + await this.projectBots[botName].handleNumberMessage(msg) } } diff --git a/src/index.ts b/src/index.ts index 6f085459..cee54102 100644 --- a/src/index.ts +++ b/src/index.ts @@ -470,23 +470,23 @@ discordClient.on(Events.MessageCreate, async (msg) => { if (msgContent.startsWith('#')) { switch (channelID) { case CHANNEL_ENGINE_CHAT: - pbabIndexerBot.handleNumberMessage(msg) + await pbabIndexerBot.handleNumberMessage(msg) break case CHANNEL_AB_X_PACE: - abXpaceIndexerBot.handleNumberMessage(msg) + await abXpaceIndexerBot.handleNumberMessage(msg) break case CHANNEL_AB_X_BM: - abXbmIndexerBot.handleNumberMessage(msg) + await abXbmIndexerBot.handleNumberMessage(msg) break case CHANNEL_BLOCK_TALK: case CHANNEL_FACTORY: case CHANNEL_ARTBOT_TESTING: case CHANNEL_ART_CHAT: - artIndexerBot.handleNumberMessage(msg) + await artIndexerBot.handleNumberMessage(msg) break // Fall-back - expect a project bot to handle default: - projectConfig.routeProjectNumberMsg(channelID, msg) + await projectConfig.routeProjectNumberMsg(channelID, msg) break } return From bf0c914a2ed389fa48a71b60d6cf2532eac7ed35 Mon Sep 17 00:00:00 2001 From: Lindsay Gilbert Date: Wed, 26 Aug 2026 09:35:51 -0400 Subject: [PATCH 2/2] updates --- src/Classes/APIBots/utils.ts | 5 +---- src/Classes/ArtIndexerBot.ts | 3 --- src/Classes/ProjectBot.ts | 29 ++++++++--------------------- 3 files changed, 9 insertions(+), 28 deletions(-) diff --git a/src/Classes/APIBots/utils.ts b/src/Classes/APIBots/utils.ts index fa088fe9..2b7fb111 100644 --- a/src/Classes/APIBots/utils.ts +++ b/src/Classes/APIBots/utils.ts @@ -402,10 +402,7 @@ export async function replaceVideoWithGIF(url: string) { // some GIFs are not available, so we fallback to PNG try { - const controller = new AbortController() - const timeoutId = setTimeout(() => controller.abort(), 10000) - const resp = await fetch(gifURL, { signal: controller.signal }) - clearTimeout(timeoutId) + const resp = await fetch(gifURL) if (!resp.ok) { if (resp.status === 404) { diff --git a/src/Classes/ArtIndexerBot.ts b/src/Classes/ArtIndexerBot.ts index 228cda2d..f300a6bb 100644 --- a/src/Classes/ArtIndexerBot.ts +++ b/src/Classes/ArtIndexerBot.ts @@ -524,9 +524,6 @@ export class ArtIndexerBot { if (!projectBot) { logger.info({ content }, "Wasn't able to parse message") - msg.channel.send( - `Sorry, I wasn't able to understand that: ${content}` - ) return } diff --git a/src/Classes/ProjectBot.ts b/src/Classes/ProjectBot.ts index 82e775d8..506cf7de 100644 --- a/src/Classes/ProjectBot.ts +++ b/src/Classes/ProjectBot.ts @@ -11,7 +11,6 @@ import { PROJECTBOT_EXPLORE_UTM, PROJECTBOT_UTM, ethFromWeiString, - buildGeneratorUrl, getProjectSlugUrl, getTokenApiUrl, getTokenUrl, @@ -279,9 +278,6 @@ export class ProjectBot { { err: e, msgContent: msg.content, tokenId: `${this.coreContract}-${tokenID}` }, 'Error getting token metadata' ) - await msg.channel.send( - `Sorry, I couldn't load that ${this.projectName} token. Try again in a bit!` - ) return } let external_url = tokenMetadata.contract?.token_base_url @@ -326,20 +322,14 @@ export class ProjectBot { PROJECTBOT_UTM : '' - const generatorUrl = tokenMetadata.live_view_url - ? tokenMetadata.live_view_url + PROJECTBOT_UTM - : buildGeneratorUrl(this.chainId, this.coreContract, tokenID) + - PROJECTBOT_UTM - try { - const embedContent = new EmbedBuilder().setTitle(title) - - if (titleLink.startsWith('http')) { - embedContent.setURL(titleLink) - } - if (assetUrl.startsWith('http')) { - embedContent.setImage(assetUrl) - } + const embedContent = new EmbedBuilder() + // Set the title of the field. + .setTitle(title) + // Add link to title. + .setURL(titleLink) + // Set the full image for embed. + .setImage(assetUrl) if (ownerText) { embedContent.addFields({ @@ -351,7 +341,7 @@ export class ProjectBot { embedContent.addFields({ name: 'Live Script', - value: `[Generator](${generatorUrl})`, + value: `[Generator](${tokenMetadata.live_view_url + PROJECTBOT_UTM})`, inline: true, }) @@ -379,9 +369,6 @@ export class ProjectBot { }, 'Error sending token embed' ) - await msg.channel.send( - `Sorry, I found ${this.projectName} but couldn't post it. Try again in a bit!` - ) } }