From 5064594e377b27064ce64a79ad9f207eed8020e7 Mon Sep 17 00:00:00 2001 From: JonnyBro Date: Wed, 5 Jan 2022 02:26:26 +0500 Subject: [PATCH] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=20=D1=81=D0=BE=D0=BE?= =?UTF-8?q?=D0=B1=D1=89=D0=B5=D0=BD=D0=B8=D0=B9=20=D0=BF=D1=80=D0=B8=20giv?= =?UTF-8?q?eaway=20reroll?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- commands/Moderation/giveaway.js | 10 +++++----- languages/ru-RU/moderation/giveaway.json | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/commands/Moderation/giveaway.js b/commands/Moderation/giveaway.js index 01ac4767..1af96c70 100644 --- a/commands/Moderation/giveaway.js +++ b/commands/Moderation/giveaway.js @@ -84,8 +84,10 @@ class Giveaway extends Command { if (!messageID) return message.error("moderation/giveaway:MISSING_ID"); this.client.giveawaysManager.reroll(messageID, { - congrat: message.translate("moderation/giveaway:REROLL_CONGRAT"), - error: message.translate("moderation/giveaway:REROLL_ERROR") + messages: { + congrat: message.translate("moderation/giveaway:REROLL_CONGRAT"), + error: message.translate("moderation/giveaway:REROLL_ERROR") + } }).then(() => { return message.success("moderation/giveaway:GIVEAWAY_REROLLED"); }).catch(() => { @@ -109,9 +111,7 @@ class Giveaway extends Command { if (!messageID) return message.error("moderation/giveaway:MISSING_ID"); try { - this.client.giveawaysManager.edit(messageID, { - setEndTimestamp: Date.now() - }); + this.client.giveawaysManager.end(messageID); return message.success("moderation/giveaway:GIVEAWAY_ENDED"); } catch (e) { return message.error("moderation/giveaway:NOT_FOUND", { diff --git a/languages/ru-RU/moderation/giveaway.json b/languages/ru-RU/moderation/giveaway.json index 1fb49db0..4e4b7114 100644 --- a/languages/ru-RU/moderation/giveaway.json +++ b/languages/ru-RU/moderation/giveaway.json @@ -22,9 +22,9 @@ "END_AT": "Закончилась:", "HOSTEDBY": "Организатор: {this.hostedBy}", "REROLL_CONGRAT": "🎉 Новый(е) побелитель(и): {winners}! Поздравляем!", - "REROLL_ERROR": "Нет действительных заявок, никто не выиграл!", + "REROLL_ERROR": "Нет действительных участников, никто не выиграл!", "GIVEAWAY_CREATED": "Раздача начата!", "GIVEAWAY_REROLLED": "Раздача перезапущена!", - "GIVEAWAY_ENDED": "Раздача закончится через несколько секунд!", + "GIVEAWAY_ENDED": "Раздача принудительно окончена!", "GIVEAWAY_DELETED": "Раздача удалена!" } \ No newline at end of file