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

Fix leaderboard fields

This commit is contained in:
baz 2024-12-02 04:23:17 +00:00
parent ec4eae07d4
commit fa9430cacb
2 changed files with 34 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
commands/100-games/wrapped.js
View File

@ -1,5 +1,5 @@
const { SlashCommandBuilder, EmbedBuilder } = require('discord.js'); const { SlashCommandBuilder, EmbedBuilder } = require('discord.js');
const { getUserRegistration, getBeatenGames, checkGameStorageId, getChangelog, getLeaderboardEntriesBetweenDates, getLeaderboardEntries } = require('../../databaseHelperFunctions'); const { getUserRegistration, getBeatenGames, checkGameStorageId, getChangelog, getLeaderboardEntriesBetweenDates, getLeaderboardEntries, getBeatenGamesForYear } = require('../../databaseHelperFunctions');
const { getGameJson, getGenres, getCompanyInfo } = require('../../igdbHelperFunctions'); const { getGameJson, getGenres, getCompanyInfo } = require('../../igdbHelperFunctions');
let userBeatenGamesDatabaseEntries = {}; let userBeatenGamesDatabaseEntries = {};
@ -36,7 +36,7 @@ module.exports = {
const numberOfGamesBeat = await GetNumberOfGamesBeat(); const numberOfGamesBeat = await GetNumberOfGamesBeat();
const averageBeatGameInterval = await GetAverageBeatInterval(); const averageBeatGameInterval = await GetAverageBeatInterval();
const mostActiveMonth = await GetMostActiveMonth(); const mostActiveMonth = await GetMostActiveMonth(userDatabaseEntry);
const oldestGameBeat = await GetOldestGameBeat(); const oldestGameBeat = await GetOldestGameBeat();
const newestGameBeat = await GetNewestGameBeat(); const newestGameBeat = await GetNewestGameBeat();
const averageGameAge = await GetAverageGameAge(); const averageGameAge = await GetAverageGameAge();
@ -147,18 +147,26 @@ async function GetAverageBeatInterval() {
return 0; return 0;
} }
async function GetMostActiveMonth() { async function GetMostActiveMonth(userDatabaseEntry) {
if (userBeatenGamesDatabaseEntries && userBeatenGamesDatabaseEntries.length > 0) { if (userBeatenGamesDatabaseEntries && userBeatenGamesDatabaseEntries.length > 0) {
let mostActiveMonth = [];
for (let i = 0; i < 12; i++) { const results = [];
const month = FilterByMonth(userBeatenGamesDatabaseEntries, i); results.push(['January', await getBeatenGamesForYear(userDatabaseEntry.id, '2024-01-01', '2024-02-01')]);
if (month.length > mostActiveMonth.length) { results.push(['February', await getBeatenGamesForYear(userDatabaseEntry.id, '2024-02-01', '2024-03-01')]);
mostActiveMonth = month; results.push(['March', await getBeatenGamesForYear(userDatabaseEntry.id, '2024-03-01', '2024-04-01')]);
} results.push(['April', await getBeatenGamesForYear(userDatabaseEntry.id, '2024-04-01', '2024-05-01')]);
} results.push(['May', await getBeatenGamesForYear(userDatabaseEntry.id, '2024-05-01', '2024-06-01')]);
results.push(['June', await getBeatenGamesForYear(userDatabaseEntry.id, '2024-06-01', '2024-07-01')]);
results.push(['July', await getBeatenGamesForYear(userDatabaseEntry.id, '2024-07-01', '2024-08-01')]);
results.push(['August', await getBeatenGamesForYear(userDatabaseEntry.id, '2024-08-01', '2024-09-01')]);
results.push(['September', await getBeatenGamesForYear(userDatabaseEntry.id, '2024-09-01', '2024-10-01')]);
results.push(['October', await getBeatenGamesForYear(userDatabaseEntry.id, '2024-10-01', '2024-11-01')]);
results.push(['November', await getBeatenGamesForYear(userDatabaseEntry.id, '2024-11-01', '2024-12-01')]);
results.push(['December', await getBeatenGamesForYear(userDatabaseEntry.id, '2024-12-01', '2025-01-01')]);
return String.prototype.concat(mostActiveMonth[0].updatedAt.toLocaleDateString('en-GB', { month: 'long' }), ' (', mostActiveMonth.length.toString(), ' games)'); const sorted = Object.entries(results).sort((a, b) => b[1][1] - a[1][1]);
return sorted[0][1][0] + ' (' + sorted[0][1][1].toString() + ' games)';
} }
return ''; return '';
@ -349,12 +357,14 @@ async function GetNumberOfDroppedGames(userDatabaseEntry) {
async function GetYearLeaderboardPosition(userDatabaseEntry) { async function GetYearLeaderboardPosition(userDatabaseEntry) {
const leaderboard = await getLeaderboardEntriesBetweenDates('2024-01-01', '2024-12-31'); const leaderboard = await getLeaderboardEntriesBetweenDates('2024-01-01', '2024-12-31');
await leaderboard.sort((a, b) => parseInt(b.count) - parseInt(a.count));
const index = leaderboard.findIndex(item => item.username === userDatabaseEntry.username) + 1; const index = leaderboard.findIndex(item => item.username === userDatabaseEntry.username) + 1;
return await appendOrdinalSuffix(index); return await appendOrdinalSuffix(index);
} }
async function GetLeaderboardPosition(userDatabaseEntry) { async function GetLeaderboardPosition(userDatabaseEntry) {
const leaderboard = await getLeaderboardEntries(); const leaderboard = await getLeaderboardEntries();
await leaderboard.sort((a, b) => parseInt(b.count) - parseInt(a.count));
const index = leaderboard.findIndex(item => item.username === userDatabaseEntry.username) + 1; const index = leaderboard.findIndex(item => item.username === userDatabaseEntry.username) + 1;
return await appendOrdinalSuffix(index); return await appendOrdinalSuffix(index);
} }

13
databaseHelperFunctions.js
View File

@ -408,6 +408,18 @@ async function getAllBeatenGames() {
return false; return false;
} }
async function getBeatenGamesForYear(userId, start, end) {
const startDate = new Date(start);
const endDate = new Date(end);
const count = await LoggedGames.count({ where: { userId: userId, status: 'beat', statusLastChanged: { [ Op.between ]: [startDate, endDate] } } })
.catch((err) => {
console.log(err);
});
return count;
}
async function backupDatabase() { async function backupDatabase() {
const date = new Date().toJSON().slice(0, 10); const date = new Date().toJSON().slice(0, 10);
@ -476,4 +488,5 @@ module.exports = {
getChangelog, getChangelog,
getAllChangelog, getAllChangelog,
getLeaderboardEntriesBetweenDates, getLeaderboardEntriesBetweenDates,
getBeatenGamesForYear,
}; };