Wroclaw/GPTcord
1
0
Fork 0
Code Issues 7 Pull requests 1 Releases Activity

Merge branch 'fix/5'

Browse source
This commit is contained in:
Wroclaw 2023-08-20 17:21:26 +02:00
commit 1205eea7af
2 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/execution.ts
View file

@ -267,6 +267,7 @@ async function executeFromQueue(channel: string) {
messages.forEach(m => { Moderation.checkMessageNoReturn(m); }); messages.forEach(m => { Moderation.checkMessageNoReturn(m); });
const questionMessageId: string = message instanceof DiscordApi.Message ? message.id : '';
if (message instanceof DiscordApi.Message) { if (message instanceof DiscordApi.Message) {
channelQueue.startTyping(); channelQueue.startTyping();
} }
@ -274,7 +275,13 @@ async function executeFromQueue(channel: string) {
await message.deferReply(); await message.deferReply();
} }
OpenAImessages = toOpenAIMessages(messages); messages.sort((a, b) => {
if (a.id === questionMessageId) return -1;
if (b.id === questionMessageId) return 1;
return b.createdTimestamp - a.createdTimestamp;
});
OpenAImessages = toOpenAIMessages(messages.values());
let generatedMessage: ChatCompletionResponseMessage | undefined = undefined; let generatedMessage: ChatCompletionResponseMessage | undefined = undefined;
let answer: Awaited<ReturnType<typeof openai.createChatCompletion>>; let answer: Awaited<ReturnType<typeof openai.createChatCompletion>>;

13
src/toOpenAIMessages.ts
View file

@ -92,17 +92,18 @@ function getAuthorUsername(message: DiscordMessage): string | undefined {
} }
/** /**
* Converts the Collection of Discord Messages to array of OpenAI Messages to send * Converts the Iterable of Discord Messages to array of OpenAI Messages to send
* @param messages the collection to convert * first message in the interable will be the last of the returned array (reverse order)
* @param messages the iterable to convert
* @returns the converted messages * @returns the converted messages
*/ */
export default function toOpenAIMessages(messages: Collection<string, DiscordMessage>): OpenAIMessage[] { export default function toOpenAIMessages(
messages: Iterable<DiscordMessage>,
): OpenAIMessage[] {
const rvalue: OpenAIMessage[] = []; const rvalue: OpenAIMessage[] = [];
let tokenCount = 0; let tokenCount = 0;
messages.sort((a, b) => b.createdTimestamp - a.createdTimestamp); for (const message of messages) {
for (const message of messages.values()) {
const content = formatMessage(message); const content = formatMessage(message);
// FIXME: tokens are not being counted properly (it's lower than it is) but it's enough for me for now. // FIXME: tokens are not being counted properly (it's lower than it is) but it's enough for me for now.
tokenCount += countTokens(content); tokenCount += countTokens(content);