* add: .prunecancel to cancel active prunes

* change: .qs improved with thumbnails
* change: .prune now reports progress
* dev: DryIoc replacing Ninject

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

@@ -13,17 +13,25 @@ public partial class Administration
 
         public sealed class PruneOptions : INadekoCommandOptions
         {
-            [Option(shortName: 's', longName: "safe", Default = false, HelpText = "Whether pinned messages should be deleted.", Required = false)]
+            [Option(shortName: 's',
+                longName: "safe",
+                Default = false,
+                HelpText = "Whether pinned messages should be deleted.",
+                Required = false)]
             public bool Safe { get; set; }
-            
-            [Option(shortName: 'a', longName: "after", Default = null, HelpText = "Prune only messages after the specified message ID.", Required = false)]
+
+            [Option(shortName: 'a',
+                longName: "after",
+                Default = null,
+                HelpText = "Prune only messages after the specified message ID.",
+                Required = false)]
             public ulong? After { get; set; }
 
             public void NormalizeOptions()
             {
             }
         }
-        
+
         //deletes her own messages, no perm required
         [Cmd]
         [RequireContext(ContextType.Guild)]
@@ -31,15 +39,27 @@ public partial class Administration
         public async Task Prune(params string[] args)
         {
             var (opts, _) = OptionsParser.ParseFrom(new PruneOptions(), args);
-            
+
             var user = await ctx.Guild.GetCurrentUserAsync();
 
+            var progressMsg = await Response().Pending(strs.prune_progress(0, 100)).SendAsync();
+            var progress = GetProgressTracker(progressMsg);
+
             if (opts.Safe)
-                await _service.PruneWhere((ITextChannel)ctx.Channel, 100, x => x.Author.Id == user.Id && !x.IsPinned, opts.After);
+                await _service.PruneWhere((ITextChannel)ctx.Channel,
+                    100,
+                    x => x.Author.Id == user.Id && !x.IsPinned,
+                    progress,
+                    opts.After);
             else
-                await _service.PruneWhere((ITextChannel)ctx.Channel, 100, x => x.Author.Id == user.Id, opts.After);
-            
+                await _service.PruneWhere((ITextChannel)ctx.Channel,
+                    100,
+                    x => x.Author.Id == user.Id,
+                    progress,
+                    opts.After);
+
             ctx.Message.DeleteAfter(3);
+            await progressMsg.DeleteAsync();
         }
 
         // prune x
@@ -54,15 +74,52 @@ public partial class Administration
             count++;
             if (count < 1)
                 return;
+
             if (count > 1000)
                 count = 1000;
-            
+
             var (opts, _) = OptionsParser.ParseFrom<PruneOptions>(new PruneOptions(), args);
 
+            var progressMsg = await Response().Pending(strs.prune_progress(0, count)).SendAsync();
+            var progress = GetProgressTracker(progressMsg);
+
             if (opts.Safe)
-                await _service.PruneWhere((ITextChannel)ctx.Channel, count, x => !x.IsPinned, opts.After);
+                await _service.PruneWhere((ITextChannel)ctx.Channel,
+                    count,
+                    x => !x.IsPinned && x.Id != progressMsg.Id,
+                    progress,
+                    opts.After);
             else
-                await _service.PruneWhere((ITextChannel)ctx.Channel, count, _ => true, opts.After);
+                await _service.PruneWhere((ITextChannel)ctx.Channel,
+                    count,
+                    x => x.Id != progressMsg.Id,
+                    progress,
+                    opts.After);
+
+            await progressMsg.DeleteAsync();
+        }
+
+        private IProgress<(int, int)> GetProgressTracker(IUserMessage progressMsg)
+        {
+            var progress = new Progress<(int, int)>(async (x) =>
+            {
+                var (deleted, total) = x;
+                try
+                {
+                    await progressMsg.ModifyAsync(props =>
+                    {
+                        props.Embed = _sender.CreateEmbed()
+                                             .WithPendingColor()
+                                             .WithDescription(GetText(strs.prune_progress(deleted, total)))
+                                             .Build();
+                    });
+                }
+                catch
+                {
+                }
+            });
+
+            return progress;
         }
 
         //prune @user [x]
