Browse Source

style: format with prettier

dependabot/npm_and_yarn/semver-5.7.2
Abheek Dhawan 2 years ago
parent
commit
bd7ffe8e9d
Signed by: abheekd GPG Key ID: 7BE81B8C14475B67
  1. 56
      src/commands/about.ts
  2. 14
      src/commands/help.ts
  3. 123
      src/commands/rounds.ts
  4. 32
      src/commands/score.ts
  5. 292
      src/commands/settings.ts
  6. 44
      src/commands/top.ts
  7. 333
      src/commands/train.ts
  8. 15
      src/deploy-commands.js
  9. 18
      src/events/interactionCreate.ts
  10. 20
      src/events/messageCreate.ts
  11. 19
      src/events/ready.ts
  12. 54
      src/helpers/db.ts
  13. 11
      src/helpers/env.ts
  14. 18
      src/helpers/log.ts
  15. 96
      src/helpers/util/pagination.ts
  16. 50
      src/index.ts
  17. 4
      src/models/generatedRound.ts
  18. 4
      src/models/userConfig.ts
  19. 4
      src/models/userScore.ts

56
src/commands/about.ts

@ -1,15 +1,15 @@
import { SlashCommandBuilder } from '@discordjs/builders'; import { SlashCommandBuilder } from "@discordjs/builders";
import { MessageEmbed, CommandInteraction } from 'discord.js'; import { MessageEmbed, CommandInteraction } from "discord.js";
import gitlog from 'gitlog'; import gitlog from "gitlog";
import userScore from '../models/userScore'; import userScore from "../models/userScore";
import { paginateInteraction } from '../helpers/util/pagination'; import { paginateInteraction } from "../helpers/util/pagination";
export const data = new SlashCommandBuilder() export const data = new SlashCommandBuilder()
.setName('about') .setName("about")
.setDescription('Commands regarding the creation/development of the bot'); .setDescription("Commands regarding the creation/development of the bot");
export async function execute(interaction: CommandInteraction) { export async function execute(interaction: CommandInteraction) {
await interaction.deferReply(); await interaction.deferReply();
@ -17,11 +17,16 @@ export async function execute(interaction: CommandInteraction) {
const client = interaction.client; const client = interaction.client;
const embeds: MessageEmbed[] = []; const embeds: MessageEmbed[] = [];
const contributorEmbed = new MessageEmbed().setTitle('Contributors') const contributorEmbed = new MessageEmbed()
.addField('Creator', '<@745063586422063214> [ADawesomeguy#3602]', true) .setTitle("Contributors")
.addField('Contributors', '<@650525101048987649> [tEjAs#8127]\n<@426864344463048705> [tetrident#9396]', true) // Add more contributors here, first one is Abheek, second one is Tejas .addField("Creator", "<@745063586422063214> [ADawesomeguy#3602]", true)
.addField(
"Contributors",
"<@650525101048987649> [tEjAs#8127]\n<@426864344463048705> [tetrident#9396]",
true
) // Add more contributors here, first one is Abheek, second one is Tejas
.setTimestamp() .setTimestamp()
.setColor('#ffffff'); .setColor("#ffffff");
embeds.push(contributorEmbed); embeds.push(contributorEmbed);
const gitRepoLocation = __dirname; const gitRepoLocation = __dirname;
@ -29,27 +34,36 @@ export async function execute(interaction: CommandInteraction) {
const commits = gitlog({ const commits = gitlog({
repo: gitRepoLocation, repo: gitRepoLocation,
number: 5, number: 5,
fields: ['hash', 'abbrevHash', 'subject', 'authorName', 'authorDateRel'], fields: ["hash", "abbrevHash", "subject", "authorName", "authorDateRel"],
}); });
const changelogEmbed = new MessageEmbed() const changelogEmbed = new MessageEmbed()
.setAuthor({ name: interaction.user.tag, iconURL: interaction.user.displayAvatarURL() }) .setAuthor({
.setTitle('Changelog') name: interaction.user.tag,
.setColor('#ffffff') iconURL: interaction.user.displayAvatarURL(),
})
.setTitle("Changelog")
.setColor("#ffffff")
.setTimestamp(); .setTimestamp();
commits.forEach(commit => { 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`); 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`
);
}); });
embeds.push(changelogEmbed); embeds.push(changelogEmbed);
await client.guilds.fetch(); await client.guilds.fetch();
const trainingDocuments = await userScore.countDocuments({}); const trainingDocuments = await userScore.countDocuments({});
const aboutBotEmbed = new MessageEmbed() const aboutBotEmbed = new MessageEmbed()
.setAuthor({ name: interaction.user.tag, iconURL: interaction.user.displayAvatarURL() }) .setAuthor({
.setTitle('About AwesomeSciBo') name: interaction.user.tag,
.addField('Servers', `${client.guilds.cache.size}`, true) iconURL: interaction.user.displayAvatarURL(),
.addField('Training Users', `${trainingDocuments}`, true) })
.setTitle("About AwesomeSciBo")
.addField("Servers", `${client.guilds.cache.size}`, true)
.addField("Training Users", `${trainingDocuments}`, true)
.setTimestamp(); .setTimestamp();
embeds.push(aboutBotEmbed); embeds.push(aboutBotEmbed);

14
src/commands/help.ts

@ -1,16 +1,18 @@
import { SlashCommandBuilder } from '@discordjs/builders'; import { SlashCommandBuilder } from "@discordjs/builders";
import { MessageEmbed, CommandInteraction } from 'discord.js'; import { MessageEmbed, CommandInteraction } from "discord.js";
export const data = new SlashCommandBuilder() export const data = new SlashCommandBuilder()
.setName('help') .setName("help")
.setDescription('Replies with a help message explaining what the bot can do'); .setDescription("Replies with a help message explaining what the bot can do");
export async function execute(interaction: CommandInteraction) { export async function execute(interaction: CommandInteraction) {
await interaction.deferReply(); await interaction.deferReply();
await interaction.deferReply(); await interaction.deferReply();
const helpEmbed = new MessageEmbed() const helpEmbed = new MessageEmbed()
.setDescription('AwesomeSciBo has migrated to using slash commands! You can take a look at the different commands by typing `/` and clicking on the AwesomeSciBo icon.') .setDescription(
.setColor('#ffffff'); "AwesomeSciBo has migrated to using slash commands! You can take a look at the different commands by typing `/` and clicking on the AwesomeSciBo icon."
)
.setColor("#ffffff");
interaction.followUp({ embeds: [helpEmbed] }); interaction.followUp({ embeds: [helpEmbed] });
} }

123
src/commands/rounds.ts

@ -1,40 +1,45 @@
import { SlashCommandBuilder } from '@discordjs/builders'; import { SlashCommandBuilder } from "@discordjs/builders";
import { MessageEmbed, CommandInteraction } from 'discord.js'; import { MessageEmbed, CommandInteraction } from "discord.js";
import axios from 'axios'; import axios from "axios";
import log from '../helpers/log'; import log from "../helpers/log";
import generatedRound from '../models/generatedRound'; import generatedRound from "../models/generatedRound";
export const data = new SlashCommandBuilder() export const data = new SlashCommandBuilder()
.setName('rounds') .setName("rounds")
.setDescription('Commands regarding the generation of rounds') .setDescription("Commands regarding the generation of rounds")
.addSubcommand(subcommand => { .addSubcommand((subcommand) => {
subcommand subcommand
.setName('generate') .setName("generate")
.setDescription('Generates a round with randomized questions from https://scibowldb.com/'); .setDescription(
"Generates a round with randomized questions from https://scibowldb.com/"
);
return subcommand; return subcommand;
}) })
.addSubcommand(subcommand => { .addSubcommand((subcommand) => {
subcommand subcommand
.setName('list') .setName("list")
.setDescription('Lists your 5 most recently generated rounds with links'); .setDescription("Lists your 5 most recently generated rounds with links");
return subcommand; return subcommand;
}) })
.addSubcommand(subcommand => { .addSubcommand((subcommand) => {
subcommand subcommand
.setName('hit') .setName("hit")
.setDescription('Shows the total number of rounds hit as well as the number for the specific user'); .setDescription(
"Shows the total number of rounds hit as well as the number for the specific user"
);
return subcommand; return subcommand;
}); });
export async function execute(interaction: CommandInteraction) { export async function execute(interaction: CommandInteraction) {
const action = interaction.options.getSubcommand(); const action = interaction.options.getSubcommand();
switch (action) { switch (action) {
case 'generate': { case "generate": {
interaction.deferReply({ ephemeral: true }); interaction.deferReply({ ephemeral: true });
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 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: string; let tossup_question: string;
let question_category: string; let question_category: string;
let tossup_format: string; let tossup_format: string;
@ -42,11 +47,24 @@ export async function execute(interaction: CommandInteraction) {
let bonus_question: string; let bonus_question: string;
let bonus_format: string; let bonus_format: string;
let bonus_answer: string; let bonus_answer: string;
let htmlContent = ''; let htmlContent = "";
await axios.post('https://scibowldb.com/api/questions', { categories: ['BIOLOGY', 'PHYSICS', 'CHEMISTRY', 'EARTH AND SPACE', 'ASTRONOMY', 'MATH'] }) await axios
.post("https://scibowldb.com/api/questions", {
categories: [
"BIOLOGY",
"PHYSICS",
"CHEMISTRY",
"EARTH AND SPACE",
"ASTRONOMY",
"MATH",
],
})
.then((response) => { .then((response) => {
for (let i = 1; i < 26; i++) { for (let i = 1; i < 26; i++) {
const questionData = response.data.questions[Math.floor(Math.random() * response.data.questions.length)]; const questionData =
response.data.questions[
Math.floor(Math.random() * response.data.questions.length)
];
tossup_question = questionData.tossup_question; tossup_question = questionData.tossup_question;
tossup_answer = questionData.tossup_answer; tossup_answer = questionData.tossup_answer;
question_category = questionData.category; question_category = questionData.category;
@ -54,9 +72,29 @@ export async function execute(interaction: CommandInteraction) {
bonus_question = questionData.bonus_question; bonus_question = questionData.bonus_question;
bonus_answer = questionData.bonus_answer; bonus_answer = questionData.bonus_answer;
bonus_format = questionData.bonus_format; bonus_format = questionData.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 =
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>'; "<br><br><h3 style='text-align: center;'><strong>TOSS-UP</strong></h3>\n<br>" +
htmlContent = htmlContent.replace(/\n/g, '<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; finalizedHTML += htmlContent;
} }
@ -69,7 +107,11 @@ export async function execute(interaction: CommandInteraction) {
newGeneratedRound.save((err, round) => { newGeneratedRound.save((err, round) => {
if (err) { if (err) {
log({ logger: 'rounds', content: `Saving round to DB failed: ${err}`, level: 'error' }); log({
logger: "rounds",
content: `Saving round to DB failed: ${err}`,
level: "error",
});
return; return;
} }
interaction.followUp({ interaction.followUp({
@ -81,13 +123,15 @@ export async function execute(interaction: CommandInteraction) {
break; break;
} }
case 'list': { case "list": {
interaction.deferReply({ ephemeral: true }); interaction.deferReply({ ephemeral: true });
let roundsList = await generatedRound.find({ requestedBy: interaction.user.id }).sort({ timestamp: -1 }); let roundsList = await generatedRound
let finalMessage = ''; .find({ requestedBy: interaction.user.id })
.sort({ timestamp: -1 });
let finalMessage = "";
if (!roundsList) { if (!roundsList) {
interaction.followUp('You haven\'t requested any rounds!'); interaction.followUp("You haven't requested any rounds!");
return; return;
} }
@ -96,12 +140,17 @@ export async function execute(interaction: CommandInteraction) {
} }
roundsList.forEach(async (item, index) => { roundsList.forEach(async (item, index) => {
finalMessage += `${index + 1}. [${item.timestamp.split('T')[0]}](https://api.adawesome.tech/round/${item._id.toString()})\n`; finalMessage += `${index + 1}. [${
item.timestamp.split("T")[0]
}](https://api.adawesome.tech/round/${item._id.toString()})\n`;
}); });
const roundsListEmbed = new MessageEmbed() const roundsListEmbed = new MessageEmbed()
.setAuthor({ name: interaction.user.tag, iconURL: interaction.user.displayAvatarURL() }) .setAuthor({
.setTitle('Last 5 rounds requested') name: interaction.user.tag,
iconURL: interaction.user.displayAvatarURL(),
})
.setTitle("Last 5 rounds requested")
.setDescription(finalMessage) .setDescription(finalMessage)
.setTimestamp(); .setTimestamp();
@ -112,13 +161,17 @@ export async function execute(interaction: CommandInteraction) {
break; break;
} }
case 'hit': { case "hit": {
await interaction.deferReply(); await interaction.deferReply();
const totalCount = await generatedRound.countDocuments({}); const totalCount = await generatedRound.countDocuments({});
const userCount = await generatedRound.countDocuments({ requestedBy: interaction.user.id }); const userCount = await generatedRound.countDocuments({
requestedBy: interaction.user.id,
});
interaction.followUp(`Total Hits: ${totalCount}\nYour Hits: ${userCount}`); interaction.followUp(
`Total Hits: ${totalCount}\nYour Hits: ${userCount}`
);
break; break;
} }
} }

32
src/commands/score.ts

@ -1,34 +1,38 @@
import { SlashCommandBuilder } from '@discordjs/builders'; import { SlashCommandBuilder } from "@discordjs/builders";
import { CommandInteraction, MessageEmbed } from 'discord.js'; import { CommandInteraction, MessageEmbed } from "discord.js";
import log from '../helpers/log'; import log from "../helpers/log";
import userScore from '../models/userScore'; import userScore from "../models/userScore";
export const data = new SlashCommandBuilder() export const data = new SlashCommandBuilder()
.setName('score') .setName("score")
.setDescription('Returns the score of the current user or another') .setDescription("Returns the score of the current user or another")
.addUserOption(option => { .addUserOption((option) => {
option option
.setName('user') .setName("user")
.setDescription('The user to find the score for') .setDescription("The user to find the score for")
.setRequired(false); .setRequired(false);
return option; return option;
}); });
export async function execute(interaction: CommandInteraction) { export async function execute(interaction: CommandInteraction) {
const scoreEmbed = new MessageEmbed() const scoreEmbed = new MessageEmbed().setColor("#ffffff");
.setColor('#ffffff');
const user = interaction.options.getUser('user') || interaction.user; const user = interaction.options.getUser("user") || interaction.user;
userScore.findOne({ authorID: user.id }, async (err, score) => { userScore.findOne({ authorID: user.id }, async (err, score) => {
if (err) { if (err) {
log({ logger: 'db', content: `Unable to obtain user: ${err}`, level: 'info' }); log({
logger: "db",
content: `Unable to obtain user: ${err}`,
level: "info",
});
} }
if (!score) { if (!score) {
await interaction.reply({ await interaction.reply({
content: 'Unfortunately, that user does not seem to have used AwesomeSciBo yet.', content:
"Unfortunately, that user does not seem to have used AwesomeSciBo yet.",
ephemeral: true, ephemeral: true,
}); });
return; return;

292
src/commands/settings.ts

@ -1,250 +1,288 @@
import { SlashCommandBuilder } from '@discordjs/builders'; import { SlashCommandBuilder } from "@discordjs/builders";
import { Message, MessageActionRow, MessageSelectMenu } from 'discord.js'; import { Message, MessageActionRow, MessageSelectMenu } from "discord.js";
import { CommandInteraction, MessageEmbed } from 'discord.js'; import { CommandInteraction, MessageEmbed } from "discord.js";
import log from '../helpers/log'; import log from "../helpers/log";
import userConfig from '../models/userConfig'; import userConfig from "../models/userConfig";
export const data = new SlashCommandBuilder() export const data = new SlashCommandBuilder()
.setName('settings') .setName("settings")
.setDescription('BETA - settings configuration') .setDescription("BETA - settings configuration")
.addSubcommand(subcommand => { .addSubcommand((subcommand) => {
subcommand subcommand.setName("subject").setDescription("Changes subject of problems");
.setName('subject')
.setDescription('Changes subject of problems');
return subcommand; return subcommand;
}) })
.addSubcommand(subcommand => { .addSubcommand((subcommand) => {
subcommand subcommand.setName("display").setDescription("Displays current settings");
.setName('display')
.setDescription('Displays current settings');
return subcommand; return subcommand;
}) })
.addSubcommand(subcommand => { .addSubcommand((subcommand) => {
subcommand subcommand
.setName('gradelevels') .setName("gradelevels")
.setDescription('Changes grade level of problems'); .setDescription("Changes grade level of problems");
return subcommand; return subcommand;
}); });
export async function execute(interaction: CommandInteraction) { export async function execute(interaction: CommandInteraction) {
const action = interaction.options.getSubcommand(); const action = interaction.options.getSubcommand();
switch (action) { switch (action) {
case 'display': { case "display": {
await interaction.deferReply(); await interaction.deferReply();
const settingsEmbed = new MessageEmbed() const settingsEmbed = new MessageEmbed().setColor("#ffffff");
.setColor('#ffffff');
const user = interaction.options.getUser('user') || interaction.user; const user = interaction.options.getUser("user") || interaction.user;
settingsEmbed settingsEmbed
.setAuthor({ name: user.tag, iconURL: user.displayAvatarURL() }) .setAuthor({ name: user.tag, iconURL: user.displayAvatarURL() })
.setDescription('Current selections: '); .setDescription("Current selections: ");
const menu = new MessageActionRow() const menu = new MessageActionRow().addComponents(
.addComponents(
new MessageSelectMenu() new MessageSelectMenu()
.setCustomId('selectdisp') .setCustomId("selectdisp")
.setPlaceholder('Nothing selected') .setPlaceholder("Nothing selected")
.addOptions([ .addOptions([
{ {
label: 'subjects', label: "subjects",
description: 'subjects', description: "subjects",
value: 'subjects', value: "subjects",
}, },
{ {
label: 'gradelevels', label: "gradelevels",
description: 'grade levels', description: "grade levels",
value: 'gradelevels', value: "gradelevels",
}, },
]), ])
); );
interaction.followUp({ interaction
embeds: [/* settingsEmbed*/], .followUp({
embeds: [
/* settingsEmbed*/
],
components: [menu], components: [menu],
}) })
.then((dispMsg => { .then((dispMsg) => {
const w = dispMsg as Message; const w = dispMsg as Message;
const dispFilter = i => ['selectdisp'].includes(i.customId) && i.user.id == interaction.user.id; // <== ATTENTION! First argument... const dispFilter = (i) =>
w.awaitMessageComponent({ filter: dispFilter, componentType: 'SELECT_MENU' }) ["selectdisp"].includes(i.customId) &&
.then(async dispChoice => { i.user.id == interaction.user.id; // <== ATTENTION! First argument...
w.awaitMessageComponent({
filter: dispFilter,
componentType: "SELECT_MENU",
}).then(async (dispChoice) => {
const vals = dispChoice.values; const vals = dispChoice.values;
const config = await userConfig.findById(interaction.user.id); const config = await userConfig.findById(interaction.user.id);
if (!config) { if (!config) {
await interaction.editReply({ await interaction.editReply({
content: 'You don\'t have a configuration!', content: "You don't have a configuration!",
embeds: [], embeds: [],
components: [], components: [],
}); });
} } else if (vals.length === 1 && vals.at(0) === "subjects") {
else if (vals.length === 1 && vals.at(0) === 'subjects') {
await interaction.editReply({ await interaction.editReply({
content: `Current subjects setting: ${config.subjects.toString().split(',').join(', ')}`, content: `Current subjects setting: ${config.subjects
.toString()
.split(",")
.join(", ")}`,
components: [], components: [],
}); });
} } else if (vals.length === 1 && vals.at(0) === "gradelevels") {
else if (vals.length === 1 && vals.at(0) === 'gradelevels') {
await interaction.editReply({ await interaction.editReply({
content: `Current grade level setting: ${config.gradeLevels.toString().split(',').join(', ')}`, content: `Current grade level setting: ${config.gradeLevels
.toString()
.split(",")
.join(", ")}`,
components: [], components: [],
}); });
} } else {
else { (err) =>
err => log({ log({
logger: '\'Error occurred: /settings:display did not equal subjects or gradelevels.\'', logger:
"'Error occurred: /settings:display did not equal subjects or gradelevels.'",
content: `${err}`, content: `${err}`,
level: 'error', level: "error",
}); });
} }
}); });
})); });
break; break;
} }
case 'gradelevels': { case "gradelevels": {
await interaction.deferReply(); await interaction.deferReply();
const settingsEmbed = new MessageEmbed() const settingsEmbed = new MessageEmbed().setColor("#ffffff");
.setColor('#ffffff');
const user = interaction.options.getUser('user') || interaction.user; const user = interaction.options.getUser("user") || interaction.user;
settingsEmbed settingsEmbed
.setAuthor({ name: user.tag, iconURL: user.displayAvatarURL() }) .setAuthor({ name: user.tag, iconURL: user.displayAvatarURL() })
.setDescription('Current level settings: '); .setDescription("Current level settings: ");
const menu = new MessageActionRow() const menu = new MessageActionRow().addComponents(
.addComponents(
new MessageSelectMenu() new MessageSelectMenu()
.setCustomId('selectlvl') .setCustomId("selectlvl")
.setPlaceholder('Nothing selected') .setPlaceholder("Nothing selected")
.setMinValues(1) .setMinValues(1)
.setMaxValues(2) .setMaxValues(2)
.addOptions([ .addOptions([
{ {
label: 'Middle School', label: "Middle School",
description: 'Middle school level problems', description: "Middle school level problems",
value: 'MS', value: "MS",
}, },
{ {
label: 'High School', label: "High School",
description: 'High school level problems', description: "High school level problems",
value: 'HS', value: "HS",
}, },
]), ])
); );
interaction.followUp({ interaction
embeds: [/* settingsEmbed*/], .followUp({
embeds: [
/* settingsEmbed*/
],
components: [menu], components: [menu],
}) })
.then((lvlMsg => { .then((lvlMsg) => {
const w = lvlMsg as Message; const w = lvlMsg as Message;
const lvlFilter = i => ['selectlvl'].includes(i.customId) && i.user.id == interaction.user.id; // <== ATTENTION! First argument... const lvlFilter = (i) =>
w.awaitMessageComponent({ filter: lvlFilter, componentType: 'SELECT_MENU' }) ["selectlvl"].includes(i.customId) &&
.then(async lvlChoice => { i.user.id == interaction.user.id; // <== ATTENTION! First argument...
w.awaitMessageComponent({
filter: lvlFilter,
componentType: "SELECT_MENU",
}).then(async (lvlChoice) => {
const vals = lvlChoice.values; const vals = lvlChoice.values;
const levels = new Array<string>(); const levels = new Array<string>();
await userConfig.findOneAndUpdate({ _id: interaction.user.id }, { gradeLevels: vals }, { await userConfig.findOneAndUpdate(
{ _id: interaction.user.id },
{ gradeLevels: vals },
{
upsert: true, upsert: true,
new: true, new: true,
}); }
await vals.forEach(v => { );
await vals.forEach((v) => {
switch (v) { switch (v) {
case 'MS': case "MS":
levels.push('Middle School'); levels.push("Middle School");
break; break;
case 'HS': case "HS":
levels.push('High School'); levels.push("High School");
} }
}); });
await interaction.editReply({ await interaction.editReply({
content: `Level set to: ${levels.toString().split(',').join(', ')}`, content: `Level set to: ${levels
.toString()
.split(",")
.join(", ")}`,
embeds: [], embeds: [],
components: [], components: [],
}); });
}); });
})); });
break; break;
} }
case 'subject': { case "subject": {
await interaction.deferReply(); await interaction.deferReply();
const settingsEmbed = new MessageEmbed() const settingsEmbed = new MessageEmbed().setColor("#ffffff");
.setColor('#ffffff');
const user = interaction.options.getUser('user') || interaction.user; const user = interaction.options.getUser("user") || interaction.user;
settingsEmbed settingsEmbed
.setAuthor({ name: user.tag, iconURL: user.displayAvatarURL() }) .setAuthor({ name: user.tag, iconURL: user.displayAvatarURL() })
.setDescription('Current subject settings: '); .setDescription("Current subject settings: ");
const menu = new MessageActionRow() const menu = new MessageActionRow().addComponents(
.addComponents(
new MessageSelectMenu() new MessageSelectMenu()
.setCustomId('selectsubject') .setCustomId("selectsubject")
.setPlaceholder('Nothing selected') .setPlaceholder("Nothing selected")
.setMinValues(1) .setMinValues(1)
.setMaxValues(7) .setMaxValues(7)
.addOptions([ .addOptions([
{ {
label: 'Astronomy', label: "Astronomy",
description: 'Astronomy', description: "Astronomy",
value: 'ASTRONOMY', value: "ASTRONOMY",
}, },
{ {
label: 'Biology', label: "Biology",
description: 'Biology', description: "Biology",
value: 'BIOLOGY', value: "BIOLOGY",
}, },
{ {
label: 'Earth Science', label: "Earth Science",
description: 'Earth Science', description: "Earth Science",
value: 'EARTH SCIENCE', value: "EARTH SCIENCE",
}, },
{ {
label: 'Chemistry', label: "Chemistry",
description: 'Chemistry', description: "Chemistry",
value: 'CHEMISTRY', value: "CHEMISTRY",
}, },
{ {
label: 'Physics', label: "Physics",
description: 'Physics', description: "Physics",
value: 'PHYSICS', value: "PHYSICS",
}, },
{ {
label: 'Mathematics', label: "Mathematics",
description: 'Mathematics', description: "Mathematics",
value: 'MATH', value: "MATH",
}, },
{ {
label: 'Energy', label: "Energy",
description: 'Energy', description: "Energy",
value: 'ENERGY', value: "ENERGY",
}, },
]), ])
); );
interaction.followUp({ interaction
embeds: [/* settingsEmbed*/], .followUp({
embeds: [
/* settingsEmbed*/
],
components: [menu], components: [menu],
}) })
.then((subjectMsg => { .then((subjectMsg) => {
const subjectFilter = i => ['selectsubject'].includes(i.customId) && i.user.id == interaction.user.id; // <== ATTENTION! First argument... const subjectFilter = (i) =>
(subjectMsg as Message).awaitMessageComponent({ filter: subjectFilter, componentType: 'SELECT_MENU' }) ["selectsubject"].includes(i.customId) &&
.then(async subjectChoice => { i.user.id == interaction.user.id; // <== ATTENTION! First argument...
(subjectMsg as Message)
.awaitMessageComponent({
filter: subjectFilter,
componentType: "SELECT_MENU",
})
.then(async (subjectChoice) => {
const vals = subjectChoice.values; const vals = subjectChoice.values;
await userConfig.findOneAndUpdate({ _id: interaction.user.id }, { subjects: vals }, { await userConfig.findOneAndUpdate(
{ _id: interaction.user.id },
{ subjects: vals },
{
upsert: true, upsert: true,
new: true, new: true,
}); }
);
const subjects = new Array<string>(); const subjects = new Array<string>();
await vals.forEach(v => { await vals.forEach((v) => {
subjects.push(v.toLowerCase().split(' ').map(w => w[0].toUpperCase() + w.substring(1)).join(' ')); subjects.push(
v
.toLowerCase()
.split(" ")
.map((w) => w[0].toUpperCase() + w.substring(1))
.join(" ")
);
}); });
await interaction.editReply({ await interaction.editReply({
content: `Subjects set to: ${subjects.toString().split(',').join(', ')}`, content: `Subjects set to: ${subjects
.toString()
.split(",")
.join(", ")}`,
components: [], components: [],
embeds: [], embeds: [],
}); });
}); });
})); });
break; break;
} }
} }

44
src/commands/top.ts

@ -1,12 +1,14 @@
import { SlashCommandBuilder } from '@discordjs/builders'; import { SlashCommandBuilder } from "@discordjs/builders";
import { CommandInteraction, MessageEmbed } from 'discord.js'; import { CommandInteraction, MessageEmbed } from "discord.js";
import log from '../helpers/log'; import log from "../helpers/log";
import userScore from '../models/userScore'; import userScore from "../models/userScore";
export const data = new SlashCommandBuilder() export const data = new SlashCommandBuilder()
.setName('top') .setName("top")
.setDescription('Lists top ten scores across servers and in the current server'); .setDescription(
"Lists top ten scores across servers and in the current server"
);
export async function execute(interaction: CommandInteraction) { export async function execute(interaction: CommandInteraction) {
await interaction.deferReply(); await interaction.deferReply();
@ -16,44 +18,54 @@ export async function execute(interaction: CommandInteraction) {
.sort({ score: -1 }) // Sort by descending order .sort({ score: -1 }) // Sort by descending order
.exec(async (err, obj) => { .exec(async (err, obj) => {
if (err) { if (err) {
log({ logger: 'top', content: `Getting top players failed: ${err}`, level: 'error' }); log({
logger: "top",
content: `Getting top players failed: ${err}`,
level: "error",
});
console.log(err); console.log(err);
} }
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 interaction.followUp( return interaction.followUp(
`There are only ${obj.length} users, we need at least 10!`, `There are only ${obj.length} users, we need at least 10!`
); );
} }
const embeds: MessageEmbed[] = []; const embeds: MessageEmbed[] = [];
let lbMessageContent = ''; let lbMessageContent = "";
for (let i = 0; i < 10; i++) { for (let i = 0; i < 10; i++) {
lbMessageContent += `${i + 1}: <@${obj[i].authorID}>: ${obj[i].score}\n`; // Loop through each user and add their name and score to leaderboard content lbMessageContent += `${i + 1}: <@${obj[i].authorID}>: ${
obj[i].score
}\n`; // Loop through each user and add their name and score to leaderboard content
} }
const leaderboardEmbed = new MessageEmbed() const leaderboardEmbed = new MessageEmbed()
.setTitle('Top Ten!') .setTitle("Top Ten!")
.setDescription(lbMessageContent) .setDescription(lbMessageContent)
.setColor('#ffffff'); .setColor("#ffffff");
embeds.push(leaderboardEmbed); embeds.push(leaderboardEmbed);
let sMessageContent = ''; let sMessageContent = "";
const members = await interaction.guild?.members.fetch(); const members = await interaction.guild?.members.fetch();
const serverLeaderBoardArray = await obj.filter(o => members?.some(m => m.user.id === o.authorID)); const serverLeaderBoardArray = await obj.filter((o) =>
members?.some((m) => m.user.id === o.authorID)
);
if (serverLeaderBoardArray.length > 10) { if (serverLeaderBoardArray.length > 10) {
for (let i = 0; i < 10; i++) { for (let i = 0; i < 10; i++) {
sMessageContent += `${i + 1}: <@${serverLeaderBoardArray[i].authorID}>: ${serverLeaderBoardArray[i].score}\n`; sMessageContent += `${i + 1}: <@${
serverLeaderBoardArray[i].authorID
}>: ${serverLeaderBoardArray[i].score}\n`;
} }
const sLeaderboardEmbed = new MessageEmbed() const sLeaderboardEmbed = new MessageEmbed()
.setTitle(`Top Ten in ${interaction.guild?.name}!`) .setTitle(`Top Ten in ${interaction.guild?.name}!`)
.setDescription(sMessageContent) .setDescription(sMessageContent)
.setColor('#ffffff'); .setColor("#ffffff");
embeds.push(sLeaderboardEmbed); embeds.push(sLeaderboardEmbed);
} }

333
src/commands/train.ts

@ -1,31 +1,37 @@
import { SlashCommandBuilder } from '@discordjs/builders'; import { SlashCommandBuilder } from "@discordjs/builders";
import { MessageEmbed, MessageActionRow, MessageButton, CommandInteraction, Message } from 'discord.js'; import {
MessageEmbed,
MessageActionRow,
MessageButton,
CommandInteraction,
Message,
} from "discord.js";
import { decode } from 'html-entities'; import { decode } from "html-entities";
import axios from 'axios'; import axios from "axios";
import userScore from '../models/userScore'; import userScore from "../models/userScore";
import userConfig from '../models/userConfig'; import userConfig from "../models/userConfig";
import log from '../helpers/log.js'; import log from "../helpers/log.js";
import { updateScore } from '../helpers/db.js'; import { updateScore } from "../helpers/db.js";
export const data = new SlashCommandBuilder() export const data = new SlashCommandBuilder()
.setName('train') .setName("train")
.setDescription('Sends a training question to be answered') .setDescription("Sends a training question to be answered")
.addStringOption(option => { .addStringOption((option) => {
option option
.setName('subject') .setName("subject")
.setDescription('Optional subject to be used as a filter') .setDescription("Optional subject to be used as a filter")
.setRequired(false) .setRequired(false)
.addChoices( .addChoices(
{ name: 'astro', value: 'astro' }, { name: "astro", value: "astro" },
{ name: 'bio', value: 'bio' }, { name: "bio", value: "bio" },
{ name: 'chem', value: 'chem' }, { name: "chem", value: "chem" },
{ name: 'ess', value: 'ess' }, { name: "ess", value: "ess" },
{ name: 'phys', value: 'phys' }, { name: "phys", value: "phys" },
{ name: 'math', value: 'math' }, { name: "math", value: "math" },
{ name: 'energy', value: 'energy' }, { name: "energy", value: "energy" }
) )
.setRequired(false); .setRequired(false);
return option; return option;
@ -34,153 +40,188 @@ export const data = new SlashCommandBuilder()
export async function execute(interaction: CommandInteraction) { export async function execute(interaction: CommandInteraction) {
await interaction.deferReply(); await interaction.deferReply();
const subject = interaction.options.get('subject') ? interaction.options.get('subject')?.value : null; const subject = interaction.options.get("subject")
? interaction.options.get("subject")?.value
: null;
const authorId = interaction.user.id; const authorId = interaction.user.id;
let score: number; let score: number;
userScore userScore
.findOne({ authorID: authorId }) .findOne({ authorID: authorId })
.lean() .lean()
.then((obj: { score: number; }, err: unknown) => { .then((obj: { score: number }, err: unknown) => {
if (!obj) { if (!obj) {
score = 0; score = 0;
const firstTimeEmbed = new MessageEmbed() const firstTimeEmbed = new MessageEmbed()
.setAuthor({ .setAuthor({
name: interaction.client.user?.tag ? interaction.client.user?.tag : '', name: interaction.client.user?.tag
? interaction.client.user?.tag
: "",
iconURL: interaction.client.user?.displayAvatarURL(), iconURL: interaction.client.user?.displayAvatarURL(),
}) })
.setDescription('Hey! It seems like it\'s your first time using AwesomeSciBo. Here\'s some information regarding the bot if you need it (for issues, contributions, etc.):') .setDescription(
.addField('Creator', '<@745063586422063214> [@abheekd#3602]') "Hey! It seems like it's your first time using AwesomeSciBo. Here's some information regarding the bot if you need it (for issues, contributions, etc.):"
.addField('GitHub', '[Link](https://github.com/ADawesomeguy/AwesomeSciBo) (a star couldn\'t hurt...)') )
.setColor('#ffffff') .addField("Creator", "<@745063586422063214> [@abheekd#3602]")
.addField(
"GitHub",
"[Link](https://github.com/ADawesomeguy/AwesomeSciBo) (a star couldn't hurt...)"
)
.setColor("#ffffff")
.setTimestamp(); .setTimestamp();
interaction.user.send({ embeds: [firstTimeEmbed] }) interaction.user
.catch(err => log({ logger: 'train', content: `${err}`, level: 'error' })); .send({ embeds: [firstTimeEmbed] })
} .catch((err) =>
else if (obj) { log({ logger: "train", content: `${err}`, level: "error" })
);
} else if (obj) {
score = obj.score; score = obj.score;
} } else {
else { log({
log({ logger: 'train', content: `Getting user score failed: ${err}`, level: 'error' }); logger: "train",
content: `Getting user score failed: ${err}`,
level: "error",
});
} }
}); });
let categoryArray: string[] = []; let categoryArray: string[] = [];
const allCategories = ['BIOLOGY', 'PHYSICS', 'CHEMISTRY', 'EARTH AND SPACE', 'ASTRONOMY', 'MATH']; const allCategories = [
"BIOLOGY",
"PHYSICS",
"CHEMISTRY",
"EARTH AND SPACE",
"ASTRONOMY",
"MATH",
];
const configCategories = await userConfig.findById(interaction.user.id); const configCategories = await userConfig.findById(interaction.user.id);
switch (subject) { switch (subject) {
case null: case null:
categoryArray = (configCategories ? (configCategories.subjects || allCategories) : allCategories); categoryArray = configCategories
? configCategories.subjects || allCategories
: allCategories;
break; break;
case 'astro': case "astro":
case 'astronomy': case "astronomy":
categoryArray = ['ASTRONOMY']; categoryArray = ["ASTRONOMY"];
break; break;
case 'bio': case "bio":
case 'biology': case "biology":
categoryArray = ['BIOLOGY']; categoryArray = ["BIOLOGY"];
break; break;
case 'ess': case "ess":
case 'earth science': case "earth science":
case 'es': case "es":
categoryArray = ['EARTH SCIENCE']; categoryArray = ["EARTH SCIENCE"];
break; break;
case 'chem': case "chem":
case 'chemistry': case "chemistry":
categoryArray = ['CHEMISTRY']; categoryArray = ["CHEMISTRY"];
break; break;
case 'phys': case "phys":
case 'physics': case "physics":
categoryArray = ['PHYSICS']; categoryArray = ["PHYSICS"];
break; break;
case 'math': case "math":
categoryArray = ['MATH']; categoryArray = ["MATH"];
break; break;
case 'energy': case "energy":
categoryArray = ['ENERGY']; categoryArray = ["ENERGY"];
break; break;
default: default:
interaction.followUp({ interaction.followUp({
embeds: [new MessageEmbed() embeds: [
.setDescription('<:red_x:816791117671825409> Not a valid subject!') new MessageEmbed()
.setColor('#ffffff')], .setDescription("<:red_x:816791117671825409> Not a valid subject!")
.setColor("#ffffff"),
],
}); });
return; return;
} }
axios axios
.post('https://scibowldb.com/api/questions/random', { categories: categoryArray }) .post("https://scibowldb.com/api/questions/random", {
categories: categoryArray,
})
.then((res) => { .then((res) => {
const questionData = res.data.question; const questionData = res.data.question;
const tossupQuestion = questionData.tossup_question; const tossupQuestion = questionData.tossup_question;
const tossupAnswer = questionData.tossup_answer; const tossupAnswer = questionData.tossup_answer;
const tossupFormat = questionData.tossup_format; const tossupFormat = questionData.tossup_format;
let answers = tossupAnswer.split(' (ACCEPT: '); let answers = tossupAnswer.split(" (ACCEPT: ");
if (answers.length > 1) { if (answers.length > 1) {
answers[1] = answers[1].slice(0, answers[1].length - 1); // If there are multiple elements, it means there was an 'accept' and therefore a trailing ')' which should be removed answers[1] = answers[1].slice(0, answers[1].length - 1); // If there are multiple elements, it means there was an 'accept' and therefore a trailing ')' which should be removed
answers = [answers[0], ...answers[1].split(new RegExp(' OR ', 'i'))]; // Use the first element plus the last element split by 'OR' case insensitive answers = [answers[0], ...answers[1].split(new RegExp(" OR ", "i"))]; // Use the first element plus the last element split by 'OR' case insensitive
} }
interaction.followUp({ content: decode(tossupQuestion), fetchReply: true }) interaction
.then(q => { .followUp({ content: decode(tossupQuestion), fetchReply: true })
.then((q) => {
const questionMessage = q as Message; const questionMessage = q as Message;
const sourceButton = new MessageActionRow() const sourceButton = new MessageActionRow().addComponents(
.addComponents(
new MessageButton() new MessageButton()
.setURL(questionData.uri) .setURL(questionData.uri)
.setLabel('Source') .setLabel("Source")
.setStyle('LINK'), .setStyle("LINK")
); );
switch (tossupFormat) { switch (tossupFormat) {
case 'Short Answer': { case "Short Answer": {
// eslint-disable-next-line no-case-declarations // eslint-disable-next-line no-case-declarations
const messageFilter = m => m.author.id === interaction.user.id || m.author.id === interaction.client.user?.id; const messageFilter = (m) =>
interaction.channel?.awaitMessages({ m.author.id === interaction.user.id ||
m.author.id === interaction.client.user?.id;
interaction.channel
?.awaitMessages({
filter: messageFilter, filter: messageFilter,
max: 1, max: 1,
}) })
.then(collected => { .then((collected) => {
const answerMsg = collected.first(); const answerMsg = collected.first();
if (answerMsg?.author.id === interaction.client.user?.id) return; if (answerMsg?.author.id === interaction.client.user?.id)
return;
let predicted = ''; let predicted = "";
if (answerMsg?.content.toLowerCase() === tossupAnswer.toLowerCase() || answers.includes(answerMsg?.content.toUpperCase())) { if (
predicted = 'correct'; answerMsg?.content.toLowerCase() ===
} tossupAnswer.toLowerCase() ||
else { answers.includes(answerMsg?.content.toUpperCase())
predicted = 'incorrect'; ) {
predicted = "correct";
} else {
predicted = "incorrect";
} }
if (predicted === 'correct') { if (predicted === "correct") {
updateScore(true, score, authorId).then((msgToReply) => updateScore(true, score, authorId).then((msgToReply) =>
answerMsg?.reply(msgToReply), answerMsg?.reply(msgToReply)
); );
} } else {
else {
const overrideEmbed = new MessageEmbed() const overrideEmbed = new MessageEmbed()
.setAuthor({ .setAuthor({
name: answerMsg?.author.tag ? answerMsg.author.tag : '', name: answerMsg?.author.tag ? answerMsg.author.tag : "",
iconURL: answerMsg?.author.displayAvatarURL(), iconURL: answerMsg?.author.displayAvatarURL(),
}) })
.addField('Correct answer', `\`${tossupAnswer}\``) .addField("Correct answer", `\`${tossupAnswer}\``)
.setDescription('It seems your answer was incorrect. Please react with <:override:955265585086857236> to override your answer if you think you got it right.') .setDescription(
.setColor('#ffffff') "It seems your answer was incorrect. Please react with <:override:955265585086857236> to override your answer if you think you got it right."
)
.setColor("#ffffff")
.setTimestamp(); .setTimestamp();
const overrideButton = new MessageActionRow() const overrideButton = new MessageActionRow().addComponents(
.addComponents(
new MessageButton() new MessageButton()
.setCustomId('override') .setCustomId("override")
.setEmoji('<:override:955265585086857236>') .setEmoji("<:override:955265585086857236>")
.setStyle('SECONDARY'), .setStyle("SECONDARY")
); );
answerMsg?.channel.send({ answerMsg?.channel
.send({
embeds: [overrideEmbed], embeds: [overrideEmbed],
components: [overrideButton], components: [overrideButton],
}) })
.then(overrideMsg => { .then((overrideMsg) => {
const overrideFilter = i => { const overrideFilter = (i) => {
return ( return (
['override'].includes(i.customId) && ["override"].includes(i.customId) &&
i.user.id === answerMsg.author.id i.user.id === answerMsg.author.id
); );
}; };
@ -188,64 +229,80 @@ export async function execute(interaction: CommandInteraction) {
.awaitMessageComponent({ .awaitMessageComponent({
filter: overrideFilter, filter: overrideFilter,
}) })
.then(i => { .then((i) => {
updateScore(true, score, authorId).then(async msgToReply => { updateScore(true, score, authorId).then(
async (msgToReply) => {
await i.reply(msgToReply); await i.reply(msgToReply);
overrideMsg.edit({ components: [] }); overrideMsg.edit({ components: [] });
}); }
}).catch(err => log({ );
logger: 'train', })
.catch((err) =>
log({
logger: "train",
content: `Failed to override score: ${err}`, content: `Failed to override score: ${err}`,
level: 'error', level: "error",
})); })
}).catch(err => log({ );
logger: 'train', })
.catch((err) =>
log({
logger: "train",
content: `Failed to send override message: ${err}`, content: `Failed to send override message: ${err}`,
level: 'error', level: "error",
})); })
);
} }
interaction.editReply({ components: [sourceButton] }); interaction.editReply({ components: [sourceButton] });
}).catch(err => log({ logger: 'train', content: `${err}`, level: 'error' })); })
.catch((err) =>
log({ logger: "train", content: `${err}`, level: "error" })
);
break; break;
} }
case 'Multiple Choice': { case "Multiple Choice": {
const choices = new MessageActionRow() const choices = new MessageActionRow().addComponents(
.addComponents(
new MessageButton() new MessageButton()
.setCustomId('w') .setCustomId("w")
.setLabel('W') .setLabel("W")
.setStyle('SECONDARY'), .setStyle("SECONDARY"),
new MessageButton() new MessageButton()
.setCustomId('x') .setCustomId("x")
.setLabel('X') .setLabel("X")
.setStyle('SECONDARY'), .setStyle("SECONDARY"),
new MessageButton() new MessageButton()
.setCustomId('y') .setCustomId("y")
.setLabel('Y') .setLabel("Y")
.setStyle('SECONDARY'), .setStyle("SECONDARY"),
new MessageButton() new MessageButton()
.setCustomId('z') .setCustomId("z")
.setLabel('Z') .setLabel("Z")
.setStyle('SECONDARY'), .setStyle("SECONDARY")
); );
interaction.editReply({ components: [choices] }); interaction.editReply({ components: [choices] });
const mcFilter = i => ['w', 'x', 'y', 'z'].includes(i.customId) && i.user.id === interaction.user.id; const mcFilter = (i) =>
questionMessage.awaitMessageComponent({ filter: mcFilter }) ["w", "x", "y", "z"].includes(i.customId) &&
.then(mcChoice => { i.user.id === interaction.user.id;
if (tossupAnswer.charAt(0).toLowerCase() === mcChoice.customId) { questionMessage
.awaitMessageComponent({ filter: mcFilter })
.then((mcChoice) => {
if (
tossupAnswer.charAt(0).toLowerCase() === mcChoice.customId
) {
updateScore(true, score, authorId).then((msgToReply) => updateScore(true, score, authorId).then((msgToReply) =>
mcChoice.reply(msgToReply), mcChoice.reply(msgToReply)
); );
} } else {
else {
const incorrectEmbed = new MessageEmbed() const incorrectEmbed = new MessageEmbed()
.setAuthor({ .setAuthor({
name: interaction.user.tag, name: interaction.user.tag,
iconURL: interaction.user.displayAvatarURL(), iconURL: interaction.user.displayAvatarURL(),
}) })
.addField('Correct answer', `\`${tossupAnswer}\``) .addField("Correct answer", `\`${tossupAnswer}\``)
.setDescription(`It seems your answer ${mcChoice.customId.toUpperCase()} was incorrect.`) .setDescription(
.setColor('#ffffff') `It seems your answer ${mcChoice.customId.toUpperCase()} was incorrect.`
)
.setColor("#ffffff")
.setTimestamp(); .setTimestamp();
mcChoice.reply({ embeds: [incorrectEmbed] }); mcChoice.reply({ embeds: [incorrectEmbed] });
} }
@ -254,6 +311,12 @@ export async function execute(interaction: CommandInteraction) {
break; break;
} }
} }
}).catch(err => log({ logger: 'train', content: `${err}`, level: 'error' })); })
}).catch(err => log({ logger: 'train', content: `${err}`, level: 'error' })); .catch((err) =>
log({ logger: "train", content: `${err}`, level: "error" })
);
})
.catch((err) =>
log({ logger: "train", content: `${err}`, level: "error" })
);
} }

15
src/deploy-commands.js

@ -1,20 +1,23 @@
#!/usr/bin/env node #!/usr/bin/env node
const fs = require('node:fs'); const fs = require('node:fs');
const {REST} = require('@discordjs/rest'); const { REST } = require('@discordjs/rest');
const {Routes} = require('discord-api-types/v9'); const { Routes } = require('discord-api-types/v9');
const {clientId, token} = require('./helpers/env'); const { clientId, token } = require('./helpers/env');
const commands = []; const commands = [];
const commandFiles = fs.readdirSync(__dirname + '/commands').filter(file => file.endsWith('.js')); const commandFiles = fs
.readdirSync(__dirname + '/commands')
.filter((file) => file.endsWith('.js'));
for (const file of commandFiles) { for (const file of commandFiles) {
const command = require(`${__dirname}/commands/${file}`); const command = require(`${__dirname}/commands/${file}`);
commands.push(command.data.toJSON()); commands.push(command.data.toJSON());
} }
const rest = new REST({version: '9'}).setToken(token); const rest = new REST({ version: '9' }).setToken(token);
rest.put(Routes.applicationCommands(clientId), {body: commands}) rest
.put(Routes.applicationCommands(clientId), { body: commands })
.then(() => console.log('Successfully registered application commands.')) .then(() => console.log('Successfully registered application commands.'))
.catch(console.error); .catch(console.error);

18
src/events/interactionCreate.ts

@ -1,6 +1,6 @@
import log from '../helpers/log'; import log from "../helpers/log";
export const name = 'interactionCreate'; export const name = "interactionCreate";
export const once = false; export const once = false;
@ -15,9 +15,15 @@ export async function execute(interaction) {
try { try {
await command.execute(interaction); await command.execute(interaction);
} } catch (error) {
catch (error) { log({
log({ logger: 'interaction', content: `Interaction ${interaction.commandName} failed!`, level: 'error' }); logger: "interaction",
await interaction.followUp({ content: 'There was an error while executing this command!', ephemeral: true }); content: `Interaction ${interaction.commandName} failed!`,
level: "error",
});
await interaction.followUp({
content: "There was an error while executing this command!",
ephemeral: true,
});
} }
} }

20
src/events/messageCreate.ts

@ -1,31 +1,31 @@
import axios from 'axios'; import axios from "axios";
import { MessageEmbed } from 'discord.js'; import { MessageEmbed } from "discord.js";
import { decode } from 'html-entities'; import { decode } from "html-entities";
import { testingGuild } from '../helpers/env'; import { testingGuild } from "../helpers/env";
export const name = 'messageCreate'; export const name = "messageCreate";
export const once = false; export const once = false;
export async function execute(message) { export async function execute(message) {
if (message.author.bot || message.guild.id != testingGuild) return; if (message.author.bot || message.guild.id != testingGuild) return;
if (message.content.startsWith('!q')) { if (message.content.startsWith("!q")) {
const questionId = message.content.split(' ')[1]; const questionId = message.content.split(" ")[1];
axios axios
.get(`https://scibowldb.com/api/questions/${questionId}`) .get(`https://scibowldb.com/api/questions/${questionId}`)
.then((res) => { .then((res) => {
const data = res.data.question; const data = res.data.question;
const tossupQuestion = data.tossup_question; const tossupQuestion = data.tossup_question;
const tossupAnswer = data.tossup_answer; const tossupAnswer = data.tossup_answer;
let answers = tossupAnswer.split(' (ACCEPT: '); let answers = tossupAnswer.split(" (ACCEPT: ");
if (answers.length > 1) { if (answers.length > 1) {
answers[1] = answers[1].slice(0, answers[1].length - 1); // If there are multiple elements, it means there was an 'accept' and therefore a trailing ')' which should be removed answers[1] = answers[1].slice(0, answers[1].length - 1); // If there are multiple elements, it means there was an 'accept' and therefore a trailing ')' which should be removed
answers = [answers[0], ...answers[1].split(new RegExp(' OR ', 'i'))]; // Use the first element plus the last element split by 'OR' case insensitive answers = [answers[0], ...answers[1].split(new RegExp(" OR ", "i"))]; // Use the first element plus the last element split by 'OR' case insensitive
} }
const dataEmbed = new MessageEmbed() const dataEmbed = new MessageEmbed()
.setTitle('Data') .setTitle("Data")
.setDescription(`\`\`\`json\n${JSON.stringify(data, null, 2)}\`\`\``); .setDescription(`\`\`\`json\n${JSON.stringify(data, null, 2)}\`\`\``);
message.reply({ message.reply({
content: decode(tossupQuestion) + `\n\nAnswers: [${answers}]`, content: decode(tossupQuestion) + `\n\nAnswers: [${answers}]`,

19
src/events/ready.ts

@ -1,16 +1,17 @@
import * as db from '../helpers/db'; import * as db from "../helpers/db";
import { mongoUri } from '../helpers/env'; import { mongoUri } from "../helpers/env";
import log from '../helpers/log'; import log from "../helpers/log";
export const name = 'ready'; export const name = "ready";
export const once = true; export const once = true;
export async function execute(client) { export async function execute(client) {
await db.connect(mongoUri); await db.connect(mongoUri);
log({ logger: 'status', content: `Logged in as ${client.user.tag}!`, level: 'info' }); log({
client.user.setActivity( logger: "status",
'for /help', content: `Logged in as ${client.user.tag}!`,
{ type: 'WATCHING' }, level: "info",
); });
client.user.setActivity("for /help", { type: "WATCHING" });
} }

54
src/helpers/db.ts

@ -1,13 +1,16 @@
import mongoose from 'mongoose'; import mongoose from "mongoose";
import log from '../helpers/log'; import log from "../helpers/log";
import userScore from '../models/userScore'; import userScore from "../models/userScore";
export async function updateScore(isCorrect: boolean, score: number, authorId: string) { export async function updateScore(
isCorrect: boolean,
score: number,
authorId: string
) {
if (!isCorrect) { if (!isCorrect) {
return `Nice try! Your score is still ${score}.`; return `Nice try! Your score is still ${score}.`;
} } else {
else {
// TODO: Error handling // TODO: Error handling
const doc = await userScore.findOne({ const doc = await userScore.findOne({
authorID: authorId, authorID: authorId,
@ -17,16 +20,22 @@ export async function updateScore(isCorrect: boolean, score: number, authorId: s
authorID: authorId, authorID: authorId,
score: score + 4, score: score + 4,
}); });
newUserScore.save(err => { newUserScore.save((err) => {
if (err) { if (err) {
log({ logger: 'db', content: `Error creating new user ${authorId} for scoring`, level: 'error' }); log({
} logger: "db",
else { content: `Error creating new user ${authorId} for scoring`,
log({ logger: 'db', content: `Successfully created user ${authorId} for scoring`, level: 'debug' }); level: "error",
} });
} else {
log({
logger: "db",
content: `Successfully created user ${authorId} for scoring`,
level: "debug",
}); });
} }
else { });
} else {
doc.score = doc.score + 4; doc.score = doc.score + 4;
doc.save(); doc.save();
} }
@ -41,11 +50,18 @@ export async function connect(mongoUri) {
useUnifiedTopology: true, useUnifiedTopology: true,
useNewUrlParser: true, useNewUrlParser: true,
}) })
.then(() => log({ logger: 'db', content: `Connected to the database at ${mongoUri}!`, level: 'info' })) .then(() =>
.catch(err => log({ log({
logger: 'db', logger: "db",
content: `Connected to the database at ${mongoUri}!`,
level: "info",
})
)
.catch((err) =>
log({
logger: "db",
content: `Failed to connect to the database at ${mongoUri}: ${err}`, content: `Failed to connect to the database at ${mongoUri}: ${err}`,
level: 'fatal', level: "fatal",
})); })
);
} }

11
src/helpers/env.ts

@ -1,6 +1,7 @@
import 'dotenv/config'; import "dotenv/config";
export const clientId = process.env.CLIENT_ID || ''; export const clientId = process.env.CLIENT_ID || "";
export const testingGuild = process.env.TESTING_GUILD || ''; export const testingGuild = process.env.TESTING_GUILD || "";
export const token = process.env.TOKEN || ''; export const token = process.env.TOKEN || "";
export const mongoUri = process.env.MONGO_URI = 'mongodb://mongo:27017/AWESOME'; export const mongoUri = (process.env.MONGO_URI =
"mongodb://mongo:27017/AWESOME");

18
src/helpers/log.ts

@ -1,25 +1,25 @@
import log4js from 'log4js'; import log4js from "log4js";
export default function(config) { export default function (config) {
const logger = log4js.getLogger(config.logger); const logger = log4js.getLogger(config.logger);
logger.level = 'debug'; logger.level = "debug";
switch (config.level) { switch (config.level) {
case 'trace': case "trace":
logger.trace(config.content); logger.trace(config.content);
break; break;
case 'debug': case "debug":
logger.debug(config.content); logger.debug(config.content);
break; break;
case 'info': case "info":
logger.info(config.content); logger.info(config.content);
break; break;
case 'warn': case "warn":
logger.warn(config.content); logger.warn(config.content);
break; break;
case 'error': case "error":
logger.error(config.content); logger.error(config.content);
break; break;
case 'fatal': case "fatal":
logger.fatal(config.content); logger.fatal(config.content);
break; break;
default: default:

96
src/helpers/util/pagination.ts

@ -1,87 +1,113 @@
import { CommandInteraction, Message, MessageActionRow, MessageButton, MessageEmbed } from 'discord.js'; import {
CommandInteraction,
Message,
MessageActionRow,
MessageButton,
MessageEmbed,
} from "discord.js";
export async function paginateMessage(message: Message, embeds: MessageEmbed[]) { export async function paginateMessage(
message: Message,
embeds: MessageEmbed[]
) {
let index = 0; let index = 0;
const row = new MessageActionRow; const row = new MessageActionRow();
row.addComponents( row.addComponents(
new MessageButton() new MessageButton()
.setCustomId('paginator-left') .setCustomId("paginator-left")
.setEmoji('868552005977788466') .setEmoji("868552005977788466")
.setStyle('SECONDARY'), .setStyle("SECONDARY"),
new MessageButton() new MessageButton()
.setCustomId('paginator-right') .setCustomId("paginator-right")
.setEmoji('868551772887711754') .setEmoji("868551772887711754")
.setStyle('SECONDARY') .setStyle("SECONDARY")
); );
await message.reply({ content: `Page 1 of ${embeds.length}:`, embeds: [embeds[index]], components: [row] }) await message
.then(async paginatorMessage => { .reply({
const filter = m => m.author.id === message.author.id; content: `Page 1 of ${embeds.length}:`,
embeds: [embeds[index]],
components: [row],
})
.then(async (paginatorMessage) => {
const filter = (m) => m.author.id === message.author.id;
const paginatorCollector = paginatorMessage.createMessageComponentCollector({ const paginatorCollector =
componentType: 'BUTTON', paginatorMessage.createMessageComponentCollector({
componentType: "BUTTON",
filter: filter, filter: filter,
}); });
paginatorCollector.on('collect', async i => { paginatorCollector.on("collect", async (i) => {
switch (i.customId) { switch (i.customId) {
case 'paginator-left': case "paginator-left":
index--; index--;
if (index < 0) index = embeds.length - 1; if (index < 0) index = embeds.length - 1;
break; break;
case 'paginator-right': case "paginator-right":
index++; index++;
if (index > embeds.length - 1) index = 0; if (index > embeds.length - 1) index = 0;
break; break;
} }
paginatorMessage.edit({ content: `Page ${index + 1} of ${embeds.length}:`, embeds: [embeds[index]] }); paginatorMessage.edit({
content: `Page ${index + 1} of ${embeds.length}:`,
embeds: [embeds[index]],
});
}); });
}); });
} }
export async function paginateInteraction(interaction: CommandInteraction, embeds: MessageEmbed[]) { export async function paginateInteraction(
interaction: CommandInteraction,
embeds: MessageEmbed[]
) {
let index = 0; let index = 0;
const row = new MessageActionRow; const row = new MessageActionRow();
row.addComponents( row.addComponents(
new MessageButton() new MessageButton()
.setCustomId('paginator-left') .setCustomId("paginator-left")
.setEmoji('868552005977788466') .setEmoji("868552005977788466")
.setStyle('SECONDARY'), .setStyle("SECONDARY"),
new MessageButton() new MessageButton()
.setCustomId('paginator-right') .setCustomId("paginator-right")
.setEmoji('868551772887711754') .setEmoji("868551772887711754")
.setStyle('SECONDARY') .setStyle("SECONDARY")
); );
await interaction.followUp({ await interaction
.followUp({
content: `Page 1 of ${embeds.length}:`, content: `Page 1 of ${embeds.length}:`,
embeds: [embeds[index]], embeds: [embeds[index]],
components: [row], components: [row],
fetchReply: true, fetchReply: true,
}) })
.then(async p => { .then(async (p) => {
const paginatorMessage = p as Message; const paginatorMessage = p as Message;
const filter = i => i.user.id === interaction.user.id; const filter = (i) => i.user.id === interaction.user.id;
const paginatorCollector = paginatorMessage.createMessageComponentCollector({ const paginatorCollector =
componentType: 'BUTTON', paginatorMessage.createMessageComponentCollector({
componentType: "BUTTON",
filter: filter, filter: filter,
}); });
paginatorCollector.on('collect', async i => { paginatorCollector.on("collect", async (i) => {
switch (i.customId) { switch (i.customId) {
case 'paginator-left': case "paginator-left":
index--; index--;
if (index < 0) index = embeds.length - 1; if (index < 0) index = embeds.length - 1;
break; break;
case 'paginator-right': case "paginator-right":
index++; index++;
if (index > embeds.length - 1) index = 0; if (index > embeds.length - 1) index = 0;
break; break;
} }
await i.update({ content: `Page ${index + 1} of ${embeds.length}:`, embeds: [embeds[index]] }); await i.update({
content: `Page ${index + 1} of ${embeds.length}:`,
embeds: [embeds[index]],
});
}); });
}); });
} }

50
src/index.ts

@ -1,37 +1,53 @@
#!/usr/bin/env node #!/usr/bin/env node
import fs from 'node:fs'; import fs from "node:fs";
import { Client, Collection, Intents } from 'discord.js'; import { Client, Collection, Intents } from "discord.js";
import { token } from './helpers/env'; import { token } from "./helpers/env";
import log from './helpers/log'; import log from "./helpers/log";
const client = new Client({ const client = new Client({
intents: [Intents.FLAGS.GUILDS, Intents.FLAGS.GUILD_MESSAGES, Intents.FLAGS.GUILD_MESSAGE_REACTIONS, Intents.FLAGS.GUILD_MEMBERS, Intents.FLAGS.DIRECT_MESSAGES, Intents.FLAGS.DIRECT_MESSAGE_REACTIONS], intents: [
Intents.FLAGS.GUILDS,
Intents.FLAGS.GUILD_MESSAGES,
Intents.FLAGS.GUILD_MESSAGE_REACTIONS,
Intents.FLAGS.GUILD_MEMBERS,
Intents.FLAGS.DIRECT_MESSAGES,
Intents.FLAGS.DIRECT_MESSAGE_REACTIONS,
],
}); });
client['commands'] = new Collection(); client["commands"] = new Collection();
const commandFiles = fs.readdirSync(`${__dirname}/commands`).filter(file => file.endsWith('.js')); const commandFiles = fs
const eventFiles = fs.readdirSync(`${__dirname}/events`).filter(file => file.endsWith('.js')); .readdirSync(`${__dirname}/commands`)
.filter((file) => file.endsWith(".js"));
const eventFiles = fs
.readdirSync(`${__dirname}/events`)
.filter((file) => file.endsWith(".js"));
for (const file of commandFiles) { for (const file of commandFiles) {
import(`${__dirname}/commands/${file}`) import(`${__dirname}/commands/${file}`).then((command) => {
.then(command => { client["commands"].set(command.data.name, command);
client['commands'].set(command.data.name, command); log({
log({ logger: 'command', content: `Registered command ${file}!`, level: 'info' }); logger: "command",
content: `Registered command ${file}!`,
level: "info",
});
}); });
} }
for (const file of eventFiles) { for (const file of eventFiles) {
import(`${__dirname}/events/${file}`) import(`${__dirname}/events/${file}`).then((event) => {
.then(event => {
if (event.once) { if (event.once) {
client.once(event.name, (...args) => event.execute(...args)); client.once(event.name, (...args) => event.execute(...args));
} } else {
else {
client.on(event.name, (...args) => event.execute(...args)); client.on(event.name, (...args) => event.execute(...args));
} }
log({ logger: 'event', content: `Registered event ${file}!`, level: 'info' }); log({
logger: "event",
content: `Registered event ${file}!`,
level: "info",
});
}); });
} }

4
src/models/generatedRound.ts

@ -1,4 +1,4 @@
import mongoose from 'mongoose'; import mongoose from "mongoose";
const generatedRoundSchema = new mongoose.Schema({ const generatedRoundSchema = new mongoose.Schema({
htmlContent: { htmlContent: {
@ -19,4 +19,4 @@ const generatedRoundSchema = new mongoose.Schema({
}, },
}); });
export default mongoose.model('GeneratedRound', generatedRoundSchema); export default mongoose.model("GeneratedRound", generatedRoundSchema);

4
src/models/userConfig.ts

@ -1,4 +1,4 @@
import mongoose from 'mongoose'; import mongoose from "mongoose";
const userConfigSchema = new mongoose.Schema({ const userConfigSchema = new mongoose.Schema({
_id: String, _id: String,
@ -14,4 +14,4 @@ const userConfigSchema = new mongoose.Schema({
}, },
}); });
export default mongoose.model('UserConfig', userConfigSchema); export default mongoose.model("UserConfig", userConfigSchema);

4
src/models/userScore.ts

@ -1,4 +1,4 @@
import mongoose from 'mongoose'; import mongoose from "mongoose";
const userScoreSchema = new mongoose.Schema({ const userScoreSchema = new mongoose.Schema({
authorID: { authorID: {
@ -11,4 +11,4 @@ const userScoreSchema = new mongoose.Schema({
}, },
}); });
export default mongoose.model('UserScore', userScoreSchema); export default mongoose.model("UserScore", userScoreSchema);

Loading…
Cancel
Save