From 25983d2c273cb72df41e10cf8e68f9c4d75a79e2 Mon Sep 17 00:00:00 2001
From: JonnyBro <niktom.nikto@yandex.ru>
Date: Thu, 13 Jan 2022 22:53:33 +0500
Subject: [PATCH] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=D1=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dashboard/routes/user.js               |  5 +++--
 dashboard/views/user.ejs               | 18 +++++++++---------
 languages/ru-RU/economy/birthdate.json |  2 +-
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/dashboard/routes/user.js b/dashboard/routes/user.js
index 75570fd4..001606f7 100644
--- a/dashboard/routes/user.js
+++ b/dashboard/routes/user.js
@@ -13,9 +13,9 @@ router.get("/:userID/:serverID", CheckAuth, async function (req, res) {
 			currentURL: `${req.client.config.dashboard.baseURL}${req.originalUrl}`
 		});
 	}
-
 	const guildData = await req.client.findOrCreateGuild({ id: guild.id });
-	await utils.fetchUser({
+
+	const userInfos = await utils.fetchUser({
 		id: req.params.userID
 	}, req.client).catch(() => {
 		res.render("404", {
@@ -27,6 +27,7 @@ router.get("/:userID/:serverID", CheckAuth, async function (req, res) {
 
 	res.render("user", {
 		user: req.userInfos,
+		userInfos: userInfos,
 		guild: guildData,
 		bot: req.client,
 		translate: req.translate,
diff --git a/dashboard/views/user.ejs b/dashboard/views/user.ejs
index 336542ec..d27bb579 100644
--- a/dashboard/views/user.ejs
+++ b/dashboard/views/user.ejs
@@ -27,19 +27,19 @@
 					<div class="box box-widget widget-user">
 						<!-- Add the bg color to the header using any of the bg-* classes -->
 						<div class="widget-user-header bg-red">
-							<h3 class="widget-user-username"><%= user.tag %></h3>
+							<h3 class="widget-user-username"><%= userInfos.tag %></h3>
 							<i><%= bot.guilds.cache.get(guild.id).name %></i>
 							<p> <i>ID: <%= guild.id %></i> </p>
 						</div>
 						<div class="widget-user-image">
-							<img class="img-circle" src="<%= user.displayAvatarURL %>" alt="User Avatar">
+							<img class="img-circle" src="<%= userInfos.displayAvatarURL %>" alt="User Avatar">
 						</div>
 						<div class="box-footer">
 							<div class="row">
 								<div class="col-sm-12">
 									<div class="description-block">
 										<span
-											class="description-text"><%= user.bio || translate("economy/profile:NO_BIO") %></span>
+											class="description-text"><%= userInfos.bio || translate("economy/profile:NO_BIO") %></span>
 									</div>
 								</div>
 								<div class="col-sm-4 border-right">
@@ -47,7 +47,7 @@
 										<h5 class="description-header">
 											<%= translate("economy/profile:BIRTHDATE").substr(2) %></h5>
 										<span
-											class="description-text"><%= user.birthdate ? printDate(new Date(user.birthdate)) : translate("economy/profile:NO_BIRTHDATE") %></span>
+											class="description-text"><%= userInfos.birthdate ? printDate(new Date(userInfos.birthdate)) : translate("economy/profile:NO_BIRTHDATE") %></span>
 									</div>
 									<!-- /.description-block -->
 								</div>
@@ -56,7 +56,7 @@
 									<div class="description-block">
 										<h5 class="description-header"><%= translate("economy/profile:REGISTERED").substr(2) %></h5>
 										<span
-											class="description-text"><%= printDate(new Date(user.registeredAt)) %></span>
+											class="description-text"><%= printDate(new Date(userInfos.registeredAt)) %></span>
 									</div>
 									<!-- /.description-block -->
 								</div>
@@ -66,7 +66,7 @@
 										<h5 class="description-header">
 											<%= translate("economy/profile:LOVER").substr(2) %></h5>
 										<span
-											class="description-text"><%= !user.lover ? translate("economy/profile:NO_LOVER") : bot.users.cache.get(user.lover).tag %></span>
+											class="description-text"><%= !userInfos.lover ? translate("economy/profile:NO_LOVER") : bot.users.cache.get(userInfos.lover).tag %></span>
 									</div>
 									<!-- /.description-block -->
 								</div>
@@ -86,7 +86,7 @@
 							<div class="info-box-content">
 								<span
 									class="info-box-text"><%= translate("economy/profile:LEVEL").substr(2) %></span>
-								<span class="info-box-number"><%= guild.members.find(u => u.id === user.id).level %></span>
+								<span class="info-box-number"><%= guild.members.find(u => u.id === userInfos.id).level %></span>
 							</div>
 							<!-- /.info-box-content -->
 						</div>
@@ -100,7 +100,7 @@
 							<div class="info-box-content">
 								<span
 									class="info-box-text"><%= translate("economy/profile:CASH").substr(2) %> / <%= translate("economy/profile:BANK").substr(2) %></span>
-								<span class="info-box-number"><%= guild.members.find(u => u.id === user.id).money %> / <%= guild.members.find(u => u.id === user.id).bankSold %></span>
+								<span class="info-box-number"><%= guild.members.find(u => u.id === userInfos.id).money %> / <%= guild.members.find(u => u.id === userInfos.id).bankSold %></span>
 							</div>
 							<!-- /.info-box-content -->
 						</div>
@@ -113,7 +113,7 @@
 
 							<div class="info-box-content">
 								<span class="info-box-text"><%= translate("economy/profile:REPUTATION").substr(2) %></span>
-								<span class="info-box-number"><%= user.rep %></span>
+								<span class="info-box-number"><%= userInfos.rep %></span>
 							</div>
 							<!-- /.info-box-content -->
 						</div>
diff --git a/languages/ru-RU/economy/birthdate.json b/languages/ru-RU/economy/birthdate.json
index cb3886ed..cce5dc2c 100644
--- a/languages/ru-RU/economy/birthdate.json
+++ b/languages/ru-RU/economy/birthdate.json
@@ -1,6 +1,6 @@
 {
 	"DESCRIPTION": "Установить дату рождения",
-	"USAGE": "{{prefix}}birthdate [дата]",
+	"USAGE": "{{prefix}}birthdate [ДД/ММ/ГГГГ]",
 	"EXAMPLES": "{{prefix}}birthdate 01/01/2010",
 	"MISSING_DATE": "Укажите дату в формате 20/11/2003",
 	"INVALID_DATE": "Используйте данный формат: ДД/ММ/ГГГГ. Например, `1 января 2010` будет `01/01/2010`.",