@@ -94,21 +151,48 @@ public partial class Administration
                 count = 1000;
 
             var (opts, _) = OptionsParser.ParseFrom<PruneOptions>(new PruneOptions(), args);
-            
+
+            var progressMsg = await Response().Pending(strs.prune_progress(0, count)).SendAsync();
+            var progress = GetProgressTracker(progressMsg);
+
             if (opts.Safe)
             {
                 await _service.PruneWhere((ITextChannel)ctx.Channel,
                     count,
                     m => m.Author.Id == userId && DateTime.UtcNow - m.CreatedAt < _twoWeeks && !m.IsPinned,
-                    opts.After);
+                    progress,
+                    opts.After
+                );
             }
             else
             {
                 await _service.PruneWhere((ITextChannel)ctx.Channel,
                     count,
                     m => m.Author.Id == userId && DateTime.UtcNow - m.CreatedAt < _twoWeeks,
-                    opts.After);
+                    progress,
+                    opts.After
+                );
             }
+
+            await progressMsg.DeleteAsync();
+        }
+
+        [Cmd]
+        [RequireContext(ContextType.Guild)]
+        [UserPerm(ChannelPerm.ManageMessages)]
+        [BotPerm(ChannelPerm.ManageMessages)]
+        public async Task PruneCancel()
+        {
+            var ok = await _service.CancelAsync(ctx.Guild.Id);
+
+            if (!ok)
+            {
+                await Response().Error(strs.prune_not_found).SendAsync();
+                return;
+            }
+
+
+            await Response().Confirm(strs.prune_cancelled).SendAsync();
         }
     }
 }

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

@@ -4,21 +4,29 @@ namespace NadekoBot.Modules.Administration.Services;
 public class PruneService : INService
 {
     //channelids where prunes are currently occuring
-    private readonly ConcurrentHashSet<ulong> _pruningGuilds = new();
+    private readonly ConcurrentDictionary<ulong, CancellationTokenSource> _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, ulong? after = null)
+    public async Task PruneWhere(
+        ITextChannel channel,
+        int amount,
+        Func<IMessage, bool> predicate,
+        IProgress<(int deleted, int total)> progress,
+        ulong? after = null
+    )
     {
         ArgumentNullException.ThrowIfNull(channel, nameof(channel));
 
+        var originalAmount = amount;
         if (amount <= 0)
             throw new ArgumentOutOfRangeException(nameof(amount));
 
-        if (!_pruningGuilds.Add(channel.GuildId))
+        using var cancelSource = new CancellationTokenSource();
+        if (!_pruningGuilds.TryAdd(channel.GuildId, cancelSource))
             return;
 
         try
@@ -26,16 +34,22 @@ public class PruneService : INService
             var now = DateTime.UtcNow;
             IMessage[] msgs;
             IMessage lastMessage = null;
-            var dled = await channel.GetMessagesAsync(50).FlattenAsync();
-            
-            msgs = dled
-                .Where(predicate)
-                .Where(x => after is ulong a ? x.Id > a : true)
-                .Take(amount)
-                .ToArray();
-            
-            while (amount > 0 && msgs.Any())
+
+            while (amount > 0 && !cancelSource.IsCancellationRequested)
             {
+                var dled = lastMessage is null
+                    ? await channel.GetMessagesAsync(50).FlattenAsync()
+                    : await channel.GetMessagesAsync(lastMessage, Direction.Before, 50).FlattenAsync();
+
+                msgs = dled
+                       .Where(predicate)
+                       .Where(x => after is not ulong a || x.Id > a)
+                       .Take(amount)
+                       .ToArray();
+
+                if (!msgs.Any())
+                    return;
+
                 lastMessage = msgs[^1];
 
                 var bulkDeletable = new List<IMessage>();
@@ -53,27 +67,17 @@ public class PruneService : INService
                 if (bulkDeletable.Count > 0)
                 {
                     await channel.DeleteMessagesAsync(bulkDeletable);
-                    await Task.Delay(2000);
+                    amount -= msgs.Length;
+                    progress.Report((originalAmount - amount, originalAmount));
+                    await Task.Delay(2000, cancelSource.Token);
                 }
 
                 foreach (var group in singleDeletable.Chunk(5))
                 {
                     await group.Select(x => x.DeleteAsync()).WhenAll();
-                    await Task.Delay(5000);
-                }
-
-                //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)
-                {
-                    dled = await channel.GetMessagesAsync(lastMessage, Direction.Before, 50).FlattenAsync();
-
-                    msgs = dled
-                        .Where(predicate)
-                        .Where(x => after is ulong a ? x.Id > a : true)
-                        .Take(amount)
-                        .ToArray();
+                    amount -= 5;
+                    progress.Report((originalAmount - amount, originalAmount));
+                    await Task.Delay(5000, cancelSource.Token);
                 }
             }
         }
