Merge pull request #47 from penev92/restructuring

Restructured the project
OpenRA · Nov 11, 2021 · 7ab2fa0 · 7ab2fa0
2 parents 7f46fd9 + e6c6dce
commit 7ab2fa0
Show file tree

Hide file tree

Showing 59 changed files with 350 additions and 239 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -8,4 +8,8 @@ indent_size = 4
 
 [*.config]
 indent_style = tab
+indent_size = 4
+
+[*.json]
+indent_style = tab
 indent_size = 4
diff --git a/...mMessageHandlers/ICustomMessageHandler.cs → ...ns/EventHandlers/ICustomMessageHandler.cs b/...mMessageHandlers/ICustomMessageHandler.cs → ...ns/EventHandlers/ICustomMessageHandler.cs
@@ -1,8 +1,8 @@
 using Discord.WebSocket;
 
-namespace Orabot.EventHandlers.CustomMessageHandlers
+namespace Orabot.Core.Abstractions.EventHandlers
 {
-	internal interface ICustomMessageHandler
+	public interface ICustomMessageHandler
 	{
 		bool CanHandle(SocketUserMessage message);
 

diff --git a/...tHandlers/Abstraction/ILogEventHandler.cs → ...actions/EventHandlers/ILogEventHandler.cs b/...tHandlers/Abstraction/ILogEventHandler.cs → ...actions/EventHandlers/ILogEventHandler.cs
@@ -1,7 +1,7 @@
 using System.Threading.Tasks;
 using Discord;
 
-namespace Orabot.EventHandlers.Abstraction
+namespace Orabot.Core.Abstractions.EventHandlers
 {
 	public interface ILogEventHandler
 	{

diff --git a/...dlers/Abstraction/IMessageEventHandler.cs → ...ons/EventHandlers/IMessageEventHandler.cs b/...dlers/Abstraction/IMessageEventHandler.cs → ...ons/EventHandlers/IMessageEventHandler.cs
@@ -1,7 +1,7 @@
 using System.Threading.Tasks;
 using Discord.WebSocket;
 
-namespace Orabot.EventHandlers.Abstraction
+namespace Orabot.Core.Abstractions.EventHandlers
 {
 	public interface IMessageEventHandler
 	{

diff --git a/...lers/Abstraction/IReactionEventHandler.cs → ...ns/EventHandlers/IReactionEventHandler.cs b/...lers/Abstraction/IReactionEventHandler.cs → ...ns/EventHandlers/IReactionEventHandler.cs
@@ -2,7 +2,7 @@
 using Discord;
 using Discord.WebSocket;
 
-namespace Orabot.EventHandlers.Abstraction
+namespace Orabot.Core.Abstractions.EventHandlers
 {
 	public interface IReactionEventHandler
 	{

diff --git a/Orabot.Core.Abstractions/Orabot.Core.Abstractions.csproj b/Orabot.Core.Abstractions/Orabot.Core.Abstractions.csproj
@@ -0,0 +1,11 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.1</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Discord.Net.WebSocket" Version="2.4.0" />
+  </ItemGroup>
+
+</Project>
diff --git a/Orabot/Bot.cs → Orabot.Core/Bot.cs b/Orabot/Bot.cs → Orabot.Core/Bot.cs
@@ -1,20 +1,19 @@
 using System;
-using System.Configuration;
 using System.Threading.Tasks;
 using Discord;
 using Discord.Commands;
 using Discord.WebSocket;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
-using Orabot.EventHandlers.Abstraction;
-using Orabot.TypeReaders;
+using Orabot.Core.Abstractions.EventHandlers;
+using Orabot.Core.TypeReaders;
 
-namespace Orabot
+namespace Orabot.Core
 {
 	public class Bot : IDisposable
 	{
-		private static readonly string DiscordBotToken = ConfigurationManager.AppSettings["BotToken"];
-
 		private readonly IServiceProvider _serviceProvider;
+		private readonly string _discordBotToken;
 
 		private readonly DiscordSocketClient _client;
 		private readonly CommandService _commands;
@@ -26,6 +25,7 @@ public class Bot : IDisposable
 		public Bot(IServiceProvider serviceProvider)
 		{
 			_serviceProvider = serviceProvider;
+			_discordBotToken = _serviceProvider.GetService<IConfiguration>()["BotToken"];
 
 			_client = _serviceProvider.GetService<DiscordSocketClient>();
 			_commands = _serviceProvider.GetService<CommandService>();
@@ -39,7 +39,7 @@ public Bot(IServiceProvider serviceProvider)
 
 		public async Task RunAsync()
 		{
-			await _client.LoginAsync(TokenType.Bot, DiscordBotToken);
+			await _client.LoginAsync(TokenType.Bot, _discordBotToken);
 			await _client.StartAsync();
 
 			Console.ReadLine();

diff --git a/Orabot.Core/DependencyInjection/ServiceProviderExtensions.cs b/Orabot.Core/DependencyInjection/ServiceProviderExtensions.cs
@@ -0,0 +1,68 @@
+using System.IO;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Orabot.Core.Abstractions.EventHandlers;
+using Orabot.Core.EventHandlers;
+using Orabot.Core.EventHandlers.CustomMessageHandlers.AttachmentMessageHandlers;
+using Orabot.Core.EventHandlers.CustomMessageHandlers.CommandMessageHandlers;
+using Orabot.Core.EventHandlers.CustomMessageHandlers.LinkParsingMessageHandlers;
+using Orabot.Core.EventHandlers.CustomMessageHandlers.ModTimersMessageHandlers;
+using Orabot.Core.EventHandlers.CustomMessageHandlers.NumberParsingMessageHandlers;
+using Orabot.Core.EventHandlers.CustomMessageHandlers.NumberParsingMessageHandlers.GitHubIssueNumberMessageHandlers;
+using Orabot.Core.EventHandlers.CustomMessageHandlers.SpecificTextMessageHandlers;
+using Orabot.Core.Transformers.AttachmentToMessageTransformers;
+using Orabot.Core.Transformers.LinkToEmbedTransformers;
+using Orabot.Core.Transformers.Replays.ReplayDataToEmbedTransformers;
+using Orabot.Core.Transformers.Replays.ReplayToReplayDataTransformers;
+
+namespace Orabot.Core.DependencyInjection
+{
+    public static class ServiceProviderExtensions
+	{
+		public static IServiceCollection AddAppSettingsConfiguration(this IServiceCollection serviceCollection)
+		{
+			return serviceCollection
+				.AddSingleton<IConfiguration>(provider =>
+				{
+					var builder = new ConfigurationBuilder()
+						.SetBasePath(Directory.GetCurrentDirectory())
+						.AddJsonFile("appsettings.json");
+
+					return builder.Build();
+				});
+		}
+
+		public static IServiceCollection AddDefaultEventHandlerServices(this IServiceCollection serviceCollection)
+		{
+			return serviceCollection
+				.AddSingleton<ILogEventHandler, LogEventHandler>()
+				.AddSingleton<IMessageEventHandler, MessageEventHandler>()
+				.AddSingleton<IReactionEventHandler, RoleAssignmentReactionEventHandler>();
+		}
+
+		public static IServiceCollection AddDefaultCustomMessageHandlers(this IServiceCollection serviceCollection)
+        {
+	        return serviceCollection
+		        .AddSingleton<ICustomMessageHandler, OpenRaGitHubIssueNumberMessageHandler>()
+		        .AddSingleton<ICustomMessageHandler, OpenRaModSdkGitHubIssueNumberMessageHandler>()
+		        .AddSingleton<ICustomMessageHandler, OpenRaRa2GitHubIssueNumberMessageHandler>()
+		        .AddSingleton<ICustomMessageHandler, OpenRaWebGitHubIssueNumberMessageHandler>()
+		        .AddSingleton<ICustomMessageHandler, OrabotGitHubIssueNumberMessageHandler>()
+		        .AddSingleton<ICustomMessageHandler, OpenRaResourceCenterMapNumberMessageHandler>()
+		        .AddSingleton<ICustomMessageHandler, OpenRaResourceCenterMapLinkMessageHandler>()
+		        .AddSingleton<ICustomMessageHandler, LogFileAttachmentMessageHandler>()
+		        .AddSingleton<ICustomMessageHandler, ReplayFileAttachmentMessageHandler>()
+		        .AddSingleton<ICustomMessageHandler, BaseCommandMessageHandler>()
+		        .AddSingleton<ICustomMessageHandler, BaseModTimerMessageHandler>()
+		        .AddSingleton<ICustomMessageHandler, StackTraceMessageHandler>();
+        }
+		public static IServiceCollection AddDefaultTransformers(this IServiceCollection serviceCollection)
+		{
+			return serviceCollection
+				.AddSingleton<AttachmentLogFileToMessageTransformer>()
+				.AddSingleton<OpenRaResourceCenterMapLinkToEmbedTransformer>()
+				.AddSingleton<AttachmentReplayToUtilityMetadataTransformer>()
+				.AddSingleton<UtilityReplayMetadataToEmbedTransformer>();
+		}
+    }
+}
diff --git a/...eHandlers/BaseAttachmentMessageHandler.cs → ...eHandlers/BaseAttachmentMessageHandler.cs b/...eHandlers/BaseAttachmentMessageHandler.cs → ...eHandlers/BaseAttachmentMessageHandler.cs
@@ -1,7 +1,8 @@
 using System.Linq;
 using Discord.WebSocket;
+using Orabot.Core.Abstractions.EventHandlers;
 
-namespace Orabot.EventHandlers.CustomMessageHandlers.AttachmentMessageHandlers
+namespace Orabot.Core.EventHandlers.CustomMessageHandlers.AttachmentMessageHandlers
 {
 	internal abstract class BaseAttachmentMessageHandler : ICustomMessageHandler
 	{

diff --git a/...ndlers/LogFileAttachmentMessageHandler.cs → ...ndlers/LogFileAttachmentMessageHandler.cs b/...ndlers/LogFileAttachmentMessageHandler.cs → ...ndlers/LogFileAttachmentMessageHandler.cs
@@ -1,8 +1,8 @@
 using System.Linq;
 using Discord.WebSocket;
-using Orabot.Transformers.AttachmentToMessageTransformers;
+using Orabot.Core.Transformers.AttachmentToMessageTransformers;
 
-namespace Orabot.EventHandlers.CustomMessageHandlers.AttachmentMessageHandlers
+namespace Orabot.Core.EventHandlers.CustomMessageHandlers.AttachmentMessageHandlers
 {
 	internal class LogFileAttachmentMessageHandler : BaseAttachmentMessageHandler
 	{

diff --git a/...ers/ReplayFileAttachmentMessageHandler.cs → ...ers/ReplayFileAttachmentMessageHandler.cs b/...ers/ReplayFileAttachmentMessageHandler.cs → ...ers/ReplayFileAttachmentMessageHandler.cs
@@ -1,9 +1,9 @@
 using System.Linq;
 using Discord.WebSocket;
-using Orabot.Transformers.Replays.ReplayDataToEmbedTransformers;
-using Orabot.Transformers.Replays.ReplayToReplayDataTransformers;
+using Orabot.Core.Transformers.Replays.ReplayDataToEmbedTransformers;
+using Orabot.Core.Transformers.Replays.ReplayToReplayDataTransformers;
 
-namespace Orabot.EventHandlers.CustomMessageHandlers.AttachmentMessageHandlers
+namespace Orabot.Core.EventHandlers.CustomMessageHandlers.AttachmentMessageHandlers
 {
 	internal class ReplayFileAttachmentMessageHandler : BaseAttachmentMessageHandler
 	{

diff --git a/...sageHandlers/BaseCommandMessageHandler.cs → ...sageHandlers/BaseCommandMessageHandler.cs b/...sageHandlers/BaseCommandMessageHandler.cs → ...sageHandlers/BaseCommandMessageHandler.cs
@@ -2,8 +2,9 @@
 using Discord.Commands;
 using Discord.WebSocket;
 using Microsoft.Extensions.DependencyInjection;
+using Orabot.Core.Abstractions.EventHandlers;
 
-namespace Orabot.EventHandlers.CustomMessageHandlers.CommandMessageHandlers
+namespace Orabot.Core.EventHandlers.CustomMessageHandlers.CommandMessageHandlers
 {
 	internal class BaseCommandMessageHandler : ICustomMessageHandler
 	{

diff --git a/...Handlers/BaseLinkParsingMessageHandler.cs → ...Handlers/BaseLinkParsingMessageHandler.cs b/...Handlers/BaseLinkParsingMessageHandler.cs → ...Handlers/BaseLinkParsingMessageHandler.cs
@@ -2,8 +2,9 @@
 using System.Linq;
 using System.Text.RegularExpressions;
 using Discord.WebSocket;
+using Orabot.Core.Abstractions.EventHandlers;
 
-namespace Orabot.EventHandlers.CustomMessageHandlers.LinkParsingMessageHandlers
+namespace Orabot.Core.EventHandlers.CustomMessageHandlers.LinkParsingMessageHandlers
 {
 	internal abstract class BaseLinkParsingMessageHandler : ICustomMessageHandler
 	{

diff --git a/...nRaResourceCenterMapLinkMessageHandler.cs → ...nRaResourceCenterMapLinkMessageHandler.cs b/...nRaResourceCenterMapLinkMessageHandler.cs → ...nRaResourceCenterMapLinkMessageHandler.cs
@@ -1,7 +1,7 @@
 using Discord.WebSocket;
-using Orabot.Transformers.LinkToEmbedTransformers;
+using Orabot.Core.Transformers.LinkToEmbedTransformers;
 
-namespace Orabot.EventHandlers.CustomMessageHandlers.LinkParsingMessageHandlers
+namespace Orabot.Core.EventHandlers.CustomMessageHandlers.LinkParsingMessageHandlers
 {
 	internal class OpenRaResourceCenterMapLinkMessageHandler : BaseLinkParsingMessageHandler
 	{

diff --git a/...ageHandlers/BaseModTimerMessageHandler.cs → ...ageHandlers/BaseModTimerMessageHandler.cs b/...ageHandlers/BaseModTimerMessageHandler.cs → ...ageHandlers/BaseModTimerMessageHandler.cs
@@ -1,8 +1,9 @@
 using System.Linq;
 using System.Text.RegularExpressions;
 using Discord.WebSocket;
+using Orabot.Core.Abstractions.EventHandlers;
 
-namespace Orabot.EventHandlers.CustomMessageHandlers.ModTimersMessageHandlers
+namespace Orabot.Core.EventHandlers.CustomMessageHandlers.ModTimersMessageHandlers
 {
 	internal class BaseModTimerMessageHandler : ICustomMessageHandler
 	{

diff --git a/...ndlers/BaseNumberParsingMessageHandler.cs → ...ndlers/BaseNumberParsingMessageHandler.cs b/...ndlers/BaseNumberParsingMessageHandler.cs → ...ndlers/BaseNumberParsingMessageHandler.cs
@@ -2,8 +2,9 @@
 using System.Linq;
 using System.Text.RegularExpressions;
 using Discord.WebSocket;
+using Orabot.Core.Abstractions.EventHandlers;
 
-namespace Orabot.EventHandlers.CustomMessageHandlers.NumberParsingMessageHandlers
+namespace Orabot.Core.EventHandlers.CustomMessageHandlers.NumberParsingMessageHandlers
 {
 	internal abstract class BaseNumberParsingMessageHandler : ICustomMessageHandler
 	{
@@ -30,7 +31,7 @@ public bool CanHandle(SocketUserMessage message)
 			var matches = _regexMatchPatterns.SelectMany(regexMatchPattern => Regex.Matches(message.Content, regexMatchPattern, _regexOptions));
 			foreach (var match in matches)
 			{
-				var split = match.Groups.Values.Last().Value.Split('#');
+				var split = match.Groups.Last().Value.Split('#');
 				var keyword = split[0];
 				if (int.TryParse(split[1], out var number) && MinimumHandledNumberPerKeyword[keyword] <= number)
 				{
@@ -50,7 +51,7 @@ protected IEnumerable<string> GetMatchedNumbers(string message)
 				var matches = Regex.Matches(message, regexMatchPattern, _regexOptions);
 				foreach (Match match in matches)
 				{
-					yield return match.Groups.Values.Last().Value.Split('#')[1];
+					yield return match.Groups.Last().Value.Split('#')[1];
 				}
 			}
 		}

diff --git a/...rs/BaseGitHubIssueNumberMessageHandler.cs → ...rs/BaseGitHubIssueNumberMessageHandler.cs b/...rs/BaseGitHubIssueNumberMessageHandler.cs → ...rs/BaseGitHubIssueNumberMessageHandler.cs
@@ -1,13 +1,13 @@
 using System;
 using System.Collections.Generic;
-using System.Configuration;
 using System.Linq;
 using Discord;
 using Discord.WebSocket;
-using Orabot.Objects.GitHub;
+using Microsoft.Extensions.Configuration;
+using Orabot.Core.Objects.GitHub;
 using RestSharp;
 
-namespace Orabot.EventHandlers.CustomMessageHandlers.NumberParsingMessageHandlers.GitHubIssueNumberMessageHandlers
+namespace Orabot.Core.EventHandlers.CustomMessageHandlers.NumberParsingMessageHandlers.GitHubIssueNumberMessageHandlers
 {
 	internal abstract class BaseGitHubIssueNumberMessageHandler : BaseNumberParsingMessageHandler
 	{
@@ -21,7 +21,7 @@ internal abstract class BaseGitHubIssueNumberMessageHandler : BaseNumberParsingM
 
 		protected abstract string RepositoryName { get; }
 
-		private static readonly string IssueIconBaseUrl = ConfigurationManager.AppSettings["GitHubIconsBaseUrl"];
+		private readonly string _issueIconBaseUrl;
 
 		private readonly IRestClient _restClient;
 		private readonly Dictionary<string, Color> _colorPerStatus = new Dictionary<string, Color>
@@ -31,10 +31,11 @@ internal abstract class BaseGitHubIssueNumberMessageHandler : BaseNumberParsingM
 			{ "merged", Color.Purple }
 		};
 
-		internal BaseGitHubIssueNumberMessageHandler(IRestClient restClient)
+		internal BaseGitHubIssueNumberMessageHandler(IRestClient restClient, IConfiguration configuration)
 		{
 			_restClient = restClient;
 			restClient.BaseUrl = new Uri(BaseApiUrl);
+			_issueIconBaseUrl = configuration["GitHubIconsBaseUrl"];
 		}
 
 		public override void Invoke(SocketUserMessage message)
@@ -125,9 +126,9 @@ public override void Invoke(SocketUserMessage message)
 			}
 		}
 
-		private static string GetIssueIconUrl(bool isIssue, string status)
+		private string GetIssueIconUrl(bool isIssue, string status)
 		{
-			return $"{IssueIconBaseUrl}/github-{(isIssue ? "issue" : "pr")}-{status}.png";
+			return $"{_issueIconBaseUrl}/github-{(isIssue ? "issue" : "pr")}-{status}.png";
 		}
 	}
 }
diff --git a/.../OpenRaGitHubIssueNumberMessageHandler.cs → .../OpenRaGitHubIssueNumberMessageHandler.cs b/.../OpenRaGitHubIssueNumberMessageHandler.cs → .../OpenRaGitHubIssueNumberMessageHandler.cs
@@ -1,7 +1,8 @@
 using System.Collections.Generic;
+using Microsoft.Extensions.Configuration;
 using RestSharp;
 
-namespace Orabot.EventHandlers.CustomMessageHandlers.NumberParsingMessageHandlers.GitHubIssueNumberMessageHandlers
+namespace Orabot.Core.EventHandlers.CustomMessageHandlers.NumberParsingMessageHandlers.GitHubIssueNumberMessageHandlers
 {
 	internal class OpenRaGitHubIssueNumberMessageHandler : BaseGitHubIssueNumberMessageHandler
 	{
@@ -15,6 +16,6 @@ internal class OpenRaGitHubIssueNumberMessageHandler : BaseGitHubIssueNumberMess
 			{ "ora", 0 }
 		};
 
-		public OpenRaGitHubIssueNumberMessageHandler(IRestClient restClient) : base(restClient) { }
+		public OpenRaGitHubIssueNumberMessageHandler(IRestClient restClient, IConfiguration configuration) : base(restClient, configuration) { }
 	}
 }
diff --git a/...aModSdkGitHubIssueNumberMessageHandler.cs → ...aModSdkGitHubIssueNumberMessageHandler.cs b/...aModSdkGitHubIssueNumberMessageHandler.cs → ...aModSdkGitHubIssueNumberMessageHandler.cs
@@ -1,7 +1,8 @@
 using System.Collections.Generic;
+using Microsoft.Extensions.Configuration;
 using RestSharp;
 
-namespace Orabot.EventHandlers.CustomMessageHandlers.NumberParsingMessageHandlers.GitHubIssueNumberMessageHandlers
+namespace Orabot.Core.EventHandlers.CustomMessageHandlers.NumberParsingMessageHandlers.GitHubIssueNumberMessageHandlers
 {
 	internal class OpenRaModSdkGitHubIssueNumberMessageHandler : BaseGitHubIssueNumberMessageHandler
 	{
@@ -14,6 +15,6 @@ internal class OpenRaModSdkGitHubIssueNumberMessageHandler : BaseGitHubIssueNumb
 			{ "sdk", 0 }
 		};
 
-		public OpenRaModSdkGitHubIssueNumberMessageHandler(IRestClient restClient) : base(restClient) { }
+		public OpenRaModSdkGitHubIssueNumberMessageHandler(IRestClient restClient, IConfiguration configuration) : base(restClient, configuration) { }
 	}
 }
diff --git a/...enRaRa2GitHubIssueNumberMessageHandler.cs → ...enRaRa2GitHubIssueNumberMessageHandler.cs b/...enRaRa2GitHubIssueNumberMessageHandler.cs → ...enRaRa2GitHubIssueNumberMessageHandler.cs
@@ -1,7 +1,8 @@
 using System.Collections.Generic;
+using Microsoft.Extensions.Configuration;
 using RestSharp;
 
-namespace Orabot.EventHandlers.CustomMessageHandlers.NumberParsingMessageHandlers.GitHubIssueNumberMessageHandlers
+namespace Orabot.Core.EventHandlers.CustomMessageHandlers.NumberParsingMessageHandlers.GitHubIssueNumberMessageHandlers
 {
 	internal class OpenRaRa2GitHubIssueNumberMessageHandler : BaseGitHubIssueNumberMessageHandler
 	{
@@ -14,6 +15,6 @@ internal class OpenRaRa2GitHubIssueNumberMessageHandler : BaseGitHubIssueNumberM
 			{ "ra2", 0 }
 		};
 
-		public OpenRaRa2GitHubIssueNumberMessageHandler(IRestClient restClient) : base(restClient) { }
+		public OpenRaRa2GitHubIssueNumberMessageHandler(IRestClient restClient, IConfiguration configuration) : base(restClient, configuration) { }
 	}
 }