From 08dbebdc980ffc50e1f4be7d2400b9037ed81334 Mon Sep 17 00:00:00 2001
From: Cenk Ergen <57065323+Cenngo@users.noreply.github.com>
Date: Thu, 25 Nov 2021 12:54:54 +0300
Subject: [PATCH 1/2] fix sharded client current user

---
 src/Discord.Net.WebSocket/DiscordShardedClient.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Discord.Net.WebSocket/DiscordShardedClient.cs b/src/Discord.Net.WebSocket/DiscordShardedClient.cs
index 307f9a009..1e71ce853 100644
--- a/src/Discord.Net.WebSocket/DiscordShardedClient.cs
+++ b/src/Discord.Net.WebSocket/DiscordShardedClient.cs
@@ -495,9 +495,12 @@ namespace Discord.WebSocket
             client.GuildScheduledEventUserAdd += (arg1, arg2) => _guildScheduledEventUserAdd.InvokeAsync(arg1, arg2);
             client.GuildScheduledEventUserRemove += (arg1, arg2) => _guildScheduledEventUserRemove.InvokeAsync(arg1, arg2);
         }
-#endregion
+        #endregion
 
         #region IDiscordClient
+        /// <inheritdoc />
+        ISelfUser IDiscordClient.CurrentUser => CurrentUser;
+
         /// <inheritdoc />
         async Task<IApplication> IDiscordClient.GetApplicationInfoAsync(RequestOptions options)
             => await GetApplicationInfoAsync().ConfigureAwait(false);

From 2e4b877f3af0d57444709e6c8e7248289d3a988b Mon Sep 17 00:00:00 2001
From: Cenk Ergen <57065323+Cenngo@users.noreply.github.com>
Date: Sat, 27 Nov 2021 12:21:12 +0300
Subject: [PATCH 2/2] add custom setter to group property of module builder

---
 src/Discord.Net.Commands/Builders/ModuleBuilder.cs     | 10 +++++++++-
 .../Builders/ModuleClassBuilder.cs                     |  1 -
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/Discord.Net.Commands/Builders/ModuleBuilder.cs b/src/Discord.Net.Commands/Builders/ModuleBuilder.cs
index ddb62e797..f2a7eeb1f 100644
--- a/src/Discord.Net.Commands/Builders/ModuleBuilder.cs
+++ b/src/Discord.Net.Commands/Builders/ModuleBuilder.cs
@@ -8,6 +8,7 @@ namespace Discord.Commands.Builders
     public class ModuleBuilder
     {
         #region ModuleBuilder
+        private string _group;
         private readonly List<CommandBuilder> _commands;
         private readonly List<ModuleBuilder> _submodules;
         private readonly List<PreconditionAttribute> _preconditions;
@@ -19,7 +20,14 @@ namespace Discord.Commands.Builders
         public string Name { get; set; }
         public string Summary { get; set; }
         public string Remarks { get; set; }
-        public string Group { get; set; }
+        public string Group { get => _group;
+            set
+            {
+                _aliases.Remove(_group);
+                _group = value;
+                AddAliases(value);
+            }
+        }
 
         public IReadOnlyList<CommandBuilder> Commands => _commands;
         public IReadOnlyList<ModuleBuilder> Modules => _submodules;
diff --git a/src/Discord.Net.Commands/Builders/ModuleClassBuilder.cs b/src/Discord.Net.Commands/Builders/ModuleClassBuilder.cs
index 8c10ae806..22c58f5c7 100644
--- a/src/Discord.Net.Commands/Builders/ModuleClassBuilder.cs
+++ b/src/Discord.Net.Commands/Builders/ModuleClassBuilder.cs
@@ -118,7 +118,6 @@ namespace Discord.Commands
                     case GroupAttribute group:
                         builder.Name ??= group.Prefix;
                         builder.Group = group.Prefix;
-                        builder.AddAliases(group.Prefix);
                         break;
                     case PreconditionAttribute precondition:
                         builder.AddPrecondition(precondition);