@@ -83,7 +87,16 @@ public class PruneService : INService
         }
         finally
         {
-            _pruningGuilds.TryRemove(channel.GuildId);
+            _pruningGuilds.TryRemove(channel.GuildId, out _);
         }
     }
+
+    public async Task<bool> CancelAsync(ulong guildId)
+    {
+        if (!_pruningGuilds.TryRemove(guildId, out var source))
+            return false;
+
+        await source.CancelAsync();
+        return true;
+    }
 }

src/NadekoBot/Modules/Music/Music.cs

@@ -110,10 +110,10 @@ public sealed partial class Music : NadekoModule<IMusicService>
         try
         {
             var embed = _sender.CreateEmbed()
-                        .WithOkColor()
-                        .WithAuthor(GetText(strs.queued_track) + " #" + (index + 1), MUSIC_ICON_URL)
-                        .WithDescription($"{trackInfo.PrettyName()}\n{GetText(strs.queue)} ")
-                        .WithFooter(trackInfo.Platform.ToString());
+                               .WithOkColor()
+                               .WithAuthor(GetText(strs.queued_track) + " #" + (index + 1), MUSIC_ICON_URL)
+                               .WithDescription($"{trackInfo.PrettyName()}\n{GetText(strs.queue)} ")
+                               .WithFooter(trackInfo.Platform.ToString());
 
             if (!string.IsNullOrWhiteSpace(trackInfo.Thumbnail))
                 embed.WithThumbnailUrl(trackInfo.Thumbnail);
@@ -315,11 +315,13 @@ public sealed partial class Music : NadekoModule<IMusicService>
                 desc = add + "\n" + desc;
 
             var embed = _sender.CreateEmbed()
-                        .WithAuthor(GetText(strs.player_queue(curPage + 1, (tracks.Count / LQ_ITEMS_PER_PAGE) + 1)),
-                            MUSIC_ICON_URL)
-                        .WithDescription(desc)
-                        .WithFooter($"  {mp.PrettyVolume()}  |  🎶 {tracks.Count}  |  ⌛ {mp.PrettyTotalTime()}  ")
-                        .WithOkColor();
+                               .WithAuthor(
+                                   GetText(strs.player_queue(curPage + 1, (tracks.Count / LQ_ITEMS_PER_PAGE) + 1)),
+                                   MUSIC_ICON_URL)
+                               .WithDescription(desc)
+                               .WithFooter(
+                                   $"  {mp.PrettyVolume()}  |  🎶 {tracks.Count}  |  ⌛ {mp.PrettyTotalTime()}  ")
+                               .WithOkColor();
 
             return embed;
         }
@@ -349,13 +351,21 @@ public sealed partial class Music : NadekoModule<IMusicService>
             return;
         }
 
-        var resultsString = videos.Select((x, i) => $"`{i + 1}.`\n\t{Format.Bold(x.Title)}\n\t{x.Url}").Join('\n');
 
