From 43fa3a12c432488e548744097f1b9eff41aca7bb Mon Sep 17 00:00:00 2001 From: Ecorte Date: Tue, 28 Jan 2025 15:11:11 -0500 Subject: [PATCH] fix(generateSplitImage): use base role color when no color --- services/helper/src/commands/chat/lme/rainbow.ts | 4 ++-- services/watcher/src/listeners/events/roleUpdate.ts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/services/helper/src/commands/chat/lme/rainbow.ts b/services/helper/src/commands/chat/lme/rainbow.ts index 2357e9633..c57576d55 100644 --- a/services/helper/src/commands/chat/lme/rainbow.ts +++ b/services/helper/src/commands/chat/lme/rainbow.ts @@ -23,7 +23,7 @@ const roles = { }; const canFail: Record = { - // "821717486217986098": 0.5, // Test + "821717486217986098": 0.5, // Test "1150780245151068332": 0.5, // Mamayo }; @@ -103,7 +103,7 @@ export default class extends SlashCommand { const oldColor = role.color; const color = resolveColor(getRandomColor()); - const buffer = await generateSplitImage(role.color, color); + const buffer = await generateSplitImage(role.color === 0 ? Colors.Greyple : role.color, color); const attachmentName = `${role.id}-${color}.png`; const attachment = new AttachmentBuilder(buffer, { name: attachmentName }); diff --git a/services/watcher/src/listeners/events/roleUpdate.ts b/services/watcher/src/listeners/events/roleUpdate.ts index 6f0e47077..89c0f6bc4 100644 --- a/services/watcher/src/listeners/events/roleUpdate.ts +++ b/services/watcher/src/listeners/events/roleUpdate.ts @@ -1,6 +1,6 @@ import { Context, Listener } from "@sleepymaid/handler"; import { WatcherClient } from "../../lib/extensions/WatcherClient"; -import { APIEmbed, APIEmbedField, AttachmentBuilder, AuditLogEvent, Role } from "discord.js"; +import { APIEmbed, APIEmbedField, AttachmentBuilder, AuditLogEvent, Colors, Role } from "discord.js"; import { intToHexColor } from "@sleepymaid/util"; import { generateSplitImage } from "@sleepymaid/shared"; @@ -46,7 +46,7 @@ export default class extends Listener<"roleUpdate", WatcherClient> { value: `${intToHexColor(oldRole.color)} -> ${intToHexColor(newRole.color)}`, inline: true, }); - const buffer = await generateSplitImage(oldRole.color, newRole.color); + const buffer = await generateSplitImage(oldRole.color === 0 ? Colors.Greyple : oldRole.color, newRole.color); const attachmentName = `${oldRole.id}-${newRole.id}.png`; attachment = new AttachmentBuilder(buffer, { name: attachmentName });