From 5d81de4a836ac9806aebf1fa15349bb35bd48b62 Mon Sep 17 00:00:00 2001
From: JonnyBro <niktom.nikto@yandex.ru>
Date: Mon, 3 Jan 2022 01:45:20 +0500
Subject: [PATCH] =?UTF-8?q?=D0=9F=D1=80=D0=B0=D0=B2=D0=B8=D0=BB=D1=8C?=
 =?UTF-8?q?=D0=BD=D0=BE=D0=B5=20=D0=BE=D1=82=D0=BE=D0=B1=D1=80=D0=B0=D0=B6?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BD=D0=B0=D0=B3=D1=80=D0=B0=D0=B4?=
 =?UTF-8?q?=20=D0=B2=20number=20=D0=B8=20findwords?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 commands/Economy/deposit.js        |  4 ++--
 commands/Economy/money.js          |  6 +++---
 commands/Economy/pay.js            |  4 ++--
 commands/Economy/profile.js        |  8 ++++----
 commands/Economy/rob.js            | 10 +++++-----
 commands/Economy/withdraw.js       |  4 ++--
 commands/Economy/work.js           |  4 ++--
 commands/Fun/findwords.js          |  8 ++++++--
 commands/Fun/number.js             |  7 +++++--
 commands/General/serverinfo.js     | 10 +++++-----
 commands/Moderation/clear.js       |  4 ++--
 commands/Moderation/setwarns.js    |  8 ++++----
 languages/ru-RU/fun/findwords.json |  2 +-
 languages/ru-RU/fun/number.json    |  2 +-
 14 files changed, 44 insertions(+), 37 deletions(-)

diff --git a/commands/Economy/deposit.js b/commands/Economy/deposit.js
index f93d9785..ecf3b399 100644
--- a/commands/Economy/deposit.js
+++ b/commands/Economy/deposit.js
@@ -29,7 +29,7 @@ class Deposit extends Command {
 		};
 
 		if (data.memberData.money < amount) return message.error("economy/deposit:NOT_ENOUGH_CREDIT", {
-			money: `**${amount}** ${this.client.getNoun(amount, message.translate("misc:NOUNS:CREDIT:1"), message.translate("misc:NOUNS:CREDIT:2"), message.translate("misc:NOUNS:CREDIT:5"))}`
+			money: `**${amount}** ${message.getNoun(amount, message.translate("misc:NOUNS:CREDIT:1"), message.translate("misc:NOUNS:CREDIT:2"), message.translate("misc:NOUNS:CREDIT:5"))}`
 		});
 
 		data.memberData.money = data.memberData.money - amount;
@@ -37,7 +37,7 @@ class Deposit extends Command {
 		data.memberData.save();
 
 		message.success("economy/deposit:SUCCESS", {
-			money: `**${amount}** ${this.client.getNoun(amount, message.translate("misc:NOUNS:CREDIT:1"), message.translate("misc:NOUNS:CREDIT:2"), message.translate("misc:NOUNS:CREDIT:5"))}`
+			money: `**${amount}** ${message.getNoun(amount, message.translate("misc:NOUNS:CREDIT:1"), message.translate("misc:NOUNS:CREDIT:2"), message.translate("misc:NOUNS:CREDIT:5"))}`
 		});
 	}
 };
diff --git a/commands/Economy/money.js b/commands/Economy/money.js
index ad3b141f..e83be058 100644
--- a/commands/Economy/money.js
+++ b/commands/Economy/money.js
@@ -54,9 +54,9 @@ class Credits extends Command {
 				dynamic: true,
 				format: "png"
 			}))
