Browse Source

style: prevent ESLint from clashing with Prettier

dependabot/npm_and_yarn/semver-5.7.2
Abheek Dhawan 2 years ago
parent
commit
196f0dc6f1
Signed by: abheekd GPG Key ID: 7BE81B8C14475B67
  1. 28
      .eslintrc.json
  2. 3
      .prettierrc
  3. 36
      src/commands/about.ts
  4. 12
      src/commands/help.ts
  5. 80
      src/commands/rounds.ts
  6. 26
      src/commands/score.ts
  7. 170
      src/commands/settings.ts
  8. 26
      src/commands/top.ts
  9. 194
      src/commands/train.ts
  10. 10
      src/events/interactionCreate.ts
  11. 20
      src/events/messageCreate.ts
  12. 14
      src/events/ready.ts
  13. 22
      src/helpers/db.ts
  14. 10
      src/helpers/env.ts
  15. 16
      src/helpers/log.ts
  16. 42
      src/helpers/util/pagination.ts
  17. 24
      src/index.ts
  18. 4
      src/models/generatedRound.ts
  19. 4
      src/models/userConfig.ts
  20. 4
      src/models/userScore.ts

28
.eslintrc.json

@ -21,33 +21,17 @@
"after": true "after": true
} }
], ],
"brace-style": [
"error",
"stroustrup",
{
"allowSingleLine": true
}
],
"comma-dangle": [ "comma-dangle": [
"error", "error",
"always-multiline" "always-multiline"
], ],
"comma-spacing": "error", "comma-spacing": "error",
"comma-style": "error", "comma-style": "error",
"curly": [
"error",
"multi-line",
"consistent"
],
"dot-location": [ "dot-location": [
"error", "error",
"property" "property"
], ],
"handle-callback-err": "off", "handle-callback-err": "off",
"indent": [
"error",
"tab"
],
"keyword-spacing": "error", "keyword-spacing": "error",
"max-nested-callbacks": [ "max-nested-callbacks": [
"error", "error",
@ -93,23 +77,11 @@
"always" "always"
], ],
"prefer-const": "error", "prefer-const": "error",
"quotes": [
"error",
"single"
],
"semi": [ "semi": [
"error", "error",
"always" "always"
], ],
"space-before-blocks": "error", "space-before-blocks": "error",
"space-before-function-paren": [
"error",
{
"anonymous": "never",
"named": "never",
"asyncArrow": "always"
}
],
"space-in-parens": "error", "space-in-parens": "error",
"space-infix-ops": "error", "space-infix-ops": "error",
"space-unary-ops": "error", "space-unary-ops": "error",

3
.prettierrc

@ -1,6 +1,7 @@
{ {
"singleQuote": false, "singleQuote": true,
"semi": true, "semi": true,
"useTabs": true,
"endOfLine": "lf", "endOfLine": "lf",
"trailingComma": "es5" "trailingComma": "es5"
} }

36
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();
@ -18,15 +18,15 @@ export async function execute(interaction: CommandInteraction) {
const embeds: MessageEmbed[] = []; const embeds: MessageEmbed[] = [];
const contributorEmbed = new MessageEmbed() const contributorEmbed = new MessageEmbed()
.setTitle("Contributors") .setTitle('Contributors')
.addField("Creator", "<@745063586422063214> [ADawesomeguy#3602]", true) .addField('Creator', '<@745063586422063214> [ADawesomeguy#3602]', true)
.addField( .addField(
"Contributors", 'Contributors',
"<@650525101048987649> [tEjAs#8127]\n<@426864344463048705> [tetrident#9396]", '<@650525101048987649> [tEjAs#8127]\n<@426864344463048705> [tetrident#9396]',
true true
) // Add more contributors here, first one is Abheek, second one is Tejas ) // 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;
@ -34,7 +34,7 @@ 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()
@ -42,8 +42,8 @@ export async function execute(interaction: CommandInteraction) {
name: interaction.user.tag, name: interaction.user.tag,
iconURL: interaction.user.displayAvatarURL(), iconURL: interaction.user.displayAvatarURL(),
}) })
.setTitle("Changelog") .setTitle('Changelog')
.setColor("#ffffff") .setColor('#ffffff')
.setTimestamp(); .setTimestamp();
commits.forEach((commit) => { commits.forEach((commit) => {
@ -61,9 +61,9 @@ export async function execute(interaction: CommandInteraction) {
name: interaction.user.tag, name: interaction.user.tag,
iconURL: interaction.user.displayAvatarURL(), iconURL: interaction.user.displayAvatarURL(),
}) })
.setTitle("About AwesomeSciBo") .setTitle('About AwesomeSciBo')
.addField("Servers", `${client.guilds.cache.size}`, true) .addField('Servers', `${client.guilds.cache.size}`, true)
.addField("Training Users", `${trainingDocuments}`, true) .addField('Training Users', `${trainingDocuments}`, true)
.setTimestamp(); .setTimestamp();
embeds.push(aboutBotEmbed); embeds.push(aboutBotEmbed);

12
src/commands/help.ts

@ -1,9 +1,9 @@
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();
@ -11,8 +11,8 @@ export async function execute(interaction: CommandInteraction) {
const helpEmbed = new MessageEmbed() const helpEmbed = new MessageEmbed()
.setDescription( .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." '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"); .setColor('#ffffff');
interaction.followUp({ embeds: [helpEmbed] }); interaction.followUp({ embeds: [helpEmbed] });
} }