-        var msg = await Response().Confirm(resultsString).SendAsync();
+        var embeds = videos.Select((x, i) => _sender.CreateEmbed()
+                                                    .WithOkColor()
+                                                    .WithThumbnailUrl(x.Thumbnail)
+                                                    .WithDescription($"`{i + 1}.` {Format.Bold(x.Title)}\n\t{x.Url}"))
+                           .ToList();
+
+        var msg = await Response()
+                        .Text(strs.queue_search_results)
+                        .Embeds(embeds)
+                        .SendAsync();
 
         try
         {
-            var input = await GetUserInputAsync(ctx.User.Id, ctx.Channel.Id);
+            var input = await GetUserInputAsync(ctx.User.Id, ctx.Channel.Id, str => int.TryParse(str, out _));
             if (input is null || !int.TryParse(input, out var index) || (index -= 1) < 0 || index >= videos.Count)
             {
                 _logService.AddDeleteIgnore(msg.Id);
@@ -415,10 +425,10 @@ public sealed partial class Music : NadekoModule<IMusicService>
         }
 
         var embed = _sender.CreateEmbed()
-                    .WithAuthor(GetText(strs.removed_track) + " #" + index, MUSIC_ICON_URL)
-                    .WithDescription(track.PrettyName())
-                    .WithFooter(track.PrettyInfo())
-                    .WithErrorColor();
+                           .WithAuthor(GetText(strs.removed_track) + " #" + index, MUSIC_ICON_URL)
+                           .WithDescription(track.PrettyName())
+                           .WithFooter(track.PrettyInfo())
+                           .WithErrorColor();
 
         await _service.SendToOutputAsync(ctx.Guild.Id, embed);
     }
@@ -583,11 +593,11 @@ public sealed partial class Music : NadekoModule<IMusicService>
         }
 
         var embed = _sender.CreateEmbed()
-                    .WithTitle(track.Title.TrimTo(65))
-                    .WithAuthor(GetText(strs.track_moved), MUSIC_ICON_URL)
-                    .AddField(GetText(strs.from_position), $"#{from + 1}", true)
-                    .AddField(GetText(strs.to_position), $"#{to + 1}", true)
-                    .WithOkColor();
+                           .WithTitle(track.Title.TrimTo(65))
+                           .WithAuthor(GetText(strs.track_moved), MUSIC_ICON_URL)
+                           .AddField(GetText(strs.from_position), $"#{from + 1}", true)
+                           .AddField(GetText(strs.to_position), $"#{to + 1}", true)
+                           .WithOkColor();
 
         if (Uri.IsWellFormedUriString(track.Url, UriKind.Absolute))
             embed.WithUrl(track.Url);
@@ -642,12 +652,12 @@ public sealed partial class Music : NadekoModule<IMusicService>
             return;
 
         var embed = _sender.CreateEmbed()
-                    .WithOkColor()
-                    .WithAuthor(GetText(strs.now_playing), MUSIC_ICON_URL)
-                    .WithDescription(currentTrack.PrettyName())
-                    .WithThumbnailUrl(currentTrack.Thumbnail)
-                    .WithFooter(
-                        $"{mp.PrettyVolume()} | {mp.PrettyTotalTime()} | {currentTrack.Platform} | {currentTrack.Queuer}");
+                           .WithOkColor()
+                           .WithAuthor(GetText(strs.now_playing), MUSIC_ICON_URL)
+                           .WithDescription(currentTrack.PrettyName())
+                           .WithThumbnailUrl(currentTrack.Thumbnail)
+                           .WithFooter(
+                               $"{mp.PrettyVolume()} | {mp.PrettyTotalTime()} | {currentTrack.Platform} | {currentTrack.Queuer}");
 
         await Response().Embed(embed).SendAsync();
     }

src/NadekoBot/Modules/Music/Services/IMusicService.cs

@@ -3,7 +3,7 @@ using System.Diagnostics.CodeAnalysis;
 
 namespace NadekoBot.Modules.Music.Services;
 
