From 1c834231b91fbf0916118721ced4060693615324 Mon Sep 17 00:00:00 2001 From: Sergey Nazarov Date: Tue, 26 Mar 2024 19:45:30 +0300 Subject: [PATCH] Update async contracts --- .../Handlers/Implementation/NewMessageHandler.cs | 5 +---- .../Events/TextUpdateReceived.cs | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/Nocr.TelegramListener.AppServices/UpdateListeners/Handlers/Implementation/NewMessageHandler.cs b/src/Nocr.TelegramListener.AppServices/UpdateListeners/Handlers/Implementation/NewMessageHandler.cs index 9aa4b88..802be15 100644 --- a/src/Nocr.TelegramListener.AppServices/UpdateListeners/Handlers/Implementation/NewMessageHandler.cs +++ b/src/Nocr.TelegramListener.AppServices/UpdateListeners/Handlers/Implementation/NewMessageHandler.cs @@ -31,9 +31,6 @@ public sealed class NewMessageHandler : INewMessageHandler if (string.IsNullOrWhiteSpace(m.message)) break; - var from = m.from_id.Peer(_telegramRegistry.Users, _telegramRegistry.Chats); - var fromUsername = from.StartsWith('@') ? from : null; - _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), @@ -49,7 +46,7 @@ public sealed class NewMessageHandler : INewMessageHandler var @event = new MessageReceived { FromId = m.from_id.ID, - FromUsername = fromUsername, + From = m.from_id.Peer(_telegramRegistry.Users, _telegramRegistry.Chats), ChatUsername = chatUserName, Text = m.message, OccuredDateTime = _dateProvider.UtcNow diff --git a/src/Nocr.TelegramListener.Async.Api.Contracts/Events/TextUpdateReceived.cs b/src/Nocr.TelegramListener.Async.Api.Contracts/Events/TextUpdateReceived.cs index 96935be..50f7e3a 100644 --- a/src/Nocr.TelegramListener.Async.Api.Contracts/Events/TextUpdateReceived.cs +++ b/src/Nocr.TelegramListener.Async.Api.Contracts/Events/TextUpdateReceived.cs @@ -8,7 +8,7 @@ public sealed class MessageReceived : IEvent public long FromId { get; set; } - public string? FromUsername { get; set; } + public string? From { get; set; } public string ChatUsername { get; set; } = default!;