-			.addField(message.translate("economy/profile:CASH"), `**${memberData.money}** ${this.client.getNoun(memberData.money, message.translate("misc:NOUNS:CREDIT:1"), message.translate("misc:NOUNS:CREDIT:2"), message.translate("misc:NOUNS:CREDIT:5"))}`, true)
-			.addField(message.translate("economy/profile:BANK"), `**${memberData.bankSold}** ${this.client.getNoun(memberData.bankSold, message.translate("misc:NOUNS:CREDIT:1"), message.translate("misc:NOUNS:CREDIT:2"), message.translate("misc:NOUNS:CREDIT:5"))}`, true)
-			.addField(message.translate("economy/profile:GLOBAL"), `**${globalMoney}** ${this.client.getNoun(globalMoney, message.translate("misc:NOUNS:CREDIT:1"), message.translate("misc:NOUNS:CREDIT:2"), message.translate("misc:NOUNS:CREDIT:5"))}`, true)
+			.addField(message.translate("economy/profile:CASH"), `**${memberData.money}** ${message.getNoun(memberData.money, message.translate("misc:NOUNS:CREDIT:1"), message.translate("misc:NOUNS:CREDIT:2"), message.translate("misc:NOUNS:CREDIT:5"))}`, true)
+			.addField(message.translate("economy/profile:BANK"), `**${memberData.bankSold}** ${message.getNoun(memberData.bankSold, message.translate("misc:NOUNS:CREDIT:1"), message.translate("misc:NOUNS:CREDIT:2"), message.translate("misc:NOUNS:CREDIT:5"))}`, true)
+			.addField(message.translate("economy/profile:GLOBAL"), `**${globalMoney}** ${message.getNoun(globalMoney, message.translate("misc:NOUNS:CREDIT:1"), message.translate("misc:NOUNS:CREDIT:2"), message.translate("misc:NOUNS:CREDIT:5"))}`, true)
 			.setColor(this.client.config.embed.color)
 			.setFooter(this.client.config.embed.footer);
 		message.channel.send(embed);
