From 0cabfe0c99d93d38ac0498ec5ac8ed9432205f35 Mon Sep 17 00:00:00 2001 From: "Ean Milligan (Bastion)" Date: Mon, 20 Jun 2022 21:03:01 -0400 Subject: [PATCH] sonar fixes --- src/solver/rollQueue.ts | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/solver/rollQueue.ts b/src/solver/rollQueue.ts index 009d4f6..5b4a2a4 100644 --- a/src/solver/rollQueue.ts +++ b/src/solver/rollQueue.ts @@ -104,7 +104,7 @@ const handleRollWorker = async (rq: QueuedRoll) => { apiErroredOut = true; rq.api.requestEvent.respondWith( new Response( - 'Message failed to send.', + 'Message failed to send - location 0.', { status: Status.InternalServerError, statusText: STATUS_TEXT.get(Status.InternalServerError) }, ), ); @@ -127,7 +127,7 @@ const handleRollWorker = async (rq: QueuedRoll) => { await sendDirectMessage(BigInt(gm.substring(2, gm.length - 1)), { file: gmEmbedDetails.attachment, }).catch(() => { - if (rq.apiRoll && n) { + if (n && rq.apiRoll) { n.reply(generateDMFailed(gm)); } else { rq.dd.message.reply(generateDMFailed(gm)); @@ -153,7 +153,7 @@ const handleRollWorker = async (rq: QueuedRoll) => { apiErroredOut = true; rq.api.requestEvent.respondWith( new Response( - 'Message failed to send.', + 'Message failed to send - location 1.', { status: Status.InternalServerError, statusText: STATUS_TEXT.get(Status.InternalServerError) }, ), ); @@ -172,7 +172,11 @@ const handleRollWorker = async (rq: QueuedRoll) => { } } - if (!apiErroredOut) { + if (rq.apiRoll && !apiErroredOut) { + dbClient.execute(queries.insertRollLogCmd(1, 0), [rq.originalCommand, returnmsg.errorCode, n ? n.id : null]).catch((e) => { + log(LT.ERROR, `Failed to insert into DB: ${JSON.stringify(e)}`); + }); + rq.api.requestEvent.respondWith( new Response( JSON.stringify(