poll-feat

Kysect.BotFramework.ConsoleTest/Program.cs

@@ -1,7 +1,9 @@
 using System.Threading.Tasks;
+using Kysect.BotFramework.ApiProviders.Discord;
 using Kysect.BotFramework.ApiProviders.Telegram;
-using Kysect.BotFramework.Commands;
+using Kysect.BotFramework.DefaultCommands;
 using Kysect.BotFramework.Core;
+using Kysect.BotFramework.DefaultCommands;
 using Kysect.BotFramework.Settings;
 
 namespace Kysect.BotFramework.ConsoleTest
@@ -19,6 +21,7 @@ private static async Task MainAsync()
                 .SetPrefix('!')
                 .SetCaseSensitive(false)
                 .AddCommand(PingCommand.Descriptor)
+                .AddCommand(PollCommand.Descriptor)
                 .Build(api);
 
             botManager.Start();

Kysect.BotFramework/ApiProviders/Discord/DiscordApiProvider.cs

@@ -1,18 +1,24 @@
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Linq;
+using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using Discord;
 using Discord.Commands;
 using Discord.Rest;
 using Discord.WebSocket;
+using DSharpPlus;
+using DSharpPlus.Entities;
 using FluentResults;
 using Kysect.BotFramework.Core;
 using Kysect.BotFramework.Core.BotMedia;
 using Kysect.BotFramework.Core.BotMessages;
 using Kysect.BotFramework.Core.Tools.Loggers;
 using Kysect.BotFramework.DefaultCommands;
 using Kysect.BotFramework.Settings;
+using TokenType = Discord.TokenType;
+using System.Text.RegularExpressions;
 
 namespace Kysect.BotFramework.ApiProviders.Discord
 {
@@ -21,6 +27,12 @@ public class DiscordApiProvider : IBotApiProvider, IDisposable
         private readonly object _lock = new object();
         private readonly DiscordSettings _settings;
         private DiscordSocketClient _client;
+        private int _argsCount;
+
+        private readonly string[] _emojis =
+        {
+            "", "1️⃣", "2️⃣", "3️⃣","4️⃣","5️⃣","6️⃣","7️⃣", "8️⃣", "9️⃣", "🔟"
+        };
 
         public DiscordApiProvider(ISettingsProvider<DiscordSettings> settingsProvider)
         {
@@ -118,12 +130,26 @@ public Result<string> SendTextMessage(string text, SenderInfo sender)
             if (text.Length == 0)
             {
                 LoggerHolder.Instance.Error("The message wasn't sent by the command " +
-                                            $"\"{PingCommand.Descriptor.CommandName}\", the length must not be zero.");
+                                            "\"{CommandName}\", the length must not be zero", 
+                                            PingCommand.Descriptor.CommandName);
                 return Result.Ok();
             }
-
+            
             return SendText(text, sender);
         }
+
+        public Result<string> SendPollMessage(string text, SenderInfo sender)
+        {
+            if (text.Length == 0)
+            {
+                LoggerHolder.Instance.Error("The message wasn't sent by the command " +
+                                            "\"{CommandName}\", the length must not be zero", 
+                                            PollCommand.Descriptor.CommandName);
+                return Result.Ok();
+            }
+
+            return SendPoll(text, sender);
+        }
 
         public void Dispose()
         {
@@ -150,15 +176,22 @@ private Task ClientOnMessage(SocketMessage arg)
             }
 
             var context = new SocketCommandContext(_client, message);
+            if (!context.User.IsBot && context.Message.Content.Contains("!Poll"))
+            {
+                _argsCount = GetPollArguments(message.Content).Count() - 1;
+            }
+            if (context.User.IsBot && context.Message.Embeds.Any())
+            {
+                ReactWithEmojis(context);
+            }
+
             if (context.User.IsBot || context.Guild is null)
             {
                 return Task.CompletedTask;
             }
-
             LoggerHolder.Instance.Debug($"New message event: {context.Message}");
-
+            
             IBotMessage botMessage = ParseMessage(message, context);
