Added DM to bot /gpt generate

Author: Muchaszewski

Slack-GPT-Socket/BotInfo/SlackBotInfo.cs

@@ -1,3 +1,4 @@
+using SlackNet;
 using SlackNet.WebApi;
 
 namespace Slack_GPT_Socket;

Slack-GPT-Socket/BotInfo/SlackBotInfoApplicationBuilder.cs

@@ -25,11 +25,26 @@ public static IServiceCollection AddSlackBotInfo(this IServiceCollection builder
     /// <returns></returns>
     public static IApplicationBuilder UseSlackBotInfo(this IApplicationBuilder builder)
     {
+        var task = UseSlackBotInfoAsync(builder);
+        task.Wait();
+        return builder;
+    }
+
+    private static async Task UseSlackBotInfoAsync(IApplicationBuilder builder)
+    {
+        var logger = builder.ApplicationServices.GetRequiredService<ILogger<SlackBotInfo>>();
         var slackApiClient = builder.ApplicationServices.GetRequiredService<ISlackApiClient>();
         var slackBotInfo = builder.ApplicationServices.GetRequiredService<SlackBotInfo>();
-        var botInfoTask =  slackApiClient.Auth.Test();
-        botInfoTask.Wait();
-        slackBotInfo.BotInfo = botInfoTask.Result;
-        return builder;
+        
+        Task.WaitAll(new[]
+        {
+            SetBotInfo(slackApiClient, slackBotInfo, logger),
+        });
+    }
+
+    private static async Task SetBotInfo(ISlackApiClient slackApiClient, SlackBotInfo slackBotInfo, ILogger<SlackBotInfo> logger)
+    {
+        var botInfoTask = await slackApiClient.Auth.Test();
+        slackBotInfo.BotInfo = botInfoTask;
     }
 }

Slack-GPT-Socket/Program.cs

@@ -12,6 +12,7 @@
 builder.Services.AddOptions<ApiSettings>().Bind(builder.Configuration.GetSection("Api"));
 builder.Services.Configure<GptCommands>(builder.Configuration.GetSection("GptCommands"));
 builder.Services.Configure<GptDefaults>(builder.Configuration.GetSection("GptDefaults"));
+builder.Services.Configure<SlackSettings>(builder.Configuration.GetSection("Slack"));
 
 builder.Services.AddSingleton<GptClient>();
 builder.Services.AddSingleton<GptCustomCommands>();
@@ -25,6 +26,7 @@
     .UseApiToken(settings.SlackBotToken)
     .UseAppLevelToken(settings.SlackAppToken)
     .RegisterEventHandler<AppMention, SlackMentionHandler>()
+    .RegisterEventHandler<MessageEvent, SlackMessageHandler>()
     .RegisterSlashCommandHandler<SlackCommandHandler>("/gpt")
 );
 

Slack-GPT-Socket/Settings/SlackSettings.cs

@@ -0,0 +1,13 @@
+namespace Slack_GPT_Socket.Settings;
+
+/// <summary>
+///     Settings for the Slack API
+/// </summary>
+public class SlackSettings
+{
+    /// <summary>
+    ///     Only mentions will trigger the bot outside of bot's owned channel.
+    ///     Otherwise he will respond to any message, in a thread where he was mentioned.
+    /// </summary>
+    public bool OnlyMentionsOutsideBotChannel { get; set; } = true;
+}

Slack-GPT-Socket/SlackHandlers/Command/CommandManager.cs

@@ -2,7 +2,9 @@
 using Slack_GPT_Socket.GptApi.ParameterResolvers;
 using Slack_GPT_Socket.Settings;
 using Slack_GPT_Socket.Utilities.LiteDB;
+using SlackNet;
 using SlackNet.Interaction;
+using ILogger = Microsoft.Extensions.Logging.ILogger;
 
 namespace Slack_GPT_Socket.Command;
 
@@ -13,20 +15,29 @@ public class CommandManager
     /// <summary>
     ///     Initializes the command manager.
     /// </summary>
+    /// <param name="slackSettings"></param>
     /// <param name="customCommands"></param>
     /// <param name="botInfo"></param>
     /// <param name="userCommandDb"></param>
     /// <param name="gptDefaults"></param>
     /// <param name="log"></param>
