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

Merge branch '1.4' into shard-process

Browse Source
This commit is contained in:
Master Kwoth
2017-06-19 21:50:36 +02:00
parent b381ee00b6 808dca8ec4
commit 4684117654
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/NadekoBot/Services/Administration/PruneService.cs
View File

@@ -12,7 +12,7 @@ namespace NadekoBot.Services.Administration
public class PruneService public class PruneService
{ {
//channelids where prunes are currently occuring //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); private readonly TimeSpan twoWeeks = TimeSpan.FromDays(14);
public async Task PruneWhere(ITextChannel channel, int amount, Func<IMessage, bool> predicate) public async Task PruneWhere(ITextChannel channel, int amount, Func<IMessage, bool> predicate)
@@ -21,14 +21,14 @@ namespace NadekoBot.Services.Administration
if (amount <= 0) if (amount <= 0)
throw new ArgumentOutOfRangeException(nameof(amount)); throw new ArgumentOutOfRangeException(nameof(amount));
if (!_pruningChannels.Add(channel.Id)) if (!_pruningGuilds.Add(channel.GuildId))
return; return;
try try
{ {
IMessage[] msgs; IMessage[] msgs;
IMessage lastMessage = null; 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()) while (amount > 0 && msgs.Any())
{ {
lastMessage = msgs[msgs.Length - 1]; 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 //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 //100 messages, Maybe this needs to be reduced by msgs.Length instead of 100
amount -= 100; amount -= 50;
if(amount > 0) 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 catch
@@ -63,7 +63,7 @@ namespace NadekoBot.Services.Administration
} }
finally finally
{ {
_pruningChannels.TryRemove(channel.Id); _pruningGuilds.TryRemove(channel.GuildId);
} }
} }
} }