-
             OnMessage?.Invoke(context.Client,
                               new BotEventArgs(
                                   botMessage,
@@ -270,18 +303,83 @@ private Result<string> SendText(string text, SenderInfo sender)
                 return Result.Fail(new Error(message).CausedBy(e));
             }
         }
+
+        private Result<string> SendPoll(string text, SenderInfo sender)
+        {
+            List<string> arguments = GetPollArguments(text);
+
+            Result<string> result = CheckText(text);
+            if (result.IsFailed)
+            {
+                return result;
+            }
+
+            for (int i = 1; i < arguments.Count; i++)
+            {
+                arguments[i] = _emojis[i] + "\t" + arguments[i];
+            }
+
+            var embed = new EmbedBuilder
+            {
+                Title = arguments[0],
+                Color = Color.Purple,
+                Description = String.Join("\n", arguments.Skip(1))
+            };
+
+            Task<RestUserMessage> task = _client.GetGuild((ulong) sender.GroupId)
+                .GetTextChannel((ulong) sender.UserSenderId)
+                .SendMessageAsync(embed: embed.Build());
+
+            try
+            {
+                task.Wait();
+                return Result.Ok("Message send");
+            }
+            catch (Exception e)
+            {
+                var message = "Error while sending message";
+                LoggerHolder.Instance.Error(e, message);
+                return Result.Fail(new Error(message).CausedBy(e));
+            }
+        }
 
         private Result<string> CheckText(string text)
         {
             if (text.Length > 2000)
             {
                 string subString = text.Substring(0, 99) + "...";
                 string errorMessage = "The message wasn't sent by the command " +
-                                      $"\"{PingCommand.Descriptor.CommandName}\", the length is too big.";
+                                      $"\"{PingCommand.Descriptor.CommandName}\", the length is too big";
                 return Result.Fail(new Error(errorMessage).CausedBy(subString));
             }
 
             return Result.Ok();
         }
+
+        private List<string> GetPollArguments(string args)
+        {
+            var regex = new Regex(@"[^\s""']+|""([^""]*)""|'([^']*)'"); // Splits into "..." '...' a b c
+            var matches = regex.Matches(args);
+            List<string> options = new List<string>();
+
+            if (matches.Count > 0)
+            {
+                foreach (Match match in matches)
+                {
+                    options.Add(match.Value.Replace("\"", ""));
+                }
+            }
+
+            return options;
+        }
+
+        private async void ReactWithEmojis(SocketCommandContext context)
+        {
+            for (int i = 1; i < _argsCount; i++)
+            {
+                await context.Message.AddReactionAsync(new Emoji(_emojis[i]))
+                    .ConfigureAwait(false);
+            }
+        }
     }
 }

Kysect.BotFramework/ApiProviders/IBotApiProvider.cs

@@ -15,5 +15,6 @@ public interface IBotApiProvider
         Result<string> SendMedia(IBotMediaFile mediaFile, string text, SenderInfo sender);
         Result<string> SendOnlineMedia(IBotOnlineFile file, string text, SenderInfo sender);
         Result<string> SendTextMessage(string text, SenderInfo sender);
+        Result<string> SendPollMessage(string text, SenderInfo sender);
     }
 }

Kysect.BotFramework/ApiProviders/Telegram/TelegramApiProvider.cs

@@ -29,7 +29,6 @@ public TelegramApiProvider(ISettingsProvider<TelegramSettings> settingsProvider)
             _settings = settingsProvider.GetSettings();
             Initialize();
         }
-
         public event EventHandler<BotEventArgs> OnMessage;
 
         public void Restart()
@@ -308,6 +307,8 @@ private Result<string> SendText(string text, SenderInfo sender)
                 return Result.Fail(new Error(message).CausedBy(e));
             }
         }
