abheekd
/
awesomescibo
mirror of https://github.com/ADawesomeguy/AwesomeSciBo
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Feature slash commands (#10) 

* Switch training and helping to slash commands

* Remove intents

* Change formatting slightly

* Stop bot from registering slash commands multiple times

* Fix intents

* Have slash commands register as they weren't in every server

* Add privileged intents

* Remove privileged intents (not needed) and use interaction.user.id as member is undefined in DMs

* Use set instead of create for slash commands

* Capitalize first letter of command descriptions

* Convert round command to slash commands

* Fix setting commands to use the entire array instead of looping through it

* Remove default response if message starts with "do be"

* Use full form body instead of storing it in variable

* Replace separate round commands with single round command using subcommands

* Fix round commands

* Add description for rounds command

* Use rounds function instead of generateRound function

* Use interaction.user instead of undefined interaction.author

* Remove mention from generated message

* Replace message.author with interaction.user

* Move embed to options

* Make generated round message ephemeral

* Get rid of generating message

* Make generated round message ephemeral

* Add hits to rounds command

* Register rounds hit as a command

* Add top command to slash commands

* Use interaction.user instead of nonexistent interaction.author

* Fix callback catch blocks to perform actions other than logging to the console

* Attempt to fix catch blocks always replying with errors

* Attempt to fix catch blocks always replying with errors

* Capitalize first letter of subject option description

* Add slash command for changelog

* Add about commands as slash commands

* Add ISS to slash commands

* Remove ISS from regular commands

* Add about bot command

* Change question timeout to 2 minutes

* Make sure to reply with the about bot embed

* Add source to question

* Update contributors

* Prevent AwesomeSciBo from losing its mind if there's no #general

* Update join message and set slash commands on guild join

* Remove misplaced semicolon

* Remove server-specific commands

* Remove message event but not functions

* Update .gitignore

* Change help message
pull/12/head
Abheek Dhawan 3 years ago
committed by GitHub
parent
b60a8cee1c
commit
821d2aec54
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 384 additions and 367 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      .gitignore
  2. 423
      bot/awesomescibo.js
  3. 77
      bot/package-lock.json
  4. 2
      bot/package.json

1
.gitignore
View File

@ -10,3 +10,4 @@ bot/README.md
.env .env
userScore userScore
config.json config.json
.DS_Store

423
bot/awesomescibo.js
View File

@ -1,7 +1,9 @@
#!/usr/bin/env node #!/usr/bin/env node
const Discord = require("discord.js"); const Discord = require("discord.js");
const Intents = Discord.Intents;
const client = new Discord.Client({ const client = new Discord.Client({
intents: ["GUILDS", "GUILD_MESSAGES", "GUILD_MESSAGE_REACTIONS", "DIRECT_MESSAGES", "DIRECT_MESSAGE_REACTIONS"/*, "GUILD_MEMBERS", "GUILD_PRESENCES"*/],
partials: ["MESSAGE", "CHANNEL", "REACTION"], partials: ["MESSAGE", "CHANNEL", "REACTION"],
intents: ["GUILDS", "GUILD_MESSAGES"] intents: ["GUILDS", "GUILD_MESSAGES"]
}); });
@ -12,10 +14,87 @@ const generatedRound = require("./mongooseModels/mongooseGeneratedRoundModel.js"
const mongoose = require("mongoose"); const mongoose = require("mongoose");
const gitlog = require("gitlog").default; const gitlog = require("gitlog").default;
const helpMessage = const helpMessage = "AwesomeSciBo has migrated to using slash commands! You can take a look at the different commands by typing `/` and clicking on the AwesomeSciBo icon."
"`do be helping`: display this help message\n`do be roundgen`: send a pdf round to the channel\n`do be scoring`: start a scoring session\n > `do be scoring (a/b)(4/10)`: add points to Team A or Team B\n > `do be scoring stop`: end scoring session and post final points\n > `do be servers`: send the number of servers this bot is a part of\n > `do be iss`: show the current location of the International Space Station\n`do be training`: send a quick practice problem (you **must** react to your answer, or the bot will yell at you)\n > subject options: astro, phys, chem, math, bio, ess, energy\n`do be top`: list cross-server top 10 players\n `do be about`: List people who contributed to this bot\n Source Code: https://github.com/ADawesomeguy/AwesomeSciBo (don't forget to star!)";
const slashCommands = [
{
"name": "train",
"description": "Sends a single training question to be answered",
"options": [
{
"type": 3,
"name": "subject",
"description": "Optional subject to be used as a filter",
"default": false,
"required": false
}
]
},
{
"name": "help",
"description": "Replies with a help message explaining what the bot can do"
},
{
"name": "rounds",
"options": [
{
"type": 1,
"name": "generate",
"description": "Generates a round with randomized questions from https://scibowldb.com/",
"options": []
},
{
"type": 1,
"name": "list",
"description": "Lists your 5 most recently generated rounds with links",
"options": []
},
{
"type": 1,
"name": "hit",
"description": "Shows the total number of rounds hit as well as the number for the specific user",
"options": []
}
],
"description": "Commands regarding rounds generated by AwesomeSciBo"
},
{
"name": "top",
"description": "Lists top ten scores across servers (server specific leaderboard WIP)"
},
{
"name": "about",
"options": [
{
"type": 1,
"name": "contributors",
"description": "Lists contributors to the AwesomeSciBo bot",
"options": []
},
{
"type": 1,
"name": "changelog",
"description": "Lists the 5 most recent changes in a \"git log\" type format",
"options": []
},
{
"type": 1,
"name": "bot",
"description": "Lists information about AwesomeSciBo",
"options": []
}
],
"description": "Commands regarding the creation/development of the bot"
},
{
"name": "iss",
"description": "Shows the location of the ISS on a map as well as all of the current astronauts within it"
}
]
client.once("ready", () => { client.once("ready", () => {
client.application.commands.set(slashCommands);
// Connect to MongoDB using mongoose // Connect to MongoDB using mongoose
if (!process.env.CI) { if (!process.env.CI) {
mongoose mongoose
@ -27,7 +106,7 @@ client.once("ready", () => {
// Log client tag and set status // Log client tag and set status
console.log(`Logged in as: ${client.user.username}!`); console.log(`Logged in as: ${client.user.username}!`);
client.user.setActivity( client.user.setActivity(
'for "do be helping" | Add me to your own server: adat.link/awscibo', 'for "/helping" | Add me to your own server: adat.link/awscibo',
{ type: "WATCHING" } { type: "WATCHING" }
); );
}) })
@ -36,19 +115,22 @@ client.once("ready", () => {
}); });
client.on("guildCreate", (guild) => { client.on("guildCreate", (guild) => {
guild.channels.cache //guild.commands.set(slashCommands);
const welcomeChannel = guild.channels.cache
.find( .find(
(channel) => (channel) =>
// Find channel by name // Find channel by name
channel.name === process.env.WELCOME_CHANNEL && channel.type === "text" channel.name === "general" && channel.type === "text"
) )
.send("'Sup, I'm the AwesomeSciBo bot!") if (welcomeChannel) {
welcomeChannel.send("'Sup, I'm the AwesomeSciBo bot! Use `/help` to learn more about me!")
.catch(console.error); .catch(console.error);
}
}); });
async function updateScore(isCorrect, score, authorId) { async function updateScore(isCorrect, score, authorId) {
if (!isCorrect) { if (!isCorrect) {
return `nice try! Your score is still ${score}.`; return `Nice try! Your score is still ${score}.`;
} else { } else {
score += 4; score += 4;
if (score == 4) { if (score == 4) {
@ -69,30 +151,12 @@ async function updateScore(isCorrect, score, authorId) {
doc.save(); doc.save();
} }
return `great job! Your score is now ${score}.`; return `Great job! Your score is now ${score}.`;
} }
} }
async function otherCommands(message) { function training(subject, interaction) {
if ( const authorId = interaction.user.id;
message.content.toLowerCase().startsWith("do be announcing") &&
(message.author.id === process.env.ABHEEK_USER_ID ||
message.author.id === process.env.TEJAS_USER_ID)
) {
const announcement = message.content.substring(17);
client.guilds.cache.forEach((guild) => {
const channel = guild.channels.cache.find(
(channelGeneral) =>
channelGeneral.name === process.env.ANNOUNCING_CHANNEL
);
if (channel) {
if (channel.type === "text") {
channel.send(announcement).catch(console.error);
}
}
});
} else if (message.content.toLowerCase().startsWith("do be training")) {
const authorId = message.author.id;
let score; let score;
userScore userScore
.findOne({ authorID: authorId }) .findOne({ authorID: authorId })
@ -106,11 +170,11 @@ async function otherCommands(message) {
console.log(err); console.log(err);
} }
}); });
const subject = message.content.substring(15);
let categoryArray = []; let categoryArray = [];
switch (subject) { switch (subject) {
case "": case null:
categoryArray = ["BIOLOGY", "PHYSICS", "CHEMISTRY", "EARTH AND SPACE", "ASTRONOMY", "MATH"]; categoryArray = ["BIOLOGY", "PHYSICS", "CHEMISTRY", "EARTH AND SPACE", "ASTRONOMY", "MATH"];
break; break;
case "astro": case "astro":
@ -141,7 +205,7 @@ async function otherCommands(message) {
categoryArray = ["ENERGY"]; categoryArray = ["ENERGY"];
break; break;
default: default:
message.channel.send("Not a valid subject!"); interaction.reply("Not a valid subject!");
return; return;
} }
@ -150,11 +214,10 @@ async function otherCommands(message) {
.then((res) => { .then((res) => {
data = res.data.question; data = res.data.question;
const messageFilter = (m) => m.author.id === authorId; const messageFilter = (m) => m.author.id === authorId;
message.reply(data.tossup_question).then(() => { interaction.reply(data.tossup_question + `\n\n||Source: ${data.uri}||`).then(() => {
message.channel interaction.channel.awaitMessages(messageFilter, {
.awaitMessages(messageFilter, {
max: 1, max: 1,
time: 30000, time: 120000,
errors: ["time"], errors: ["time"],
}) })
.then((answerMsg) => { .then((answerMsg) => {
@ -205,81 +268,22 @@ async function otherCommands(message) {
overrideMsg overrideMsg
.awaitReactions(filter, { .awaitReactions(filter, {
max: 1, max: 1,
time: 600000,
errors: ["time"],
}) })
.then((userReaction) => { .then((userReaction) => {
updateScore(true, score, authorId).then((msgToReply) => updateScore(true, score, authorId).then((msgToReply) =>
answerMsg.reply(msgToReply) answerMsg.reply(msgToReply)
); );
}); }).catch(console.error);
}) }).catch(console.error);
}
})
.catch(console.error);
});
})
.catch(console.error);
} else {
// Not any of the commands supported
message.channel.send(
"That didn't quite make sense! Please use `do be helping` to see the available commands."
);
}
} }
}).catch(error => { if (error) interaction.editReply("Sorry, the question timed out waiting for an answer.") });
function sendHelpMessage(message) { }).catch(console.error);
message.channel.send( }).catch(error => { if (error) interaction.reply("Sorry, there was a problem fetching the question. Please try again!") });
new Discord.MessageEmbed().setTitle("Help").setDescription(helpMessage)
);
} }
async function generateRound(message) { function sendHelpMessage(interaction) {
const generatingMessage = message.channel.send("Generating..."); const helpEmbed = new Discord.MessageEmbed().setDescription(helpMessage).setColor("ffffff");
let i; interaction.reply(helpEmbed);
let finalizedHTML = '<html><head><link rel="preconnect" href="https://fonts.gstatic.com"><link href="https://fonts.googleapis.com/css2?family=Ubuntu&display=swap" rel="stylesheet"> </head><body style="width: 70%; margin-left: auto; margin-right: auto;"><h2 style="text-align: center; text-decoration: underline overline; padding: 7px;">ROUND GENERATED BY AWESOMESCIBO USING THE SCIBOWLDB API</h2>';
let tossup_question;
let question_category;
let tossup_format;
let tossup_answer;
let bonus_question;
let bonus_format;
let bonus_answer;
let htmlContent = "";
await axios.post("https://scibowldb.com/api/questions", { categories: ["BIOLOGY", "PHYSICS", "CHEMISTRY", "EARTH AND SPACE", "ASTRONOMY", "MATH"] })
.then((response) => {
for (i = 1; i < 26; i++) {
data = response.data.questions[Math.floor(Math.random() * response.data.questions.length)];
tossup_question = data.tossup_question;
tossup_answer = data.tossup_answer;
question_category = data.category;
tossup_format = data.tossup_format;
bonus_question = data.bonus_question;
bonus_answer = data.bonus_answer;
bonus_format = data.bonus_format;
htmlContent = `<br><br><h3 style="text-align: center;"><strong>TOSS-UP</strong></h3>\n<br>` + `${i}) <strong>${question_category}</strong>` + " " + `<em>${tossup_format}</em>` + " " + tossup_question + "<br><br>" + "<strong>ANSWER:</strong> " + tossup_answer + "<br>";
htmlContent += `<br><br><h3 style="text-align: center;"><strong>BONUS</strong></h3>\n<br>` + `${i}) <strong>${question_category}</strong>` + " " + `<em>${bonus_format}</em>` + " " + bonus_question + "<br><br>" + "<strong>ANSWER:</strong> " + bonus_answer + "<br><br><hr><br>";
htmlContent = htmlContent.replace(/\n/g, "<br>");
finalizedHTML += htmlContent;
}
newGeneratedRound = new generatedRound({
htmlContent: finalizedHTML,
requestedBy: message.author.id,
authorTag: message.author.tag,
timestamp: new Date().toISOString(),
});
newGeneratedRound.save((err, round) => {
if (err) {
console.log(err);
return;
}
message.channel.messages.fetch(generatingMessage.id)
.then(generatingMessage => {
const msg = generatingMessage.first();
msg.edit(`${message.author}, here's your round: https://api.adawesome.tech/round/${round._id.toString()}`);
});
});
});
} }
async function startScoring(message) { async function startScoring(message) {
@ -293,35 +297,35 @@ async function startScoring(message) {
time: 1500000, time: 1500000,
}); });
collector.on("collect", (m) => { collector.on("collect", (m) => {
if (m.content.toLowerCase() === "do be scoring a 4") { if (m.content.toLowerCase() === "/scoring a 4") {
// A team gets toss-up // A team gets toss-up
m.delete({ timeout: 1000 }).catch(console.error); m.delete({ timeout: 1000 }).catch(console.error);
scoreA += 4; scoreA += 4;
scoreboard.channel.send( scoreboard.channel.send(
`Here's the score:\nTeam A: ${scoreA}\nTeam B: ${scoreB}` `Here's the score:\nTeam A: ${scoreA}\nTeam B: ${scoreB}`
); );
} else if (m.content.toLowerCase() === "do be scoring a 10") { } else if (m.content.toLowerCase() === "/scoring a 10") {
// A team gets bonus // A team gets bonus
m.delete({ timeout: 1000 }).catch(console.error); m.delete({ timeout: 1000 }).catch(console.error);
scoreA += 10; scoreA += 10;
scoreboard.channel.send( scoreboard.channel.send(
`Here's the score:\nTeam A: ${scoreA}\nTeam B: ${scoreB}` `Here's the score:\nTeam A: ${scoreA}\nTeam B: ${scoreB}`
); );
} else if (m.content.toLowerCase() === "do be scoring b 4") { } else if (m.content.toLowerCase() === "/scoring b 4") {
// B team gets toss up // B team gets toss up
m.delete({ timeout: 1000 }).catch(console.error); m.delete({ timeout: 1000 }).catch(console.error);
scoreB += 4; scoreB += 4;
scoreboard.channel.send( scoreboard.channel.send(
`Here's the score:\nTeam A: ${scoreA}\nTeam B: ${scoreB}` `Here's the score:\nTeam A: ${scoreA}\nTeam B: ${scoreB}`
); );
} else if (m.content.toLowerCase() === "do be scoring b 10") { } else if (m.content.toLowerCase() === "/scoring b 10") {
// B team gets bonus // B team gets bonus
m.delete({ timeout: 1000 }).catch(console.error); m.delete({ timeout: 1000 }).catch(console.error);
scoreB += 10; scoreB += 10;
scoreboard.channel.send( scoreboard.channel.send(
`Here's the score:\nTeam A: ${scoreA}\nTeam B: ${scoreB}` `Here's the score:\nTeam A: ${scoreA}\nTeam B: ${scoreB}`
); );
} else if (m.content === "do be scoring stop") { } else if (m.content === "/scoring stop") {
m.delete({ timeout: 1000 }).catch(console.error); m.delete({ timeout: 1000 }).catch(console.error);
scoreboard.delete({ timeout: 1000 }); scoreboard.delete({ timeout: 1000 });
m.channel.send( m.channel.send(
@ -346,11 +350,11 @@ function showServerNumber(message) {
message.channel.send(client.guilds.cache.size); message.channel.send(client.guilds.cache.size);
} }
async function showIssLocation(message) { async function showIssLocation(interaction) {
await fetch("http://api.open-notify.org/iss-now.json") await fetch("http://api.open-notify.org/iss-now.json")
.then((request) => request.json()) .then((request) => request.json())
.then((data) => { .then((data) => {
message.channel.send( interaction.reply(
new Discord.MessageEmbed() new Discord.MessageEmbed()
.setTitle("The current location of the ISS!") .setTitle("The current location of the ISS!")
.setImage( .setImage(
@ -358,10 +362,10 @@ async function showIssLocation(message) {
) )
.setURL("https://spotthestation.nasa.gov/tracking_map.cfm") .setURL("https://spotthestation.nasa.gov/tracking_map.cfm")
); );
}); }).catch(error => { if (error) interaction.editReply("Unable to fetch data. Please try again!") });
} }
function showLeaderboard(message) { function showLeaderboard(interaction) {
let messageContent = ""; let messageContent = "";
userScore userScore
.find({}) .find({})
@ -369,20 +373,20 @@ function showLeaderboard(message) {
.exec((err, obj) => { .exec((err, obj) => {
if (err) { if (err) {
console.log(err); console.log(err);
return message.reply( return interaction.reply(
"Uh oh! :( There was an internal error. Please try again." "Uh oh! :( There was an internal error. Please try again."
); );
} }
if (obj.length < 10) { if (obj.length < 10) {
// Need at least 10 scores for top 10 // Need at least 10 scores for top 10
return message.reply( return interaction.reply(
`There are only ${obj.length} users, we need at least 10!` `There are only ${obj.length} users, we need at least 10!`
); );
} }
for (let i = 0; i < 10; i++) { for (let i = 0; i < 10; i++) {
messageContent += `${i + 1}: <@${obj[i].authorID}>: ${obj[i].score}\n`; // Loop through each user and add their name and score to leaderboard content messageContent += `${i + 1}: <@${obj[i].authorID}>: ${obj[i].score}\n`; // Loop through each user and add their name and score to leaderboard content
} }
message.channel.send( interaction.reply(
new Discord.MessageEmbed() new Discord.MessageEmbed()
.setTitle("Top Ten!") .setTitle("Top Ten!")
.setDescription(messageContent) .setDescription(messageContent)
@ -390,20 +394,94 @@ function showLeaderboard(message) {
}); });
} }
function aboutMessage(message) { async function about(action, interaction) {
message.channel.send( if (action === "contributors") {
new Discord.MessageEmbed().setTitle("Contributors: ").setDescription(` interaction.reply(
<@745063586422063214> [ADawesomeguy#2235] new Discord.MessageEmbed().setTitle("Contributors")
<@650525101048987649> [tEjAs#8127] .addField("Creator", `<@745063586422063214> [ADawesomeguy#2235]`, true)
`) // Add more contributors here, first one is Abheek, second one is Tejas .addField("Contributors", `<@650525101048987649> [tEjAs#8127]\n<@426864344463048705> [tetrident#9396]`, true) // Add more contributors here, first one is Abheek, second one is Tejas
.setTimestamp()
); );
} else if (action === "changelog") {
let parentFolder = __dirname.split("/");
parentFolder.pop();
parentFolder = parentFolder.join("/");
const commits = gitlog({
repo: parentFolder,
number: 5,
fields: ["hash", "abbrevHash", "subject", "authorName", "authorDateRel"],
});
const changelogEmbed = new Discord.MessageEmbed()
.setAuthor(interaction.user.tag, interaction.user.displayAvatarURL())
.setTitle("Changelog")
.setTimestamp();
commits.forEach(commit => {
changelogEmbed.addField(commit.abbrevHash, `> \`Hash:\`${commit.hash}\n> \`Subject:\`${commit.subject}\n> \`Author:\`${commit.authorName}\n> \`Date:\`${commit.authorDateRel}\n> \`Link\`: [GitHub](https://github.com/ADawesomeguy/AwesomeSciBo/commit/${commit.hash})\n`);
});
interaction.reply(changelogEmbed);
} else if (action === "bot") {
const aboutBotEmbed = new Discord.MessageEmbed()
.setAuthor(interaction.user.tag, interaction.user.displayAvatarURL())
.setTitle("About AwesomeSciBo")
.addField("Servers", client.guilds.cache.size, true)
.addField("Training Users", await userScore.countDocuments({}), true)
.setTimestamp();
interaction.reply(aboutBotEmbed);
}
} }
async function userRounds(message) { async function rounds(action, interaction) {
let rounds = await generatedRound.find({ requestedBy: message.author.id }).sort({ timestamp: -1 }); if (action === "generate") {
let i;
let finalizedHTML = '<html><head><link rel="preconnect" href="https://fonts.gstatic.com"><link href="https://fonts.googleapis.com/css2?family=Ubuntu&display=swap" rel="stylesheet"> </head><body style="width: 70%; margin-left: auto; margin-right: auto;"><h2 style="text-align: center; text-decoration: underline overline; padding: 7px;">ROUND GENERATED BY AWESOMESCIBO USING THE SCIBOWLDB API</h2>';
let tossup_question;
let question_category;
let tossup_format;
let tossup_answer;
let bonus_question;
let bonus_format;
let bonus_answer;
let htmlContent = "";
await axios.post("https://scibowldb.com/api/questions", { categories: ["BIOLOGY", "PHYSICS", "CHEMISTRY", "EARTH AND SPACE", "ASTRONOMY", "MATH"] })
.then((response) => {
for (i = 1; i < 26; i++) {
data = response.data.questions[Math.floor(Math.random() * response.data.questions.length)];
tossup_question = data.tossup_question;
tossup_answer = data.tossup_answer;
question_category = data.category;
tossup_format = data.tossup_format;
bonus_question = data.bonus_question;
bonus_answer = data.bonus_answer;
bonus_format = data.bonus_format;
htmlContent = `<br><br><h3 style="text-align: center;"><strong>TOSS-UP</strong></h3>\n<br>` + `${i}) <strong>${question_category}</strong>` + " " + `<em>${tossup_format}</em>` + " " + tossup_question + "<br><br>" + "<strong>ANSWER:</strong> " + tossup_answer + "<br>";
htmlContent += `<br><br><h3 style="text-align: center;"><strong>BONUS</strong></h3>\n<br>` + `${i}) <strong>${question_category}</strong>` + " " + `<em>${bonus_format}</em>` + " " + bonus_question + "<br><br>" + "<strong>ANSWER:</strong> " + bonus_answer + "<br><br><hr><br>";
htmlContent = htmlContent.replace(/\n/g, "<br>");
finalizedHTML += htmlContent;
}
newGeneratedRound = new generatedRound({
htmlContent: finalizedHTML,
requestedBy: interaction.user.id,
authorTag: interaction.user.tag,
timestamp: new Date().toISOString(),
});
newGeneratedRound.save((err, round) => {
if (err) {
console.log(err);
return;
}
interaction.reply(`Here's your round: https://api.adawesome.tech/round/${round._id.toString()}`, { ephemeral: true });
});
});
} else if (action === "list"){
let rounds = await generatedRound.find({ requestedBy: interaction.user.id }).sort({ timestamp: -1 });
let finalMessage = ""; let finalMessage = "";
if (!rounds) { if (!rounds) {
message.reply("you haven't requested any rounds!"); interaction.reply("You haven't requested any rounds!");
return; return;
} }
@ -416,95 +494,48 @@ async function userRounds(message) {
}); });
const roundsEmbed = new Discord.MessageEmbed() const roundsEmbed = new Discord.MessageEmbed()
.setAuthor(message.author.tag, message.author.displayAvatarURL()) .setAuthor(interaction.user.tag, interaction.user.displayAvatarURL())
.setTitle(`Last 5 rounds requested by ${message.author.tag}`) .setTitle(`Last 5 rounds requested by ${interaction.user.tag}`)
.setDescription(finalMessage) .setDescription(finalMessage)
.setTimestamp(); .setTimestamp();
message.channel.send(roundsEmbed); interaction.reply({
} embeds: [roundsEmbed],
ephemeral: true
async function hits(message) {
let totalCount = await generatedRound.countDocuments({});
let userCount = await generatedRound.countDocuments({ requestedBy: message.author.id });
message.channel.send(`Total Hits: ${totalCount}\nYour Hits: ${userCount}`);
}
async function changelog(message) {
let parentFolder = __dirname.split("/");
parentFolder.pop();
parentFolder = parentFolder.join("/");
const commits = gitlog({
repo: parentFolder,
number: 5,
fields: ["hash", "abbrevHash", "subject", "authorName", "authorDateRel"],
});
const changelogEmbed = new Discord.MessageEmbed()
.setAuthor(message.author.tag, message.author.displayAvatarURL())
.setTitle("Changelog")
.setTimestamp();
commits.forEach(commit => {
changelogEmbed.addField(commit.abbrevHash, `> \`Hash:\`${commit.hash}\n> \`Subject:\`${commit.subject}\n> \`Author:\`${commit.authorName}\n> \`Date:\`${commit.authorDateRel}\n> \`Link\`: [GitHub](https://github.com/ADawesomeguy/AwesomeSciBo/commit/${commit.hash})\n`);
}); });
} else if (action === "hit"){
let totalCount = await generatedRound.countDocuments({});
let userCount = await generatedRound.countDocuments({ requestedBy: interaction.user.id });
message.channel.send(changelogEmbed); interaction.reply(`Total Hits: ${totalCount}\nYour Hits: ${userCount}`);
} }
client.on("message", async (message) => {
if (message.author.bot) {
return;
} }
// Temporary logging purposes client.on("interaction", interaction => {
// If the interaction isn't a slash command, return
if (!interaction.isCommand()) return;
const formattedMessage = message.content.toLowerCase().replace(/ /g, ""); switch(interaction.commandName) {
if (formattedMessage.startsWith("dobe")) { case "help":
console.log(`${message.author.tag} > ${message.content}`); sendHelpMessage(interaction);
// Bot prefix is "do be"
switch (formattedMessage) {
case "dobehelping": // Display help message
sendHelpMessage(message);
break; break;
case "doberoundgen": // Generate round publicly case "train":
generateRound(message); training(interaction.options[0] ? interaction.options[0].value : null, interaction);
break; break;
case "dobescoring": // Start scoring case "rounds":
startScoring(message); rounds(interaction.options[0].name, interaction);
break; break;
case "dobetop": // Top 10 scores case "top":
showLeaderboard(message); showLeaderboard(interaction);
break; break;
case "dobehappy": // Send happy message case "about":
dontWorryBeHappy(message); about(interaction.options[0].name, interaction);
break; break;
case "dobeservers": // Shows number of servers bot is in case "iss":
showServerNumber(message); showIssLocation(interaction);
break; break;
case "dobeiss": // Show location of ISS
showIssLocation(message);
break;
case "dobeabout": // Show about message of bot
aboutMessage(message);
break;
case "dobemyrounds":
userRounds(message);
break;
case "dobehits":
hits(message);
break;
case "dobechangelog":
changelog(message);
break;
default:
// Do be training
otherCommands(message);
}
} }
}); })
client client
.login(process.env.TOKEN) .login(process.env.TOKEN)

77
bot/package-lock.json
View File

@ -10,7 +10,7 @@
"license": "Apache 2.0", "license": "Apache 2.0",
"dependencies": { "dependencies": {
"axios": "^0.21.1", "axios": "^0.21.1",
"discord.js": "^12.5.1", "discord.js": "github:discordjs/discord.js",
"dotenv": "^8.2.0", "dotenv": "^8.2.0",
"eslint": "^7.21.0", "eslint": "^7.21.0",
"fs": "^0.0.1-security", "fs": "^0.0.1-security",
@ -393,21 +393,18 @@
} }
}, },
"node_modules/discord.js": { "node_modules/discord.js": {
"version": "12.5.1", "resolved": "git+ssh://git@github.com/discordjs/discord.js.git#c7334363b36c5f7f1c7880fe77a2e9b2eb1a6442",
"resolved": "https://registry.npmjs.org/discord.js/-/discord.js-12.5.1.tgz",
"integrity": "sha512-VwZkVaUAIOB9mKdca0I5MefPMTQJTNg0qdgi1huF3iwsFwJ0L5s/Y69AQe+iPmjuV6j9rtKoG0Ta0n9vgEIL6w==",
"dependencies": { "dependencies": {
"@discordjs/collection": "^0.1.6", "@discordjs/collection": "^0.1.6",
"@discordjs/form-data": "^3.0.1", "@discordjs/form-data": "^3.0.1",
"abort-controller": "^3.0.0", "abort-controller": "^3.0.0",
"node-fetch": "^2.6.1", "node-fetch": "^2.6.1",
"prism-media": "^1.2.2", "prism-media": "^1.2.2",
"setimmediate": "^1.0.5",
"tweetnacl": "^1.0.3", "tweetnacl": "^1.0.3",
"ws": "^7.3.1" "ws": "^7.3.1"
}, },
"engines": { "engines": {
"node": ">=12.0.0" "node": ">=14.0.0"
} }
}, },
"node_modules/doctrine": { "node_modules/doctrine": {
@ -907,19 +904,19 @@
"optional": true "optional": true
}, },
"node_modules/mime-db": { "node_modules/mime-db": {
"version": "1.46.0", "version": "1.47.0",
"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.46.0.tgz", "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.47.0.tgz",
"integrity": "sha512-svXaP8UQRZ5K7or+ZmfNhg2xX3yKDMUzqadsSqi4NCH/KomcH75MAMYAGVlvXn4+b/xOPhS3I2uHKRUzvjY7BQ==", "integrity": "sha512-QBmA/G2y+IfeS4oktet3qRZ+P5kPhCKRXxXnQEudYqUaEioAU1/Lq2us3D/t1Jfo4hE9REQPrbB7K5sOczJVIw==",
"engines": { "engines": {
"node": ">= 0.6" "node": ">= 0.6"
} }
}, },
"node_modules/mime-types": { "node_modules/mime-types": {
"version": "2.1.29", "version": "2.1.30",
"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.29.tgz", "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.30.tgz",
"integrity": "sha512-Y/jMt/S5sR9OaqteJtslsFZKWOIIqMACsJSiHghlCAyhf7jfVYjKBmLiX8OgpWeW+fjJ2b+Az69aPFPkUOY6xQ==", "integrity": "sha512-crmjA4bLtR8m9qLpHvgxSChT+XoSlZi8J4n/aIdn3z92e/U47Z0V/yl+Wh9W046GgFVAmoNR/fmdbZYcSSIUeg==",
"dependencies": { "dependencies": {
"mime-db": "1.46.0" "mime-db": "1.47.0"
}, },
"engines": { "engines": {
"node": ">= 0.6" "node": ">= 0.6"
@ -1108,9 +1105,9 @@
} }
}, },
"node_modules/prism-media": { "node_modules/prism-media": {
"version": "1.2.7", "version": "1.2.9",
"resolved": "https://registry.npmjs.org/prism-media/-/prism-media-1.2.7.tgz", "resolved": "https://registry.npmjs.org/prism-media/-/prism-media-1.2.9.tgz",
"integrity": "sha512-thS1z3L6BDmf724sqLC73bHGjSYArFTYHa7cqInyS3EdDNTHKgDCXy7l+IhRvlnX7aFNiUb8jJcC+R8ezxwgMA==" "integrity": "sha512-UHCYuqHipbTR1ZsXr5eg4JUmHER8Ss4YEb9Azn+9zzJ7/jlTtD1h0lc4g6tNx3eMlB8Mp6bfll0LPMAV4R6r3Q=="
}, },
"node_modules/process-nextick-args": { "node_modules/process-nextick-args": {
"version": "2.0.1", "version": "2.0.1",
@ -1223,11 +1220,6 @@
"node": ">=10" "node": ">=10"
} }
}, },
"node_modules/setimmediate": {
"version": "1.0.5",
"resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
"integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU="
},
"node_modules/shebang-command": { "node_modules/shebang-command": {
"version": "2.0.0", "version": "2.0.0",
"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
@ -1450,9 +1442,9 @@
"integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
}, },
"node_modules/ws": { "node_modules/ws": {
"version": "7.4.3", "version": "7.4.5",
"resolved": "https://registry.npmjs.org/ws/-/ws-7.4.3.tgz", "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.5.tgz",
"integrity": "sha512-hr6vCR76GsossIRsr8OLR9acVVm1jyfEWvhbNjtgPOrfvAlKzvyeg/P6r8RuDjRyrcQoPQT7K0DGEPc7Ae6jzA==", "integrity": "sha512-xzyu3hFvomRfXKH8vOFMU3OguG6oOvhXMo3xsGy3xWExqaM2dxBbVxuD99O7m3ZUFMvvscsZDqxfgMaRr/Nr1g==",
"engines": { "engines": {
"node": ">=8.3.0" "node": ">=8.3.0"
} }
@ -1771,16 +1763,14 @@
"integrity": "sha512-CYiCSgIF1p6EUByQPlGkKnP1M9g0ZV3qMIrqMqZqdwazygIA/YP2vrbcyl1h/WppKJTdl1F85cXIle+394iDAQ==" "integrity": "sha512-CYiCSgIF1p6EUByQPlGkKnP1M9g0ZV3qMIrqMqZqdwazygIA/YP2vrbcyl1h/WppKJTdl1F85cXIle+394iDAQ=="
}, },
"discord.js": { "discord.js": {
"version": "12.5.1", "version": "git+ssh://git@github.com/discordjs/discord.js.git#c7334363b36c5f7f1c7880fe77a2e9b2eb1a6442",
"resolved": "https://registry.npmjs.org/discord.js/-/discord.js-12.5.1.tgz", "from": "discord.js@github:discordjs/discord.js",
"integrity": "sha512-VwZkVaUAIOB9mKdca0I5MefPMTQJTNg0qdgi1huF3iwsFwJ0L5s/Y69AQe+iPmjuV6j9rtKoG0Ta0n9vgEIL6w==",
"requires": { "requires": {
"@discordjs/collection": "^0.1.6", "@discordjs/collection": "^0.1.6",
"@discordjs/form-data": "^3.0.1", "@discordjs/form-data": "^3.0.1",
"abort-controller": "^3.0.0", "abort-controller": "^3.0.0",
"node-fetch": "^2.6.1", "node-fetch": "^2.6.1",
"prism-media": "^1.2.2", "prism-media": "^1.2.2",
"setimmediate": "^1.0.5",
"tweetnacl": "^1.0.3", "tweetnacl": "^1.0.3",
"ws": "^7.3.1" "ws": "^7.3.1"
} }
@ -2175,16 +2165,16 @@
"optional": true "optional": true
}, },
"mime-db": { "mime-db": {
"version": "1.46.0", "version": "1.47.0",
"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.46.0.tgz", "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.47.0.tgz",
"integrity": "sha512-svXaP8UQRZ5K7or+ZmfNhg2xX3yKDMUzqadsSqi4NCH/KomcH75MAMYAGVlvXn4+b/xOPhS3I2uHKRUzvjY7BQ==" "integrity": "sha512-QBmA/G2y+IfeS4oktet3qRZ+P5kPhCKRXxXnQEudYqUaEioAU1/Lq2us3D/t1Jfo4hE9REQPrbB7K5sOczJVIw=="
}, },
"mime-types": { "mime-types": {
"version": "2.1.29", "version": "2.1.30",
"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.29.tgz", "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.30.tgz",
"integrity": "sha512-Y/jMt/S5sR9OaqteJtslsFZKWOIIqMACsJSiHghlCAyhf7jfVYjKBmLiX8OgpWeW+fjJ2b+Az69aPFPkUOY6xQ==", "integrity": "sha512-crmjA4bLtR8m9qLpHvgxSChT+XoSlZi8J4n/aIdn3z92e/U47Z0V/yl+Wh9W046GgFVAmoNR/fmdbZYcSSIUeg==",
"requires": { "requires": {
"mime-db": "1.46.0" "mime-db": "1.47.0"
} }
}, },
"minimatch": { "minimatch": {
@ -2334,9 +2324,9 @@
"integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==" "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g=="
}, },
"prism-media": { "prism-media": {
"version": "1.2.7", "version": "1.2.9",
"resolved": "https://registry.npmjs.org/prism-media/-/prism-media-1.2.7.tgz", "resolved": "https://registry.npmjs.org/prism-media/-/prism-media-1.2.9.tgz",
"integrity": "sha512-thS1z3L6BDmf724sqLC73bHGjSYArFTYHa7cqInyS3EdDNTHKgDCXy7l+IhRvlnX7aFNiUb8jJcC+R8ezxwgMA==" "integrity": "sha512-UHCYuqHipbTR1ZsXr5eg4JUmHER8Ss4YEb9Azn+9zzJ7/jlTtD1h0lc4g6tNx3eMlB8Mp6bfll0LPMAV4R6r3Q=="
}, },
"process-nextick-args": { "process-nextick-args": {
"version": "2.0.1", "version": "2.0.1",
@ -2424,11 +2414,6 @@
"lru-cache": "^6.0.0" "lru-cache": "^6.0.0"
} }
}, },
"setimmediate": {
"version": "1.0.5",
"resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
"integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU="
},
"shebang-command": { "shebang-command": {
"version": "2.0.0", "version": "2.0.0",
"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
@ -2616,9 +2601,9 @@
"integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
}, },
"ws": { "ws": {
"version": "7.4.3", "version": "7.4.5",
"resolved": "https://registry.npmjs.org/ws/-/ws-7.4.3.tgz", "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.5.tgz",
"integrity": "sha512-hr6vCR76GsossIRsr8OLR9acVVm1jyfEWvhbNjtgPOrfvAlKzvyeg/P6r8RuDjRyrcQoPQT7K0DGEPc7Ae6jzA==" "integrity": "sha512-xzyu3hFvomRfXKH8vOFMU3OguG6oOvhXMo3xsGy3xWExqaM2dxBbVxuD99O7m3ZUFMvvscsZDqxfgMaRr/Nr1g=="
}, },
"yallist": { "yallist": {
"version": "4.0.0", "version": "4.0.0",

2
bot/package.json
View File

@ -1,7 +1,7 @@
{ {
"dependencies": { "dependencies": {
"axios": "^0.21.1", "axios": "^0.21.1",
"discord.js": "^12.5.1", "discord.js": "github:discordjs/discord.js",
"dotenv": "^8.2.0", "dotenv": "^8.2.0",
"eslint": "^7.21.0", "eslint": "^7.21.0",
"fs": "^0.0.1-security", "fs": "^0.0.1-security",

Write Preview
Loading…
Cancel
Save