diff --git a/commands/Economy/pay.js b/commands/Economy/pay.js
index f26e61b4..54deba0b 100644
--- a/commands/Economy/pay.js
+++ b/commands/Economy/pay.js
@@ -27,7 +27,7 @@ class Pay extends Command {
 
 		const amount = Math.ceil(parseInt(sentAmount, 10));
 		if (amount > data.memberData.money) return message.error("economy/pay:ENOUGH_MONEY", {
-			amount: `${amount} ${this.client.getNoun(amount, message.translate("misc:NOUNS:CREDITS:1"), message.translate("misc:NOUNS:CREDITS:2"), message.translate("misc:NOUNS:CREDITS:5"))}`
+			amount: `${amount} ${message.getNoun(amount, message.translate("misc:NOUNS:CREDITS:1"), message.translate("misc:NOUNS:CREDITS:2"), message.translate("misc:NOUNS:CREDITS:5"))}`
 		});
 
 		const memberData = await this.client.findOrCreateMember({
@@ -42,7 +42,7 @@ class Pay extends Command {
 		memberData.save();
 
 		message.success("economy/pay:SUCCESS", {
-			amount: `${amount} ${this.client.getNoun(amount, message.translate("misc:NOUNS:CREDIT:1"), message.translate("misc:NOUNS:CREDIT:2"), message.translate("misc:NOUNS:CREDIT:5"))}`,
+			amount: `${amount} ${message.getNoun(amount, message.translate("misc:NOUNS:CREDIT:1"), message.translate("misc:NOUNS:CREDIT:2"), message.translate("misc:NOUNS:CREDIT:5"))}`,
 			username: member.user.tag
 		});
 	}
diff --git a/commands/Economy/profile.js b/commands/Economy/profile.js
index 47ca039d..0417ea6f 100644
--- a/commands/Economy/profile.js
+++ b/commands/Economy/profile.js
@@ -65,10 +65,10 @@ class Profile extends Command {
 			}])
 			.setImage("attachment://achievements.png")
 			.addField(message.translate("economy/profile:BIO"), userData.bio ? userData.bio : message.translate("economy/profile:NO_BIO"))
-			.addField(message.translate("economy/profile:CASH"), `**${memberData.money}** ${this.client.getNoun(memberData.money, message.translate("misc:NOUNS:CREDIT:1"), message.translate("misc:NOUNS:CREDIT:2"), message.translate("misc:NOUNS:CREDIT:5"))}`, true)
-			.addField(message.translate("economy/profile:BANK"), `**${memberData.bankSold}** ${this.client.getNoun(memberData.bankSold, message.translate("misc:NOUNS:CREDIT:1"), message.translate("misc:NOUNS:CREDIT:2"), message.translate("misc:NOUNS:CREDIT:5"))}`, true)
-			.addField(message.translate("economy/profile:GLOBAL"), `**${globalMoney}** ${this.client.getNoun(globalMoney, message.translate("misc:NOUNS:CREDIT:1"), message.translate("misc:NOUNS:CREDIT:2"), message.translate("misc:NOUNS:CREDIT:5"))}`, true)
-			.addField(message.translate("economy/profile:REPUTATION"), `**${userData.rep}** ${this.client.getNoun(userData.rep, message.translate("misc:NOUNS:POINTS:1"), message.translate("misc:NOUNS:POINTS:2"), message.translate("misc:NOUNS:POINTS:5"))}`, true)
+			.addField(message.translate("economy/profile:CASH"), `**${memberData.money}** ${message.getNoun(memberData.money, message.translate("misc:NOUNS:CREDIT:1"), message.translate("misc:NOUNS:CREDIT:2"), message.translate("misc:NOUNS:CREDIT:5"))}`, true)
+			.addField(message.translate("economy/profile:BANK"), `**${memberData.bankSold}** ${message.getNoun(memberData.bankSold, message.translate("misc:NOUNS:CREDIT:1"), message.translate("misc:NOUNS:CREDIT:2"), message.translate("misc:NOUNS:CREDIT:5"))}`, true)
+			.addField(message.translate("economy/profile:GLOBAL"), `**${globalMoney}** ${message.getNoun(globalMoney, message.translate("misc:NOUNS:CREDIT:1"), message.translate("misc:NOUNS:CREDIT:2"), message.translate("misc:NOUNS:CREDIT:5"))}`, true)
+			.addField(message.translate("economy/profile:REPUTATION"), `**${userData.rep}** ${message.getNoun(userData.rep, message.translate("misc:NOUNS:POINTS:1"), message.translate("misc:NOUNS:POINTS:2"), message.translate("misc:NOUNS:POINTS:5"))}`, true)
 			.addField(message.translate("economy/profile:LEVEL"), `**${memberData.level}**`, true)
 			.addField(message.translate("economy/profile:EXP"), `**${memberData.exp}/${5 * (memberData.level * memberData.level) + 80 * memberData.level + 100}** xp`, true)
 			.addField(message.translate("economy/profile:REGISTERED"), message.printDate(new Date(memberData.registeredAt)), true)
diff --git a/commands/Economy/rob.js b/commands/Economy/rob.js
index 641ca18e..c2645ba1 100644
--- a/commands/Economy/rob.js
+++ b/commands/Economy/rob.js
@@ -46,8 +46,8 @@ class Rob extends Command {
 
 		const potentiallyLose = Math.floor(amountToRob * 1.5);
 		if (potentiallyLose > data.memberData.money) return message.error("economy/rob:NOT_ENOUGH_AUTHOR", {
-			moneyMin: `${potentiallyLose} ${this.client.getNoun(potentiallyLose, message.translate("misc:NOUNS:CREDIT:1"), message.translate("misc:NOUNS:CREDIT:2"), message.translate("misc:NOUNS:CREDIT:5"))}`,
-			moneyCurrent: `${data.memberData.money} ${this.client.getNoun(data.memberData.money, message.translate("misc:NOUNS:CREDIT:1"), message.translate("misc:NOUNS:CREDIT:2"), message.translate("misc:NOUNS:CREDIT:5"))}`
+			moneyMin: `${potentiallyLose} ${message.getNoun(potentiallyLose, message.translate("misc:NOUNS:CREDIT:1"), message.translate("misc:NOUNS:CREDIT:2"), message.translate("misc:NOUNS:CREDIT:5"))}`,
+			moneyCurrent: `${data.memberData.money} ${message.getNoun(data.memberData.money, message.translate("misc:NOUNS:CREDIT:1"), message.translate("misc:NOUNS:CREDIT:2"), message.translate("misc:NOUNS:CREDIT:5"))}`
 		});
 
 		const itsAWon = Math.floor(this.client.functions.randomNum(0, 100) < 25);
@@ -59,7 +59,7 @@ class Rob extends Command {
 			await memberData.save();
 			const randomNum = Math.floor(this.client.functions.randomNum(1, 3));
 			message.sendT("economy/rob:ROB_WON_" + randomNum, {
-				money: `${amountToRob} ${this.client.getNoun(amountToRob, message.translate("misc:NOUNS:CREDIT:1"), message.translate("misc:NOUNS:CREDIT:2"), message.translate("misc:NOUNS:CREDIT:5"))}`,
+				money: `${amountToRob} ${message.getNoun(amountToRob, message.translate("misc:NOUNS:CREDIT:1"), message.translate("misc:NOUNS:CREDIT:2"), message.translate("misc:NOUNS:CREDIT:5"))}`,
 				username: member.user.username
 			});
 			data.memberData.money += amountToRob;
@@ -70,8 +70,8 @@ class Rob extends Command {
 			const won = Math.floor(0.9 * amountToRob);
 			const randomNum = Math.floor(this.client.functions.randomNum(1, 3));
 			message.sendT("economy/rob:ROB_LOSE_" + randomNum, {
-				fine: `${potentiallyLose} ${this.client.getNoun(potentiallyLose, message.translate("misc:NOUNS:CREDIT:1"), message.translate("misc:NOUNS:CREDIT:2"), message.translate("misc:NOUNS:CREDIT:5"))}`,
-				offset: `${won} ${this.client.getNoun(won, message.translate("misc:NOUNS:CREDIT:1"), message.translate("misc:NOUNS:CREDIT:2"), message.translate("misc:NOUNS:CREDIT:5"))}`,
+				fine: `${potentiallyLose} ${message.getNoun(potentiallyLose, message.translate("misc:NOUNS:CREDIT:1"), message.translate("misc:NOUNS:CREDIT:2"), message.translate("misc:NOUNS:CREDIT:5"))}`,
+				offset: `${won} ${message.getNoun(won, message.translate("misc:NOUNS:CREDIT:1"), message.translate("misc:NOUNS:CREDIT:2"), message.translate("misc:NOUNS:CREDIT:5"))}`,
 				username: member.user.username
 			});
 			data.memberData.money -= potentiallyLose;
diff --git a/commands/Economy/withdraw.js b/commands/Economy/withdraw.js
index 2bef477f..327a3a28 100644
--- a/commands/Economy/withdraw.js
+++ b/commands/Economy/withdraw.js
@@ -29,7 +29,7 @@ class Withdraw extends Command {
 		};
 
 		if (data.memberData.bankSold < amount) return message.error("economy/withdraw:NOT_ENOUGH", {
-			money: `**${amount}** ${this.client.getNoun(amount, message.translate("misc:NOUNS:CREDIT:1"), message.translate("misc:NOUNS:CREDIT:2"), message.translate("misc:NOUNS:CREDIT:5"))}`
+			money: `**${amount}** ${message.getNoun(amount, message.translate("misc:NOUNS:CREDIT:1"), message.translate("misc:NOUNS:CREDIT:2"), message.translate("misc:NOUNS:CREDIT:5"))}`
 		});
 
 		data.memberData.money = data.memberData.money + amount;
@@ -37,7 +37,7 @@ class Withdraw extends Command {
 		data.memberData.save();
 
 		message.success("economy/withdraw:SUCCESS", {
-			money: `**${amount}** ${this.client.getNoun(amount, message.translate("misc:NOUNS:CREDIT:1"), message.translate("misc:NOUNS:CREDIT:2"), message.translate("misc:NOUNS:CREDIT:5"))}`
+			money: `**${amount}** ${message.getNoun(amount, message.translate("misc:NOUNS:CREDIT:1"), message.translate("misc:NOUNS:CREDIT:2"), message.translate("misc:NOUNS:CREDIT:5"))}`
 		});
 	}
 };
diff --git a/commands/Economy/work.js b/commands/Economy/work.js
index a1b99c5c..10ba9f82 100644
--- a/commands/Economy/work.js
+++ b/commands/Economy/work.js
@@ -59,7 +59,7 @@ class Work extends Command {
 		if (data.memberData.workStreak >= 5) {
 			won += 200;
 			embed.addField(message.translate("economy/work:SALARY"), message.translate("economy/work:SALARY_CONTENT", {
-					won: `${won} ${this.client.getNoun(won, message.translate("misc:NOUNS:CREDIT:1"), message.translate("misc:NOUNS:CREDIT:2"), message.translate("misc:NOUNS:CREDIT:5"))}`
+					won: `${won} ${message.getNoun(won, message.translate("misc:NOUNS:CREDIT:1"), message.translate("misc:NOUNS:CREDIT:2"), message.translate("misc:NOUNS:CREDIT:5"))}`
 				}))
 				.addField(message.translate("economy/work:STREAK"), message.translate("economy/work:STREAK_CONTENT"));
 			data.memberData.workStreak = 0;
@@ -71,7 +71,7 @@ class Work extends Command {
 				};
 			};
 			embed.addField(message.translate("economy/work:SALARY"), message.translate("economy/work:SALARY_CONTENT", {
-					won: `${won} ${this.client.getNoun(won, message.translate("misc:NOUNS:CREDIT:1"), message.translate("misc:NOUNS:CREDIT:2"), message.translate("misc:NOUNS:CREDIT:5"))}`
+					won: `${won} ${message.getNoun(won, message.translate("misc:NOUNS:CREDIT:1"), message.translate("misc:NOUNS:CREDIT:2"), message.translate("misc:NOUNS:CREDIT:5"))}`
 				}))
 				.addField(message.translate("economy/work:STREAK"), award.join(""));
 		};
diff --git a/commands/Fun/findwords.js b/commands/Fun/findwords.js
index 3a760932..de904bbf 100644
--- a/commands/Fun/findwords.js
+++ b/commands/Fun/findwords.js
@@ -99,14 +99,18 @@ class FindWords extends Command {
 							participants: participants.map((p) => `<@${p}>`).join(", ")
 						});
 						if (participants.length > 1 && data.guild.disabledCategories && !data.guild.disabledCategories.includes("Economy")) {
+							const won = 150 * (participants.length * 0.5);
+
 							message.sendT("fun/findwords:CREDITS", {
-								winner: user.username
+								winner: user.username,
+								credits: `**${won}** ${message.getNoun(won, message.translate("misc:NOUNS:CREDIT:1"), message.translate("misc:NOUNS:CREDIT:2"), message.translate("misc:NOUNS:CREDIT:5"))}`
 							});
+
 							const userdata = await this.client.findOrCreateMember({
 								id: user.id,
 								guildID: message.guild.id
 							});
-							userdata.money = userdata.money + (150 * (participants.length * 0.5));
+							userdata.money = userdata.money + won;
 							userdata.save();
 						};
 					};
diff --git a/commands/Fun/number.js b/commands/Fun/number.js
index db5a9bd2..bceeb14e 100644
--- a/commands/Fun/number.js
+++ b/commands/Fun/number.js
@@ -53,15 +53,18 @@ class Number extends Command {
 				});
 
 				if (participants.length > 1 && data.guild.disabledCategories && !data.guild.disabledCategories.includes("Economy")) {
+					const won = 100 * (participants.length * 0.5);
+
 					message.sendT("fun/number:WON", {
-						winner: msg.author.username
+						winner: msg.author.username,
+						credits: `**${won}** ${message.getNoun(won, message.translate("misc:NOUNS:CREDIT:1"), message.translate("misc:NOUNS:CREDIT:2"), message.translate("misc:NOUNS:CREDIT:5"))}`
 					});
 
 					const userdata = await this.client.findOrCreateMember({
 						id: msg.author.id,
 						guildID: message.guild.id
 					});
-					userdata.money = userdata.money + (100 * (participants.length * 0.5));
+					userdata.money = userdata.money + won;
 					userdata.save();
 					collector.stop(msg.author.username);
 				};
