mattburchett/NadekoBot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

.rafflecur added

Browse Source
This commit is contained in:
Master Kwoth
2017-10-20 17:20:26 +02:00
parent cfee252ce3
commit 204cdbfb2b
9 changed files with 129 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
NadekoBot.Core/Modules/Games/PollCommands.cs
View File

@ -39,7 +39,7 @@ namespace NadekoBot.Modules.Games
private async Task InternalStartPoll(string arg)
{
if(await _service.StartPoll((ITextChannel)Context.Channel, Context.Message, arg) == false)
if(await _service.StartPoll(Context.Channel.Id, Context.Message, arg) == false)
await ReplyErrorLocalized("poll_already_running").ConfigureAwait(false);
}
@ -53,8 +53,6 @@ namespace NadekoBot.Modules.Games
_service.ActivePolls.TryRemove(channel.Guild.Id, out var poll);
await poll.StopPoll().ConfigureAwait(false);
}
}
}
}
}

4
NadekoBot.Core/Modules/Games/Services/PollService.cs
View File

@ -26,7 +26,7 @@ namespace NadekoBot.Modules.Games.Services
_strings = strings;
}
public async Task<bool?> StartPoll(ITextChannel channel, IUserMessage msg, string arg)
public async Task<bool?> StartPoll(ulong guildId, IUserMessage msg, string arg)
{
if (string.IsNullOrWhiteSpace(arg) || !arg.Contains(";"))
return null;
@ -35,7 +35,7 @@ namespace NadekoBot.Modules.Games.Services
return null;
var poll = new Poll(_client, _strings, msg, data[0], data.Skip(1));
if (ActivePolls.TryAdd(channel.Guild.Id, poll))
if (ActivePolls.TryAdd(guildId, poll))
{
poll.OnEnded += (gid) =>
{