Noi/RegexBot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix state not being reset after vote

Browse source
This commit is contained in:
Noikoio 2018-11-25 18:02:40 -08:00
parent 325ba7e6b3
commit 2409946d6b
1 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
Module/VoteTempChannel/VoteTempChannel.cs
View file

@ -58,6 +58,7 @@ namespace Noikoio.RegexBot.Module.VoteTempChannel
// Check if we're accepting votes. Locking here; other tasks may alter this data. // Check if we're accepting votes. Locking here; other tasks may alter this data.
bool cooldown; bool cooldown;
bool voteCounted = false; bool voteCounted = false;
bool voteIsInitial = false;
string newChannelName = null; string newChannelName = null;
lock (info) lock (info)
{ {
@ -74,14 +75,20 @@ namespace Noikoio.RegexBot.Module.VoteTempChannel
if (!cooldown) if (!cooldown)
{ {
voteCounted = info.Voting.AddVote(arg.Author.Id, out var voteCount); voteCounted = info.Voting.AddVote(arg.Author.Id, out var voteCount);
voteIsInitial = voteCount == 1;
if (voteCount >= info.Config.VotePassThreshold) if (voteCount >= info.Config.VotePassThreshold)
{ {
// Non-null value in newChannelName signals vote success
newChannelName = info.Config.TempChannelName; newChannelName = info.Config.TempChannelName;
} }
} }
// Prepare new temporary channel while we're still locking // Prepare some stuff while we're still in the lock
if (newChannelName != null) info.TempChannelLastActivity = DateTime.UtcNow; if (newChannelName != null)
{
info.TempChannelLastActivity = DateTime.UtcNow;
info.Voting.Reset();
}
} }
if (cooldown) if (cooldown)
@ -113,8 +120,12 @@ namespace Noikoio.RegexBot.Module.VoteTempChannel
+ "\nBe aware that this channel is temporary and **will** be deleted later."); + "\nBe aware that this channel is temporary and **will** be deleted later.");
newChannelName = newCh.Id.ToString(); // For use in the confirmation message newChannelName = newCh.Id.ToString(); // For use in the confirmation message
} }
await arg.Channel.SendMessageAsync(":white_check_mark: Channel creation vote has been counted." if (voteIsInitial && newChannelName == null)
+ (newChannelName != null ? $"\n<#{newChannelName}> has been created!" : "")); await arg.Channel.SendMessageAsync($":white_check_mark: {arg.Author.Mention} has initiated a vote! " +
"Others may now vote to confirm creation of the new channel.");
else
await arg.Channel.SendMessageAsync(":white_check_mark: Channel creation vote has been counted."
+ (newChannelName != null ? $"\n<#{newChannelName}> is now active!" : ""));
} }
/// <summary> /// <summary>
@ -194,6 +205,7 @@ namespace Noikoio.RegexBot.Module.VoteTempChannel
lock (info) { lock (info) {
act = info.Voting.IsSessionExpired(); act = info.Voting.IsSessionExpired();
nameTest = info.Config.VoteChannel; nameTest = info.Config.VoteChannel;
if (act) info.Voting.StartCooldown();
} }
if (!act) return; if (!act) return;