lucien/odin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

commit

Browse source
This commit is contained in:
Lukian LEIZOUR 2023-03-04 16:05:53 +01:00
parent 8654d31004
commit 11ec79ba72
2 changed files with 34 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

28
app.js
View file

@ -238,22 +238,22 @@ client.on('interactionCreate', async interaction => {
else if (interaction.commandName === 'addmsg') {
await interaction.deferReply();
await addMessage(interaction.options.get('name').value,"user" ,interaction.options.get('message').value);
await addMessage(interaction.options.get('name').value,"user" ,interaction.options.get('message').value, interaction.member.user.username);
messages = await getMessages(interaction.options.get('name').value);
messages = await getMessages(interaction.options.get('name').value, "role");
sendConv(messages).then((res) => {
addMessage(interaction.options.get('name').value,"assistant",res.data.choices[0].message.content);
addMessage(interaction.options.get('name').value,"assistant",res.data.choices[0].message.content , "Chaise bot");
const embed_user = new discord.EmbedBuilder()
.setColor(0xBBFAF4)
.setAuthor({ name : interaction.member.user.username, iconURL : "https://cdn.discordapp.com/avatars/"+interaction.member.user.id+"/"+interaction.member.user.avatar+".jpeg"})
.setTitle(interaction.options.get('message').value);
.setDescription(interaction.options.get('message').value);
const embed_bot = new discord.EmbedBuilder()
.setColor(0xFABBDE)
.setAuthor({ name : "Chaise bot", iconURL : client.user.displayAvatarURL()})
.setTitle(res.data.choices[0].message.content)
.setDescription(res.data.choices[0].message.content)
.setFooter({ text : "Powered by OpenAI https://www.openai.com/", iconURL : "https://seeklogo.com/images/O/open-ai-logo-8B9BFEDC26-seeklogo.com.png" });
interaction.editReply({ embeds : [embed_user, embed_bot] });
@ -264,14 +264,24 @@ client.on('interactionCreate', async interaction => {
else if (interaction.commandName === 'displayconv') {
await interaction.deferReply();
messages = await getMessages(interaction.options.get('name').value);
message = "";
messages = await getMessages(interaction.options.get('name').value, "user");
embeds = [];
embed_text = "";
messages.forEach(element => {
message += element.role + " : " + element.content + "\n";
if (element.user == "System") {}
else {
embed_text += "**" + element.user + "** : " + element.content + "\n";}
});
interaction.editReply(message);
const embed = new discord.EmbedBuilder()
.setColor(0xFABBDE)
.setAuthor({ name : "Conversation : " + interaction.options.get('name').value, iconURL : client.user.displayAvatarURL()})
.setDescription(embed_text)
.setFooter({ text : "Powered by OpenAI https://www.openai.com/", iconURL : "https://seeklogo.com/images/O/open-ai-logo-8B9BFEDC26-seeklogo.com.png" });
interaction.editReply({ embeds : [embed] });
}
});

19
libs/mysql.js
View file

@ -65,11 +65,11 @@ function addConv (convName) {
if (error) {
reject(error);
} else {
connection.query('CREATE TABLE ' + convName + '(id int NOT NULL AUTO_INCREMENT, author varchar(20) NOT NULL, message text, PRIMARY KEY (id))', async (error, results, fields) => {
connection.query('CREATE TABLE ' + convName + '(id int NOT NULL AUTO_INCREMENT, author varchar(20) NOT NULL, message text, user varchar(20), PRIMARY KEY (id))', async (error, results, fields) => {
if (error) {
reject(error);
} else {
resolve(addMessage(convName, 'system', 'You are a helpful assistant.'));
resolve(addMessage(convName, 'system', 'You are a helpful assistant.', 'System'));
}
});
}
@ -111,9 +111,9 @@ function getConvs() {
});
}
function addMessage(convName, author, message) {
function addMessage(convName, author, message, user) {
return new Promise((resolve, reject) => {
connection.query('INSERT INTO ' + convName + ' (author, message) VALUES ("' + author + '"'+', "' + message + '")', (error, results, fields) => {
connection.query('INSERT INTO ' + convName + ' (author, message, user) VALUES ("' + author + '"'+', "' + message + '", "' + user + '")', (error, results, fields) => {
if (error) {
reject(error);
} else {
@ -123,17 +123,22 @@ function addMessage(convName, author, message) {
});
}
function getMessages (convName) {
function getMessages (convName, choice) {
return new Promise((resolve, reject) => {
connection.query('SELECT author, message FROM ' + convName, (error, results, fields) => {
connection.query('SELECT author, message, user FROM ' + convName, (error, results, fields) => {
if (error) {
reject(error);
} else {
messages = [];
if (choice == 'role') {
results.forEach(element => {
messages.push({"role" : element.author, "content" : element.message});
});
} else if (choice == 'user') {
results.forEach(element => {
messages.push({"user" : element.user, "content" : element.message});
});
}
resolve(messages);
}