coc fix

NadekoBot.sln

@@ -16,13 +16,13 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Discord.Net", "discord.net\
 EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Discord.Net.Commands", "discord.net\src\Discord.Net.Commands\Discord.Net.Commands.xproj", "{078DD7E6-943D-4D09-AFC2-D2BA58B76C9C}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Discord.Net.Core", "Discord.Net\src\Discord.Net.Core\Discord.Net.Core.xproj", "{E5F4786F-58F3-469E-8C87-1908A95436B7}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Discord.Net.Core", "discord.net\src\Discord.Net.Core\Discord.Net.Core.xproj", "{E5F4786F-58F3-469E-8C87-1908A95436B7}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Discord.Net.Rest", "Discord.Net\src\Discord.Net.Rest\Discord.Net.Rest.xproj", "{63F5B5C8-56FE-4B53-8003-B58CEB451EF9}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Discord.Net.Rest", "discord.net\src\Discord.Net.Rest\Discord.Net.Rest.xproj", "{63F5B5C8-56FE-4B53-8003-B58CEB451EF9}"
 EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Discord.Net.Rpc", "discord.net\src\Discord.Net.Rpc\Discord.Net.Rpc.xproj", "{0E741C78-869B-4E05-A300-0C5B32F07734}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Discord.Net.WebSocket", "Discord.Net\src\Discord.Net.WebSocket\Discord.Net.WebSocket.xproj", "{E9800F7A-3354-41B1-BDBB-2D59F8124EC9}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Discord.Net.WebSocket", "discord.net\src\Discord.Net.WebSocket\Discord.Net.WebSocket.xproj", "{E9800F7A-3354-41B1-BDBB-2D59F8124EC9}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

src/NadekoBot/Modules/ClashOfClans/ClashOfClans.cs

@@ -10,6 +10,7 @@ using NadekoBot.Attributes;
 using NadekoBot.Services.Database.Models;
 using System.Linq;
 using NadekoBot.Extensions;
+using System.Threading;
 
 namespace NadekoBot.Modules.ClashOfClans
 {
@@ -18,6 +19,8 @@ namespace NadekoBot.Modules.ClashOfClans
     {
         public static ConcurrentDictionary<ulong, List<ClashWar>> ClashWars { get; set; } = new ConcurrentDictionary<ulong, List<ClashWar>>();
 
+        private static Timer checkWarTimer { get; }
+
         static ClashOfClans()
         {
             using (var uow = DbHandler.UnitOfWork())
@@ -37,6 +40,21 @@ namespace NadekoBot.Modules.ClashOfClans
                         .GroupBy(cw => cw.GuildId)
                         .ToDictionary(g => g.Key, g => g.ToList()));
             }
+
+            checkWarTimer = new Timer(async _ =>
+            {
+                foreach (var kvp in ClashWars)
+                {
+                    foreach (var war in kvp.Value)
+                    {
+                        try { await CheckWar(TimeSpan.FromHours(2), war).ConfigureAwait(false); } catch { }
+                    }
+                }
+            }, null, TimeSpan.FromMinutes(1), TimeSpan.FromMinutes(1));
+        }
+        public ClashOfClans() : base()
+        {
+
         }
 
         private static async Task CheckWar(TimeSpan callExpire, ClashWar war)
@@ -44,11 +62,20 @@ namespace NadekoBot.Modules.ClashOfClans
             var Bases = war.Bases;
             for (var i = 0; i < Bases.Count; i++)
             {
-                if (Bases[i].CallUser == null) continue;
+                var callUser = Bases[i].CallUser;
-                if (!Bases[i].BaseDestroyed && DateTime.UtcNow - Bases[i].TimeAdded >= callExpire)
+                if (callUser == null) continue;
+                if ((!Bases[i].BaseDestroyed) && DateTime.UtcNow - Bases[i].TimeAdded >= callExpire)
                 {
+                    if (Bases[i].Stars != 3)
+                        Bases[i].BaseDestroyed = true;
+                    else
                         Bases[i] = null;
-                    try { await war.Channel.SendErrorAsync($"❗🔰**Claim from @{Bases[i].CallUser} for a war against {war.ShortPrint()} has expired.**").ConfigureAwait(false); } catch { }
+                    try
+                    {
+                        SaveWar(war);
+                        await war.Channel.SendErrorAsync($"❗🔰**Claim from @{Bases[i].CallUser} for a war against {war.ShortPrint()} has expired.**").ConfigureAwait(false);
+                    }
+                    catch { }
                 }
             }
         }

src/NadekoBot/Modules/Gambling/Commands/DiceRollCommand.cs

