missionShop done ! #2273

DraftBot-A-Discord-Adventure · Jan 15, 2025 · afda0e6 · afda0e6
1 parent 13a8e4f
commit afda0e6
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 21 deletions.
diff --git a/Core/src/commands/mission/MissionShopCommand.ts b/Core/src/commands/mission/MissionShopCommand.ts
@@ -200,8 +200,6 @@ function getSkipMapMissionShopItem(): ShopItem {
 				.build();
 
 			response.push(packet);
-
-
 			return false;
 		}
 	};

diff --git a/Discord/src/commands/mission/MissionShop.ts b/Discord/src/commands/mission/MissionShop.ts
@@ -93,7 +93,8 @@ export async function handleLovePointsValueShopItem(packet: CommandMissionShopPe
 					actualLP: packet.lovePoints,
 					diet: PetUtils.getDietDisplay(packet.diet, lng),
 					nextFeed: PetUtils.getFeedCooldownDisplay(packet.nextFeed, lng),
-					commentOnResult: StringUtils.getRandomTranslation(`commands:shop.shopItems.lovePointsValue.advice.${packet.loveLevel}`, lng)
+					commentOnResult: StringUtils.getRandomTranslation(`commands:shop.shopItems.lovePointsValue.advice.${packet.loveLevel}`, lng),
+					interpolation: {escapeValue: false}
 				}))
 		]
 	});
@@ -112,7 +113,9 @@ export async function skipMissionShopItemCollector(packet: ReactionCollectorCrea
 		.setDescription(`${i18n.t("commands:shop.shopItems.skipMission.giveDesc", {
 			lng: interaction.userLanguage
 		})}\n\n`);
-	const reactions: ReactionCollectorSkipMissionShopItemReaction[] = packet.reactions.map(reaction => reaction.data as ReactionCollectorSkipMissionShopItemReaction);
+	const reactions: ReactionCollectorSkipMissionShopItemReaction[] = packet.reactions
+		.map(reaction => reaction.data as ReactionCollectorSkipMissionShopItemReaction)
+		.filter(reaction => reaction.mission);
 	await DiscordCollectorUtils.createChoiceListCollector(
 		interaction,
 		embed,
@@ -125,7 +128,11 @@ export async function skipMissionShopItemCollector(packet: ReactionCollectorCrea
 
 export async function skipMissionShopResult(packet: CommandMissionShopSkipMissionResult, context: PacketContext): Promise<void> {
 	const interaction = DiscordCache.getInteraction(context.discord!.interaction!);
-	await interaction?.followUp({
+	const buttonInteraction = DiscordCache.getButtonInteraction(context.discord!.buttonInteraction!);
+	if (!interaction) {
+		return;
+	}
+	await buttonInteraction?.editReply({
 		embeds: [
 			new DraftBotEmbed()
 				.formatAuthor(i18n.t("commands:shop.shopItems.skipMission.successTitle", {

diff --git a/Discord/src/commands/player/ShopCommand.ts b/Discord/src/commands/player/ShopCommand.ts
@@ -298,7 +298,7 @@ async function manageBuyoutConfirmation(packet: ReactionCollectorCreationPacket,
 				}\n${EmoteUtils.translateEmojiToDiscord(DraftBotIcons.collectors.warning)}${
 					i18n.t(`commands:shop.shopItems.${shopItemTypeToId(shopItemId)}.info`, {
 						lng: interaction.userLanguage,
-						kingsMoneyAmount: data.additionnalShopData?.gemToMoneyRatio,
+						kingsMoneyAmount: data.additionnalShopData?.gemToMoneyRatio
 					})
 				}`)
 		],

diff --git a/Discord/src/utils/ErrorUtils.ts b/Discord/src/utils/ErrorUtils.ts
@@ -140,7 +140,7 @@ export async function handleClassicError(context: PacketContext, errorKey: strin
 	if (!interaction) {
 		return;
 	}
-	await (interaction.deferred ? interaction.editReply : interaction.reply)({
+	await (interaction.deferred ? interaction.editReply : interaction.replied ? interaction.followUp : interaction.reply)({
 		embeds: [
 			new DraftBotErrorEmbed(
 				interaction.user,

diff --git a/Discord/src/utils/PetUtils.ts b/Discord/src/utils/PetUtils.ts
@@ -103,7 +103,7 @@ export class PetUtils {
 	}
 
 	static getDietDisplay(diet: string | undefined, lng: Language): string {
-		return i18n.t(`models:diet.${diet}`, {lng});
+		return i18n.t("models:diet", {lng, context: diet ?? "omnivorous"});
 	}
 
 	static getFeedCooldownDisplay(nextFeed: number, lng: Language): string {

diff --git a/Lang/fr/models.json b/Lang/fr/models.json
@@ -1331,9 +1331,7 @@
     "commonFood_one": "friandise",
     "commonFood_other": "friandises"
   },
-  "diet": {
-    "diet_undefined": "{emote:diet.omnivorous} Omnivore",
-    "diet_herbivorous": "{emote:diet.herbivorous} Herbivore",
-    "diet_carnivorous": "{emote:diet.carnivorous} Carnivore"
-  }
+  "diet_omnivorous": "{emote:diet.omnivorous} Omnivore",
+  "diet_herbivorous": "{emote:diet.herbivorous} Herbivore",
+  "diet_carnivorous": "{emote:diet.carnivorous} Carnivore"
 }
diff --git a/Lib/src/constants/BadgeConstants.ts b/Lib/src/constants/BadgeConstants.ts
@@ -1,17 +1,17 @@
-export abstract class BadgeConstants {
-	static readonly POWERFUL_GUILD: "💎";
+export class BadgeConstants {
+	static readonly POWERFUL_GUILD = "💎";
 
-	static readonly VERY_POWERFUL_GUILD: "🪩";
+	static readonly VERY_POWERFUL_GUILD = "🪩";
 
-	static readonly STAFF_MEMBER: "⚙️";
+	static readonly STAFF_MEMBER = "⚙️";
 
-	static readonly QUEST_MASTER: "💍";
+	static readonly QUEST_MASTER = "💍";
 
-	static readonly RICH_PERSON: "🤑";
+	static readonly RICH_PERSON = "🤑";
 
-	static readonly PET_TAMER: "💞";
+	static readonly PET_TAMER = "💞";
 
-	static readonly LIST_FOR_GIVE_BADGE_COMMAND: [
+	static readonly LIST_FOR_GIVE_BADGE_COMMAND = [
 		"🏅",
 		"⚙️",
 		"✨",
-Original file line number
+Diff line change
@@ Expand Up / @@ -200,8 +200,6 @@ function getSkipMapMissionShopItem(): ShopItem { @@
     				.build();
     			response.push(packet);
     			return false;
     		}
     	};
@@ Expand Down @@