nocr/telegram-listener
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix channel messages publishing

Browse Source
This commit is contained in:
Sergey Nazarov 2024-05-06 15:53:09 +03:00
parent 4e43da8362
commit d9590a61d0
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Nocr.TelegramListener.AppServices/UpdateListeners/Handlers/Implementation/NewMessageHandler.cs
View File

@ -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;
}

2
src/Nocr.TelegramListener.Host/Infrastructure/Startup.cs
View File

@ -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();
}
}