diff --git a/source/src/Slackbot.Net.Endpoints/Middlewares/AppHomeOpenedEvents.cs b/source/src/Slackbot.Net.Endpoints/Middlewares/AppHomeOpenedEvents.cs index 436c377..4324724 100644 --- a/source/src/Slackbot.Net.Endpoints/Middlewares/AppHomeOpenedEvents.cs +++ b/source/src/Slackbot.Net.Endpoints/Middlewares/AppHomeOpenedEvents.cs @@ -8,19 +8,20 @@ namespace Slackbot.Net.Endpoints.Middlewares; internal class AppHomeOpenedEvents( RequestDelegate next, ILogger logger, - IEnumerable responseHandlers) + IEnumerable responseHandlers +) { public async Task Invoke(HttpContext context) { var appHomeOpenedEvent = (AppHomeOpenedEvent)context.Items[HttpItemKeys.SlackEventKey]; var metadata = (EventMetaData)context.Items[HttpItemKeys.EventMetadataKey]; - var handler = responseHandlers.FirstOrDefault(); - if (handler == null) + if (responseHandlers == null || !responseHandlers.Any()) { logger.LogError("No handler registered for IHandleAppHomeOpened"); + return; } - else + foreach (var handler in responseHandlers) { logger.LogInformation($"Handling using {handler.GetType()}"); try @@ -35,12 +36,12 @@ public async Task Invoke(HttpContext context) } } - await next(context); + context.Response.StatusCode = 200; } public static bool ShouldRun(HttpContext ctx) { - return ctx.Items.ContainsKey(HttpItemKeys.EventTypeKey) && - ctx.Items[HttpItemKeys.EventTypeKey].ToString() == EventTypes.AppHomeOpened; + return ctx.Items.ContainsKey(HttpItemKeys.EventTypeKey) + && ctx.Items[HttpItemKeys.EventTypeKey].ToString() == EventTypes.AppHomeOpened; } } diff --git a/source/src/Slackbot.Net.Endpoints/Middlewares/EmojiChangedEvents.cs b/source/src/Slackbot.Net.Endpoints/Middlewares/EmojiChangedEvents.cs index 90afadc..b8a22ae 100644 --- a/source/src/Slackbot.Net.Endpoints/Middlewares/EmojiChangedEvents.cs +++ b/source/src/Slackbot.Net.Endpoints/Middlewares/EmojiChangedEvents.cs @@ -15,13 +15,12 @@ public async Task Invoke(HttpContext context) { var emojiChanged = (EmojiChangedEvent)context.Items[HttpItemKeys.SlackEventKey]; var metadata = (EventMetaData)context.Items[HttpItemKeys.EventMetadataKey]; - var handler = responseHandlers.FirstOrDefault(); - if (handler == null) + if (responseHandlers == null || !responseHandlers.Any()) { logger.LogError("No handler registered for IHandleEmojiChanged"); } - else + foreach (var handler in responseHandlers) { logger.LogInformation("Handling using {HandlerType}", handler.GetType()); try @@ -42,6 +41,6 @@ public async Task Invoke(HttpContext context) public static bool ShouldRun(HttpContext ctx) { return ctx.Items.ContainsKey(HttpItemKeys.EventTypeKey) - && ctx.Items[HttpItemKeys.EventTypeKey].ToString() == EventTypes.EmojiChanged; + && ctx.Items[HttpItemKeys.EventTypeKey].ToString() == EventTypes.EmojiChanged; } } diff --git a/source/src/Slackbot.Net.Endpoints/Middlewares/MemberJoinedEvents.cs b/source/src/Slackbot.Net.Endpoints/Middlewares/MemberJoinedEvents.cs index 12973c9..ae9515d 100644 --- a/source/src/Slackbot.Net.Endpoints/Middlewares/MemberJoinedEvents.cs +++ b/source/src/Slackbot.Net.Endpoints/Middlewares/MemberJoinedEvents.cs @@ -5,42 +5,37 @@ namespace Slackbot.Net.Endpoints.Middlewares; -internal class MemberJoinedEvents +internal class MemberJoinedEvents( + RequestDelegate next, + ILogger logger, + IEnumerable responseHandlers +) { - private readonly ILogger _logger; - private readonly RequestDelegate _next; - private readonly IEnumerable _responseHandlers; - - public MemberJoinedEvents(RequestDelegate next, ILogger logger, - IEnumerable responseHandlers, ILoggerFactory loggerFactory) - { - _next = next; - _logger = logger; - _responseHandlers = responseHandlers; - } + private readonly RequestDelegate _next = next; public async Task Invoke(HttpContext context) { - var memberJoinedChannelEvent = (MemberJoinedChannelEvent)context.Items[HttpItemKeys.SlackEventKey]; + var memberJoinedChannelEvent = (MemberJoinedChannelEvent) + context.Items[HttpItemKeys.SlackEventKey]; var metadata = (EventMetaData)context.Items[HttpItemKeys.EventMetadataKey]; - var handler = _responseHandlers.FirstOrDefault(); - if (handler == null) + if (responseHandlers == null) { - _logger.LogError("No handler registered for IHandleMemberJoinedChannelEvents"); + logger.LogError("No handler registered for IHandleMemberJoinedChannelEvents"); + return; } - else + foreach (var handler in responseHandlers) { - _logger.LogInformation($"Handling using {handler.GetType()}"); + logger.LogInformation($"Handling using {handler.GetType()}"); try { - _logger.LogInformation($"Handling using {handler.GetType()}"); + logger.LogInformation($"Handling using {handler.GetType()}"); var response = await handler.Handle(metadata, memberJoinedChannelEvent); - _logger.LogInformation(response.Response); + logger.LogInformation(response.Response); } catch (Exception e) { - _logger.LogError(e, e.Message); + logger.LogError(e, e.Message); } } @@ -49,7 +44,7 @@ public async Task Invoke(HttpContext context) public static bool ShouldRun(HttpContext ctx) { - return ctx.Items.ContainsKey(HttpItemKeys.EventTypeKey) && - ctx.Items[HttpItemKeys.EventTypeKey].ToString() == EventTypes.MemberJoinedChannel; + return ctx.Items.ContainsKey(HttpItemKeys.EventTypeKey) + && ctx.Items[HttpItemKeys.EventTypeKey].ToString() == EventTypes.MemberJoinedChannel; } } diff --git a/source/src/Slackbot.Net.Endpoints/Middlewares/MessageEvents.cs b/source/src/Slackbot.Net.Endpoints/Middlewares/MessageEvents.cs index c034ac6..117c30d 100644 --- a/source/src/Slackbot.Net.Endpoints/Middlewares/MessageEvents.cs +++ b/source/src/Slackbot.Net.Endpoints/Middlewares/MessageEvents.cs @@ -15,13 +15,12 @@ public async Task Invoke(HttpContext context) { var messageEvent = (MessageEvent)context.Items[HttpItemKeys.SlackEventKey]; var metadata = (EventMetaData)context.Items[HttpItemKeys.EventMetadataKey]; - var handler = responseHandlers.FirstOrDefault(); - if (handler == null) + if (responseHandlers == null || !responseHandlers.Any()) { logger.LogError("No handler registered for IHandleMessage"); } - else + foreach (var handler in responseHandlers) { logger.LogInformation("Handling using {HandlerType}", handler.GetType()); try diff --git a/source/src/Slackbot.Net.Endpoints/Middlewares/TeamJoinEvents.cs b/source/src/Slackbot.Net.Endpoints/Middlewares/TeamJoinEvents.cs index f7f0c81..71bad8a 100644 --- a/source/src/Slackbot.Net.Endpoints/Middlewares/TeamJoinEvents.cs +++ b/source/src/Slackbot.Net.Endpoints/Middlewares/TeamJoinEvents.cs @@ -15,13 +15,12 @@ public async Task Invoke(HttpContext context) { var teamJoinEvent = (TeamJoinEvent)context.Items[HttpItemKeys.SlackEventKey]; var metadata = (EventMetaData)context.Items[HttpItemKeys.EventMetadataKey]; - var handler = responseHandlers.FirstOrDefault(); - if (handler == null) + if (responseHandlers == null || !responseHandlers.Any()) { logger.LogError("No handler registered for IHandleTeamJoinEvents"); } - else + foreach (var handler in responseHandlers) { logger.LogInformation("Handling using {HandlerType}", handler.GetType()); try diff --git a/source/src/Slackbot.Net.Endpoints/Models/Interactive/User.cs b/source/src/Slackbot.Net.Endpoints/Models/Interactive/User.cs index d134e2d..b71e678 100644 --- a/source/src/Slackbot.Net.Endpoints/Models/Interactive/User.cs +++ b/source/src/Slackbot.Net.Endpoints/Models/Interactive/User.cs @@ -4,5 +4,6 @@ namespace Slackbot.Net.Endpoints.Models.Interactive; public class User { - [JsonPropertyName("user_id")] public string User_Id { get; set; } + [JsonPropertyName("id")] + public string User_Id { get; set; } }