+
+        public Result<string> SendPollMessage(string text, SenderInfo sender) => throw new NotImplementedException();
 
         private Result<string> CheckText(string text)
         {

Kysect.BotFramework/ApiProviders/VK/VkFixedApiProvider.cs

@@ -31,6 +31,8 @@ public void Restart()
 
         public Result<string> SendTextMessage(string text, SenderInfo sender) => throw new NotImplementedException();
 
+        public Result<string> SendPollMessage(string text, SenderInfo sender) => throw new NotImplementedException();
+
         public void Dispose()
         {
             throw new NotImplementedException();

Kysect.BotFramework/Core/BotMessages/BotPollMessage.cs

@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using System.Text.RegularExpressions;
+using Kysect.BotFramework.ApiProviders;
+using Telegram.Bot.Requests;
+
+namespace Kysect.BotFramework.Core.BotMessages
+{
+    public class BotPollMessage : IBotMessage
+    {
+        public BotPollMessage(string text)
+        {
+            Text = text;
+        }
+
+        public string Text { get; }
+
+        public void Send(IBotApiProvider apiProvider, SenderInfo sender)
+        {
+            apiProvider.SendPollMessage(Text, sender);
+        }
+    }
+}

Kysect.BotFramework/Core/CommandInvoking/CommandHandler.cs

@@ -2,6 +2,7 @@
 using FluentResults;
 using Kysect.BotFramework.Core.BotMessages;
 using Kysect.BotFramework.Core.Commands;
+using Kysect.BotFramework.DefaultCommands;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace Kysect.BotFramework.Core.CommandInvoking
@@ -24,7 +25,7 @@ public Result CheckArgsCount(CommandContainer args)
                 return commandTask.ToResult<CommandContainer>();
             }
 
-            return commandTask.Value.Args.Length == args.Arguments.Count
+            return (commandTask.Value.Args.Count == args.Arguments.Count) || (args.CommandName == "Poll") // Better way to check for Poll?
                 ? Result.Ok()
                 : Result.Fail<CommandContainer>(
                     "Cannot execute command. Argument count miss matched with command signature");

Kysect.BotFramework/Core/Commands/BotCommandDescriptor.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using Kysect.BotFramework.Core.CommandInvoking;
 using Microsoft.Extensions.DependencyInjection;
 
@@ -8,9 +9,9 @@ public abstract class BotCommandDescriptor
     {
         public string CommandName { get; }
         public string Description { get; }
-        public string[] Args { get; }
+        public List<string> Args { get; }
 
-        public BotCommandDescriptor(string commandName, string description, string[] args)
+        public BotCommandDescriptor(string commandName, string description, List<string> args)
         {
             CommandName = commandName;
             Description = description;
@@ -22,13 +23,13 @@ public BotCommandDescriptor(string commandName, string description, string[] arg
 
     public class BotCommandDescriptor<T> : BotCommandDescriptor where T : IBotCommand
     {
-        public BotCommandDescriptor(string commandName, string description, string[] args) 
+        public BotCommandDescriptor(string commandName, string description, List<string> args) 
             : base(commandName, description, args)
         {
         }
 
         public BotCommandDescriptor(string commandName, string description) 
-            : this(commandName, description, Array.Empty<string>())
+            : this(commandName, description, new List<string>())
         {
         }
 

Kysect.BotFramework/DefaultCommands/PollCommand.cs

@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using FluentResults;
+using Kysect.BotFramework.Core.BotMessages;
+using Kysect.BotFramework.Core.Commands;
+
+namespace Kysect.BotFramework.DefaultCommands
+{
+    public class PollCommand : IBotAsyncCommand
+    {
+        public static readonly BotCommandDescriptor<PollCommand> Descriptor = new BotCommandDescriptor<PollCommand>(
+            "Poll", 
+            "Create a new poll", new List<string>());
+
+        public Result CanExecute(CommandContainer args) => Result.Ok();
+
+        public Task<Result<IBotMessage>> Execute(CommandContainer args)
+        {
+            IBotMessage message = new BotPollMessage(String.Join(" ", args.Arguments));
+            return Task.FromResult(Result.Ok(message));
+        }
+    }
+}

Kysect.BotFramework/Kysect.BotFramework.csproj

@@ -24,6 +24,7 @@
 
   <ItemGroup>
     <PackageReference Include="Discord.Net" Version="2.3.1" />
+    <PackageReference Include="DSharpPlus" Version="4.1.0" />
     <PackageReference Include="FluentResults" Version="2.3.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.1" />
     <PackageReference Include="Serilog" Version="2.10.0" />