Merge pull request #36 from N3aar/fix/get-artist-info

fix: get artist information and give points when winning

Author: N3aar

src/commands/lastfm/jumble.ts

@@ -1,6 +1,6 @@
 import type { UserArtistData } from "@/shared/types/lastFmTypes.js";
 import { embedColors } from "@/utils/contants.js";
-import { getRandomNumber } from "@/utils/random.js";
+import { getSkewedRandomInt } from "@/utils/random.js";
 import { shuffleString } from "@/utils/stringFormat.js";
 import { Command } from "@sapphire/framework";
 import { EmbedBuilder, type GuildMember, type TextChannel } from "discord.js";
@@ -74,9 +74,9 @@ export class JumbleCommand extends Command {
 		const totalArtists =
 			await this.container.lastFmAPI.getTotalArtists(username);
 		const totalPages = Math.ceil((totalArtists ?? 100) / 100);
-		const twentyPercent = Math.floor(totalPages * 0.3);
+		const reducedPages = Math.floor(totalPages * 0.3);
 
-		const page = getRandomNumber(1, Math.max(totalPages - twentyPercent, 1));
+		const page = getSkewedRandomInt(1, reducedPages);
 		const artists = await this.container.lastFmAPI.getTopArtists(
 			username,
 			100,
@@ -111,7 +111,7 @@ export class JumbleCommand extends Command {
 
 		if (!gameContext) {
 			await interaction.reply({
-				content: "Não foi encontrado informações sobre o artista!",
+				content: "Não foi possível iniciar este Jumble, tente novamente!",
 				ephemeral: false,
 				fetchReply: false,
 			});

src/events/announceScheduledEvent.ts

@@ -1,5 +1,5 @@
 import { birthdayVideos } from "@/utils/contants.js";
-import { getRandomNumber } from "@/utils/random.js";
+import { getRandomInt } from "@/utils/random.js";
 import { container } from "@sapphire/pieces";
 import type { MessageCreateOptions, TextChannel } from "discord.js";
 
@@ -89,8 +89,7 @@ export default async function announceScheduledEvent() {
 		};
 
 		if (hasBirthdays) {
-			const random =
-				birthdayVideos[getRandomNumber(0, birthdayVideos.length - 1)];
+			const random = birthdayVideos[getRandomInt(0, birthdayVideos.length - 1)];
 
 			message.files = [
 				{

src/shared/handlers/JumbleGameHandler.ts

@@ -1,3 +1,4 @@
+import { fail } from "node:assert";
 import {
 	type TranslationKey,
 	embedColors,
@@ -47,13 +48,13 @@ type JumbleGameContext = {
 };
 
 type ArtistInfo = {
-	isGroup: boolean;
-	type: TranslationKey | null;
-	gender: TranslationKey | null;
-	musicGenre: string | undefined;
-	country: string | null;
-	begin: string | null;
-	end: string | null;
+	isGroup?: boolean;
+	musicGenre?: string;
+	type?: TranslationKey | null;
+	gender?: TranslationKey | null;
+	country?: string | null;
+	begin?: string | null;
+	end?: string | null;
 };
 
 enum ButtonCustomIds {
@@ -87,18 +88,8 @@ export default class JumbleGameHandler {
 		name: string,
 		mbid?: string | null,
 	): Promise<JumbleGameContext | null> {
-		const artistInfo = await this.getArtistInfo(name, mbid);
-		if (!artistInfo) return null;
-
-		const hints = this.createHints(
-			playcount,
-			artistInfo.type,
-			artistInfo.country,
-			artistInfo.musicGenre,
-			artistInfo.gender,
-			artistInfo.begin,
-			artistInfo.end,
-		);
+		const artistInfo: ArtistInfo = (await this.getArtistInfo(name, mbid)) ?? {};
+		const hints = this.createHints(playcount, artistInfo);
 
 		const gameContext: JumbleGameContext = {
 			hints,
@@ -203,15 +194,9 @@ export default class JumbleGameHandler {
 		return collector;
 	}
 
-	private createHints(
-		playcount: number,
-		type: TranslationKey | null,
-		country: string | null,
-		musicGenre: string | undefined,
-		gender: TranslationKey | null,
-		begin: string | null,
-		end: string | null,
-	): string[] {
+	private createHints(playcount: number, artistInfo: ArtistInfo): string[] {
+		const { type, country, musicGenre, gender, begin, end } = artistInfo;
+
 		const hints: string[] = [];
 		const isGroup = type ? this.isGroupType(type) : false;
 
@@ -222,8 +207,8 @@ export default class JumbleGameHandler {
 			? convertToDiscordTimestamp(end, discordTimestampFormats.LONG_DATE)
 			: null;
 
-		const arttype = translations[type ?? "group"];
-		const artgender = translations[gender ?? "male"];
+		const arttype = translations[type ?? "group"] ?? type;
+		const artgender = translations[gender ?? "male"] ?? gender;
 		const flag = `:flag_${country?.toLowerCase()}:`;
 
 		const conditionsAndHints: [boolean, string][] = [
@@ -283,35 +268,17 @@ export default class JumbleGameHandler {
 		}
 	}
 
-	private async addPoints(userId: string, points: number): Promise<boolean> {
-		try {
-			const user = await container.db.user.findUnique({
-				where: {
-					discordId: userId,
-				},
-			});
-
-			if (!user) return false;
-
-			await container.db.jumble.upsert({
-				where: {
-					userId: user.id,
-				},
-				update: {
-					points: {
-						increment: points,
-					},
-				},
-				create: {
-					userId: user.id,
-					points: points,
+	private async addPoints(userId: string, points: number) {
+		await container.db.jumble.update({
+			where: {
+				userId: userId,
+			},
+			data: {
+				points: {
+					increment: points,
 				},
-			});
-
-			return true;
-		} catch (error) {
-			return false;
-		}
+			},
+		});
 	}
 
 	private async setBestTime(userId: string, time: number) {
@@ -433,25 +400,32 @@ export default class JumbleGameHandler {
 			},
 		});
 
-		if (!userData || !userData.Jumble) return;
+		if (!userData || !userData.Jumble) {
+			const embed = new EmbedBuilder()
+				.setDescription(
+					"Use o comando /lastfm para registrar sua conta antes de jogar.",
+				)
+				.setColor(embedColors.default);
 
-		const added = await this.addPoints(userData.id, 1);
-		if (added) {
-			const bestTime = userData.Jumble.bestTime;
+			await message.channel.send({ embeds: [embed] });
 
-			if (bestTime <= 0 || seconds < bestTime) {
-				await this.setBestTime(userData.id, seconds);
-			}
+			return;
+		}
+
+		await this.addPoints(userData.id, 1);
+
+		const bestTime = userData.Jumble.bestTime;
+
+		if (bestTime <= 0 || seconds < bestTime) {
+			await this.setBestTime(userData.id, seconds);
 		}
 
 		const embed = new EmbedBuilder()
 			.setDescription(description)
 			.setFooter({ text: `Respondido em ${seconds}s` })
 			.setColor(embedColors.success);
 
-		message.channel.send({
-			embeds: [embed],
-		});
+		message.channel.send({ embeds: [embed] });
 	}
 
 	private processInteraction(
@@ -510,6 +484,14 @@ export default class JumbleGameHandler {
 		if (isWinner) embed.spliceFields(1, 1);
 		else embed.spliceFields(1, 1, newField);
 
+		if (!isWinner && !isGiveUp) {
+			const failEmbed = new EmbedBuilder()
+				.setDescription(`Ninguém adivinhou. A resposta era \`${artistName}\``)
+				.setColor(embedColors.error);
+
+			message.reply({ embeds: [failEmbed] });
+		}
+
 		message.edit({
 			embeds: [embed],
 			components: [],

src/shared/handlers/xpHandler.ts

@@ -1,5 +1,5 @@
 import { expValues } from "@/utils/contants.js";
-import { getRandomNumber } from "@/utils/random.js";
+import { getRandomInt } from "@/utils/random.js";
 import { container } from "@sapphire/pieces";
 import type { Guild, GuildMember, TextChannel } from "discord.js";
 
@@ -63,7 +63,7 @@ export default class ExpHandler {
 
 		if (!expStats?.canGetExp) return;
 
-		expStats.exp += getRandomNumber(expValues.min, expValues.max);
+		expStats.exp += getRandomInt(expValues.min, expValues.max);
 		expStats.canGetExp = false;
 
 		const newXp = expStats.exp;

src/utils/contants.ts

@@ -63,12 +63,13 @@ export const translations = {
 	group: "grupo",
 	person: "pessoa",
 	orchestra: "orquestra",
-	choir: "Coro",
-	character: "Personagem",
-	other: "Outro",
+	choir: "coro",
+	character: "personagem",
+	other: "outro",
 	male: "masculino",
 	female: "feminino",
 	neither: "nenhum",
+	not_applicable: "não aplicável",
 };
 
 export const fieldTitles = {

src/utils/random.ts

@@ -1,7 +1,13 @@
-export function getRandomNumber(min: number, max: number) {
+export function getRandomInt(min: number, max: number) {
 	return Math.floor(Math.random() * (max - min + 1)) + min;
 }
 
+export function getSkewedRandomInt(min: number, max: number) {
+	const random = Math.random();
+	const skewed = random ** 2;
+	return Math.floor(skewed * (max - min + 1)) + min;
+}
+
 export function shuffle<T>(array: T[]): T[] {
 	const newArray = array.slice();