80
src/commands/rounds.ts

@ -1,33 +1,33 @@
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( .setDescription(
"Generates a round with randomized questions from https://scibowldb.com/" '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( .setDescription(
"Shows the total number of rounds hit as well as the number for the specific user" 'Shows the total number of rounds hit as well as the number for the specific user'
); );
return subcommand; return subcommand;
}); });
@ -35,7 +35,7 @@ export const data = new SlashCommandBuilder()
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 = let finalizedHTML =
@ -47,16 +47,16 @@ 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 await axios
.post("https://scibowldb.com/api/questions", { .post('https://scibowldb.com/api/questions', {
categories: [ categories: [
"BIOLOGY", 'BIOLOGY',
"PHYSICS", 'PHYSICS',
"CHEMISTRY", 'CHEMISTRY',
"EARTH AND SPACE", 'EARTH AND SPACE',
"ASTRONOMY", 'ASTRONOMY',
"MATH", 'MATH',
], ],
}) })
.then((response) => { .then((response) => {
@ -75,26 +75,26 @@ export async function execute(interaction: CommandInteraction) {
htmlContent = htmlContent =
"<br><br><h3 style='text-align: center;'><strong>TOSS-UP</strong></h3>\n<br>" + "<br><br><h3 style='text-align: center;'><strong>TOSS-UP</strong></h3>\n<br>" +
`${i}) <strong>${question_category}</strong>` + `${i}) <strong>${question_category}</strong>` +
" " + ' ' +
`<em>${tossup_format}</em>` + `<em>${tossup_format}</em>` +
" " + ' ' +
tossup_question + tossup_question +
"<br><br>" + '<br><br>' +
"<strong>ANSWER:</strong> " + '<strong>ANSWER:</strong> ' +
tossup_answer + tossup_answer +
"<br>"; '<br>';
htmlContent += htmlContent +=
"<br><br><h3 style='text-align: center;'><strong>BONUS</strong></h3>\n<br>" + "<br><br><h3 style='text-align: center;'><strong>BONUS</strong></h3>\n<br>" +
`${i}) <strong>${question_category}</strong>` + `${i}) <strong>${question_category}</strong>` +
" " + ' ' +
`<em>${bonus_format}</em>` + `<em>${bonus_format}</em>` +
" " + ' ' +
bonus_question + bonus_question +
"<br><br>" + '<br><br>' +
"<strong>ANSWER:</strong> " + '<strong>ANSWER:</strong> ' +
bonus_answer + bonus_answer +
"<br><br><hr><br>"; '<br><br><hr><br>';
htmlContent = htmlContent.replace(/\n/g, "<br>"); htmlContent = htmlContent.replace(/\n/g, '<br>');
finalizedHTML += htmlContent; finalizedHTML += htmlContent;
} }
@ -108,9 +108,9 @@ export async function execute(interaction: CommandInteraction) {
newGeneratedRound.save((err, round) => { newGeneratedRound.save((err, round) => {
if (err) { if (err) {
log({ log({
logger: "rounds", logger: 'rounds',
content: `Saving round to DB failed: ${err}`, content: `Saving round to DB failed: ${err}`,
level: "error", level: 'error',
}); });
return; return;
} }
@ -123,13 +123,13 @@ export async function execute(interaction: CommandInteraction) {
break; break;
} }
case "list": { case 'list': {
interaction.deferReply({ ephemeral: true }); interaction.deferReply({ ephemeral: true });
let roundsList = await generatedRound let roundsList = await generatedRound
.find({ requestedBy: interaction.user.id }) .find({ requestedBy: interaction.user.id })
.sort({ timestamp: -1 }); .sort({ timestamp: -1 });
let finalMessage = ""; let finalMessage = '';
if (!roundsList) { if (!roundsList) {
interaction.followUp("You haven't requested any rounds!"); interaction.followUp("You haven't requested any rounds!");
return; return;
@ -141,7 +141,7 @@ export async function execute(interaction: CommandInteraction) {
roundsList.forEach(async (item, index) => { roundsList.forEach(async (item, index) => {
finalMessage += `${index + 1}. [${ finalMessage += `${index + 1}. [${
item.timestamp.split("T")[0] item.timestamp.split('T')[0]
}](https://api.adawesome.tech/round/${item._id.toString()})\n`; }](https://api.adawesome.tech/round/${item._id.toString()})\n`;
}); });
@ -150,7 +150,7 @@ export async function execute(interaction: CommandInteraction) {
name: interaction.user.tag, name: interaction.user.tag,
iconURL: interaction.user.displayAvatarURL(), iconURL: interaction.user.displayAvatarURL(),
}) })
.setTitle("Last 5 rounds requested") .setTitle('Last 5 rounds requested')
.setDescription(finalMessage) .setDescription(finalMessage)
.setTimestamp(); .setTimestamp();
@ -161,7 +161,7 @@ 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({});

26
src/commands/score.ts

@ -1,38 +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().setColor("#ffffff"); const scoreEmbed = new MessageEmbed().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({ log({
logger: "db", logger: 'db',
content: `Unable to obtain user: ${err}`, content: `Unable to obtain user: ${err}`,
level: "info", level: 'info',
}); });
} }
if (!score) { if (!score) {
await interaction.reply({ await interaction.reply({
content: content:
"Unfortunately, that user does not seem to have used AwesomeSciBo yet.", 'Unfortunately, that user does not seem to have used AwesomeSciBo yet.',
ephemeral: true, ephemeral: true,
}); });
return; return;

170
src/commands/settings.ts

@ -1,53 +1,53 @@
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.setName("subject").setDescription("Changes subject of problems"); subcommand.setName('subject').setDescription('Changes subject of problems');
return subcommand; return subcommand;
}) })
.addSubcommand((subcommand) => { .addSubcommand((subcommand) => {
subcommand.setName("display").setDescription("Displays current settings"); subcommand.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().setColor("#ffffff"); const settingsEmbed = new MessageEmbed().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().addComponents( const menu = new MessageActionRow().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',
}, },
]) ])
); );
@ -62,11 +62,11 @@ export async function execute(interaction: CommandInteraction) {
.then((dispMsg) => { .then((dispMsg) => {
const w = dispMsg as Message; const w = dispMsg as Message;
const dispFilter = (i) => const dispFilter = (i) =>
["selectdisp"].includes(i.customId) && ['selectdisp'].includes(i.customId) &&
i.user.id == interaction.user.id; // <== ATTENTION! First argument... i.user.id == interaction.user.id; // <== ATTENTION! First argument...
w.awaitMessageComponent({ w.awaitMessageComponent({
filter: dispFilter, filter: dispFilter,
componentType: "SELECT_MENU", componentType: 'SELECT_MENU',
}).then(async (dispChoice) => { }).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);
@ -76,20 +76,20 @@ export async function execute(interaction: CommandInteraction) {
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 content: `Current subjects setting: ${config.subjects
.toString() .toString()
.split(",") .split(',')
.join(", ")}`, .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 content: `Current grade level setting: ${config.gradeLevels
.toString() .toString()
.split(",") .split(',')
.join(", ")}`, .join(', ')}`,
components: [], components: [],
}); });
} else { } else {
@ -98,39 +98,39 @@ export async function execute(interaction: CommandInteraction) {
logger: logger:
"'Error occurred: /settings:display did not equal subjects or gradelevels.'", "'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().setColor("#ffffff"); const settingsEmbed = new MessageEmbed().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().addComponents( const menu = new MessageActionRow().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',
}, },
]) ])
); );
@ -145,11 +145,11 @@ export async function execute(interaction: CommandInteraction) {
.then((lvlMsg) => { .then((lvlMsg) => {
const w = lvlMsg as Message; const w = lvlMsg as Message;
const lvlFilter = (i) => const lvlFilter = (i) =>
["selectlvl"].includes(i.customId) && ['selectlvl'].includes(i.customId) &&
i.user.id == interaction.user.id; // <== ATTENTION! First argument... i.user.id == interaction.user.id; // <== ATTENTION! First argument...
w.awaitMessageComponent({ w.awaitMessageComponent({
filter: lvlFilter, filter: lvlFilter,
componentType: "SELECT_MENU", componentType: 'SELECT_MENU',
}).then(async (lvlChoice) => { }).then(async (lvlChoice) => {
const vals = lvlChoice.values; const vals = lvlChoice.values;
const levels = new Array<string>(); const levels = new Array<string>();
@ -163,18 +163,18 @@ export async function execute(interaction: CommandInteraction) {
); );
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 content: `Level set to: ${levels
.toString() .toString()
.split(",") .split(',')
.join(", ")}`, .join(', ')}`,
embeds: [], embeds: [],
components: [], components: [],
}); });
@ -182,57 +182,57 @@ export async function execute(interaction: CommandInteraction) {
}); });
break; break;
} }
case "subject": { case 'subject': {
await interaction.deferReply(); await interaction.deferReply();
const settingsEmbed = new MessageEmbed().setColor("#ffffff"); const settingsEmbed = new MessageEmbed().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().addComponents( const menu = new MessageActionRow().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',
}, },
]) ])
); );
@ -246,12 +246,12 @@ export async function execute(interaction: CommandInteraction) {
}) })
.then((subjectMsg) => { .then((subjectMsg) => {
const subjectFilter = (i) => const subjectFilter = (i) =>
["selectsubject"].includes(i.customId) && ['selectsubject'].includes(i.customId) &&
i.user.id == interaction.user.id; // <== ATTENTION! First argument... i.user.id == interaction.user.id; // <== ATTENTION! First argument...
(subjectMsg as Message) (subjectMsg as Message)
.awaitMessageComponent({ .awaitMessageComponent({
filter: subjectFilter, filter: subjectFilter,
componentType: "SELECT_MENU", componentType: 'SELECT_MENU',
}) })
.then(async (subjectChoice) => { .then(async (subjectChoice) => {
const vals = subjectChoice.values; const vals = subjectChoice.values;
@ -268,16 +268,16 @@ export async function execute(interaction: CommandInteraction) {
subjects.push( subjects.push(
v v
.toLowerCase() .toLowerCase()
.split(" ") .split(' ')
.map((w) => w[0].toUpperCase() + w.substring(1)) .map((w) => w[0].toUpperCase() + w.substring(1))
.join(" ") .join(' ')
); );
}); });
await interaction.editReply({ await interaction.editReply({
content: `Subjects set to: ${subjects content: `Subjects set to: ${subjects
.toString() .toString()
.split(",") .split(',')
.join(", ")}`, .join(', ')}`,
components: [], components: [],
embeds: [], embeds: [],
}); });

26
src/commands/top.ts

@ -1,13 +1,13 @@
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( .setDescription(
"Lists top ten scores across servers and in the current server" 'Lists top ten scores across servers and in the current server'
); );
export async function execute(interaction: CommandInteraction) { export async function execute(interaction: CommandInteraction) {
@ -19,9 +19,9 @@ export async function execute(interaction: CommandInteraction) {
.exec(async (err, obj) => { .exec(async (err, obj) => {
if (err) { if (err) {
log({ log({
logger: "top", logger: 'top',
content: `Getting top players failed: ${err}`, content: `Getting top players failed: ${err}`,
level: "error", level: 'error',
}); });
console.log(err); console.log(err);
} }
@ -34,7 +34,7 @@ export async function execute(interaction: CommandInteraction) {
} }
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}>: ${ lbMessageContent += `${i + 1}: <@${obj[i].authorID}>: ${
@ -43,13 +43,13 @@ export async function execute(interaction: CommandInteraction) {
} }
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) => const serverLeaderBoardArray = await obj.filter((o) =>
@ -65,7 +65,7 @@ export async function execute(interaction: CommandInteraction) {
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);
} }

194
src/commands/train.ts

@ -1,37 +1,37 @@
import { SlashCommandBuilder } from "@discordjs/builders"; import { SlashCommandBuilder } from '@discordjs/builders';
import { import {
MessageEmbed, MessageEmbed,
MessageActionRow, MessageActionRow,
MessageButton, MessageButton,
CommandInteraction, CommandInteraction,
Message, Message,
} from "discord.js"; } 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;
@ -40,8 +40,8 @@ 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") const subject = interaction.options.get('subject')
? interaction.options.get("subject")?.value ? interaction.options.get('subject')?.value
: null; : null;
const authorId = interaction.user.id; const authorId = interaction.user.id;
let score: number; let score: number;
@ -55,43 +55,43 @@ export async function execute(interaction: CommandInteraction) {
.setAuthor({ .setAuthor({
name: interaction.client.user?.tag name: interaction.client.user?.tag
? interaction.client.user?.tag ? interaction.client.user?.tag
: "", : '',
iconURL: interaction.client.user?.displayAvatarURL(), iconURL: interaction.client.user?.displayAvatarURL(),
}) })
.setDescription( .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.):" "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("Creator", "<@745063586422063214> [@abheekd#3602]") .addField('Creator', '<@745063586422063214> [@abheekd#3602]')
.addField( .addField(
"GitHub", 'GitHub',
"[Link](https://github.com/ADawesomeguy/AwesomeSciBo) (a star couldn't hurt...)" "[Link](https://github.com/ADawesomeguy/AwesomeSciBo) (a star couldn't hurt...)"
) )
.setColor("#ffffff") .setColor('#ffffff')
.setTimestamp(); .setTimestamp();
interaction.user interaction.user
.send({ embeds: [firstTimeEmbed] }) .send({ embeds: [firstTimeEmbed] })
.catch((err) => .catch((err) =>
log({ logger: "train", content: `${err}`, level: "error" }) log({ logger: 'train', content: `${err}`, level: 'error' })
); );
} else if (obj) { } else if (obj) {
score = obj.score; score = obj.score;
} else { } else {
log({ log({
logger: "train", logger: 'train',
content: `Getting user score failed: ${err}`, content: `Getting user score failed: ${err}`,
level: "error", level: 'error',
}); });
} }
}); });
let categoryArray: string[] = []; let categoryArray: string[] = [];
const allCategories = [ const allCategories = [
"BIOLOGY", 'BIOLOGY',
"PHYSICS", 'PHYSICS',
"CHEMISTRY", 'CHEMISTRY',
"EARTH AND SPACE", 'EARTH AND SPACE',
"ASTRONOMY", 'ASTRONOMY',
"MATH", 'MATH',
]; ];
const configCategories = await userConfig.findById(interaction.user.id); const configCategories = await userConfig.findById(interaction.user.id);
@ -101,46 +101,46 @@ export async function execute(interaction: CommandInteraction) {
? configCategories.subjects || allCategories ? configCategories.subjects || allCategories
: 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: [ embeds: [
new MessageEmbed() new MessageEmbed()
.setDescription("<:red_x:816791117671825409> Not a valid subject!") .setDescription('<:red_x:816791117671825409> Not a valid subject!')
.setColor("#ffffff"), .setColor('#ffffff'),
], ],
}); });
return; return;
} }
axios axios
.post("https://scibowldb.com/api/questions/random", { .post('https://scibowldb.com/api/questions/random', {
categories: categoryArray, categories: categoryArray,
}) })
.then((res) => { .then((res) => {
@ -148,10 +148,10 @@ export async function execute(interaction: CommandInteraction) {
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 interaction
.followUp({ content: decode(tossupQuestion), fetchReply: true }) .followUp({ content: decode(tossupQuestion), fetchReply: true })
@ -160,11 +160,11 @@ export async function execute(interaction: CommandInteraction) {
const sourceButton = new MessageActionRow().addComponents( const sourceButton = new MessageActionRow().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) => const messageFilter = (m) =>
m.author.id === interaction.user.id || m.author.id === interaction.user.id ||
@ -180,38 +180,38 @@ export async function execute(interaction: CommandInteraction) {
if (answerMsg?.author.id === interaction.client.user?.id) if (answerMsg?.author.id === interaction.client.user?.id)
return; return;
let predicted = ""; let predicted = '';
if ( if (
answerMsg?.content.toLowerCase() === answerMsg?.content.toLowerCase() ===
tossupAnswer.toLowerCase() || tossupAnswer.toLowerCase() ||
answers.includes(answerMsg?.content.toUpperCase()) answers.includes(answerMsg?.content.toUpperCase())
) { ) {
predicted = "correct"; predicted = 'correct';
} else { } else {
predicted = "incorrect"; 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( .setDescription(
"It seems your answer was incorrect. Please react with <:override:955265585086857236> to override your answer if you think you got it right." 'It seems your answer was incorrect. Please react with <:override:955265585086857236> to override your answer if you think you got it right.'
) )
.setColor("#ffffff") .setColor('#ffffff')
.setTimestamp(); .setTimestamp();
const overrideButton = new MessageActionRow().addComponents( const overrideButton = new MessageActionRow().addComponents(
new MessageButton() new MessageButton()
.setCustomId("override") .setCustomId('override')
.setEmoji("<:override:955265585086857236>") .setEmoji('<:override:955265585086857236>')
.setStyle("SECONDARY") .setStyle('SECONDARY')
); );
answerMsg?.channel answerMsg?.channel
.send({ .send({
@ -221,7 +221,7 @@ export async function execute(interaction: CommandInteraction) {
.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
); );
}; };
@ -239,49 +239,49 @@ export async function execute(interaction: CommandInteraction) {
}) })
.catch((err) => .catch((err) =>
log({ log({
logger: "train", logger: 'train',
content: `Failed to override score: ${err}`, content: `Failed to override score: ${err}`,
level: "error", level: 'error',
}) })
); );
}) })
.catch((err) => .catch((err) =>
log({ log({
logger: "train", 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) => .catch((err) =>
log({ logger: "train", content: `${err}`, level: "error" }) log({ logger: 'train', content: `${err}`, level: 'error' })
); );
break; break;
} }
case "Multiple Choice": { case 'Multiple Choice': {
const choices = new MessageActionRow().addComponents( const choices = new MessageActionRow().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) => const mcFilter = (i) =>
["w", "x", "y", "z"].includes(i.customId) && ['w', 'x', 'y', 'z'].includes(i.customId) &&
i.user.id === interaction.user.id; i.user.id === interaction.user.id;
questionMessage questionMessage
.awaitMessageComponent({ filter: mcFilter }) .awaitMessageComponent({ filter: mcFilter })
@ -298,11 +298,11 @@ export async function execute(interaction: CommandInteraction) {
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( .setDescription(
`It seems your answer ${mcChoice.customId.toUpperCase()} was incorrect.` `It seems your answer ${mcChoice.customId.toUpperCase()} was incorrect.`
) )
.setColor("#ffffff") .setColor('#ffffff')
.setTimestamp(); .setTimestamp();
mcChoice.reply({ embeds: [incorrectEmbed] }); mcChoice.reply({ embeds: [incorrectEmbed] });
} }
@ -313,10 +313,10 @@ export async function execute(interaction: CommandInteraction) {
} }
}) })
.catch((err) => .catch((err) =>
log({ logger: "train", content: `${err}`, level: "error" }) log({ logger: 'train', content: `${err}`, level: 'error' })
); );
}) })
.catch((err) => .catch((err) =>
log({ logger: "train", content: `${err}`, level: "error" }) log({ logger: 'train', content: `${err}`, level: 'error' })
); );
} }

10
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;
@ -17,12 +17,12 @@ export async function execute(interaction) {
await command.execute(interaction); await command.execute(interaction);
} catch (error) { } catch (error) {
log({ log({
logger: "interaction", logger: 'interaction',
content: `Interaction ${interaction.commandName} failed!`, content: `Interaction ${interaction.commandName} failed!`,
level: "error", level: 'error',
}); });
await interaction.followUp({ await interaction.followUp({
content: "There was an error while executing this command!", content: 'There was an error while executing this command!',
ephemeral: true, 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}]`,

14
src/events/ready.ts

@ -1,17 +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({ log({
logger: "status", logger: 'status',
content: `Logged in as ${client.user.tag}!`, content: `Logged in as ${client.user.tag}!`,
level: "info", level: 'info',
}); });
client.user.setActivity("for /help", { type: "WATCHING" }); client.user.setActivity('for /help', { type: 'WATCHING' });
} }

22
src/helpers/db.ts

@ -1,7 +1,7 @@
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( export async function updateScore(
isCorrect: boolean, isCorrect: boolean,
@ -23,15 +23,15 @@ export async function updateScore(
newUserScore.save((err) => { newUserScore.save((err) => {
if (err) { if (err) {
log({ log({
logger: "db", logger: 'db',
content: `Error creating new user ${authorId} for scoring`, content: `Error creating new user ${authorId} for scoring`,
level: "error", level: 'error',
}); });
} else { } else {
log({ log({
logger: "db", logger: 'db',
content: `Successfully created user ${authorId} for scoring`, content: `Successfully created user ${authorId} for scoring`,
level: "debug", level: 'debug',
}); });
} }
}); });
@ -52,16 +52,16 @@ export async function connect(mongoUri) {
}) })
.then(() => .then(() =>
log({ log({
logger: "db", logger: 'db',
content: `Connected to the database at ${mongoUri}!`, content: `Connected to the database at ${mongoUri}!`,
level: "info", level: 'info',
}) })
) )
.catch((err) => .catch((err) =>
log({ log({
logger: "db", 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',
}) })
); );
} }

10
src/helpers/env.ts

@ -1,7 +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 = export const mongoUri = (process.env.MONGO_URI =
"mongodb://mongo:27017/AWESOME"); 'mongodb://mongo:27017/AWESOME');

16
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:

42
src/helpers/util/pagination.ts

@ -4,7 +4,7 @@ import {
MessageActionRow, MessageActionRow,
MessageButton, MessageButton,
MessageEmbed, MessageEmbed,
} from "discord.js"; } from 'discord.js';
export async function paginateMessage( export async function paginateMessage(
message: Message, message: Message,
@ -15,13 +15,13 @@ export async function paginateMessage(
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 await message
@ -35,17 +35,17 @@ export async function paginateMessage(
const paginatorCollector = const paginatorCollector =
paginatorMessage.createMessageComponentCollector({ paginatorMessage.createMessageComponentCollector({
componentType: "BUTTON", 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;
@ -67,13 +67,13 @@ export async function paginateInteraction(
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 await interaction
@ -89,17 +89,17 @@ export async function paginateInteraction(
const paginatorCollector = const paginatorCollector =
paginatorMessage.createMessageComponentCollector({ paginatorMessage.createMessageComponentCollector({
componentType: "BUTTON", 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;

24
src/index.ts

@ -1,9 +1,9 @@
#!/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: [
@ -16,22 +16,22 @@ const client = new Client({
], ],
}); });
client["commands"] = new Collection(); client['commands'] = new Collection();
const commandFiles = fs const commandFiles = fs
.readdirSync(`${__dirname}/commands`) .readdirSync(`${__dirname}/commands`)
.filter((file) => file.endsWith(".js")); .filter((file) => file.endsWith('.js'));
const eventFiles = fs const eventFiles = fs
.readdirSync(`${__dirname}/events`) .readdirSync(`${__dirname}/events`)
.filter((file) => file.endsWith(".js")); .filter((file) => file.endsWith('.js'));
for (const file of commandFiles) { for (const file of commandFiles) {
import(`${__dirname}/commands/${file}`).then((command) => { import(`${__dirname}/commands/${file}`).then((command) => {
client["commands"].set(command.data.name, command); client['commands'].set(command.data.name, command);
log({ log({
logger: "command", logger: 'command',
content: `Registered command ${file}!`, content: `Registered command ${file}!`,
level: "info", level: 'info',
}); });
}); });
} }
@ -44,9 +44,9 @@ for (const file of eventFiles) {
client.on(event.name, (...args) => event.execute(...args)); client.on(event.name, (...args) => event.execute(...args));
} }
log({ log({
logger: "event", logger: 'event',
content: `Registered event ${file}!`, content: `Registered event ${file}!`,
level: "info", 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