- cleanup

Author: Igor Evdokimov

Botticelli.Analytics.Shared/Metrics/IMetricObject.cs

@@ -3,7 +3,7 @@
 public interface IMetricObject
 {
     string Id { get; }
-    string BotId { get; set; }
+    string? BotId { get; set; }
     DateTime Timestamp { get; set; }
     string Name { get; set; }
     Dictionary<string, string>? AdditionalParameters { get; set; }

Botticelli.Analytics.Shared/Metrics/UserDefinedMetricObject.cs

@@ -3,7 +3,7 @@
 public class MetricObject : IMetricObject
 {
     public string Id => Guid.NewGuid().ToString();
-    public required string BotId { get; set; }
+    public required string? BotId { get; set; }
     public DateTime Timestamp { get; set; }
     public virtual required string Name { get; set; }
     public Dictionary<string, string>? AdditionalParameters { get; set; }

Botticelli.Bot.Data.Entities/Bot/BotData.cs

@@ -12,5 +12,5 @@ public class BotData
     public BotStatus? Status { get; set; }
     public BotType? Type { get; set; }
     public string? BotKey { get; set; } 
-    public List<BotAdditionalInfo> AdditionalInfo { get; set; }
+    public List<BotAdditionalInfo>? AdditionalInfo { get; set; }
 }

Botticelli.Client.Analytics/MetricsProcessor.cs

@@ -9,7 +9,7 @@ public class MetricsProcessor
 
     public MetricsProcessor(MetricsPublisher publisher) => _publisher = publisher;
 
-    public void Process(string name, string botId)
+    public void Process(string name, string? botId)
         => Task.Run(() => _publisher.Publish(new MetricObject
         {
             Name = name,

Botticelli.Framework.Monads/Commands/Processors/OutputCommandProcessor.cs

@@ -12,7 +12,7 @@ public class OutputCommandProcessor<TReplyMarkup, TCommand> : ChainProcessor<TCo
     where TReplyMarkup : class
     where TCommand : IChainCommand
 {
-    private readonly SendOptionsBuilder<TReplyMarkup>? _options;
+    private readonly SendOptionsBuilder<TReplyMarkup> _options;
 
     public OutputCommandProcessor(ILogger<OutputCommandProcessor<TReplyMarkup, TCommand>> logger,
         ILayoutSupplier<TReplyMarkup> layoutSupplier,

Botticelli.Framework.Telegram/TelegramBot.cs

@@ -54,7 +54,7 @@ public TelegramBot(ITelegramBotClient client,
     public override event MsgSentEventHandler? MessageSent;
     public override event MsgReceivedEventHandler? MessageReceived;
     public override event MsgRemovedEventHandler? MessageRemoved;
-    public override event MessengerSpecificEventHandler? MessengerSpecificEvent;
+    public event MessengerSpecificEventHandler? MessengerSpecificEvent;
 
     /// <summary>
     ///     Deletes a message
@@ -119,7 +119,7 @@ await _client.DeleteMessageAsync(request.ChatId,
     /// <exception cref="BotException"></exception>
     /// <exception cref="ArgumentOutOfRangeException"></exception>
     protected override async Task<SendMessageResponse> InnerSendMessageAsync<TSendOptions>(SendMessageRequest request,
-                                                                                           ISendOptionsBuilder<TSendOptions>? optionsBuilder,
+                                                                                           ISendOptionsBuilder<TSendOptions> optionsBuilder,
                                                                                            bool isUpdate,
                                                                                            CancellationToken token)
     {

Botticelli.Framework.Vk/VkBot.cs

@@ -167,7 +167,7 @@ private string CreateVkAttach(VkSendVideoResponse fk, string type)
 
 
     protected override async Task<SendMessageResponse> InnerSendMessageAsync<TSendOptions>(SendMessageRequest request,
-        ISendOptionsBuilder<TSendOptions>? optionsBuilder,
+        ISendOptionsBuilder<TSendOptions> optionsBuilder,
         bool isUpdate,
         CancellationToken token)
     {
@@ -181,7 +181,7 @@ protected override async Task<SendMessageResponse> InnerSendMessageAsync<TSendOp
                 foreach (var vkRequest in requests)
                     await _messagePublisher.SendAsync(vkRequest, token);
             }
-            catch (Exception ex)
+            catch (Exception? ex)
             {
                 throw new BotException("Can't send a message!", ex);
             }
@@ -312,5 +312,5 @@ public override Task<RemoveMessageResponse> DeleteMessageAsync(RemoveMessageRequ
     public override event MsgSentEventHandler MessageSent;
     public override event MsgReceivedEventHandler MessageReceived;
     public override event MsgRemovedEventHandler MessageRemoved;
-    public override event MessengerSpecificEventHandler MessengerSpecificEvent;
+    public virtual event MessengerSpecificEventHandler MessengerSpecificEvent;
 }

Botticelli.Framework/BaseBot.cs

@@ -11,7 +11,6 @@
 using Botticelli.Shared.API.Client.Requests;
 using Botticelli.Shared.API.Client.Responses;
 using Botticelli.Shared.Constants;
-using Botticelli.Shared.ValueObjects;
 using Microsoft.Extensions.Logging;
 
 namespace Botticelli.Framework;
@@ -31,9 +30,9 @@ public abstract class BaseBot
 
     public delegate void StoppedEventHandler(object sender, StoppedBotEventArgs e);
 
-    public virtual event MsgSentEventHandler MessageSent;
-    public virtual event MsgReceivedEventHandler MessageReceived;
-    public virtual event MsgRemovedEventHandler MessageRemoved;
+    public virtual event MsgSentEventHandler? MessageSent;
+    public virtual event MsgReceivedEventHandler? MessageReceived;
+    public virtual event MsgRemovedEventHandler? MessageRemoved;
 }
 
 /// <summary>
@@ -102,7 +101,7 @@ public Task<SendMessageResponse> SendMessageAsync(SendMessageRequest request, Ca
     /// <param name="token"></param>
     /// <returns></returns>
     public virtual async Task<SendMessageResponse> SendMessageAsync<TSendOptions>(SendMessageRequest request,
-                                                                                  ISendOptionsBuilder<TSendOptions>? optionsBuilder,
+                                                                                  ISendOptionsBuilder<TSendOptions> optionsBuilder,
                                                                                   CancellationToken token)
             where TSendOptions : class
     {
@@ -117,7 +116,7 @@ public virtual async Task<SendMessageResponse> SendMessageAsync<TSendOptions>(Se
     public Task<SendMessageResponse> UpdateMessageAsync(SendMessageRequest request, CancellationToken token)
         => SendMessageAsync<object>(request, null, token);
 
-    public async Task<SendMessageResponse> UpdateMessageAsync<TSendOptions>(SendMessageRequest request, ISendOptionsBuilder<TSendOptions>? optionsBuilder, CancellationToken token)
+    public async Task<SendMessageResponse> UpdateMessageAsync<TSendOptions>(SendMessageRequest request, ISendOptionsBuilder<TSendOptions> optionsBuilder, CancellationToken token)
             where TSendOptions : class
     {
         _metrics.Process(MetricNames.MessageSent, BotDataUtils.GetBotId());
@@ -144,15 +143,14 @@ public virtual async Task<RemoveMessageResponse> DeleteMessageAsync(RemoveMessag
     protected abstract Task<StopBotResponse> InnerStopBotAsync(StopBotRequest request, CancellationToken token);
 
     protected abstract Task<SendMessageResponse> InnerSendMessageAsync<TSendOptions>(SendMessageRequest request,
-                                                                                     ISendOptionsBuilder<TSendOptions>? optionsBuilder,
+                                                                                     ISendOptionsBuilder<TSendOptions> optionsBuilder,
                                                                                      bool isUpdate,
                                                                                      CancellationToken token)
             where TSendOptions : class;
 
     protected abstract Task<RemoveMessageResponse> InnerDeleteMessageAsync(RemoveMessageRequest request,
                                                                            CancellationToken token);
 
-    public virtual event MessengerSpecificEventHandler MessengerSpecificEvent;
     public event StartedEventHandler Started;
     public event StoppedEventHandler Stopped;
 }

Botticelli.Framework/BotStatusService.cs

@@ -77,7 +77,7 @@ private void GetRequiredStatus(CancellationToken cancellationToken)
         if (taskResult == default)
             throw new BotException("No result from server!");
 
-        var botContext = taskResult?.BotContext;
+        var botContext = taskResult.BotContext;
         if (botContext == default)
             throw new BotException("No bot context from server!");
 
@@ -88,7 +88,7 @@ private void GetRequiredStatus(CancellationToken cancellationToken)
             BotKey = botContext.BotKey,
             AdditionalInfo = botContext.Items?.Select(it => new BotAdditionalInfo
                 {
-                    BotId = taskResult.BotId,
+                    BotId = taskResult!.BotId,
                     ItemName = it.Key,
                     ItemValue = it.Value
                 })