no impersonating :)
This commit is contained in:
parent
af36301c5e
commit
8b668d82bb
1 changed files with 20 additions and 19 deletions
39
index.ts
39
index.ts
|
@ -33,9 +33,8 @@ const openai = new OpenAIApi(configuration);
|
||||||
|
|
||||||
client.on("ready", async () => {
|
client.on("ready", async () => {
|
||||||
console.log(`Logged in as ${client.user?.tag}!`);
|
console.log(`Logged in as ${client.user?.tag}!`);
|
||||||
const channel = await client.channels.fetch(process.env.CHANNEL ?? '');
|
const channel = await client.channels.fetch(process.env.CHANNEL ?? "");
|
||||||
if (channel?.type != ChannelType.GuildText)
|
if (channel?.type != ChannelType.GuildText) return;
|
||||||
return
|
|
||||||
channel.send("\\Smolhaj Reset");
|
channel.send("\\Smolhaj Reset");
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -50,7 +49,6 @@ client.on("messageCreate", async (message) => {
|
||||||
if (message.channel.type != ChannelType.GuildText) return;
|
if (message.channel.type != ChannelType.GuildText) return;
|
||||||
if (message.content == "die") process.exit(1);
|
if (message.content == "die") process.exit(1);
|
||||||
|
|
||||||
|
|
||||||
// "adapted" from https://github.com/ryanccn/blahaj/blob/main/src/chat.ts
|
// "adapted" from https://github.com/ryanccn/blahaj/blob/main/src/chat.ts
|
||||||
|
|
||||||
await message.channel.sendTyping();
|
await message.channel.sendTyping();
|
||||||
|
@ -86,11 +84,12 @@ client.on("messageCreate", async (message) => {
|
||||||
if (msg.author === msg.author.client.user) {
|
if (msg.author === msg.author.client.user) {
|
||||||
return { role: "assistant", content: msg.content };
|
return { role: "assistant", content: msg.content };
|
||||||
}
|
}
|
||||||
|
let username = msg.member?.displayName ?? msg.author.username;
|
||||||
|
if (username == "skyevg" && msg.author.id != "1038096782963507210")
|
||||||
|
username = msg.author.username; // no impersonating :)
|
||||||
return {
|
return {
|
||||||
role: "user",
|
role: "user",
|
||||||
content: `${msg.member?.displayName ?? msg.author.username}:${
|
content: `${username}:${msg.content}`,
|
||||||
msg.content
|
|
||||||
}`,
|
|
||||||
};
|
};
|
||||||
})
|
})
|
||||||
.values(),
|
.values(),
|
||||||
|
@ -104,14 +103,16 @@ client.on("messageCreate", async (message) => {
|
||||||
const responseMessage = response.data.choices[0].message;
|
const responseMessage = response.data.choices[0].message;
|
||||||
if (!responseMessage) return;
|
if (!responseMessage) return;
|
||||||
|
|
||||||
const lastMessage = msgs
|
const lastMessage =
|
||||||
.filter((msg) => {
|
msgs
|
||||||
if (msg.webhookId && !msg.content.startsWith("\\")) return true;
|
.filter((msg) => {
|
||||||
if (msg.author.bot && msg.author !== msg.author.client.user)
|
if (msg.webhookId && !msg.content.startsWith("\\")) return true;
|
||||||
return false;
|
if (msg.author.bot && msg.author !== msg.author.client.user)
|
||||||
if (msg.content.startsWith("\\")) return false;
|
return false;
|
||||||
return true;
|
if (msg.content.startsWith("\\")) return false;
|
||||||
}).first() ?? message;
|
return true;
|
||||||
|
})
|
||||||
|
.first() ?? message;
|
||||||
|
|
||||||
const isAppropriate = await openai
|
const isAppropriate = await openai
|
||||||
.createModeration({ input: responseMessage.content })
|
.createModeration({ input: responseMessage.content })
|
||||||
|
@ -120,13 +121,13 @@ client.on("messageCreate", async (message) => {
|
||||||
if (isAppropriate) {
|
if (isAppropriate) {
|
||||||
try {
|
try {
|
||||||
await lastMessage.reply({
|
await lastMessage.reply({
|
||||||
content: responseMessage.content,
|
content: responseMessage.content,
|
||||||
allowedMentions: { parse: ["users"] },
|
allowedMentions: { parse: ["users"] },
|
||||||
});
|
});
|
||||||
} catch {
|
} catch {
|
||||||
await message.channel.send({
|
await message.channel.send({
|
||||||
content: responseMessage.content,
|
content: responseMessage.content,
|
||||||
allowedMentions: { parse: ["users"] },
|
allowedMentions: { parse: ["users"] },
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
|
Loading…
Reference in a new issue