+    /// <param name="slackApiClient"></param>
+    /// <param name="gptClient"></param>
     public CommandManager(
+        ISlackApiClient slackApiClient,
+        GptClient gptClient,
+        SlackSettings slackSettings,
         GptCustomCommands customCommands,
         SlackBotInfo botInfo,
         IUserCommandDb userCommandDb,
         GptDefaults gptDefaults,
         ILogger log)
     {
         var parameterManager = new ParameterManager(customCommands, gptDefaults, userCommandDb);
+        var messageHandler = new SlackMessageEventBaseHandler(slackApiClient, log, gptClient, botInfo,
+            slackSettings);
 
+        AddCommandStrategy(new GenerateCommandStrategy(messageHandler));
         AddCommandStrategy(new HelpCommandStrategy(gptDefaults, botInfo, customCommands, userCommandDb,
             parameterManager));
         AddCommandStrategy(new StatusCommandStrategy());
@@ -42,7 +53,7 @@ public Task<SlashCommandResponse> Execute(SlashCommand command)
             if (strategy.CanHandle(command)) return strategy.Execute(command);
         }
 
-        return Task.FromResult(CommandStrategyUtils.SlashCommandResponse("Command not found."));
+        return Task.FromResult(CommandStrategyUtils.SlashCommandResponse("Command not found. Type /gpt help or /gpt generate [prompt] to get started."));
     }
 
     private void AddCommandStrategy(ICommandStrategy commandStrategy)

Slack-GPT-Socket/SlackHandlers/Command/CommandsCommandStrategy.cs

@@ -42,7 +42,7 @@ public async Task<SlashCommandResponse> Execute(SlashCommand command)
                 return HelpCommand(command, restOfCommand);
         }
 
-        return CommandStrategyUtils.SlashCommandResponse("Command not found.");
+        return CommandStrategyUtils.SlashCommandResponse("Command not found. Type /help or /generate to get started.");
     }
 
     /// <summary>

Slack-GPT-Socket/SlackHandlers/Command/GenerateCommandStrategy.cs

@@ -0,0 +1,23 @@
+using SlackNet.Interaction;
+
+namespace Slack_GPT_Socket.Command;
+
+public class GenerateCommandStrategy : ICommandStrategy
+{
+    private SlackMessageEventBaseHandler _handler;
+
+    public GenerateCommandStrategy(SlackMessageEventBaseHandler handler)
+    {
+        _handler = handler;
+    }
+
+    public string Command => "generate";
+    public async Task<SlashCommandResponse> Execute(SlashCommand command)
+    {
+        command.Text = command.Text.Substring(Command.Length).Trim();
+        
+        await _handler.CommandHandler(command);
+
+        return CommandStrategyUtils.SlashCommandResponse(SlackLoadingMessage.GetRandomLoadingMessage());
+    }
+}

Slack-GPT-Socket/SlackHandlers/Command/HelpCommandStrategy.cs

@@ -75,6 +75,7 @@ private string GeneralHelpText(SlashCommand command)
         sb.AppendLine();
         sb.AppendLine("You can also use the following commands:");
         sb.AppendLine(" - `/gpt help` - Display this help");
+        sb.AppendLine(" - `/gpt generate <prompt>` - Generate text from the prompt. Very limited, please use chat channel or mention instead.");
         sb.AppendLine(" - `/gpt status` - Get the status of the bot");
         sb.AppendLine(" - `/gpt commands` - List all commands");
         sb.AppendLine(" - `/gpt whatsNew` - List the latest changes");

Slack-GPT-Socket/SlackHandlers/SlackCommandHandler.cs

@@ -18,12 +18,15 @@ public class SlackCommandHandler : ISlashCommandHandler
     public SlackCommandHandler(
         GptCustomCommands customCommands,
         SlackBotInfo botInfo,
+        ISlackApiClient slackApiClient,
+        GptClient gptClient,
         IUserCommandDb userCommandDb,
         IOptions<GptDefaults> gptDefaults,
+        IOptions<SlackSettings> slackSettings,
         ILogger<SlackCommandHandler> log)
     {
         _commandManager =
-            new CommandManager(customCommands, botInfo, userCommandDb, gptDefaults.Value, log);
+            new CommandManager(slackApiClient, gptClient, slackSettings.Value, customCommands, botInfo, userCommandDb, gptDefaults.Value, log);
     }