[#4] Use Telegram.Bot.Types.Update (#5)

PaGrom · Sep 6, 2020 · d788016 · d788016
1 parent 756e6da
commit d788016
Show file tree

Hide file tree

Showing 30 changed files with 28 additions and 178 deletions.
diff --git a/Telegrom.Core/Contexts/IUpdateContext.cs b/Telegrom.Core/Contexts/IUpdateContext.cs
@@ -1,4 +1,4 @@
-using Telegrom.Core.TelegramModel;
+using Telegram.Bot.Types;
 
 namespace Telegrom.Core.Contexts
 {

diff --git a/Telegrom.Core/Contexts/SessionContext.cs b/Telegrom.Core/Contexts/SessionContext.cs
@@ -5,6 +5,7 @@
 using Autofac;
 using Microsoft.Extensions.Logging;
 using Telegram.Bot.Requests.Abstractions;
+using Telegram.Bot.Types;
 using Telegrom.Core.MessageBus;
 using Telegrom.Core.TelegramModel;
 

diff --git a/Telegrom.Core/Contexts/SessionManager.cs b/Telegrom.Core/Contexts/SessionManager.cs
@@ -4,7 +4,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Autofac;
-using Telegrom.Core.TelegramModel;
+using Telegram.Bot.Types;
 
 namespace Telegrom.Core.Contexts
 {

diff --git a/Telegrom.Core/Contexts/UpdateContext.cs b/Telegrom.Core/Contexts/UpdateContext.cs
@@ -1,4 +1,4 @@
-using Telegrom.Core.TelegramModel;
+using Telegram.Bot.Types;
 
 namespace Telegrom.Core.Contexts
 {

diff --git a/Telegrom.Core/IIdentityService.cs b/Telegrom.Core/IIdentityService.cs
@@ -1,6 +1,6 @@
 using System.Threading;
 using System.Threading.Tasks;
-using Telegrom.Core.TelegramModel;
+using Telegram.Bot.Types;
 
 namespace Telegrom.Core
 {

diff --git a/Telegrom.Core/ISessionStateAttributesRemover.cs b/Telegrom.Core/ISessionStateAttributesRemover.cs
@@ -1,6 +1,6 @@
 using System.Threading;
 using System.Threading.Tasks;
-using Telegrom.Core.TelegramModel;
+using Telegram.Bot.Types;
 
 namespace Telegrom.Core
 {

diff --git a/Telegrom.Core/ITelegramUpdateReceiver.cs b/Telegrom.Core/ITelegramUpdateReceiver.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Threading;
-using Telegrom.Core.TelegramModel;
+using Telegram.Bot.Types;
 
 namespace Telegrom.Core
 {

diff --git a/Telegrom.Core/IUpdateService.cs b/Telegrom.Core/IUpdateService.cs
@@ -1,6 +1,6 @@
 using System.Threading;
 using System.Threading.Tasks;
-using Telegrom.Core.TelegramModel;
+using Telegram.Bot.Types;
 
 namespace Telegrom.Core
 {

diff --git a/Telegrom.Core/IWakeUpService.cs b/Telegrom.Core/IWakeUpService.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Threading;
 using System.Threading.Tasks;
-using Telegrom.Core.TelegramModel;
+using Telegram.Bot.Types;
 
 namespace Telegrom.Core
 {

diff --git a/Telegrom.Core/MessageBus/IIncomingUpdateQueueReader.cs b/Telegrom.Core/MessageBus/IIncomingUpdateQueueReader.cs
@@ -1,6 +1,6 @@
 using System.Threading;
 using System.Threading.Tasks;
-using Telegrom.Core.TelegramModel;
+using Telegram.Bot.Types;
 
 namespace Telegrom.Core.MessageBus
 {

diff --git a/Telegrom.Core/MessageBus/IIncomingUpdateQueueWriter.cs b/Telegrom.Core/MessageBus/IIncomingUpdateQueueWriter.cs
@@ -1,6 +1,6 @@
 using System.Threading;
 using System.Threading.Tasks;
-using Telegrom.Core.TelegramModel;
+using Telegram.Bot.Types;
 
 namespace Telegrom.Core.MessageBus
 {

diff --git a/Telegrom.Core/MessageBus/IUpdateDispatcher.cs b/Telegrom.Core/MessageBus/IUpdateDispatcher.cs
@@ -1,6 +1,6 @@
 using System.Threading;
 using System.Threading.Tasks;
-using Telegrom.Core.TelegramModel;
+using Telegram.Bot.Types;
 
 namespace Telegrom.Core.MessageBus
 {

diff --git a/Telegrom.Core/TelegramModel/CallbackQuery.cs b/Telegrom.Core/TelegramModel/CallbackQuery.cs
diff --git a/Telegrom.Core/TelegramModel/Message.cs b/Telegrom.Core/TelegramModel/Message.cs
diff --git a/Telegrom.Core/TelegramModel/Update.cs b/Telegrom.Core/TelegramModel/Update.cs
diff --git a/Telegrom.Core/TelegramModel/User.cs b/Telegrom.Core/TelegramModel/User.cs
diff --git a/Telegrom.Database/IdentityService.cs b/Telegrom.Database/IdentityService.cs
@@ -2,8 +2,8 @@
 using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
+using Telegram.Bot.Types;
 using Telegrom.Core;
-using Telegrom.Core.TelegramModel;
 using Telegrom.Database.Model;
 
 namespace Telegrom.Database

diff --git a/Telegrom.Database/SessionStateAttributesRemover.cs b/Telegrom.Database/SessionStateAttributesRemover.cs
@@ -2,8 +2,8 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore;
+using Telegram.Bot.Types;
 using Telegrom.Core;
-using Telegrom.Core.TelegramModel;
 
 namespace Telegrom.Database
 {

diff --git a/Telegrom.Database/UpdateService.cs b/Telegrom.Database/UpdateService.cs
@@ -1,8 +1,8 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Newtonsoft.Json;
+using Telegram.Bot.Types;
 using Telegrom.Core;
-using Telegrom.Core.TelegramModel;
 using Telegrom.Database.Model;
 
 namespace Telegrom.Database
@@ -21,7 +21,7 @@ public UpdateService(User user, DatabaseContext context)
         public async Task SaveUpdateAsync(Update update, CancellationToken cancellationToken)
         {
             var sessionUpdate = await _context.SessionUpdates
-                .FindAsync(new object[] { _user.Id, update.UpdateId }, cancellationToken);
+                .FindAsync(new object[] { _user.Id, update.Id }, cancellationToken);
 
             if (sessionUpdate != null)
             {
@@ -32,7 +32,7 @@ public async Task SaveUpdateAsync(Update update, CancellationToken cancellationT
                 await _context.SessionUpdates.AddAsync(new SessionUpdate
                 {
                     IdentityId = _user.Id,
-                    UpdateId = update.UpdateId,
+                    UpdateId = update.Id,
                     UpdateType = update.GetType().AssemblyQualifiedName,
                     Update = JsonConvert.SerializeObject(update)
                 }, cancellationToken);
@@ -44,7 +44,7 @@ await _context.SessionUpdates.AddAsync(new SessionUpdate
         public async Task MakeUpdateProcessedAsync(Update update, CancellationToken cancellationToken)
         {
             var sessionUpdate = await _context.SessionUpdates
-                .FindAsync(new object[] { _user.Id, update.UpdateId }, cancellationToken);
+                .FindAsync(new object[] { _user.Id, update.Id }, cancellationToken);
 
             sessionUpdate.Processed = true;
 

diff --git a/Telegrom.Database/WakeUpService.cs b/Telegrom.Database/WakeUpService.cs
@@ -4,8 +4,8 @@
 using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore;
 using Newtonsoft.Json;
+using Telegram.Bot.Types;
 using Telegrom.Core;
-using Telegrom.Core.TelegramModel;
 
 namespace Telegrom.Database
 {

diff --git a/Telegrom.TelegramService/TelegramMappingProfile.cs b/Telegrom.TelegramService/TelegramMappingProfile.cs
diff --git a/Telegrom.TelegramService/TelegramServiceModule.cs b/Telegrom.TelegramService/TelegramServiceModule.cs
@@ -1,10 +1,8 @@
 using System.Net;
 using Autofac;
-using AutoMapper;
 using MihaZupan;
 using Telegram.Bot;
 using Telegrom.Core;
-using Telegrom.Core.MessageBus;
 
 namespace Telegrom.TelegramService
 {
@@ -52,10 +50,6 @@ protected override void Load(ContainerBuilder builder)
                     .SingleInstance();
             }
 
-            builder.RegisterType<TelegramMappingProfile>()
-                .As<Profile>()
-                .InstancePerLifetimeScope();
-
             builder.RegisterType<TelegramUpdateReceiver>()
                 .As<ITelegramUpdateReceiver>()
                 .SingleInstance();

diff --git a/Telegrom.TelegramService/TelegramUpdateReceiver.cs b/Telegrom.TelegramService/TelegramUpdateReceiver.cs
@@ -1,28 +1,23 @@
 using System;
 using System.Threading;
-using AutoMapper;
 using Microsoft.Extensions.Logging;
 using Telegram.Bot;
 using Telegram.Bot.Args;
-using Telegram.Bot.Types.Enums;
+using Telegram.Bot.Types;
 using Telegrom.Core;
-using Telegrom.Core.TelegramModel;
 
 namespace Telegrom.TelegramService
 {
     public class TelegramUpdateReceiver : ITelegramUpdateReceiver
     {
         private readonly ITelegramBotClient _telegramBotClient;
-        private readonly IMapper _mapper;
         private readonly ILogger<TelegramUpdateReceiver> _logger;
         private Action<Update, CancellationToken> _updateReceivedHandler;
 
         public TelegramUpdateReceiver(ITelegramBotClient telegramBotClient,
-            IMapper mapper,
             ILogger<TelegramUpdateReceiver> logger)
         {
             _telegramBotClient = telegramBotClient;
-            _mapper = mapper;
             _logger = logger;
 
             var me = _telegramBotClient.GetMeAsync().GetAwaiter().GetResult();
@@ -45,17 +40,7 @@ private void BotOnUpdateReceived(object sender, UpdateEventArgs e)
             var update = e.Update;
             _logger.LogInformation("Get update {@update}", update);
 
-            Update telegramUpdate = update.Type switch
-            {
-                UpdateType.Message => _mapper.Map<Message>(update),
-                UpdateType.CallbackQuery => _mapper.Map<CallbackQuery>(update),
-                _ => null
-            };
-
-            if (telegramUpdate != null)
-            {
-                _updateReceivedHandler?.Invoke(telegramUpdate, default);
-            }
+            _updateReceivedHandler?.Invoke(update, default);
         }
 
         public void SetUpdateReceivedHandler(Action<Update, CancellationToken> handler)

diff --git a/Telegrom.TelegramService/Telegrom.TelegramService.csproj b/Telegrom.TelegramService/Telegrom.TelegramService.csproj
@@ -6,7 +6,6 @@
 
   <ItemGroup>
     <PackageReference Include="Autofac" Version="5.2.0" />
-    <PackageReference Include="AutoMapper" Version="9.0.0" />
     <PackageReference Include="HttpToSocks5Proxy" Version="1.4.0" />
     <PackageReference Include="Telegram.Bot" Version="15.7.1" />
   </ItemGroup>

diff --git a/Telegrom/IncomingUpdateQueue.cs b/Telegrom/IncomingUpdateQueue.cs
@@ -1,8 +1,8 @@
 using System;
 using System.Threading;
 using System.Threading.Tasks;
+using Telegram.Bot.Types;
 using Telegrom.Core.MessageBus;
-using Telegrom.Core.TelegramModel;
 
 namespace Telegrom
 {

diff --git a/Telegrom/InternalBotService.cs b/Telegrom/InternalBotService.cs
@@ -1,10 +1,10 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
+using Telegram.Bot.Types;
 using Telegrom.Core;
 using Telegrom.Core.Contexts;
 using Telegrom.Core.MessageBus;
-using Telegrom.Core.TelegramModel;
 
 namespace Telegrom
 {

diff --git a/Telegrom/SessionIncomingUpdateQueue.cs b/Telegrom/SessionIncomingUpdateQueue.cs
@@ -1,8 +1,8 @@
 using System;
 using System.Threading;
 using System.Threading.Tasks;
+using Telegram.Bot.Types;
 using Telegrom.Core.MessageBus;
-using Telegrom.Core.TelegramModel;
 
 namespace Telegrom
 {