Slowly moving over to dependency injection. Starting with DiscordBot

Faellesskabet · Jul 27, 2022 · d84cbea · d84cbea
1 parent 650484f
commit d84cbea
Show file tree

Hide file tree

Showing 11 changed files with 18 additions and 26 deletions.
diff --git a/Dikubot/DataLayer/Cronjob/Cronjobs/ForceNameChangeTask.cs b/Dikubot/DataLayer/Cronjob/Cronjobs/ForceNameChangeTask.cs
@@ -20,7 +20,7 @@ private static void Update()
         Logger.Debug("Forcing name changes for selected servers");
         GuildSettingsService guildSettingsService = new GuildSettingsService();
         UserGlobalServices userGlobalServices = new UserGlobalServices();
-        foreach (var guild in DiscordBot.Client.Guilds)
+        foreach (var guild in DiscordBot.ClientStatic.Guilds)
         {
             GuildSettingsModel guildSettingsModel = guildSettingsService.Get(guild);
             if (!guildSettingsModel.ForceNameChange)

diff --git a/Dikubot/DataLayer/Cronjob/Cronjobs/UpdateUserRolesTask.cs b/Dikubot/DataLayer/Cronjob/Cronjobs/UpdateUserRolesTask.cs
@@ -19,7 +19,7 @@ public UpdateUserRolesTask() : base(Cronos.CronExpression.Parse("0 */2 * * *"),
         private static void Update()
         {
             Logger.Debug("Updating all user roles");
-            foreach (var guild in DiscordBot.Client.Guilds)
+            foreach (var guild in DiscordBot.ClientStatic.Guilds)
             {
                 PermissionsService permissionsService = new PermissionsService(guild);
                 GuildSettingsModel guildSettingsModel = permissionsService.GetGuildSettingsService().Get(guild);

diff --git a/Dikubot/DataLayer/Database/Global/User/UserGlobalModel.cs b/Dikubot/DataLayer/Database/Global/User/UserGlobalModel.cs
@@ -28,7 +28,7 @@ public string Email
         [BsonIgnore]
         public IUser DiscordUser
         {
-            get => DiscordBot.Client.GetUserAsync(DiscordIdLong).Result;
+            get => DiscordBot.ClientStatic.GetUserAsync(DiscordIdLong).Result;
             set => DiscordId = value.Id.ToString();
         }
 
@@ -65,7 +65,7 @@ public HashSet<Guid> Calendar
 
         public SocketGuild GetSelectedGuild()
         {
-            SocketGuild guild = DiscordBot.Client.GetGuild(SelectedGuild);
+            SocketGuild guild = DiscordBot.ClientStatic.GetGuild(SelectedGuild);
             if (guild == null)
             {
                 throw new Exception($"SelectedGuild ({SelectedGuild}) can't be found");

diff --git a/Dikubot/DataLayer/Database/Guild/Models/Calendar/CalenderServices.cs b/Dikubot/DataLayer/Database/Guild/Models/Calendar/CalenderServices.cs
@@ -16,7 +16,7 @@ public CalendarServices(SocketGuild guild) : base("Calendar", guild)
         }
 
 
-        public CalendarServices(string guidId) : base("Calendar", DiscordBot.Client.Guilds?.FirstOrDefault(g => g.Id.ToString().Equals(guidId)))
+        public CalendarServices(string guidId) : base("Calendar", DiscordBot.ClientStatic.Guilds?.FirstOrDefault(g => g.Id.ToString().Equals(guidId)))
         {
         }
 

diff --git a/Dikubot/DataLayer/Database/Guild/Models/Calendar/Equipment/EquipmentServices.cs b/Dikubot/DataLayer/Database/Guild/Models/Calendar/Equipment/EquipmentServices.cs
@@ -14,7 +14,7 @@ public class EquipmentServices : GuildServices<EquipmentModel>
         public EquipmentServices(SocketGuild guild) : base("Equipment", guild)
         {
         }
-        public EquipmentServices(string guidId) : base("Equipment", DiscordBot.Client.Guilds?.FirstOrDefault(g => g.Id.ToString().Equals(guidId)))
+        public EquipmentServices(string guidId) : base("Equipment", DiscordBot.ClientStatic.Guilds?.FirstOrDefault(g => g.Id.ToString().Equals(guidId)))
         {
         }
 

diff --git a/Dikubot/DataLayer/Database/Guild/Models/Calendar/Events/EventServices.cs b/Dikubot/DataLayer/Database/Guild/Models/Calendar/Events/EventServices.cs
@@ -16,7 +16,7 @@ public EventsServices(SocketGuild guild, string calendar = null) : base("Events"
         }
 
 
-        public EventsServices(string guidId, string calendar = null) : base("Events", DiscordBot.Client.Guilds?.FirstOrDefault(g => g.Id.ToString().Equals(guidId)))
+        public EventsServices(string guidId, string calendar = null) : base("Events", DiscordBot.ClientStatic.Guilds?.FirstOrDefault(g => g.Id.ToString().Equals(guidId)))
         {
             _calendar = calendar;
         }

diff --git a/Dikubot/DataLayer/Database/Guild/Models/Calendar/Room/RoomServices.cs b/Dikubot/DataLayer/Database/Guild/Models/Calendar/Room/RoomServices.cs
@@ -14,7 +14,7 @@ public class RoomServices : GuildServices<RoomModel>
         public RoomServices(SocketGuild guild) : base("Room", guild)
         {
         }
-        public RoomServices(string guidId) : base("Room", DiscordBot.Client.Guilds?.FirstOrDefault(g => g.Id.ToString().Equals(guidId)))
+        public RoomServices(string guidId) : base("Room", DiscordBot.ClientStatic.Guilds?.FirstOrDefault(g => g.Id.ToString().Equals(guidId)))
         {
         }
 

diff --git a/Dikubot/DataLayer/Database/Guild/Models/User/UserGuildModel.cs b/Dikubot/DataLayer/Database/Guild/Models/User/UserGuildModel.cs
@@ -25,7 +25,7 @@ public class UserGuildModel : MainModel
         [BsonIgnore]
         public SocketUser DiscordUser
         {
-            get => DiscordBot.Client.GetUser(Convert.ToUInt64(DiscordId));
+            get => DiscordBot.ClientStatic.GetUser(Convert.ToUInt64(DiscordId));
             set => DiscordId = value.Id.ToString();
         }
 

diff --git a/Dikubot/DataLayer/Logic/WebDiscordBridge/SubDomainConnector.cs b/Dikubot/DataLayer/Logic/WebDiscordBridge/SubDomainConnector.cs
@@ -42,7 +42,7 @@ public static ulong SubDomainToDiscordId(string subdomain)
 
         public static SocketGuild GetGuildFromDomain(string domain)
         {
-            return DiscordBot.Client.GetGuild(DomainToDiscordId(domain));
+            return DiscordBot.ClientStatic.GetGuild(DomainToDiscordId(domain));
         }
 
     }

diff --git a/Dikubot/DataLayer/Static/Util.cs b/Dikubot/DataLayer/Static/Util.cs
@@ -92,7 +92,7 @@ public static string ConcatListToString<T>(List<T> list)
 
         public static bool IsGuildAdmin(ulong userId, ulong guildId)
         {
-            SocketGuild guild = DiscordBot.Client.GetGuild(guildId);
+            SocketGuild guild = DiscordBot.ClientStatic.GetGuild(guildId);
             SocketGuildUser user = guild?.GetUser(userId);
             return guild != null &&
                    (guild.OwnerId == user.Id || user.Roles.Any(role => role.Permissions.Administrator));

diff --git a/Dikubot/Webapp/Startup.cs → Dikubot/Startup.cs b/Dikubot/Webapp/Startup.cs → Dikubot/Startup.cs
@@ -1,27 +1,19 @@
+using System;
+using Blazored.LocalStorage;
+using BlazorLoginDiscord.Data;
+using Dikubot.Webapp.Authentication;
+using Microsoft.AspNetCore.Authentication.Cookies;
 using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Components.Authorization;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Mvc.RazorPages;
-using Microsoft.AspNetCore.Authentication;
-using Microsoft.AspNetCore.Authentication.Cookies;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
-using Microsoft.AspNetCore.Components.Authorization;
-using System;
-using System.Net;
-using System.Threading.Tasks;
-using AspNet.Security.OAuth.Discord;
-using Blazored.LocalStorage;
-using BlazorLoginDiscord.Data;
-using Dikubot.Webapp.Authentication;
-using Dikubot.Webapp.Authentication.Discord.OAuth2;
-using Microsoft.AspNetCore.CookiePolicy;
-using Microsoft.AspNetCore.Http;
 using MudBlazor.Services;
 using Syncfusion.Blazor;
 
-
-namespace Dikubot.Webapp
+namespace Dikubot
 {
     public class Startup
     {
-Original file line number
+Diff line change
@@ Expand Up @@
             }
-            public CalendarServices(string guidId) : base("Calendar", DiscordBot.Client.Guilds?.FirstOrDefault(g => g.Id.ToString().Equals(guidId)))
+            public CalendarServices(string guidId) : base("Calendar", DiscordBot.ClientStatic.Guilds?.FirstOrDefault(g => g.Id.ToString().Equals(guidId)))
             {
             }
@@ Expand Down @@