-public interface IMusicService : IPlaceholderProvider
+public interface IMusicService
 {
     /// <summary>
     ///     Leave voice channel in the specified guild if it's connected to one
@@ -24,7 +24,7 @@ public interface IMusicService : IPlaceholderProvider
     Task EnqueueDirectoryAsync(IMusicPlayer mp, string dirPath, string queuer);
     Task<IUserMessage?> SendToOutputAsync(ulong guildId, EmbedBuilder embed);
     Task<bool> PlayAsync(ulong guildId, ulong voiceChannelId);
-    Task<IList<(string Title, string Url)>> SearchVideosAsync(string query);
+    Task<IList<(string Title, string Url, string Thumbnail)>> SearchVideosAsync(string query);
     Task<bool> SetMusicChannelAsync(ulong guildId, ulong? channelId);
     Task SetRepeatAsync(ulong guildId, PlayerRepeatType repeatType);
     Task SetVolumeAsync(ulong guildId, int value);

src/NadekoBot/Modules/Music/Services/MusicService.cs

@@ -4,7 +4,7 @@ using System.Diagnostics.CodeAnalysis;
 
 namespace NadekoBot.Modules.Music.Services;
 
-public sealed class MusicService : IMusicService
+public sealed class MusicService : IMusicService, IPlaceholderProvider
 {
     private readonly AyuVoiceStateService _voiceStateService;
     private readonly ITrackResolveProvider _trackResolveProvider;
@@ -233,23 +233,23 @@ public sealed class MusicService : IMusicService
         return true;
     }
 
-    private async Task<IList<(string Title, string Url)>> SearchYtLoaderVideosAsync(string query)
+    private async Task<IList<(string Title, string Url, string Thumb)>> SearchYtLoaderVideosAsync(string query)
     {
         var result = await _ytLoader.LoadResultsAsync(query);
-        return result.Select(x => (x.Title, x.Url)).ToList();
+        return result.Select(x => (x.Title, x.Url, x.Thumb)).ToList();
     }
 
-    private async Task<IList<(string Title, string Url)>> SearchGoogleApiVideosAsync(string query)
+    private async Task<IList<(string Title, string Url, string Thumb)>> SearchGoogleApiVideosAsync(string query)
     {
         var result = await _googleApiService.GetVideoInfosByKeywordAsync(query, 5);
-        return result.Select(x => (x.Name, x.Url)).ToList();
+        return result.Select(x => (x.Name, x.Url, x.Thumbnail)).ToList();
     }
 
-    public async Task<IList<(string Title, string Url)>> SearchVideosAsync(string query)
+    public async Task<IList<(string Title, string Url, string Thumbnail)>> SearchVideosAsync(string query)
     {
         try
         {
-            IList<(string, string)> videos = await SearchYtLoaderVideosAsync(query);
+            IList<(string, string, string)> videos = await SearchYtLoaderVideosAsync(query);
             if (videos.Count > 0)
                 return videos;
         }
@@ -269,7 +269,7 @@ public sealed class MusicService : IMusicService
                 ex.Message);
         }
 
-        return Array.Empty<(string, string)>();
+        return Array.Empty<(string, string, string)>();
     }
 
     private string GetText(ulong guildId, LocStr str)
@@ -434,4 +434,4 @@ public sealed class MusicService : IMusicService
     }
 
     #endregion
-}
+}

src/NadekoBot/Modules/Music/Services/extractor/Misc.cs

@@ -47,6 +47,7 @@ public sealed partial class YtLoader
     {
         public abstract string Url { get; }
         public abstract string Title { get; }
+        public abstract string Thumb { get; }
         public abstract TimeSpan Duration { get; }
     }
 
@@ -55,13 +56,15 @@ public sealed partial class YtLoader
         private const string BASE_YOUTUBE_URL = "https://youtube.com/watch?v=";
         public override string Url { get; }
         public override string Title { get; }
+        public override string Thumb { get; }
         public override TimeSpan Duration { get; }
 
         private readonly string _videoId;
 