diff --git a/commands/General/serverinfo.js b/commands/General/serverinfo.js
index 06c984bd..f8947f04 100644
--- a/commands/General/serverinfo.js
+++ b/commands/General/serverinfo.js
@@ -40,17 +40,17 @@ class Serverinfo extends Command {
 			.addField(this.client.customEmojis.title + message.translate("common:NAME"), guild.name, true)
 			.addField(this.client.customEmojis.calendar + message.translate("common:CREATION"), message.printDate(guild.createdAt), true)
 			.addField(this.client.customEmojis.users + message.translate("common:MEMBERS"),
-				`${guild.members.cache.filter(m => !m.user.bot).size} ${this.client.getNoun(guild.members.cache.filter(m => !m.user.bot).size, message.translate("misc:NOUNS:MEMBERS:1"), message.translate("misc:NOUNS:MEMBERS:2"), message.translate("misc:NOUNS:MEMBERS:5"))}` +
-				"\n" + `${guild.members.cache.filter(m => m.user.bot).size} ${this.client.getNoun(guild.members.cache.filter(m => m.user.bot).size, message.translate("misc:NOUNS:BOTS:1"), message.translate("misc:NOUNS:BOTS:2"), message.translate("misc:NOUNS:BOTS:5"))}`, true
+				`${guild.members.cache.filter(m => !m.user.bot).size} ${message.getNoun(guild.members.cache.filter(m => !m.user.bot).size, message.translate("misc:NOUNS:MEMBERS:1"), message.translate("misc:NOUNS:MEMBERS:2"), message.translate("misc:NOUNS:MEMBERS:5"))}` +
+				"\n" + `${guild.members.cache.filter(m => m.user.bot).size} ${message.getNoun(guild.members.cache.filter(m => m.user.bot).size, message.translate("misc:NOUNS:BOTS:1"), message.translate("misc:NOUNS:BOTS:2"), message.translate("misc:NOUNS:BOTS:5"))}`, true
 			)
 			.addField(this.client.customEmojis.afk + message.translate("general/serverinfo:AFK_CHANNEL"), guild.afkChannel || message.translate("general/serverinfo:NO_AFK_CHANNEL"), true)
 			.addField(this.client.customEmojis.id + message.translate("common:ID"), guild.id, true)
 			.addField(this.client.customEmojis.crown + message.translate("common:OWNER"), guild.owner, true)
 			.addField(this.client.customEmojis.boost + message.translate("general/serverinfo:BOOSTS"), guild.premiumSubscriptionCount || 0, true)
 			.addField(this.client.customEmojis.channels + message.translate("common:CHANNELS"),
-				`${guild.channels.cache.filter(c => c.type === "text").size} ${this.client.getNoun(guild.channels.cache.filter(c => c.type === "text").size, message.translate("misc:NOUNS:TEXT:1"), message.translate("misc:NOUNS:TEXT:2"), message.translate("misc:NOUNS:TEXT:5"))}` +
-				"\n" + `${guild.channels.cache.filter(c => c.type === "voice").size} ${this.client.getNoun(guild.channels.cache.filter(c => c.type === "voice").size, message.translate("misc:NOUNS:VOICE:1"), message.translate("misc:NOUNS:VOICE:2"), message.translate("misc:NOUNS:VOICE:5"))}` +
-				"\n" + `${guild.channels.cache.filter(c => c.type === "category").size} ${this.client.getNoun(guild.channels.cache.filter(c => c.type === "category").size, message.translate("misc:NOUNS:CATEGORY:1"), message.translate("misc:NOUNS:CATEGORY:2"), message.translate("misc:NOUNS:CATEGORY:5"))}`, true
+				`${guild.channels.cache.filter(c => c.type === "text").size} ${message.getNoun(guild.channels.cache.filter(c => c.type === "text").size, message.translate("misc:NOUNS:TEXT:1"), message.translate("misc:NOUNS:TEXT:2"), message.translate("misc:NOUNS:TEXT:5"))}` +
+				"\n" + `${guild.channels.cache.filter(c => c.type === "voice").size} ${message.getNoun(guild.channels.cache.filter(c => c.type === "voice").size, message.translate("misc:NOUNS:VOICE:1"), message.translate("misc:NOUNS:VOICE:2"), message.translate("misc:NOUNS:VOICE:5"))}` +
+				"\n" + `${guild.channels.cache.filter(c => c.type === "category").size} ${message.getNoun(guild.channels.cache.filter(c => c.type === "category").size, message.translate("misc:NOUNS:CATEGORY:1"), message.translate("misc:NOUNS:CATEGORY:2"), message.translate("misc:NOUNS:CATEGORY:5"))}`, true
 			)
 			.setColor(data.config.embed.color)
 			.setFooter(data.config.embed.footer);
diff --git a/commands/Moderation/clear.js b/commands/Moderation/clear.js
index 76711816..1c9d86a7 100644
--- a/commands/Moderation/clear.js
+++ b/commands/Moderation/clear.js
@@ -56,12 +56,12 @@ class Clear extends Command {
 
 		if (user) {
 			toDelete = await message.success("moderation/clear:CLEARED_MEMBER", {
-				amount: `${--amount} ${this.client.getNoun(--amount, message.translate("misc:NOUNS:MESSAGES:1"), message.translate("misc:NOUNS:MESSAGES:2"), message.translate("misc:NOUNS:MESSAGES:5"))}`,
+				amount: `${--amount} ${message.getNoun(--amount, message.translate("misc:NOUNS:MESSAGES:1"), message.translate("misc:NOUNS:MESSAGES:2"), message.translate("misc:NOUNS:MESSAGES:5"))}`,
 				username: user.tag
 			});
 		} else {
 			toDelete = await message.success("moderation/clear:CLEARED", {
-				amount: `${--amount} ${this.client.getNoun(--amount, message.translate("misc:NOUNS:MESSAGES:1"), message.translate("misc:NOUNS:MESSAGES:2"), message.translate("misc:NOUNS:MESSAGES:5"))}`
+				amount: `${--amount} ${message.getNoun(--amount, message.translate("misc:NOUNS:MESSAGES:1"), message.translate("misc:NOUNS:MESSAGES:2"), message.translate("misc:NOUNS:MESSAGES:5"))}`
 			});
 		};
 
diff --git a/commands/Moderation/setwarns.js b/commands/Moderation/setwarns.js
index cdc735f3..af301cfe 100644
--- a/commands/Moderation/setwarns.js
+++ b/commands/Moderation/setwarns.js
@@ -29,7 +29,7 @@ class Setwarns extends Command {
 				data.guild.save();
 				return message.success("moderation/setwarns:SUCCESS_KICK_RESET", {
 					prefix: data.guild.prefix,
-					count: `${number} ${this.client.getNoun(number, message.translate("misc:NOUNS:WARNS:1"), message.translate("misc:NOUNS:WARNS:2"), message.translate("misc:NOUNS:WARNS:5"))}`
+					count: `${number} ${message.getNoun(number, message.translate("misc:NOUNS:WARNS:1"), message.translate("misc:NOUNS:WARNS:2"), message.translate("misc:NOUNS:WARNS:5"))}`
 				});
 			} else if (sanction === "ban") {
 				data.guild.plugins.warnsSanctions.ban = false;
@@ -37,7 +37,7 @@ class Setwarns extends Command {
 				data.guild.save();
 				return message.success("moderation/setwarns:SUCCESS_BAN_RESET", {
 					prefix: data.guild.prefix,
-					count: `${number} ${this.client.getNoun(number, message.translate("misc:NOUNS:WARNS:1"), message.translate("misc:NOUNS:WARNS:2"), message.translate("misc:NOUNS:WARNS:5"))}`
+					count: `${number} ${message.getNoun(number, message.translate("misc:NOUNS:WARNS:1"), message.translate("misc:NOUNS:WARNS:2"), message.translate("misc:NOUNS:WARNS:5"))}`
 				});
 			};
 		};
@@ -51,7 +51,7 @@ class Setwarns extends Command {
 			data.guild.save();
 			return message.success("moderation/setwarns:SUCCESS_KICK", {
 				prefix: data.guild.prefix,
-				count: `${number} ${this.client.getNoun(number, message.translate("misc:NOUNS:WARNS:1"), message.translate("misc:NOUNS:WARNS:2"), message.translate("misc:NOUNS:WARNS:5"))}`
+				count: `${number} ${message.getNoun(number, message.translate("misc:NOUNS:WARNS:1"), message.translate("misc:NOUNS:WARNS:2"), message.translate("misc:NOUNS:WARNS:5"))}`
 			});
 		} else if (sanction === "ban") {
 			data.guild.plugins.warnsSanctions.ban = number;
@@ -59,7 +59,7 @@ class Setwarns extends Command {
 			data.guild.save();
 			return message.success("moderation/setwarns:SUCCESS_BAN", {
 				prefix: data.guild.prefix,
-				count: `${number} ${this.client.getNoun(number, message.translate("misc:NOUNS:WARNS:1"), message.translate("misc:NOUNS:WARNS:2"), message.translate("misc:NOUNS:WARNS:5"))}`
+				count: `${number} ${message.getNoun(number, message.translate("misc:NOUNS:WARNS:1"), message.translate("misc:NOUNS:WARNS:2"), message.translate("misc:NOUNS:WARNS:5"))}`
 			});
 		};
 	}
diff --git a/languages/ru-RU/fun/findwords.json b/languages/ru-RU/fun/findwords.json
index f8155524..213099d9 100644
--- a/languages/ru-RU/fun/findwords.json
+++ b/languages/ru-RU/fun/findwords.json
@@ -7,7 +7,7 @@
 	"FIND_WORD": "20 секунд чтобы найти слово, в котором есть **{{word}}**!",
 	"WORD_FOUND": "{{winner}} быстрее всех нашёл слово!",
 	"GAME_STATS": "🎉 | {{winner}} победил!\n\n**Статистика:**\n*-* __**Участники**__: {{participants}} ({{participantCount}})\n**Статистика игры: **\n__**Длительность**__: {{duration}}\n__**Кол-во участников**__ : {{participantCount}}",
-	"CREDITS": "{{winner}} выиграл 150 кредитов! 🎉",
+	"CREDITS": "{{winner}} выиграл {{credits}}!",
 	"NO_WINNER_ALL": "Слова не найдены, игра окончена!",
 	"NO_WINNER": "Слова не найдены, игра окончена!"
 }
\ No newline at end of file
diff --git a/languages/ru-RU/fun/number.json b/languages/ru-RU/fun/number.json
index e599c8e1..81896c85 100644
--- a/languages/ru-RU/fun/number.json
+++ b/languages/ru-RU/fun/number.json
@@ -5,7 +5,7 @@
 	"GAME_START": "Я загадал число, начинайте!",
 	"BIG": "{{user}} | Моё число **больше** чем `{{number}}`!",
 	"SMALL": "{{user}} | Моё число **меньше** чем `{{number}}`!",
-	"WON": "{{winner}} выиграл 100 кредитов!",
+	"WON": "{{winner}} выиграл {{credits}}!",
 	"DEFEAT": "Никто не угадал число! Им было **{{number}}**!",
 	"GAME_STATS": "🎉 | {{winner}} угадал число! Им было __**{{number}}**__!\n\n**Статистика:**\n*-* __**Длительность**__: {{time}}\n*-* __**Участники**__: {{participants}} ({{participantCount}})",
 	"GAME_RUNNING": "Игра уже идёт!"