diff --git a/src/commands/eligible.ts b/src/commands/eligible.ts index 5438362e2..adae55419 100644 --- a/src/commands/eligible.ts +++ b/src/commands/eligible.ts @@ -5,7 +5,7 @@ import sumStats from '../core/blitz/sumStats.js'; import { tankopedia } from '../core/blitz/tankopedia.js'; import getPeriodNow from '../core/blitzstars/getPeriodNow.js'; import getPeriodStart from '../core/blitzstars/getPeriodStart.js'; -import getTankStatsOverTime from '../core/blitzstars/getTankStatsOverTime.js'; +import getTankStatsDiffed from '../core/blitzstars/getTankStatsDiffed.js'; import { tankAverages } from '../core/blitzstars/tankAverages.js'; import addUsernameOption from '../core/discord/addUsernameOption.js'; import cleanTable, { TableInput } from '../core/discord/cleanTable.js'; @@ -58,7 +58,7 @@ export default { let body = ''; if (clan === 'SKLLD') { - const tankStatsOverTime = await getTankStatsOverTime( + const tankStatsOverTime = await getTankStatsDiffed( server, id, getPeriodStart('30'), diff --git a/src/core/blitz/sumStats.ts b/src/core/blitz/sumStats.ts index 7d990f44c..10b2095a0 100644 --- a/src/core/blitz/sumStats.ts +++ b/src/core/blitz/sumStats.ts @@ -1,5 +1,5 @@ import { AllStats } from '../../types/accountInfo.js'; -import { emptyAllStats } from '../blitzstars/getTankStatsOverTime.js'; +import { emptyAllStats } from '../blitzstars/getTankStatsDiffed.js'; export default function sumStats(allStatsCollection: AllStats[]) { return allStatsCollection.reduce((accumulated, current) => { diff --git a/src/core/blitzstars/blitzStarsError.ts b/src/core/blitzstars/blitzStarsError.ts deleted file mode 100644 index 113f4947f..000000000 --- a/src/core/blitzstars/blitzStarsError.ts +++ /dev/null @@ -1,28 +0,0 @@ -import { - CacheType, - ChatInputCommandInteraction, - EmbedBuilder, -} from 'discord.js'; -import { client } from '../../bot.js'; -import { NEGATIVE_COLOR } from '../../constants/colors.js'; -import { handleError } from '../../events/error.js'; - -export default async function blitzStarsError( - interaction: ChatInputCommandInteraction, - error: Error, - command: string, -) { - await interaction.editReply({ - embeds: [ - new EmbedBuilder() - .setColor(NEGATIVE_COLOR) - .setTitle(`${client.user?.username} ran into an issue`) - .setDescription( - 'BlitzStars returned an error. Please try again later.', - ), - ], - }); - - console.log(`BlitzStars returned an error`); - handleError(error, command); -} diff --git a/src/core/blitzstars/blitzStarsLinks.ts b/src/core/blitzstars/blitzStarsLinks.ts deleted file mode 100644 index 619da67ea..000000000 --- a/src/core/blitzstars/blitzStarsLinks.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { BlitzServer } from '../../constants/servers.js'; - -export default function blitzStarsLinks(server: BlitzServer, nickname: string) { - return `[View full stats](https://www.blitzstars.com/player/${server}/${nickname}) • [Support BlitzStars](https://www.blitzstars.com/supporters)`; -} diff --git a/src/core/blitzstars/getPlayerHistories.ts b/src/core/blitzstars/getPlayerHistories.ts index a99e1d10d..aed5d135b 100644 --- a/src/core/blitzstars/getPlayerHistories.ts +++ b/src/core/blitzstars/getPlayerHistories.ts @@ -8,7 +8,7 @@ import { } from '../../types/histories.js'; import getWargamingResponse from '../blitz/getWargamingResponse.js'; import { WARGAMING_APPLICATION_ID } from '../node/args.js'; -import { emptyAllStats } from './getTankStatsOverTime.js'; +import { emptyAllStats } from './getTankStatsDiffed.js'; export interface PlayerHistoryRaw { clan: { clan_id: number; name: string; tag: string }; diff --git a/src/core/blitzstars/getTankHistories.ts b/src/core/blitzstars/getTankHistories.ts index 21c324974..4e69e198c 100644 --- a/src/core/blitzstars/getTankHistories.ts +++ b/src/core/blitzstars/getTankHistories.ts @@ -6,7 +6,7 @@ import { getHistoriesDefaultOptions, } from '../../types/histories.js'; import getTankStats from '../blitz/getTankStats.js'; -import { emptyAllStats } from './getTankStatsOverTime.js'; +import { emptyAllStats } from './getTankStatsDiffed.js'; export interface TankHistory extends History { tank_id: number; diff --git a/src/core/blitzstars/getTankStatsOverTime.ts b/src/core/blitzstars/getTankStatsDiffed.ts similarity index 98% rename from src/core/blitzstars/getTankStatsOverTime.ts rename to src/core/blitzstars/getTankStatsDiffed.ts index c1c789822..513f7f21c 100644 --- a/src/core/blitzstars/getTankStatsOverTime.ts +++ b/src/core/blitzstars/getTankStatsDiffed.ts @@ -34,7 +34,7 @@ export const emptyTankHistoryNode: TankHistoryRaw = { all: emptyAllStats, }; -export default async function getTankStatsOverTime( +export default async function getTankStatsDiffed( server: BlitzServer, id: number, start: number, diff --git a/src/core/blitzstars/getTimeDaysAgo.ts b/src/core/blitzstars/getTimeDaysAgo.ts index fc66a9171..86a3512ea 100644 --- a/src/core/blitzstars/getTimeDaysAgo.ts +++ b/src/core/blitzstars/getTimeDaysAgo.ts @@ -1,4 +1,4 @@ -export default function getTimeDaysAgo(period: number) { +export default function getTimeDaysAgo(daysAgo: number) { const now = new Date(); now.setHours(5, 0, 0, 0); @@ -6,7 +6,7 @@ export default function getTimeDaysAgo(period: number) { if (now.getTime() > Date.now()) now.setDate(now.getDate() - 1); // subtract the period number of days from now - now.setDate(now.getDate() - period); + now.setDate(now.getDate() - daysAgo); return now.getTime() / 1000; } diff --git a/src/core/blitzstars/last5AM.ts b/src/core/blitzstars/last5AM.ts deleted file mode 100644 index ba923acc9..000000000 --- a/src/core/blitzstars/last5AM.ts +++ /dev/null @@ -1,11 +0,0 @@ -export default function last5AM() { - const fiveAM = new Date(); - fiveAM.setHours(5, 0, 0, 0); // Set the time to 5:00 AM today - - if (fiveAM > new Date()) { - // If it's now before 5:00 AM, go back one day - fiveAM.setDate(fiveAM.getDate() - 1); - } - - return fiveAM; -} diff --git a/src/core/blitzstars/playerAverage.ts b/src/core/blitzstars/playerAverage.ts index 346298fcf..a2315adb1 100644 --- a/src/core/blitzstars/playerAverage.ts +++ b/src/core/blitzstars/playerAverage.ts @@ -1,5 +1,5 @@ import sumStats from '../blitz/sumStats.js'; -import { emptyAllStats } from './getTankStatsOverTime.js'; +import { emptyAllStats } from './getTankStatsDiffed.js'; import { tankAverages } from './tankAverages.js'; console.log('Calculating player average...'); diff --git a/src/core/blitzstars/poweredByBlitzStars.ts b/src/core/blitzstars/poweredByBlitzStars.ts deleted file mode 100644 index 4967e0461..000000000 --- a/src/core/blitzstars/poweredByBlitzStars.ts +++ /dev/null @@ -1,8 +0,0 @@ -import { EmbedBuilder } from 'discord.js'; - -export default function poweredByBlitzStars(embed: EmbedBuilder) { - return embed.setTimestamp().setFooter({ - text: 'Powered by BlitzStars', - iconURL: 'https://www.blitzstars.com/assets/images/TankyMcPewpew.png', - }); -} diff --git a/src/renderers/stats.tsx b/src/renderers/stats.tsx index 04ad0f87c..b8257dd38 100644 --- a/src/renderers/stats.tsx +++ b/src/renderers/stats.tsx @@ -10,7 +10,7 @@ import getWargamingResponse from '../core/blitz/getWargamingResponse.js'; import resolveTankName from '../core/blitz/resolveTankName.js'; import sumStats from '../core/blitz/sumStats.js'; import { Tier, tankopedia } from '../core/blitz/tankopedia.js'; -import getTankStatsOverTime from '../core/blitzstars/getTankStatsOverTime.js'; +import getTankStatsDiffed from '../core/blitzstars/getTankStatsDiffed.js'; import { tankAverages } from '../core/blitzstars/tankAverages.js'; import { ResolvedPeriod } from '../core/discord/resolvePeriodFromCommand.js'; import { ResolvedPlayer } from '../core/discord/resolvePlayerFromCommand.js'; @@ -49,7 +49,7 @@ export default async function stats( image = tankopedia[tankId].images.normal; } - const tankStats = await getTankStatsOverTime(server, id, start, end); + const tankStats = await getTankStatsDiffed(server, id, start, end); let stats: AllStats; let supplementaryStats: SupplementaryStats; let tierWeights: TierWeightsRecord; diff --git a/src/renderers/today.tsx b/src/renderers/today.tsx index ff2736f75..b224921dc 100644 --- a/src/renderers/today.tsx +++ b/src/renderers/today.tsx @@ -11,7 +11,7 @@ import resolveTankName from '../core/blitz/resolveTankName.js'; import sumStats from '../core/blitz/sumStats.js'; import { tankopedia } from '../core/blitz/tankopedia.js'; import getPeriodNow from '../core/blitzstars/getPeriodNow.js'; -import getTankStatsOverTime from '../core/blitzstars/getTankStatsOverTime.js'; +import getTankStatsDiffed from '../core/blitzstars/getTankStatsDiffed.js'; import getTimeDaysAgo from '../core/blitzstars/getTimeDaysAgo.js'; import { tankAverages } from '../core/blitzstars/tankAverages.js'; import { ResolvedPlayer } from '../core/discord/resolvePlayerFromCommand.js'; @@ -20,7 +20,7 @@ import { AccountInfo, AllStats } from '../types/accountInfo.js'; import { PlayerClanData } from '../types/playerClanData.js'; export default async function today({ server, id }: ResolvedPlayer) { - const tankStatsOverTime = await getTankStatsOverTime( + const tankStatsOverTime = await getTankStatsDiffed( server, id, getTimeDaysAgo(0),