-        public YtTrackInfo(string title, string videoId, TimeSpan duration)
+        public YtTrackInfo(string title, string videoId, string thumb, TimeSpan duration)
         {
             Title = title;
+            Thumb = thumb;
             Url = BASE_YOUTUBE_URL + videoId;
             Duration = duration;
 

src/NadekoBot/Modules/Music/Services/extractor/YtLoader.cs

@@ -5,7 +5,7 @@ using System.Text.Json;
 
 namespace NadekoBot.Modules.Music.Services;
 
-public sealed partial class YtLoader
+public sealed partial class YtLoader : INService
 {
     private static readonly byte[] _ytResultInitialData = Encoding.UTF8.GetBytes("var ytInitialData = ");
     private static readonly byte[] _ytResultJsonEnd = Encoding.UTF8.GetBytes(";<");
@@ -93,7 +93,7 @@ public sealed partial class YtLoader
                 continue;
 
             var videoId = elem.GetProperty("videoId").GetString();
-            // var thumb = elem.GetProperty("thumbnail").GetProperty("thumbnails")[0].GetProperty("url").GetString();
+            var thumb = elem.GetProperty("thumbnail").GetProperty("thumbnails")[0].GetProperty("url").GetString();
             var title = elem.GetProperty("title").GetProperty("runs")[0].GetProperty("text").GetString();
             var durationString = elem.GetProperty("lengthText").GetProperty("simpleText").GetString();
 
@@ -106,7 +106,7 @@ public sealed partial class YtLoader
                 continue;
             }
 
-            tracks.Add(new YtTrackInfo(title, videoId, duration));
+            tracks.Add(new YtTrackInfo(title, videoId, thumb, duration));
             if (tracks.Count >= 5)
                 break;
         }

src/NadekoBot/Modules/Utility/Todo/TodoService.cs

@@ -4,7 +4,7 @@ using NadekoBot.Db.Models;
 
 namespace NadekoBot.Modules.Utility;
 
-public sealed class TodoService
+public sealed class TodoService : INService
 {
     private const int ARCHIVE_MAX_COUNT = 9;
     private const int TODO_MAX_COUNT = 27;

src/NadekoBot/Modules/Utility/Utility.cs

@@ -166,9 +166,10 @@ public partial class Utility : NadekoModule
                       return _sender.CreateEmbed().WithOkColor().WithDescription(GetText(strs.no_user_on_this_page));
 
                   return _sender.CreateEmbed()
-                         .WithOkColor()
-                         .WithTitle(GetText(strs.inrole_list(Format.Bold(role?.Name ?? "No Role"), roleUsers.Length)))
-                         .WithDescription(string.Join("\n", pageUsers));
+                                .WithOkColor()
+                                .WithTitle(GetText(strs.inrole_list(Format.Bold(role?.Name ?? "No Role"),
+                                    roleUsers.Length)))
+                                .WithDescription(string.Join("\n", pageUsers));
               })
               .SendAsync();
     }
