From 808dca8ec473be82de2e832ee1b4a9c9943c72fb Mon Sep 17 00:00:00 2001
From: Master Kwoth <nadekodiscordbot@gmail.com>
Date: Mon, 19 Jun 2017 17:57:12 +0200
Subject: [PATCH] nerfed prune speed a bit to hopefully prevent ratelimits?

---
 .../Services/Administration/PruneService.cs          | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/NadekoBot/Services/Administration/PruneService.cs b/src/NadekoBot/Services/Administration/PruneService.cs
index 0929c1a6..e1078102 100644
--- a/src/NadekoBot/Services/Administration/PruneService.cs
+++ b/src/NadekoBot/Services/Administration/PruneService.cs
@@ -12,7 +12,7 @@ namespace NadekoBot.Services.Administration
     public class PruneService
     {
         //channelids where prunes are currently occuring
-        private ConcurrentHashSet<ulong> _pruningChannels = new ConcurrentHashSet<ulong>();
+        private ConcurrentHashSet<ulong> _pruningGuilds = new ConcurrentHashSet<ulong>();
         private readonly TimeSpan twoWeeks = TimeSpan.FromDays(14);
 
         public async Task PruneWhere(ITextChannel channel, int amount, Func<IMessage, bool> predicate)
@@ -21,14 +21,14 @@ namespace NadekoBot.Services.Administration
             if (amount <= 0)
                 throw new ArgumentOutOfRangeException(nameof(amount));
 
-            if (!_pruningChannels.Add(channel.Id))
+            if (!_pruningGuilds.Add(channel.GuildId))
                 return;
 
             try
             {
                 IMessage[] msgs;
                 IMessage lastMessage = null;
-                msgs = (await channel.GetMessagesAsync().Flatten()).Where(predicate).Take(amount).ToArray();
+                msgs = (await channel.GetMessagesAsync(50).Flatten()).Where(predicate).Take(amount).ToArray();
                 while (amount > 0 && msgs.Any())
                 {
                     lastMessage = msgs[msgs.Length - 1];
@@ -52,9 +52,9 @@ namespace NadekoBot.Services.Administration
 
                     //this isn't good, because this still work as if i want to remove only specific user's messages from the last
                     //100 messages, Maybe this needs to be reduced by msgs.Length instead of 100
-                    amount -= 100;
+                    amount -= 50;
                     if(amount > 0)
-                        msgs = (await channel.GetMessagesAsync(lastMessage, Direction.Before).Flatten()).Where(predicate).Take(amount).ToArray();
+                        msgs = (await channel.GetMessagesAsync(lastMessage, Direction.Before, 50).Flatten()).Where(predicate).Take(amount).ToArray();
                 }
             }
             catch
@@ -63,7 +63,7 @@ namespace NadekoBot.Services.Administration
             }
             finally
             {
-                _pruningChannels.TryRemove(channel.Id);
+                _pruningGuilds.TryRemove(channel.GuildId);
             }
         }
     }