Renaming IActionHandler to IInteractiveMessageHandler and ISlackActions to ISlackInteractiveMessages

soxtoby · soxtoby · commit ec81700f465a · 2019-05-26T18:56:33.000+10:00
diff --git a/SlackNet.AspNetCore/AspNetCoreExtensions.cs b/SlackNet.AspNetCore/AspNetCoreExtensions.cs
@@ -14,7 +14,7 @@ public static IServiceCollection AddSlackNet(this IServiceCollection serviceColl
             configure(configuration);
             Default.RegisterServices((serviceType, createService) => serviceCollection.AddTransient(serviceType, c => createService(c.GetService)));
             serviceCollection.AddSingleton<ISlackEvents, SlackEventsService>();
-            serviceCollection.AddSingleton<ISlackActions, SlackActionsService>();
+            serviceCollection.AddSingleton<ISlackInteractiveMessages, SlackInteractiveMessagesService>();
             serviceCollection.AddSingleton<ISlackMessageActions, SlackMessageActionsService>();
             serviceCollection.AddSingleton<ISlackOptions, SlackOptionsService>();
             serviceCollection.TryAddSingleton<IDialogSubmissionHandler, NullDialogSubmissionHandler>();
diff --git a/SlackNet.AspNetCore/ResolvedInteractiveMessageHandler.cs b/SlackNet.AspNetCore/ResolvedInteractiveMessageHandler.cs
@@ -5,21 +5,21 @@
 
 namespace SlackNet.AspNetCore
 {
-    abstract class ResolvedActionHandler : IActionHandler
+    abstract class ResolvedInteractiveMessageHandler : IInteractiveMessageHandler
     {
-        protected ResolvedActionHandler(string actionName) => ActionName = actionName;
+        protected ResolvedInteractiveMessageHandler(string actionName) => ActionName = actionName;
 
         public string ActionName { get; }
 
         public abstract Task<MessageResponse> Handle(InteractiveMessage message);
     }
 
-    class ResolvedActionHandler<T> : ResolvedActionHandler
-        where T : IActionHandler
+    class ResolvedInteractiveMessageHandler<T> : ResolvedInteractiveMessageHandler
+        where T : IInteractiveMessageHandler
     {
         private readonly IServiceProvider _serviceProvider;
 
-        public ResolvedActionHandler(IServiceProvider serviceProvider, string actionName)
+        public ResolvedInteractiveMessageHandler(IServiceProvider serviceProvider, string actionName)
             : base(actionName)
         {
             _serviceProvider = serviceProvider;
diff --git a/SlackNet.AspNetCore/SlackActionsService.cs b/SlackNet.AspNetCore/SlackActionsService.cs
diff --git a/SlackNet.AspNetCore/SlackEventsMiddleware.cs b/SlackNet.AspNetCore/SlackEventsMiddleware.cs
@@ -15,7 +15,7 @@ class SlackEventsMiddleware
         private readonly RequestDelegate _next;
         private readonly SlackEndpointConfiguration _configuration;
         private readonly ISlackEvents _slackEvents;
-        private readonly ISlackActions _slackActions;
+        private readonly ISlackInteractiveMessages _slackInteractiveMessages;
         private readonly ISlackMessageActions _slackMessageActions;
         private readonly ISlackOptions _slackOptions;
         private readonly IDialogSubmissionHandler _dialogSubmissionHandler;
@@ -25,7 +25,7 @@ public SlackEventsMiddleware(
             RequestDelegate next,
             SlackEndpointConfiguration configuration,
             ISlackEvents slackEvents,
-            ISlackActions slackActions,
+            ISlackInteractiveMessages slackInteractiveMessages,
             ISlackMessageActions slackMessageActions,
             ISlackOptions slackOptions,
             IDialogSubmissionHandler dialogSubmissionHandler,
@@ -34,7 +34,7 @@ public SlackEventsMiddleware(
             _next = next;
             _configuration = configuration;
             _slackEvents = slackEvents;
-            _slackActions = slackActions;
+            _slackInteractiveMessages = slackInteractiveMessages;
             _slackMessageActions = slackMessageActions;
             _slackOptions = slackOptions;
             _dialogSubmissionHandler = dialogSubmissionHandler;
@@ -103,7 +103,7 @@ private async Task<HttpResponse> HandleSlackAction(HttpContext context)
 
         private async Task<HttpResponse> HandleInteractiveMessage(HttpContext context, InteractiveMessage interactiveMessage)
         {
-            var response = await _slackActions.Handle(interactiveMessage).ConfigureAwait(false);
+            var response = await _slackInteractiveMessages.Handle(interactiveMessage).ConfigureAwait(false);
 
             var responseJson = response == null ? null
                 : interactiveMessage.IsAppUnfurl ? Serialize(new AttachmentUpdateResponse(response))
diff --git a/SlackNet.AspNetCore/SlackInteractiveMessagesService.cs b/SlackNet.AspNetCore/SlackInteractiveMessagesService.cs
@@ -0,0 +1,20 @@
+﻿using System.Collections.Generic;
+using System.Threading.Tasks;
+using SlackNet.Interaction;
+
+namespace SlackNet.AspNetCore
+{
+    class SlackInteractiveMessagesService : ISlackInteractiveMessages
+    {
+        private readonly ISlackInteractiveMessages _interactiveMessages = new SlackInteractiveMessages();
+
+        public SlackInteractiveMessagesService(IEnumerable<ResolvedInteractiveMessageHandler> handlers)
+        {
+            foreach (var handler in handlers)
+                _interactiveMessages.SetHandler(handler.ActionName, handler);
+        }
+
+        public Task<MessageResponse> Handle(InteractiveMessage request) => _interactiveMessages.Handle(request);
+        public void SetHandler(string actionName, IInteractiveMessageHandler handler) => _interactiveMessages.SetHandler(actionName, handler);
+    }
+}
diff --git a/SlackNet.AspNetCore/SlackServiceConfiguration.cs b/SlackNet.AspNetCore/SlackServiceConfiguration.cs
@@ -28,11 +28,11 @@ public SlackServiceConfiguration RegisterEventHandler<TEvent, THandler>()
             return this;
         }
 
-        public SlackServiceConfiguration RegisterActionHandler<THandler>(string actionName)
-            where THandler : class, IActionHandler
+        public SlackServiceConfiguration RegisterInteractiveMessageHandler<THandler>(string actionName)
+            where THandler : class, IInteractiveMessageHandler
         {
             _serviceCollection.AddTransient<THandler>();
-            _serviceCollection.AddSingleton<ResolvedActionHandler>(c => new ResolvedActionHandler<THandler>(c, actionName));
+            _serviceCollection.AddSingleton<ResolvedInteractiveMessageHandler>(c => new ResolvedInteractiveMessageHandler<THandler>(c, actionName));
             return this;
         }
 
diff --git a/SlackNet.EventsExample/ColorSelector.cs b/SlackNet.EventsExample/ColorSelector.cs
@@ -6,7 +6,7 @@
 
 namespace SlackNet.EventsExample
 {
-    public class ColorSelector : IActionHandler, IOptionProvider
+    public class ColorSelector : IInteractiveMessageHandler, IOptionProvider
     {
         public static readonly string ActionName = "color_select";
 
diff --git a/SlackNet.EventsExample/Counter.cs b/SlackNet.EventsExample/Counter.cs
@@ -5,7 +5,7 @@
 
 namespace SlackNet.EventsExample
 {
-    public class Counter : IActionHandler
+    public class Counter : IInteractiveMessageHandler
     {
         public static readonly string ActionName = "add";
         private static readonly Regex _counterPattern = new Regex("Counter: (\\d+)");
diff --git a/SlackNet.EventsExample/DialogDemo.cs b/SlackNet.EventsExample/DialogDemo.cs
@@ -6,7 +6,7 @@
 
 namespace SlackNet.EventsExample
 {
-    public class DialogDemo : IDialogSubmissionHandler, IActionHandler
+    public class DialogDemo : IDialogSubmissionHandler, IInteractiveMessageHandler
     {
         internal const string EchoDialog = "echo-dialog";
         internal const string ErrorDialog = "error-dialog";
diff --git a/SlackNet.EventsExample/Startup.cs b/SlackNet.EventsExample/Startup.cs
@@ -19,11 +19,11 @@ public void ConfigureServices(IServiceCollection services)
             services.AddSlackNet(c => c
                 .UseApiToken(Configuration["Slack:ApiToken"])
                 .RegisterEventHandler<MessageEvent, MessageHandler>()
-                .RegisterActionHandler<Counter>(Counter.ActionName)
-                .RegisterActionHandler<ColorSelector>(ColorSelector.ActionName)
+                .RegisterInteractiveMessageHandler<Counter>(Counter.ActionName)
+                .RegisterInteractiveMessageHandler<ColorSelector>(ColorSelector.ActionName)
                 .RegisterOptionProvider<ColorSelector>(ColorSelector.ActionName)
-                .RegisterActionHandler<DialogDemo>(DialogDemo.EchoDialog)
-                .RegisterActionHandler<DialogDemo>(DialogDemo.ErrorDialog)
+                .RegisterInteractiveMessageHandler<DialogDemo>(DialogDemo.EchoDialog)
+                .RegisterInteractiveMessageHandler<DialogDemo>(DialogDemo.ErrorDialog)
                 .RegisterDialogSubmissionHandler<DialogDemo>());
             services.AddMvc();
         }
diff --git a/SlackNet/Default.cs b/SlackNet/Default.cs
@@ -41,7 +41,7 @@ private static JsonSerializerSettings SerializerSettings(ISlackTypeResolver slac
 
         public static ISlackEvents SlackEvents { get; } = new SlackEvents();
 
-        public static ISlackActions SlackActions { get; } = new SlackActions();
+        public static ISlackInteractiveMessages SlackInteractiveMessages { get; } = new SlackInteractiveMessages();
 
         public static ISlackOptions SlackOptions { get; } = new SlackOptions();
 
@@ -53,7 +53,7 @@ public static void RegisterServices(Action<Type, Func<Func<Type, object>, object
             registerService(typeof(ISlackTypeResolver), resolve => SlackTypeResolver(AssembliesContainingSlackTypes));
             registerService(typeof(IWebSocketFactory), resolve => WebSocketFactory);
             registerService(typeof(ISlackEvents), resolve => SlackEvents);
-            registerService(typeof(ISlackActions), resolve => SlackActions);
+            registerService(typeof(ISlackInteractiveMessages), resolve => SlackInteractiveMessages);
             registerService(typeof(ISlackOptions), resolve => SlackOptions);
         }
     }
diff --git a/SlackNet/Interaction/IInteractiveMessageHandler.cs b/SlackNet/Interaction/IInteractiveMessageHandler.cs
@@ -2,7 +2,7 @@
 
 namespace SlackNet.Interaction
 {
-    public interface IActionHandler
+    public interface IInteractiveMessageHandler
     {
         Task<MessageResponse> Handle(InteractiveMessage message);
     }
diff --git a/SlackNet/Interaction/SlackActions.cs b/SlackNet/Interaction/SlackActions.cs
diff --git a/SlackNet/Interaction/SlackInteractiveMessages.cs b/SlackNet/Interaction/SlackInteractiveMessages.cs
@@ -0,0 +1,23 @@
+﻿using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace SlackNet.Interaction
+{
+    public interface ISlackInteractiveMessages
+    {
+        Task<MessageResponse> Handle(InteractiveMessage request);
+        void SetHandler(string actionName, IInteractiveMessageHandler handler);
+    }
+
+    public class SlackInteractiveMessages : ISlackInteractiveMessages
+    {
+        private readonly Dictionary<string, IInteractiveMessageHandler> _handlers = new Dictionary<string, IInteractiveMessageHandler>();
+
+        public Task<MessageResponse> Handle(InteractiveMessage request) =>
+            _handlers.TryGetValue(request.Actions[0].Name, out var handler)
+                ? handler.Handle(request)
+                : Task.FromResult<MessageResponse>(null);
+
+        public void SetHandler(string actionName, IInteractiveMessageHandler handler) => _handlers[actionName] = handler;
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -5,21 +5,21 @@`
`5`	`5`
`6`	`6`	`namespace SlackNet.AspNetCore`
`7`	`7`	`{`
`8`		`- abstract class ResolvedActionHandler : IActionHandler`
	`8`	`+ abstract class ResolvedInteractiveMessageHandler : IInteractiveMessageHandler`
`9`	`9`	`{`
`10`		`- protected ResolvedActionHandler(string actionName) => ActionName = actionName;`
	`10`	`+ protected ResolvedInteractiveMessageHandler(string actionName) => ActionName = actionName;`
`11`	`11`
`12`	`12`	`public string ActionName { get; }`
`13`	`13`
`14`	`14`	`public abstract Task<MessageResponse> Handle(InteractiveMessage message);`
`15`	`15`	`}`
`16`	`16`
`17`		`- class ResolvedActionHandler<T> : ResolvedActionHandler`
`18`		`- where T : IActionHandler`
	`17`	`+ class ResolvedInteractiveMessageHandler<T> : ResolvedInteractiveMessageHandler`
	`18`	`+ where T : IInteractiveMessageHandler`
`19`	`19`	`{`
`20`	`20`	`private readonly IServiceProvider _serviceProvider;`
`21`	`21`
`22`		`- public ResolvedActionHandler(IServiceProvider serviceProvider, string actionName)`
	`22`	`+ public ResolvedInteractiveMessageHandler(IServiceProvider serviceProvider, string actionName)`
`23`	`23`	`: base(actionName)`
`24`	`24`	`{`
`25`	`25`	`_serviceProvider = serviceProvider;`
Original file line number	Diff line number	Diff line change
`@@ -28,11 +28,11 @@ public SlackServiceConfiguration RegisterEventHandler<TEvent, THandler>()`
`28`	`28`	`return this;`
`29`	`29`	`}`
`30`	`30`
`31`		`- public SlackServiceConfiguration RegisterActionHandler<THandler>(string actionName)`
`32`		`- where THandler : class, IActionHandler`
	`31`	`+ public SlackServiceConfiguration RegisterInteractiveMessageHandler<THandler>(string actionName)`
	`32`	`+ where THandler : class, IInteractiveMessageHandler`
`33`	`33`	`{`
`34`	`34`	`_serviceCollection.AddTransient<THandler>();`
`35`		`- _serviceCollection.AddSingleton<ResolvedActionHandler>(c => new ResolvedActionHandler<THandler>(c, actionName));`
	`35`	`+ _serviceCollection.AddSingleton<ResolvedInteractiveMessageHandler>(c => new ResolvedInteractiveMessageHandler<THandler>(c, actionName));`
`36`	`36`	`return this;`
`37`	`37`	`}`
`38`	`38`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`
`7`	`7`	`namespace SlackNet.EventsExample`
`8`	`8`	`{`
`9`		`- public class ColorSelector : IActionHandler, IOptionProvider`
	`9`	`+ public class ColorSelector : IInteractiveMessageHandler, IOptionProvider`
`10`	`10`	`{`
`11`	`11`	`public static readonly string ActionName = "color_select";`
`12`	`12`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`
`6`	`6`	`namespace SlackNet.EventsExample`
`7`	`7`	`{`
`8`		`- public class Counter : IActionHandler`
	`8`	`+ public class Counter : IInteractiveMessageHandler`
`9`	`9`	`{`
`10`	`10`	`public static readonly string ActionName = "add";`
`11`	`11`	`private static readonly Regex _counterPattern = new Regex("Counter: (\\d+)");`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`
`7`	`7`	`namespace SlackNet.EventsExample`
`8`	`8`	`{`
`9`		`- public class DialogDemo : IDialogSubmissionHandler, IActionHandler`
	`9`	`+ public class DialogDemo : IDialogSubmissionHandler, IInteractiveMessageHandler`
`10`	`10`	`{`
`11`	`11`	`internal const string EchoDialog = "echo-dialog";`
`12`	`12`	`internal const string ErrorDialog = "error-dialog";`