@@ -183,9 +184,14 @@ public partial class Utility : NadekoModule
     [RequireContext(ContextType.Guild)]
     public async Task CheckPerms(MeOrBot who = MeOrBot.Me)
     {
-        var builder = new StringBuilder();
         var user = who == MeOrBot.Me ? (IGuildUser)ctx.User : ((SocketGuild)ctx.Guild).CurrentUser;
         var perms = user.GetPermissions((ITextChannel)ctx.Channel);
+        await SendPerms(perms);
+    }
+
+    private async Task SendPerms(ChannelPermissions perms)
+    {
+        var builder = new StringBuilder();
         foreach (var p in perms.GetType()
                                .GetProperties()
                                .Where(static p =>
@@ -199,6 +205,16 @@ public partial class Utility : NadekoModule
         await Response().Confirm(builder.ToString()).SendAsync();
     }
 
+    // [Cmd]
+    // [RequireContext(ContextType.Guild)]
+    // [RequireUserPermission(GuildPermission.ManageRoles)]
+    // public async Task CheckPerms(SocketRole role, string perm = null)
+    // {
+    //     ChannelPermissions.
+    //     var perms = ((ITextChannel)ctx.Channel);
+    //     await SendPerms(perms)
+    // }
+
     [Cmd]
     [RequireContext(ContextType.Guild)]
     public async Task UserId([Leftover] IGuildUser target = null)
@@ -305,29 +321,29 @@ public partial class Utility : NadekoModule
 
         await Response()
               .Embed(_sender.CreateEmbed()
-                     .WithOkColor()
-                     .WithAuthor($"NadekoBot v{StatsService.BotVersion}",
-                         "https://nadeko-pictures.nyc3.digitaloceanspaces.com/other/avatar.png",
-                         "https://nadekobot.readthedocs.io/en/latest/")
-                     .AddField(GetText(strs.author), _stats.Author, true)
-                     .AddField(GetText(strs.botid), _client.CurrentUser.Id.ToString(), true)
-                     .AddField(GetText(strs.shard),
-                         $"#{_client.ShardId} / {_creds.TotalShards}",
-                         true)
-                     .AddField(GetText(strs.commands_ran), _stats.CommandsRan.ToString(), true)
-                     .AddField(GetText(strs.messages),
-                         $"{_stats.MessageCounter} ({_stats.MessagesPerSecond:F2}/sec)",
-                         true)
-                     .AddField(GetText(strs.memory),
-                         FormattableString.Invariant($"{_stats.GetPrivateMemoryMegabytes():F2} MB"),
-                         true)
-                     .AddField(GetText(strs.owner_ids), ownerIds, true)
-                     .AddField(GetText(strs.uptime), _stats.GetUptimeString("\n"), true)
-                     .AddField(GetText(strs.presence),
-                         GetText(strs.presence_txt(_coord.GetGuildCount(),
-                             _stats.TextChannels,
-                             _stats.VoiceChannels)),
-                         true))
+                            .WithOkColor()
+                            .WithAuthor($"NadekoBot v{StatsService.BotVersion}",
+                                "https://nadeko-pictures.nyc3.digitaloceanspaces.com/other/avatar.png",
+                                "https://nadekobot.readthedocs.io/en/latest/")
+                            .AddField(GetText(strs.author), _stats.Author, true)
+                            .AddField(GetText(strs.botid), _client.CurrentUser.Id.ToString(), true)
+                            .AddField(GetText(strs.shard),
+                                $"#{_client.ShardId} / {_creds.TotalShards}",
+                                true)
+                            .AddField(GetText(strs.commands_ran), _stats.CommandsRan.ToString(), true)
+                            .AddField(GetText(strs.messages),
+                                $"{_stats.MessageCounter} ({_stats.MessagesPerSecond:F2}/sec)",
+                                true)
+                            .AddField(GetText(strs.memory),
+                                FormattableString.Invariant($"{_stats.GetPrivateMemoryMegabytes():F2} MB"),
+                                true)
+                            .AddField(GetText(strs.owner_ids), ownerIds, true)
+                            .AddField(GetText(strs.uptime), _stats.GetUptimeString("\n"), true)
+                            .AddField(GetText(strs.presence),
+                                GetText(strs.presence_txt(_coord.GetGuildCount(),
+                                    _stats.TextChannels,
+                                    _stats.VoiceChannels)),
+                                true))
               .SendAsync();
     }
 
@@ -695,9 +711,9 @@ public partial class Utility : NadekoModule
             if (!string.IsNullOrWhiteSpace(output))
             {
                 var eb = _sender.CreateEmbed()
-                         .WithOkColor()
-                         .AddField("Code", scriptText)
-                         .AddField("Output", output.TrimTo(512)!);
+                                .WithOkColor()
+                                .AddField("Code", scriptText)
+                                .AddField("Output", output.TrimTo(512)!);
 
                 _ = Response().Embed(eb).SendAsync();
             }