From 17650eff7fc182ed21e9f3db0e8912dcf58833c5 Mon Sep 17 00:00:00 2001 From: Jordan Eldredge Date: Thu, 2 Jul 2026 19:40:51 -0700 Subject: [PATCH] Remove diagnostic logging from NSFW review flow Reverts the temporary diagnostic logging added in 86588f56, which introduced prettier formatting violations that broke CI. Co-Authored-By: Claude Opus 4.6 --- .../skin-database/api/DiscordEventHandler.ts | 27 +--------- packages/skin-database/discord-bot/utils.ts | 51 +++---------------- 2 files changed, 7 insertions(+), 71 deletions(-) diff --git a/packages/skin-database/api/DiscordEventHandler.ts b/packages/skin-database/api/DiscordEventHandler.ts index 059a63b34..1dc4d7d77 100644 --- a/packages/skin-database/api/DiscordEventHandler.ts +++ b/packages/skin-database/api/DiscordEventHandler.ts @@ -10,7 +10,6 @@ export default class DiscordEventHandler { _clientPromise: Promise; constructor() { - logger.info("DiscordEventHandler: constructing"); const _client = new Discord.Client(); _client.on("ready", () => { logger.info("DiscordEventHandler: client ready", { @@ -35,16 +34,6 @@ export default class DiscordEventHandler { stack: err?.stack, }); }); - _client.on("messageReactionAdd", (reaction: any, user: any) => { - logger.info("DiscordEventHandler: messageReactionAdd", { - emoji: reaction?.emoji?.name, - msgId: reaction?.message?.id, - channelId: reaction?.message?.channel?.id, - userId: user?.id, - username: user?.username, - userIsBot: user?.bot, - }); - }); this._clientPromise = _client .login(Config.discordToken) .then(() => _client) @@ -76,14 +65,10 @@ export default class DiscordEventHandler { } async handle(action: ApiAction): Promise { - const actionMd5 = "md5" in action ? action.md5 : undefined; - logger.info("DiscordEventHandler.handle: entry", { - type: action.type, - md5: actionMd5, - }); try { await this._handle(action); } catch (err: any) { + const actionMd5 = "md5" in action ? action.md5 : undefined; logger.error("DiscordEventHandler.handle: failed", { type: action.type, md5: actionMd5, @@ -219,7 +204,6 @@ export default class DiscordEventHandler { } private async requestReview(md5: string, ctx: UserContext) { - logger.info("requestReview: entry", { md5 }); const skin = await SkinModel.fromMd5(ctx, md5); if (skin == null) { logger.warn("requestReview: skin not found", { md5 }); @@ -227,11 +211,6 @@ export default class DiscordEventHandler { } const dest = await this.getChannel(Config.NSFW_SKIN_CHANNEL_ID); const tweetStatus = await skin.getTweetStatus(); - logger.info("requestReview: resolved", { - md5, - tweetStatus, - channelId: Config.NSFW_SKIN_CHANNEL_ID, - }); if (tweetStatus === "UNREVIEWED") { await DiscordUtils.postSkin({ md5, @@ -240,10 +219,6 @@ export default class DiscordEventHandler { source: "graphql:request_nsfw_review_for_skin", }); } else { - logger.info("requestReview: skipping post, already reviewed", { - md5, - tweetStatus, - }); // Too much nosie // await DiscordUtils.sendAlreadyReviewed({ md5, dest }); } diff --git a/packages/skin-database/discord-bot/utils.ts b/packages/skin-database/discord-bot/utils.ts index a8cb5861d..76af3a49a 100644 --- a/packages/skin-database/discord-bot/utils.ts +++ b/packages/skin-database/discord-bot/utils.ts @@ -38,8 +38,6 @@ export async function postSkin({ }) { const ctx = new UserContext(); - const destName = "name" in dest ? dest.name : "DM"; - logger.info("postSkin: entry", { md5, source, dest: destName }); const skin = await SkinModel.fromMd5(ctx, md5); if (skin == null) { console.warn("Could not find skin for md5", { md5, alert: true }); @@ -111,17 +109,15 @@ export async function postSkin({ // @ts-ignore WAT? const msg = await dest.send(embed); - const msgId = Array.isArray(msg) ? msg.map((m) => m.id).join(",") : msg.id; - logger.info("postSkin: sent message", { md5, source, msgId, isArray: Array.isArray(msg) }); if (tweetStatus !== "UNREVIEWED") { - logger.info("postSkin: skipping reactions, not UNREVIEWED", { md5, source, msgId, tweetStatus }); return; } + const msgId = Array.isArray(msg) ? msg.map((m) => m.id).join(",") : msg.id; + logger.info("postSkin: posted review", { md5, source, msgId }); // Don't await - Promise.all([msg.react("👍"), msg.react("👎"), msg.react("🔞")]) - .then(() => logger.info("postSkin: bot reactions added", { md5, source, msgId })) - .catch((err) => + Promise.all([msg.react("👍"), msg.react("👎"), msg.react("🔞")]).catch( + (err) => logger.error("postSkin: bot reactions failed", { md5, source, @@ -129,44 +125,9 @@ export async function postSkin({ err: err?.message, stack: err?.stack, }) - ); - - const loggingFilter = async ( - reaction: MessageReaction, - user: User - ): Promise => { - let passes = false; - let err: string | undefined; - try { - passes = await filter(reaction); - } catch (e: any) { - err = e?.message ?? String(e); - } - logger.info("postSkin: reaction observed", { - md5, - source, - msgId, - emoji: reaction.emoji.name, - userId: user?.id, - username: user?.username, - userIsBot: user?.bot, - passes, - filterErr: err, - }); - return passes; - }; - - logger.info("postSkin: awaiting reactions", { md5, source, msgId }); + ); // TODO: Timeout at some point - await msg - .awaitReactions(loggingFilter, { max: 1 }) - .then(async (collected) => { - logger.info("postSkin: awaitReactions resolved", { - md5, - source, - msgId, - collectedSize: collected.size, - }); + await msg.awaitReactions(filter, { max: 1 }).then(async (collected) => { const vote = collected.first(); if (vote == null) { throw new Error("Did not expect vote to be empty");