From d9590a61d062f6226d40bca12ced88d33c9cc474 Mon Sep 17 00:00:00 2001
From: Sergey Nazarov <insight.appdev@gmail.com>
Date: Mon, 6 May 2024 15:53:09 +0300
Subject: [PATCH] Fix channel messages publishing

---
 .../Handlers/Implementation/NewMessageHandler.cs    | 13 +++++++------
 .../Infrastructure/Startup.cs                       |  2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/Nocr.TelegramListener.AppServices/UpdateListeners/Handlers/Implementation/NewMessageHandler.cs b/src/Nocr.TelegramListener.AppServices/UpdateListeners/Handlers/Implementation/NewMessageHandler.cs
index f442d95..4917736 100644
--- a/src/Nocr.TelegramListener.AppServices/UpdateListeners/Handlers/Implementation/NewMessageHandler.cs
+++ b/src/Nocr.TelegramListener.AppServices/UpdateListeners/Handlers/Implementation/NewMessageHandler.cs
@@ -32,8 +32,8 @@ public sealed class NewMessageHandler : INewMessageHandler
                     break;
 
                 _logger.LogInformation("{From} in {Chat} > {MessageText}",
-                    m.from_id.Peer(_telegramRegistry.Users, _telegramRegistry.Chats) ?? m.post_author,
-                    m.peer_id.Peer(_telegramRegistry.Users, _telegramRegistry.Chats),
+                    m.From?.Peer(_telegramRegistry.Users, _telegramRegistry.Chats),
+                    m.Peer.Peer(_telegramRegistry.Users, _telegramRegistry.Chats),
                     m.message);
                 var chatUserName = m.peer_id.Peer(_telegramRegistry.Users, _telegramRegistry.Chats).Split("@").Last();
                 if (string.IsNullOrWhiteSpace(chatUserName))
@@ -45,8 +45,9 @@ public sealed class NewMessageHandler : INewMessageHandler
                 var @event = new MessageReceived
                 {
                     MessageId = messageBase.ID,
-                    FromId = m.from_id.ID,
-                    From = m.from_id.Peer(_telegramRegistry.Users, _telegramRegistry.Chats),
+                    // Для каналов from = null
+                    FromId = m.From?.ID ?? m.Peer.ID,
+                    From = (m.From ?? m.Peer).Peer(_telegramRegistry.Users, _telegramRegistry.Chats),
                     ChatUsername = chatUserName,
                     Text = m.message,
                     OccuredDateTime = _dateProvider.UtcNow
@@ -55,8 +56,8 @@ public sealed class NewMessageHandler : INewMessageHandler
                 break;
             case MessageService ms:
                 _logger.LogInformation("{From} in {Chat} > [{Action}]",
-                    ms.from_id.Peer(_telegramRegistry.Users, _telegramRegistry.Chats),
-                    ms.peer_id.Peer(_telegramRegistry.Users, _telegramRegistry.Chats),
+                    ms.From?.Peer(_telegramRegistry.Users, _telegramRegistry.Chats),
+                    ms.Peer.Peer(_telegramRegistry.Users, _telegramRegistry.Chats),
                     ms.action.GetType().Name[13..]);
                 break;
         }
diff --git a/src/Nocr.TelegramListener.Host/Infrastructure/Startup.cs b/src/Nocr.TelegramListener.Host/Infrastructure/Startup.cs
index f033ff3..989ffb7 100644
--- a/src/Nocr.TelegramListener.Host/Infrastructure/Startup.cs
+++ b/src/Nocr.TelegramListener.Host/Infrastructure/Startup.cs
@@ -49,7 +49,7 @@ public class Startup
     public void Configure(IApplicationBuilder app)
     {
         var bus = app.ApplicationServices.GetRequiredService<IBus>();
-        // TODO:
+        // TODO: BackgroundService
         bus.Advanced.Topics.Subscribe(Constants.RoutingKeys.Subscriptions).GetAwaiter().GetResult();
     }
 }
\ No newline at end of file