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

Merge remote-tracking branch 'refs/remotes/Kwoth/1.0' into 1.0-fearnlj01

Browse Source
This commit is contained in:
Jordan Fearnley
2016-10-25 11:43:31 +01:00
parent 155bac2b3f 579c339cf0
commit a92bdca62a
2 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/NadekoBot/Modules/Administration/Commands/LogCommand.cs
View File

@@ -48,15 +48,21 @@ namespace NadekoBot.Modules.Administration
t = new Timer(async (state) =>
{
var keys = UserPresenceUpdates.Keys.ToList();
await Task.WhenAll(keys.Select(key =>
try
{
List<string> messages;
if (UserPresenceUpdates.TryRemove(key, out messages))
try { return key.SendMessageAsync(string.Join(Environment.NewLine, messages)); } catch { } //502/403
return Task.CompletedTask;
}));
var keys = UserPresenceUpdates.Keys.ToList();
await Task.WhenAll(keys.Select(async key =>
{
List<string> messages;
if (UserPresenceUpdates.TryRemove(key, out messages))
try { await key.SendMessageAsync(string.Join(Environment.NewLine, messages)); } catch { }
}));
}
catch (Exception ex)
{
_log.Warn(ex);
}
}, null, TimeSpan.FromSeconds(10), TimeSpan.FromSeconds(10));

2
src/NadekoBot/Modules/Games/Commands/PollCommands.cs
View File

@@ -102,7 +102,7 @@ namespace NadekoBot.Modules.Games
{
var results = participants.GroupBy(kvp => kvp.Value)
.ToDictionary(x => x.Key, x => x.Sum(kvp => 1))
.OrderBy(kvp => kvp.Value);
.OrderByDescending(kvp => kvp.Value);
var totalVotesCast = results.Sum(kvp => kvp.Value);
if (totalVotesCast == 0)