diff --git a/src/execution.ts b/src/execution.ts index 5982a6f..038f32e 100644 --- a/src/execution.ts +++ b/src/execution.ts @@ -110,8 +110,6 @@ function requestReply( else { if (!request.deferred) return request.reply(Object.assign(message, interactionOptions)); - else if (request.replied) - return request.followUp(Object.assign(message, interactionOptions)); else return request.editReply(Object.assign(message, interactionOptions)); } @@ -275,26 +273,14 @@ async function executeFromQueue(channel: string) { const answerContent = answer.data.choices[0].message?.content; - if (answerContent == undefined || answerContent == "") { - if (message instanceof DiscordApi.Message) message.react("😶").catch(/*it's okay*/); + if (answerContent != undefined || answerContent != "") { + + const response = requestReply(message, {content: answerContent}, {allowedMentions: { repliedUser: false }}); + + response.then(rval => Moderation.checkMessage(rval)); } else { - const answerMessagesContent :string[] = [""]; - for (const i in answerContent.split(/\n\n/)) { - if (answerMessagesContent[answerMessagesContent.length-1].length + i.length < 2000) { - answerMessagesContent[answerMessagesContent.length-1] += "\n\n" + i; - } - else { - answerMessagesContent.push(i); - } - } - - for (const i in answerMessagesContent) { - const response = requestReply(message, {content: i}, {allowedMentions: { repliedUser: false }}); - - response.then(rval => Moderation.checkMessage(rval)); - await response; - } + if (message instanceof DiscordApi.Message) message.react("😶").catch(/*it's okay*/); } } catch (e) { console.error(`Error ocurred while handling chat completion request (${(e as object).constructor.name}):`);