@@ -53,56 +53,19 @@ namespace NadekoBot.Modules.Gambling
             [Priority(0)]
             public async Task Roll(int num)
             {
-                var ordered = true;
+                await InternalRoll(num, RoleOrderType.Ordered).ConfigureAwait(false);
-
-                if (num < 1 || num > 30)
-                {
-                    await Context.Channel.SendErrorAsync("Invalid number specified. You can roll up to 1-30 dice at a time.").ConfigureAwait(false);
-                    return;
-                }
-
-                var rng = new NadekoRandom();
-
-                var dice = new List<Image>(num);
-                var values = new List<int>(num);
-                for (var i = 0; i < num; i++)
-                {
-                    var randomNumber = rng.Next(1, 7);
-                    var toInsert = dice.Count;
-                    if (ordered)
-                    {
-                        if (randomNumber == 6 || dice.Count == 0)
-                            toInsert = 0;
-                        else if (randomNumber != 1)
-                            for (var j = 0; j < dice.Count; j++)
-                            {
-                                if (values[j] < randomNumber)
-                                {
-                                    toInsert = j;
-                                    break;
-                                }
-                            }
-                    }
-                    else
-                    {
-                        toInsert = dice.Count;
-                    }
-                    dice.Insert(toInsert, GetDice(randomNumber));
-                    values.Insert(toInsert, randomNumber);
-                }
-
-                var bitmap = dice.Merge();
-                var ms = new MemoryStream();
-                bitmap.SaveAsPng(ms);
-                ms.Position = 0;
-                await Context.Channel.SendFileAsync(ms, "dice.png", $"{Context.User.Mention} rolled {values.Count} {(values.Count == 1 ? "die" : "dice")}. Total: **{values.Sum()}** Average: **{(values.Sum() / (1.0f * values.Count)).ToString("N2")}**").ConfigureAwait(false);
             }
             
             [NadekoCommand, Usage, Description, Aliases]
             public async Task Rolluo(int num)
             {
-                var ordered = false;
+                await InternalRoll(num, RoleOrderType.Unordered).ConfigureAwait(false);
+            }
 
+
+            private async Task InternalRoll(int num, RoleOrderType ordType)
+            {
+                var ordered = ordType == RoleOrderType.Ordered;
                 if (num < 1 || num > 30)
                 {
                     await Context.Channel.SendErrorAsync("Invalid number specified. You can roll up to 1-30 dice at a time.").ConfigureAwait(false);
@@ -146,42 +109,17 @@ namespace NadekoBot.Modules.Gambling
                 await Context.Channel.SendFileAsync(ms, "dice.png", $"{Context.User.Mention} rolled {values.Count} {(values.Count == 1 ? "die" : "dice")}. Total: **{values.Sum()}** Average: **{(values.Sum() / (1.0f * values.Count)).ToString("N2")}**").ConfigureAwait(false);
             }
 
-            //todo merge into internallDndRoll and internalRoll
             [NadekoCommand, Usage, Description, Aliases]
             [Priority(1)]
             public async Task Roll(string arg)
             {
-                
+                await InternalDndRoll(arg, RoleOrderType.Ordered).ConfigureAwait(false);
             }
 
             [NadekoCommand, Usage, Description, Aliases]
             public async Task Rolluo(string arg)
             {
-                var ordered = false;
+                await InternalDndRoll(arg, RoleOrderType.Unordered).ConfigureAwait(false);
-                var rng = new NadekoRandom();
-                Match match;
-                if ((match = dndRegex.Match(arg)).Length != 0)
-                {
-                    int n1;
-                    int n2;
-                    if (int.TryParse(match.Groups["n1"].ToString(), out n1) &&
-                        int.TryParse(match.Groups["n2"].ToString(), out n2) &&
-                        n1 <= 50 && n2 <= 100000 && n1 > 0 && n2 > 0)
-                    {
-                        var add = 0;
-                        var sub = 0;
-                        int.TryParse(match.Groups["add"].Value, out add);
-                        int.TryParse(match.Groups["sub"].Value, out sub);
-
-                        var arr = new int[n1];
-                        for (int i = 0; i < n1; i++)
-                        {
-                            arr[i] = rng.Next(1, n2 + 1) + add - sub;
-                        }
-                        var elemCnt = 0;
-                        await Context.Channel.SendConfirmAsync($"{Context.User.Mention} rolled {n1} {(n1 == 1 ? "die" : "dice")} `1 to {n2}` +`{add}` -`{sub}`.\n`Result:` " + string.Join(", ", (ordered ? arr.OrderBy(x => x).AsEnumerable() : arr).Select(x => elemCnt++ % 2 == 0 ? $"**{x}**" : x.ToString()))).ConfigureAwait(false);
-                    }
-                }
             }
 
             private async Task InternalDndRoll(string arg, RoleOrderType ordType)