Price/squad-js-map-vote
1
0
Fork 0
mirror of https://github.com/AsgardEternal/squad-js-map-vote.git synced 2024-09-28 11:34:22 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix: vote end warns

Browse Source
This commit is contained in:
Davide Fantino 2023-01-30 18:34:11 +01:00
parent 7843bf50b8
commit b62be4d978
1 changed files with 55 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
mapvote.js
View File

@ -372,7 +372,7 @@ export default class MapVote extends DiscordBasePlugin {
await this.warn(steamID, "There is no vote running right now");
return;
}
this.directMsgNominations(steamID);
await this.directMsgNominations(steamID);
return;
case "start": //starts the vote again if it was canceled
if (!isAdmin) return;
@ -405,8 +405,7 @@ export default class MapVote extends DiscordBasePlugin {
await this.warn(steamID, "There is no vote running right now");
return;
}
this.endVotingGently();
await this.warn(steamID, "Ending current vote");
this.endVotingGently(steamID);
return;
case "cancelauto": //cancels the current vote and wont set next map to current winnner
if (!isAdmin) return;
@ -670,14 +669,20 @@ export default class MapVote extends DiscordBasePlugin {
this.broadcastIntervalTask = setInterval(this.broadcastNominations, toMils(this.options.voteBroadcastInterval));
}
async endVotingGently() {
async endVotingGently(steamID = null) {
this.endVoting();
if (steamID) await this.warn(steamID, "Voting terminated!");
const winnerLayer = Layers.layers.find((l) => l.layerid == this.updateNextMap());
const fancyWinner = this.formatFancyLayer(winnerLayer);
if (this.showWinnerBroadcastMessage) await this.broadcast(this.options.voteWinnerBroadcastMessage + fancyWinner);
if (!this.options.logToDiscord) return
return await this.sendDiscordMessage({
console.log("winning layer", winnerLayer, fancyWinner)
if (this.showWinnerBroadcastMessage) this.broadcast(this.options.voteWinnerBroadcastMessage + fancyWinner);
if (this.options.logToDiscord) {
await this.sendDiscordMessage({
embed: {
title: `Vote winner: ${fancyWinner}`,
color: 16761867,
@ -721,6 +726,9 @@ export default class MapVote extends DiscordBasePlugin {
});
}
return true;
}
endVoting() {
this.votingEnabled = false;
clearInterval(this.broadcastIntervalTask);
@ -823,7 +831,7 @@ export default class MapVote extends DiscordBasePlugin {
// if (tanks > 0) assets.push('Tanks');
// const vehiclesString = ' ' + assets.join('-');
// await this.msgDirect(steamID, formatChoice(choice, this.nominations[ choice ], this.tallies[ choice ]));
strMsg += (steamID, formatChoice(choice, this.nominations[ choice ], this.tallies[ choice ])) + `H:${helis}-T:${tanks}` + "\n";
strMsg += (steamID, formatChoice(choice, this.nominations[ choice ], this.tallies[ choice ])) + "\n";
}
strMsg.trim();
if (steamID) this.warn(steamID, strMsg)