Merge pull request #4 from SorenNeedsCoffee/development

v1.0.3 - last minute bug fixes/cleanup

GarbageCan/Dockerfile

@@ -1,4 +1,4 @@
 FROM mcr.microsoft.com/dotnet/aspnet:5.0
-COPY bin/Release/netcoreapp5.0 GarbageCan/
 WORKDIR /GarbageCan
+COPY bin/Release/netcoreapp5.0 GarbageCan/
 ENTRYPOINT ["dotnet", "GarbageCan.dll"]

GarbageCan/Roles/RoleManager.cs

@@ -115,7 +115,6 @@ private Task HandleJoinRoles(DiscordClient sender, GuildMemberUpdateEventArgs e)
             {
                 if (e.Member.IsBot) return Task.CompletedTask;
                 if (!_watchedUsers.Contains(e.Member.Id)) return Task.CompletedTask;
-                if (e.Member.IsPending ?? true) return Task.CompletedTask;
                 _watchedUsers.Remove(e.Member.Id);
 
                 Task.Run(async () =>
@@ -152,22 +151,27 @@ private static void HandleLevelRoles(object sender, XpEventArgs args)
                 try
                 {
                     var lvlArgs = (LevelUpArgs) args;
+                    var member = await args.context.Guild.GetMemberAsync(args.id);
+                    
                     await using var context = new Context();
-                    var removeRoles = context.levelRoles.Where(r => r.lvl == lvlArgs.oldLvl && !r.remain).ForEachAsync(
-                        async r =>
+                    var roles = context.levelRoles.OrderBy(r => r.lvl).Where(r => !r.remain).ToList();
+                    var index = 0;
+                    foreach (var r in roles)
+                    {
+                        if (r.lvl == lvlArgs.lvl && index > 0)
                         {
-                            var role = args.context.Guild.GetRole(r.roleId);
-                            var member = await args.context.Guild.GetMemberAsync(args.id);
+                            var role = args.context.Guild.GetRole(roles[index-1].roleId);
                             await member.RevokeRoleAsync(role);
-                        });
-                    var addRoles = context.levelRoles.Where(r => r.lvl == lvlArgs.lvl).ForEachAsync(async r =>
+                            break;
+                        }
+
+                        index++;
+                    }
+                    await context.levelRoles.Where(r => r.lvl == lvlArgs.lvl).ForEachAsync(async r =>
                     {
                         var role = args.context.Guild.GetRole(r.roleId);
-                        var member = await args.context.Guild.GetMemberAsync(args.id);
                         await member.GrantRoleAsync(role);
                     });
-
-                    await Task.WhenAll(removeRoles, addRoles);
                 }
                 catch (Exception e)
                 {

GarbageCan/Web/Startup.cs

@@ -2,6 +2,8 @@
 using Microsoft.AspNetCore.Authentication.JwtBearer;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.HttpOverrides;
+using Microsoft.AspNetCore.Rewrite;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.IdentityModel.Tokens;
@@ -49,6 +51,16 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
             }
 
             //app.UseHttpsRedirection();
+
+            var forwardedHeadersOptions = new ForwardedHeadersOptions {
+                ForwardedHeaders = ForwardedHeaders.XForwardedFor | ForwardedHeaders.XForwardedProto
+            };
+            forwardedHeadersOptions.KnownNetworks.Clear();
+            forwardedHeadersOptions.KnownProxies.Clear();
+            app.UseForwardedHeaders(forwardedHeadersOptions);
+
+            var rewriteOptions = new RewriteOptions().AddRedirectToHttps(308);
+            app.UseRewriter(rewriteOptions);
 
             app.UseRouting();
             app.UseCors("gbc");

GarbageCan/Web/Program.cs → GarbageCan/Web/WebAPI.cs

@@ -6,7 +6,7 @@
 
 namespace GarbageCan.Web
 {
-    public class Program : IFeature
+    public class WebAPI : IFeature
     {
         public IHost HostObj;