- Removed NadekoCommand and Aliases attribute from all commands

- All commands must be marked as partial
- Added [Cmd] Attribute to all commands
- Cmd Attribute comes from the source generator which adds [NadekoCommand] and [Aliases] Attribute to each command
- Should be updated in the future probably to be more performant and maybe add extra data to the commands
- Started reorganizing modules and submodules

src/NadekoBot/Modules/Administration/Prune/PruneCommands.cs

@@ -0,0 +1,83 @@
+#nullable disable
+using NadekoBot.Modules.Administration.Services;
+
+namespace NadekoBot.Modules.Administration;
+
+public partial class Administration
+{
+    [Group]
+    public partial class PruneCommands : NadekoSubmodule<PruneService>
+    {
+        private static readonly TimeSpan twoWeeks = TimeSpan.FromDays(14);
+
+        //delets her own messages, no perm required
+        [Cmd]
+        [RequireContext(ContextType.Guild)]
+        public async partial Task Prune(string parameter = null)
+        {
+            var user = await ctx.Guild.GetCurrentUserAsync();
+
+            if (parameter is "-s" or "--safe")
+                await _service.PruneWhere((ITextChannel)ctx.Channel, 100, x => x.Author.Id == user.Id && !x.IsPinned);
+            else
+                await _service.PruneWhere((ITextChannel)ctx.Channel, 100, x => x.Author.Id == user.Id);
+            ctx.Message.DeleteAfter(3);
+        }
+
+        // prune x
+        [Cmd]
+        [RequireContext(ContextType.Guild)]
+        [UserPerm(ChannelPerm.ManageMessages)]
+        [BotPerm(ChannelPerm.ManageMessages)]
+        [Priority(1)]
+        public async partial Task Prune(int count, string parameter = null)
+        {
+            count++;
+            if (count < 1)
+                return;
+            if (count > 1000)
+                count = 1000;
+
+            if (parameter is "-s" or "--safe")
+                await _service.PruneWhere((ITextChannel)ctx.Channel, count, x => !x.IsPinned);
+            else
+                await _service.PruneWhere((ITextChannel)ctx.Channel, count, x => true);
+        }
+
+        //prune @user [x]
+        [Cmd]
+        [RequireContext(ContextType.Guild)]
+        [UserPerm(ChannelPerm.ManageMessages)]
+        [BotPerm(ChannelPerm.ManageMessages)]
+        [Priority(0)]
+        public partial Task Prune(IGuildUser user, int count = 100, string parameter = null)
+            => Prune(user.Id, count, parameter);
+
+        //prune userid [x]
+        [Cmd]
+        [RequireContext(ContextType.Guild)]
+        [UserPerm(ChannelPerm.ManageMessages)]
+        [BotPerm(ChannelPerm.ManageMessages)]
+        [Priority(0)]
+        public async partial Task Prune(ulong userId, int count = 100, string parameter = null)
+        {
+            if (userId == ctx.User.Id)
+                count++;
+
+            if (count < 1)
+                return;
+
+            if (count > 1000)
+                count = 1000;
+
+            if (parameter is "-s" or "--safe")
+                await _service.PruneWhere((ITextChannel)ctx.Channel,
+                    count,
+                    m => m.Author.Id == userId && DateTime.UtcNow - m.CreatedAt < twoWeeks && !m.IsPinned);
+            else
+                await _service.PruneWhere((ITextChannel)ctx.Channel,
+                    count,
+                    m => m.Author.Id == userId && DateTime.UtcNow - m.CreatedAt < twoWeeks);
+        }
+    }
+}

src/NadekoBot/Modules/Administration/Prune/PruneService.cs

@@ -0,0 +1,70 @@
+#nullable disable
+namespace NadekoBot.Modules.Administration.Services;
+
+public class PruneService : INService
+{
+    //channelids where prunes are currently occuring
+    private readonly ConcurrentHashSet<ulong> _pruningGuilds = new();
+    private readonly TimeSpan _twoWeeks = TimeSpan.FromDays(14);
+    private readonly ILogCommandService _logService;
+
+    public PruneService(ILogCommandService logService)
+        => _logService = logService;
+
+    public async Task PruneWhere(ITextChannel channel, int amount, Func<IMessage, bool> predicate)
+    {
+        ArgumentNullException.ThrowIfNull(channel, nameof(channel));
+
+        if (amount <= 0)
+            throw new ArgumentOutOfRangeException(nameof(amount));
+
+        if (!_pruningGuilds.Add(channel.GuildId))
+            return;
+
+        try
+        {
+            IMessage[] msgs;
+            IMessage lastMessage = null;
+            msgs = (await channel.GetMessagesAsync(50).FlattenAsync()).Where(predicate).Take(amount).ToArray();
+            while (amount > 0 && msgs.Any())
+            {
+                lastMessage = msgs[msgs.Length - 1];
+
+                var bulkDeletable = new List<IMessage>();
+                var singleDeletable = new List<IMessage>();
+                foreach (var x in msgs)
+                {
+                    _logService.AddDeleteIgnore(x.Id);
+
+                    if (DateTime.UtcNow - x.CreatedAt < _twoWeeks)
+                        bulkDeletable.Add(x);
+                    else
+                        singleDeletable.Add(x);
+                }
+
+                if (bulkDeletable.Count > 0)
+                    await Task.WhenAll(Task.Delay(1000), channel.DeleteMessagesAsync(bulkDeletable));
+
+                foreach (var group in singleDeletable.Chunk(5))
+                    await Task.WhenAll(Task.Delay(1000), group.Select(x => x.DeleteAsync()).WhenAll());
+
+                //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 -= 50;
+                if (amount > 0)
+                    msgs = (await channel.GetMessagesAsync(lastMessage, Direction.Before, 50).FlattenAsync())
+                           .Where(predicate)
+                           .Take(amount)
+                           .ToArray();
+            }
+        }
+        catch
+        {
+            //ignore
+        }
+        finally
+        {
+            _pruningGuilds.TryRemove(channel.GuildId);
+        }
+    }
+}