Skip to content

Commit 17650ef

Browse files
captbaritoneclaude
andcommitted
Remove diagnostic logging from NSFW review flow
Reverts the temporary diagnostic logging added in 86588f5, which introduced prettier formatting violations that broke CI. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
1 parent 317b768 commit 17650ef

2 files changed

Lines changed: 7 additions & 71 deletions

File tree

packages/skin-database/api/DiscordEventHandler.ts

Lines changed: 1 addition & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ export default class DiscordEventHandler {
1010
_clientPromise: Promise<Discord.Client>;
1111

1212
constructor() {
13-
logger.info("DiscordEventHandler: constructing");
1413
const _client = new Discord.Client();
1514
_client.on("ready", () => {
1615
logger.info("DiscordEventHandler: client ready", {
@@ -35,16 +34,6 @@ export default class DiscordEventHandler {
3534
stack: err?.stack,
3635
});
3736
});
38-
_client.on("messageReactionAdd", (reaction: any, user: any) => {
39-
logger.info("DiscordEventHandler: messageReactionAdd", {
40-
emoji: reaction?.emoji?.name,
41-
msgId: reaction?.message?.id,
42-
channelId: reaction?.message?.channel?.id,
43-
userId: user?.id,
44-
username: user?.username,
45-
userIsBot: user?.bot,
46-
});
47-
});
4837
this._clientPromise = _client
4938
.login(Config.discordToken)
5039
.then(() => _client)
@@ -76,14 +65,10 @@ export default class DiscordEventHandler {
7665
}
7766

7867
async handle(action: ApiAction): Promise<void> {
79-
const actionMd5 = "md5" in action ? action.md5 : undefined;
80-
logger.info("DiscordEventHandler.handle: entry", {
81-
type: action.type,
82-
md5: actionMd5,
83-
});
8468
try {
8569
await this._handle(action);
8670
} catch (err: any) {
71+
const actionMd5 = "md5" in action ? action.md5 : undefined;
8772
logger.error("DiscordEventHandler.handle: failed", {
8873
type: action.type,
8974
md5: actionMd5,
@@ -219,19 +204,13 @@ export default class DiscordEventHandler {
219204
}
220205

221206
private async requestReview(md5: string, ctx: UserContext) {
222-
logger.info("requestReview: entry", { md5 });
223207
const skin = await SkinModel.fromMd5(ctx, md5);
224208
if (skin == null) {
225209
logger.warn("requestReview: skin not found", { md5 });
226210
return;
227211
}
228212
const dest = await this.getChannel(Config.NSFW_SKIN_CHANNEL_ID);
229213
const tweetStatus = await skin.getTweetStatus();
230-
logger.info("requestReview: resolved", {
231-
md5,
232-
tweetStatus,
233-
channelId: Config.NSFW_SKIN_CHANNEL_ID,
234-
});
235214
if (tweetStatus === "UNREVIEWED") {
236215
await DiscordUtils.postSkin({
237216
md5,
@@ -240,10 +219,6 @@ export default class DiscordEventHandler {
240219
source: "graphql:request_nsfw_review_for_skin",
241220
});
242221
} else {
243-
logger.info("requestReview: skipping post, already reviewed", {
244-
md5,
245-
tweetStatus,
246-
});
247222
// Too much nosie
248223
// await DiscordUtils.sendAlreadyReviewed({ md5, dest });
249224
}

packages/skin-database/discord-bot/utils.ts

Lines changed: 6 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,6 @@ export async function postSkin({
3838
}) {
3939
const ctx = new UserContext();
4040

41-
const destName = "name" in dest ? dest.name : "DM";
42-
logger.info("postSkin: entry", { md5, source, dest: destName });
4341
const skin = await SkinModel.fromMd5(ctx, md5);
4442
if (skin == null) {
4543
console.warn("Could not find skin for md5", { md5, alert: true });
@@ -111,62 +109,25 @@ export async function postSkin({
111109

112110
// @ts-ignore WAT?
113111
const msg = await dest.send(embed);
114-
const msgId = Array.isArray(msg) ? msg.map((m) => m.id).join(",") : msg.id;
115-
logger.info("postSkin: sent message", { md5, source, msgId, isArray: Array.isArray(msg) });
116112
if (tweetStatus !== "UNREVIEWED") {
117-
logger.info("postSkin: skipping reactions, not UNREVIEWED", { md5, source, msgId, tweetStatus });
118113
return;
119114
}
115+
const msgId = Array.isArray(msg) ? msg.map((m) => m.id).join(",") : msg.id;
116+
logger.info("postSkin: posted review", { md5, source, msgId });
120117

121118
// Don't await
122-
Promise.all([msg.react("👍"), msg.react("👎"), msg.react("🔞")])
123-
.then(() => logger.info("postSkin: bot reactions added", { md5, source, msgId }))
124-
.catch((err) =>
119+
Promise.all([msg.react("👍"), msg.react("👎"), msg.react("🔞")]).catch(
120+
(err) =>
125121
logger.error("postSkin: bot reactions failed", {
126122
md5,
127123
source,
128124
msgId,
129125
err: err?.message,
130126
stack: err?.stack,
131127
})
132-
);
133-
134-
const loggingFilter = async (
135-
reaction: MessageReaction,
136-
user: User
137-
): Promise<boolean> => {
138-
let passes = false;
139-
let err: string | undefined;
140-
try {
141-
passes = await filter(reaction);
142-
} catch (e: any) {
143-
err = e?.message ?? String(e);
144-
}
145-
logger.info("postSkin: reaction observed", {
146-
md5,
147-
source,
148-
msgId,
149-
emoji: reaction.emoji.name,
150-
userId: user?.id,
151-
username: user?.username,
152-
userIsBot: user?.bot,
153-
passes,
154-
filterErr: err,
155-
});
156-
return passes;
157-
};
158-
159-
logger.info("postSkin: awaiting reactions", { md5, source, msgId });
128+
);
160129
// TODO: Timeout at some point
161-
await msg
162-
.awaitReactions(loggingFilter, { max: 1 })
163-
.then(async (collected) => {
164-
logger.info("postSkin: awaitReactions resolved", {
165-
md5,
166-
source,
167-
msgId,
168-
collectedSize: collected.size,
169-
});
130+
await msg.awaitReactions(filter, { max: 1 }).then(async (collected) => {
170131
const vote = collected.first();
171132
if (vote == null) {
172133
throw new Error("Did not expect vote to be empty");

0 commit comments

Comments
 (0)