Merge pull request #30 from murdahl/dev/murdahl/add-message.im-event

Remove deprecated MessageAppHome event handling and add MessageIM

Author: murdahl

Samples/HelloWorld/Program.cs

@@ -19,7 +19,7 @@
     .AddAppMentionHandler<DoStuff>()
     .AddTeamJoinHandler<OnTeamJoins>()
     .AddEmojiChangedHandler<OnEmojiChanged>()
-    .AddMessageAppHomeHandler<OnMessageAppHome>();
+    .AddMessageIMHandler<OnMessageIM>();
 
 
 var app = builder.Build();
@@ -74,9 +74,9 @@ public Task<EventHandledResponse> Handle(EventMetaData eventMetadata, EmojiChang
     }
 }
 
-class OnMessageAppHome : IHandleMessageAppHome
+class OnMessageIM : IHandleMessageIM
 {
-    public Task<EventHandledResponse> Handle(EventMetaData eventMetadata, MessageAppHomeEvent @event)
+    public Task<EventHandledResponse> Handle(EventMetaData eventMetadata, MessageIMEvent @event)
     {
         var str = JsonSerializer.Serialize(@event);
         Console.WriteLine(str);

…ts/Abstractions/IHandleMessageAppHome.cs …dpoints/Abstractions/IHandleMessageIM.cssource/src/Slackbot.Net.Endpoints/Abstractions/IHandleMessageAppHome.cs renamed to source/src/Slackbot.Net.Endpoints/Abstractions/IHandleMessageIM.cs source/src/Slackbot.Net.Endpoints/Abstractions/IHandleMessageAppHome.cs renamed to source/src/Slackbot.Net.Endpoints/Abstractions/IHandleMessageIM.cs

@@ -2,7 +2,7 @@
 
 namespace Slackbot.Net.Endpoints.Abstractions;
 
-public interface IHandleMessageAppHome
+public interface IHandleMessageIM
 {
-    Task<EventHandledResponse> Handle(EventMetaData eventMetadata, MessageAppHomeEvent appHomeMessage);
+    Task<EventHandledResponse> Handle(EventMetaData eventMetadata, MessageIMEvent appHomeMessage);
 }

source/src/Slackbot.Net.Endpoints/EventTypes.cs

@@ -9,5 +9,5 @@ public static class EventTypes
     public const string AppHomeOpened = "app_home_opened";
     public const string TeamJoin = "team_join";
     public const string EmojiChanged = "emoji_changed";
-    public const string MessageAppHome = "message.app_home";
+    public const string MessageIM = "message.im";
 }

source/src/Slackbot.Net.Endpoints/Hosting/IAppBuilderExtensions.cs

@@ -21,7 +21,7 @@ public static IApplicationBuilder UseSlackbot(this IApplicationBuilder app, bool
         app.MapWhen(InteractiveEvents.ShouldRun, b => b.UseMiddleware<InteractiveEvents>());
         app.MapWhen(TeamJoinEvents.ShouldRun, b => b.UseMiddleware<TeamJoinEvents>());
         app.MapWhen(EmojiChangedEvents.ShouldRun, b => b.UseMiddleware<EmojiChangedEvents>());
-        app.MapWhen(MessageAppHomeEvents.ShouldRun, b => b.UseMiddleware<MessageAppHomeEvents>());
+        app.MapWhen(MessageIMEvents.ShouldRun, b => b.UseMiddleware<MessageIMEvents>());
 
         return app;
     }

source/src/Slackbot.Net.Endpoints/Hosting/ISlackbotHandlersBuilder.cs

@@ -18,5 +18,5 @@ public ISlackbotHandlersBuilder AddInteractiveBlockActionsHandler<T>()
     public ISlackbotHandlersBuilder AddMessageActionsHandler<T>() where T : class, IHandleMessageActions;
     public ISlackbotHandlersBuilder AddTeamJoinHandler<T>() where T : class, IHandleTeamJoin;
     public ISlackbotHandlersBuilder AddEmojiChangedHandler<T>() where T : class, IHandleEmojiChanged;
-    public ISlackbotHandlersBuilder AddMessageAppHomeHandler<T>() where T : class, IHandleMessageAppHome;
+    public ISlackbotHandlersBuilder AddMessageIMHandler<T>() where T : class, IHandleMessageIM;
 }

source/src/Slackbot.Net.Endpoints/Hosting/SlackBotHandlersBuilder.cs

@@ -66,9 +66,9 @@ public ISlackbotHandlersBuilder AddEmojiChangedHandler<T>() where T : class, IHa
         return this;
     }
 
