From 83c0b226eb7306a5c9476feb70c7c09bb4cf20aa Mon Sep 17 00:00:00 2001 From: Cynthia Foxwell Date: Fri, 30 Aug 2024 18:58:14 -0600 Subject: [PATCH 1/2] lookupinvite: fix no features error --- src/modules/utility/lookupinvite.js | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/src/modules/utility/lookupinvite.js b/src/modules/utility/lookupinvite.js index 81ac9c0..bdc5acb 100644 --- a/src/modules/utility/lookupinvite.js +++ b/src/modules/utility/lookupinvite.js @@ -121,20 +121,18 @@ lookupinvite.callback = async function (msg, line) { if (invite.guild.features) { const features = formatGuildFeatures(invite.guild.features); - embed.fields.push( - { - name: `Features (${features.length})`, - value: features.length > 0 ? features.slice(0, Math.ceil(features.length / 2)).join("\n") : "None", + embed.fields.push({ + name: `Features (${features.length})`, + value: features.length > 0 ? features.slice(0, Math.ceil(features.length / 2)).join("\n") : "None", + inline: true, + }); + if (features.length > 1) { + embed.fields.push({ + name: "\u200b", + value: features.slice(Math.ceil(features.length / 2), features.length).join("\n"), inline: true, - }, - features.length > 1 - ? { - name: "\u200b", - value: features.slice(Math.ceil(features.length / 2), features.length).join("\n"), - inline: true, - } - : null - ); + }); + } } const guildIcon = invite.guild?.icon && CDNEndpoints.GUILD_ICON(invite.guild.id, invite.guild.icon); From f54ec82c9995f5d0e2d95ad6a8119df9213e03d8 Mon Sep 17 00:00:00 2001 From: Cynthia Foxwell Date: Fri, 30 Aug 2024 18:58:33 -0600 Subject: [PATCH 2/2] codePreviews: fix edge case and logging for future issues --- src/modules/codePreviews.js | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/src/modules/codePreviews.js b/src/modules/codePreviews.js index 0ef1e07..a09a832 100644 --- a/src/modules/codePreviews.js +++ b/src/modules/codePreviews.js @@ -2,6 +2,7 @@ const {ApplicationCommandOptionTypes, MessageFlags} = require("#util/dconstants. const InteractionCommand = require("#lib/interactionCommand.js"); const events = require("#lib/events.js"); +const logger = require("#lib/logger.js"); const {hasFlag} = require("#lib/guildSettings.js"); const REGEX_GITHUB = /(?:\s|^)(\|\|\s*)?https?:\/\/(www\.)?github\.com\/[a-z0-9-]+\/[a-z0-9-._]+\/blob\/([a-z0-9-_.?&=#root/%]*)(\s*\|\|)?/gi; @@ -120,6 +121,7 @@ events.add("messageCreate", "codePreviews", async function (msg) { for (const link of githubLinks) { const spoiler = REGEX_SPOILER.test(link); files.push(await processFile(link.replace("/blob/", "/raw/"), link, spoiler)); + logger.verbose("hf:codePreviews", `Processed GitHub file: ${link}`); } } @@ -127,6 +129,7 @@ events.add("messageCreate", "codePreviews", async function (msg) { for (const link of gitlabLinks) { const spoiler = REGEX_SPOILER.test(link); files.push(await processFile(link.replace("/blob/", "/raw/"), link, spoiler)); + logger.verbose("hf:codePreviews", `Processed GitLab file: ${link}`); } } @@ -134,6 +137,7 @@ events.add("messageCreate", "codePreviews", async function (msg) { for (const link of giteaLinks) { const spoiler = REGEX_SPOILER.test(link); files.push(await processFile(link.replace("/src/", "/raw/"), link, spoiler)); + logger.verbose("hf:codePreviews", `Processed Gitea file: ${link}`); } } @@ -147,15 +151,16 @@ events.add("messageCreate", "codePreviews", async function (msg) { if (file == "") continue; if (out.length + file.length > 2000) { - await msg.channel.createMessage({ - content: out, - allowedMentions: { - repliedUser: false, - }, - messageReference: { - messageID: msg.id, - }, - }); + if (out.length > 0) + await msg.channel.createMessage({ + content: out, + allowedMentions: { + repliedUser: false, + }, + messageReference: { + messageID: msg.id, + }, + }); out = file; } else {