baz/TheOchulus
baz
/
TheOchulus
1
0
Fork 0
Code Issues 9 Pull Requests Projects Activity

Compare commits

base: baz:3f0084d6e281fe319e4a91ae8aa858c5166d268e
Branches Tags
baz:master
..
compare: baz:95c52b7ad5dba6e01f2ce41f6560325a85c6dee5
Branches Tags
baz:master

No commits in common. "3f0084d6e281fe319e4a91ae8aa858c5166d268e" and "95c52b7ad5dba6e01f2ce41f6560325a85c6dee5" have entirely different histories.
3f0084d6e2 ... 95c52b7ad5

5 changed files with 9 additions and 113 deletions
Show Stats Expand all files Collapse all files

4
commands/100-games/currentlyplaying.js
View File

@ -20,9 +20,11 @@ module.exports = {
const userDatabaseEntry = await getUserRegistration(user); const userDatabaseEntry = await getUserRegistration(user);
if (!userDatabaseEntry) return interaction.followUp({ content: `Issue checking registration with "${user.username}".`, ephemeral: true }); if (!userDatabaseEntry) return interaction.followUp({ content: `Issue checking registration with "${user.username}".`, ephemeral: true });
const databaseEntries = await getPlayingGames(userDatabaseEntry.id); let databaseEntries = await getPlayingGames(userDatabaseEntry.id);
if (!databaseEntries || databaseEntries.length == 0) return interaction.followUp({ content: 'No games found.', ephemeral: true }); if (!databaseEntries || databaseEntries.length == 0) return interaction.followUp({ content: 'No games found.', ephemeral: true });
databaseEntries = databaseEntries.reverse();
let desc = ''; let desc = '';
for (let i = 0; i < databaseEntries.length; i++) { for (let i = 0; i < databaseEntries.length; i++) {

10
commands/100-games/deletebeatengame.js → commands/100-games/deletegame.js
View File

@ -1,10 +1,10 @@
const { SlashCommandBuilder, EmbedBuilder } = require('discord.js'); const { SlashCommandBuilder, EmbedBuilder } = require('discord.js');
const { getUserRegistration, deleteBeatenGameNum, checkGameStorageId, getRecentBeatenGameEntry, deleteBeatenGameId, getBeatenGameCount, getPlanningGameCount, getPlayingGameCount } = require('../../databaseHelperFunctions.js'); const { getUserRegistration, deleteBeatenGameNum, checkGameStorageId, getRecentBeatenGameEntry, deleteBeatenGameId, getBeatenGameCount } = require('../../databaseHelperFunctions.js');
const { getCoverURL, getGameJson } = require('../../igdbHelperFunctions.js'); const { getCoverURL, getGameJson } = require('../../igdbHelperFunctions.js');
module.exports = { module.exports = {
data: new SlashCommandBuilder() data: new SlashCommandBuilder()
.setName('deletebeatengame') .setName('deletegame')
.setDescription('Delete a game that you have beaten from the 100 game challenge!') .setDescription('Delete a game that you have beaten from the 100 game challenge!')
.addNumberOption(option => option.setName('beatgamenumber').setDescription('Index of the game to delete in the list of beaten games.').setMinValue(1).setMaxValue(100)), .addNumberOption(option => option.setName('beatgamenumber').setDescription('Index of the game to delete in the list of beaten games.').setMinValue(1).setMaxValue(100)),
async execute(interaction) { async execute(interaction) {
@ -30,9 +30,7 @@ module.exports = {
if (!res) return interaction.followUp({ content: 'No game found.', ephemeral: true }); if (!res) return interaction.followUp({ content: 'No game found.', ephemeral: true });
const game = res[0]; const game = res[0];
const beatNum = await getBeatenGameCount(userDatabaseEntry); const num = await getBeatenGameCount(userDatabaseEntry);
const planNum = await getPlanningGameCount(userDatabaseEntry);
const playNum = await getPlayingGameCount(userDatabaseEntry);
const coverUrl = await getCoverURL(game.cover); const coverUrl = await getCoverURL(game.cover);
const embed = new EmbedBuilder() const embed = new EmbedBuilder()
@ -40,7 +38,7 @@ module.exports = {
.setAuthor({ name: `${interaction.user.displayName} deleted a game!`, iconURL: interaction.user.avatarURL() }) .setAuthor({ name: `${interaction.user.displayName} deleted a game!`, iconURL: interaction.user.avatarURL() })
.setTitle(`${game.name} deleted!`) .setTitle(`${game.name} deleted!`)
.setThumbnail(`${coverUrl}`) .setThumbnail(`${coverUrl}`)
.setDescription(`${interaction.user.displayName} has ${planNum} games planned, they are playing ${playNum} games, they have beaten ${beatNum} games, they have ${100 - beatNum} games remaining.`) .setDescription(`${interaction.user.displayName} has beaten ${num} games, they have ${100 - num} games remaining.`)
.setFooter({ text: 'The Ochulus • 100 Games Challenge', iconURL: interaction.client.user.avatarURL() }) .setFooter({ text: 'The Ochulus • 100 Games Challenge', iconURL: interaction.client.user.avatarURL() })
.setTimestamp(); .setTimestamp();

52
commands/100-games/deleteplannedgame.js
View File

@ -1,52 +0,0 @@
const { SlashCommandBuilder, EmbedBuilder } = require('discord.js');
const { getUserRegistration, deletePlanningGameNum, checkGameStorageId, getRecentPlanningGameEntry, deletePlanningGameId, getPlayingGameCount, getBeatenGameCount, getPlanningGameCount } = require('../../databaseHelperFunctions.js');
const { getCoverURL, getGameJson } = require('../../igdbHelperFunctions.js');
module.exports = {
data: new SlashCommandBuilder()
.setName('deleteplannedgame')
.setDescription('Delete a game that you were planning to play!')
.addNumberOption(option => option.setName('currentgamenumber').setDescription('Index of the game to delete in the list of planned games.').setMinValue(1)),
async execute(interaction) {
await interaction.reply({ content: 'Searching for user...', ephemeral: true });
const beatGameNumber = interaction.options.getNumber('currentgamenumber');
const userDatabaseEntry = await getUserRegistration(interaction.user);
let result;
if (beatGameNumber) {
result = await deletePlanningGameNum(beatGameNumber, userDatabaseEntry);
}
else {
const recentGame = await getRecentPlanningGameEntry(userDatabaseEntry.id);
result = await deletePlanningGameId(recentGame.id, userDatabaseEntry);
}
if (result) {
const gameDatabaseEntry = await checkGameStorageId(result.gameId);
const body = `where id = ${ gameDatabaseEntry.igdb_id }; fields *;`;
const res = await getGameJson(body);
if (!res) return interaction.followUp({ content: 'No game found.', ephemeral: true });
const game = res[0];
const beatNum = await getBeatenGameCount(userDatabaseEntry);
const planNum = await getPlanningGameCount(userDatabaseEntry);
const playNum = await getPlayingGameCount(userDatabaseEntry);
const coverUrl = await getCoverURL(game.cover);
const embed = new EmbedBuilder()
.setColor(0xFF0000)
.setAuthor({ name: `${interaction.user.displayName} deleted a game!`, iconURL: interaction.user.avatarURL() })
.setTitle(`${game.name} deleted!`)
.setThumbnail(`${coverUrl}`)
.setDescription(`${interaction.user.displayName} has ${planNum} games planned, they are playing ${playNum} games, they have beaten ${beatNum} games, they have ${100 - beatNum} games remaining.`)
.setFooter({ text: 'The Ochulus • 100 Games Challenge', iconURL: interaction.client.user.avatarURL() })
.setTimestamp();
return interaction.followUp({ embeds: [embed] });
}
return interaction.followUp({ content: 'Unable to delete entry / No entry found.', ephemeral: true });
},
};

52
commands/100-games/deleteplayinggame.js
View File

@ -1,52 +0,0 @@
const { SlashCommandBuilder, EmbedBuilder } = require('discord.js');
const { getUserRegistration, deletePlayingGameNum, checkGameStorageId, getRecentPlayingGameEntry, deletePlayingGameId, getPlayingGameCount, getBeatenGameCount, getPlanningGameCount } = require('../../databaseHelperFunctions.js');
const { getCoverURL, getGameJson } = require('../../igdbHelperFunctions.js');
module.exports = {
data: new SlashCommandBuilder()
.setName('deleteplayinggame')
.setDescription('Delete a game that you was playing!')
.addNumberOption(option => option.setName('currentgamenumber').setDescription('Index of the game to delete in the list of currently playing games.').setMinValue(1)),
async execute(interaction) {
await interaction.reply({ content: 'Searching for user...', ephemeral: true });
const beatGameNumber = interaction.options.getNumber('currentgamenumber');
const userDatabaseEntry = await getUserRegistration(interaction.user);
let result;
if (beatGameNumber) {
result = await deletePlayingGameNum(beatGameNumber, userDatabaseEntry);
}
else {
const recentGame = await getRecentPlayingGameEntry(userDatabaseEntry.id);
result = await deletePlayingGameId(recentGame.id, userDatabaseEntry);
}
if (result) {
const gameDatabaseEntry = await checkGameStorageId(result.gameId);
const body = `where id = ${ gameDatabaseEntry.igdb_id }; fields *;`;
const res = await getGameJson(body);
if (!res) return interaction.followUp({ content: 'No game found.', ephemeral: true });
const game = res[0];
const beatNum = await getBeatenGameCount(userDatabaseEntry);
const planNum = await getPlanningGameCount(userDatabaseEntry);
const playNum = await getPlayingGameCount(userDatabaseEntry);
const coverUrl = await getCoverURL(game.cover);
const embed = new EmbedBuilder()
.setColor(0xFF0000)
.setAuthor({ name: `${interaction.user.displayName} deleted a game!`, iconURL: interaction.user.avatarURL() })
.setTitle(`${game.name} deleted!`)
.setThumbnail(`${coverUrl}`)
.setDescription(`${interaction.user.displayName} has ${planNum} games planned, they are playing ${playNum} games, they have beaten ${beatNum} games, they have ${100 - beatNum} games remaining.`)
.setFooter({ text: 'The Ochulus • 100 Games Challenge', iconURL: interaction.client.user.avatarURL() })
.setTimestamp();
return interaction.followUp({ embeds: [embed] });
}
return interaction.followUp({ content: 'Unable to delete entry / No entry found.', ephemeral: true });
},
};

4
databaseHelperFunctions.js
View File

@ -91,7 +91,7 @@ async function createPlayingGameEntry(user, game) {
entry.status = 'playing'; entry.status = 'playing';
await entry.save(); await entry.save();
return entry; return entry;
} }
@ -252,7 +252,7 @@ async function getRecentBeatenGameEntry(userId) {
} }
async function getRecentGameEntry(userId, status) { async function getRecentGameEntry(userId, status) {
const beatenGameEntry = await LoggedGames.findOne({ where: { userId: userId, status: status }, order: [ [ 'updatedAt', 'DESC' ]] }) const beatenGameEntry = await LoggedGames.findOne({ where: { userId: userId, status: status }, order: [ [ 'updatedAt', 'ASC' ]] })
.catch((err) => { .catch((err) => {
console.log(err); console.log(err);
}); });