-    public ISlackbotHandlersBuilder AddMessageAppHomeHandler<T>() where T : class, IHandleMessageAppHome
+    public ISlackbotHandlersBuilder AddMessageIMHandler<T>() where T : class, IHandleMessageIM
     {
-        services.AddSingleton<IHandleMessageAppHome, T>();
+        services.AddSingleton<IHandleMessageIM, T>();
         return this;
     }
 }

source/src/Slackbot.Net.Endpoints/Middlewares/HttpItemsManager.cs

@@ -79,8 +79,8 @@ private static SlackEvent ToEventType(JsonElement eventJson, string raw)
                 return JsonSerializer.Deserialize<TeamJoinEvent>(json, WebOptions);
             case EventTypes.EmojiChanged:
                 return JsonSerializer.Deserialize<EmojiChangedEvent>(json, WebOptions);
-            case EventTypes.MessageAppHome:
-                return JsonSerializer.Deserialize<MessageAppHomeEvent>(json, WebOptions);
+            case EventTypes.MessageIM:
+                return JsonSerializer.Deserialize<MessageIMEvent>(json, WebOptions);
             default:
                 var unknownSlackEvent = JsonSerializer.Deserialize<UnknownSlackEvent>(json, WebOptions);
                 unknownSlackEvent.RawJson = raw;

…ints/Middlewares/MessageAppHomeEvents.cs …Endpoints/Middlewares/MessageIMEvents.cssource/src/Slackbot.Net.Endpoints/Middlewares/MessageAppHomeEvents.cs renamed to source/src/Slackbot.Net.Endpoints/Middlewares/MessageIMEvents.cs source/src/Slackbot.Net.Endpoints/Middlewares/MessageAppHomeEvents.cs renamed to source/src/Slackbot.Net.Endpoints/Middlewares/MessageIMEvents.cs

@@ -5,29 +5,29 @@
 
 namespace Slackbot.Net.Endpoints.Middlewares;
 
-public class MessageAppHomeEvents(
+public class MessageIMEvents(
     RequestDelegate next,
-    ILogger<MessageAppHomeEvents> logger,
-    IEnumerable<IHandleMessageAppHome> responseHandlers
+    ILogger<MessageIMEvents> logger,
+    IEnumerable<IHandleMessageIM> responseHandlers
 )
 {
     public async Task Invoke(HttpContext context)
     {
-        var messageAppHomeEvent = (MessageAppHomeEvent)context.Items[HttpItemKeys.SlackEventKey];
+        var messageIMEvent = (MessageIMEvent)context.Items[HttpItemKeys.SlackEventKey];
         var metadata = (EventMetaData)context.Items[HttpItemKeys.EventMetadataKey];
         var handler = responseHandlers.FirstOrDefault();
 
         if (handler == null)
         {
-            logger.LogError("No handler registered for IHandleMessageAppHome");
+            logger.LogError("No handler registered for IHandleMessageIM");
         }
         else
         {
             logger.LogInformation("Handling using {HandlerType}", handler.GetType());
             try
             {
                 logger.LogInformation("Handling using {HandlerType}", handler.GetType());
-                var response = await handler.Handle(metadata, messageAppHomeEvent);
+                var response = await handler.Handle(metadata, messageIMEvent);
                 logger.LogInformation("Handler response: {Response}", response.Response);
             }
             catch (Exception e)
@@ -42,6 +42,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.MessageAppHome;
+            && ctx.Items[HttpItemKeys.EventTypeKey].ToString() == EventTypes.MessageIM;
     }
 }

…nts/Models/Events/MessageAppHomeEvent.cs …ndpoints/Models/Events/MessageIMEvent.cssource/src/Slackbot.Net.Endpoints/Models/Events/MessageAppHomeEvent.cs renamed to source/src/Slackbot.Net.Endpoints/Models/Events/MessageIMEvent.cs source/src/Slackbot.Net.Endpoints/Models/Events/MessageAppHomeEvent.cs renamed to source/src/Slackbot.Net.Endpoints/Models/Events/MessageIMEvent.cs

@@ -1,11 +1,11 @@
 namespace Slackbot.Net.Endpoints.Models.Events;
 
-public class MessageAppHomeEvent : SlackEvent
+public class MessageIMEvent : SlackEvent
 {
-    public string Text { get; set; }
-    public string User { get; set; }
     public string Channel { get; set; }
+    public string User { get; set; }
+    public string Text { get; set; }
     public string Ts { get; set; }
     public string Event_Ts { get; set; }
-    public string Thread_Ts { get; set; }
+    public string Channel_Type { get; set; }
 }