- runners

Author: devgopher

Botticelli.Bot.Interfaces/Botticelli.Bot.Interfaces.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
 		<TargetFramework>net7.0</TargetFramework>

Botticelli.Framework.Telegram/TelegramBot.cs

@@ -3,6 +3,7 @@
 using Botticelli.Framework.Exceptions;
 using Botticelli.Framework.SendOptions;
 using Botticelli.Framework.Telegram.Handlers;
+using Botticelli.Interfaces;
 using Botticelli.Shared.API;
 using Botticelli.Shared.API.Admin.Requests;
 using Botticelli.Shared.API.Admin.Responses;
@@ -100,7 +101,7 @@ await _client.DeleteMessageAsync(request.ChatId,
     /// <exception cref="BotException"></exception>
     /// <exception cref="ArgumentOutOfRangeException"></exception>
     public override async Task<SendMessageResponse> SendMessageAsync<TSendOptions>(SendMessageRequest request,
-                                                                                   SendOptionsBuilder<TSendOptions> optionsBuilder,
+                                                                                   ISendOptionsBuilder<TSendOptions> optionsBuilder,
                                                                                    CancellationToken token)
     {
         if (!IsStarted)
@@ -132,7 +133,7 @@ public override async Task<SendMessageResponse> SendMessageAsync<TSendOptions>(S
 
             text = Escape(text);
             var retText = text.ToString();
-
+            
             if (!string.IsNullOrWhiteSpace(retText))
                 await _client.SendTextMessageAsync(request.Message.ChatId,
                                                    retText,

Botticelli.Framework/BaseBot.cs

@@ -101,7 +101,7 @@ public Task<SendMessageResponse> SendMessageAsync(SendMessageRequest request, Ca
     /// <param name="optionsBuilder"></param>
     /// <returns></returns>
     public abstract Task<SendMessageResponse> SendMessageAsync<TSendOptions>(SendMessageRequest request,
-                                                                             SendOptionsBuilder<TSendOptions> optionsBuilder,
+                                                                             ISendOptionsBuilder<TSendOptions> optionsBuilder,
                                                                              CancellationToken token) 
             where TSendOptions : class;
 

Botticelli.Framework/Commands/Processors/CommandProcessor.cs

@@ -36,6 +36,13 @@ public async Task ProcessAsync(Message message, CancellationToken token)
 
         try
         {
+            if (string.IsNullOrWhiteSpace(message.Body))
+            {
+                Logger.LogWarning("Message {msgId} has an empty body! Skipping...", message.Uid);
+
+                return;
+            }
+
             if (Regex.IsMatch(message.Body, SimpleCommandPattern))
             {
                 var match = Regex.Matches(message.Body, SimpleCommandPattern)

Botticelli.Framework/SendOptions/SendOptionsBuilder.cs

@@ -1,4 +1,5 @@
 using Botticelli.Framework.Exceptions;
+using Botticelli.Interfaces;
 
 namespace Botticelli.Framework.SendOptions
 {
@@ -7,18 +8,19 @@ namespace Botticelli.Framework.SendOptions
     /// (for example you can use InlineKeyboardMarkup  as T)
     /// </summary>
     /// <typeparam name="T"></typeparam>
-    public class SendOptionsBuilder<T>
-        where T : class
+    public class SendOptionsBuilder<T> : ISendOptionsBuilder<T> where T : class
     {
-        private T innerObject = default;
+        private T _innerObject = default;
 
         protected SendOptionsBuilder()
         {
         }
 
-        public T Create(params object[] args)
+        protected SendOptionsBuilder(T innerObject) => this._innerObject = innerObject;
+
+        public ISendOptionsBuilder<T> Create(params object[] args)
         {
-            if (innerObject != default) 
+            if (_innerObject != default) 
                 throw new BotException($"You shouldn't use {nameof(Create)}() method twice!");
 
             var constructors = typeof(T)
@@ -28,9 +30,9 @@ public T Create(params object[] args)
             // no params? ok => let's seek a parameterless constructor!
             if ((args == null || !args.Any()) && constructors.Any(c => !c.GetParameters().Any()))
             {
-                innerObject = Activator.CreateInstance<T>();
+                _innerObject = Activator.CreateInstance<T>();
 
-                return innerObject;
+                return this;
             }
 
             // Let's see if we can process parameter set and put it to a constructor|initializer
@@ -41,19 +43,21 @@ public T Create(params object[] args)
 
 
 
-            return innerObject;
+            return this;
         }
 
-        public T Set(Func<T> func)
+        public ISendOptionsBuilder<T> Set(Func<T,T> func)
         {
-            func?.Invoke();
+            func?.Invoke(_innerObject);
 
-            return innerObject;
+            return this;
         }
 
         public T Build()
-            => innerObject;
+            => _innerObject;
 
         public static SendOptionsBuilder<T> CreateBuilder() => new();
+
+        public static SendOptionsBuilder<T> CreateBuilder(T input) => new(input);
     }
 }

Botticelli.Interfaces/IEventBasedBotClientApi.cs

@@ -5,6 +5,25 @@ namespace Botticelli.Interfaces;
 
 public interface IEventBasedBotClientApi
 {
+    /// <summary>
+    /// Sends a message
+    /// </summary>
+    /// <param name="request">Message request</param>
+    /// <param name="token">Cancellation token</param>
+    /// <returns></returns>
     public Task<SendMessageResponse> SendMessageAsync(SendMessageRequest request, CancellationToken token);
+
+    /// <summary>
+    /// Sends a message
+    /// </summary>
+    /// <param name="request">Message request</param>
+    /// <param name="optionsBuilder">Specific options for a particular messenger (for example, ReplyMarkup for Telegram)</param>
+    /// <param name="token">Cancellation token</param>
+    /// <returns></returns>
+    public Task<SendMessageResponse> SendMessageAsync<TSendOptions>(SendMessageRequest request,
+                                                                    ISendOptionsBuilder<TSendOptions> optionsBuilder,
+                                                                    CancellationToken token)
+            where TSendOptions : class;
+
     public Task<RemoveMessageResponse> DeleteMessageAsync(RemoveMessageRequest request, CancellationToken token);
 }

Botticelli.Interfaces/ISendOptionsBuilder.cs

@@ -0,0 +1,8 @@
+namespace Botticelli.Interfaces;
+
+public interface ISendOptionsBuilder<T> where T : class
+{
+    ISendOptionsBuilder<T> Create(params object[] args);
+    ISendOptionsBuilder<T> Set(Func<T,T> func);
+    T Build();
+}

Botticelli.Server.FrontNew/Handler/AuthDelegatingHandler.cs

@@ -24,7 +24,7 @@ protected override async Task<HttpResponseMessage> SendAsync(
             request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", session.Token);
 
             var response = await base.SendAsync(request, cancellationToken);
-            Console.WriteLine($"Resp: {await response.Content.ReadAsStringAsync()}");
+
             return response;
         }
     }

Botticelli.sln

@@ -94,12 +94,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "back", "back", "{05922003-7
 	ProjectSection(SolutionItems) = preProject
 		deploy\linux\server\back\build.sh = deploy\linux\server\back\build.sh
 		deploy\linux\server\back\Dockerfile = deploy\linux\server\back\Dockerfile
+		deploy\linux\server\back\run_standalone.sh = deploy\linux\server\back\run_standalone.sh
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "front", "front", "{7FF17C87-CC2B-4CD6-B667-18B7BED78850}"
 	ProjectSection(SolutionItems) = preProject
 		deploy\linux\server\front\build.sh = deploy\linux\server\front\build.sh
 		deploy\linux\server\front\Dockerfile = deploy\linux\server\front\Dockerfile
+		deploy\linux\server\front\run_standalone.sh = deploy\linux\server\front\run_standalone.sh
 	EndProjectSection
 EndProject
 Global